Merge pull request #2159 from lack/wpc-gm-e810-pin-example

OCPBUGS-48343: Update WPC GM e180 pin example to be more user-friendly
openshift-kni · Jan 14, 2025 · 1841892 · 1841892
2 parents 413a53d + 93220fe
commit 1841892
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 34 deletions.
diff --git a/ztp/kube-compare-reference/default_value.yaml b/ztp/kube-compare-reference/default_value.yaml
@@ -37,7 +37,16 @@ optional_ptp_config_PtpConfigDualCardGmWpc:
     - plugins:
         e810:
           pins:
-            e810_pins: {}
+            $iface_timeTx1:
+              SMA1: 2 1
+              SMA2: 0 2
+              U.FL1: 0 1
+              U.FL2: 0 2
+            $iface_timeTx2:
+              SMA1: 1 1
+              SMA2: 0 2
+              U.FL1: 0 1
+              U.FL2: 0 2
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
@@ -78,7 +87,11 @@ optional_ptp_config_PtpConfigGmWpc:
     - plugins:
         e810:
           pins:
-            e810_pins: {}
+            $iface_timeTx:
+              SMA1: 0 1
+              SMA2: 0 2
+              U.FL1: 0 1
+              U.FL2: 0 2
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"

diff --git a/ztp/kube-compare-reference/optional/ptp-config/PtpConfigDualCardGmWpc.yaml b/ztp/kube-compare-reference/optional/ptp-config/PtpConfigDualCardGmWpc.yaml
@@ -27,17 +27,13 @@ spec:
           LocalHoldoverTimeout: 14400
           MaxInSpecOffset: 100
         pins:
+          # Syntax guide:
+          # - The 1st number in each pair must be one of:
+          #    0 - Disabled
+          #    1 - RX
+          #    2 - TX
+          # - The 2nd number in each pair must match the channel number
           {{- .plugins.e810.pins | toYaml | nindent 10 }}
-        #  "(?<iface_timeTx1>[[:alnum:]]+)":
-        #    "U.FL2": "0 2"
-        #    "U.FL1": "0 1"
-        #    "SMA2": "0 2"
-        #    "SMA1": "2 1"
-        #  "(?<iface_timeTx2>[[:alnum:]]+)":
-        #    "U.FL2": "0 2"
-        #    "U.FL1": "0 1"
-        #    "SMA2": "0 2"
-        #    "SMA1": "1 1"
         ublxCmds:
           - args: #ubxtool -P 29.20 -z CFG-HW-ANT_CFG_VOLTCTRL,1
               - "-P"

diff --git a/ztp/kube-compare-reference/optional/ptp-config/PtpConfigGmWpc.yaml b/ztp/kube-compare-reference/optional/ptp-config/PtpConfigGmWpc.yaml
@@ -25,12 +25,13 @@ spec:
           LocalHoldoverTimeout: 14400
           MaxInSpecOffset: 100
         pins:
+          # Syntax guide:
+          # - The 1st number in each pair must be one of:
+          #    0 - Disabled
+          #    1 - RX
+          #    2 - TX
+          # - The 2nd number in each pair must match the channel number
           {{- .plugins.e810.pins | toYaml | nindent 10 }}
-        #  "(?<iface_timeTx>[[:alnum:]]+)":
-        #    "U.FL2": "0 2"
-        #    "U.FL1": "0 1"
-        #    "SMA2": "0 2"
-        #    "SMA1": "0 1"
         ublxCmds:
           - args: #ubxtool -P 29.20 -z CFG-HW-ANT_CFG_VOLTCTRL,1
               - "-P"

diff --git a/ztp/source-crs/PtpConfigDualCardGmWpc.yaml b/ztp/source-crs/PtpConfigDualCardGmWpc.yaml
@@ -26,17 +26,22 @@ spec:
           LocalHoldoverTimeout: 14400
           MaxInSpecOffset: 100
         pins:
-          e810_pins: {}
-        #  "(?<iface_timeTx1>[[:alnum:]]+)":
-        #    "U.FL2": "0 2"
-        #    "U.FL1": "0 1"
-        #    "SMA2": "0 2"
-        #    "SMA1": "2 1"
-        #  "(?<iface_timeTx2>[[:alnum:]]+)":
-        #    "U.FL2": "0 2"
-        #    "U.FL1": "0 1"
-        #    "SMA2": "0 2"
-        #    "SMA1": "1 1"
+          # Syntax guide:
+          # - The 1st number in each pair must be one of:
+          #    0 - Disabled
+          #    1 - RX
+          #    2 - TX
+          # - The 2nd number in each pair must match the channel number
+          $iface_timeTx1:
+            SMA1: 2 1
+            SMA2: 0 2
+            U.FL1: 0 1
+            U.FL2: 0 2
+          $iface_timeTx2:
+            SMA1: 1 1
+            SMA2: 0 2
+            U.FL1: 0 1
+            U.FL2: 0 2
         ublxCmds:
           - args: #ubxtool -P 29.20 -z CFG-HW-ANT_CFG_VOLTCTRL,1
               - "-P"

diff --git a/ztp/source-crs/PtpConfigGmWpc.yaml b/ztp/source-crs/PtpConfigGmWpc.yaml
@@ -24,12 +24,17 @@ spec:
           LocalHoldoverTimeout: 14400
           MaxInSpecOffset: 100
         pins:
-          e810_pins: {}
-        #  "(?<iface_timeTx>[[:alnum:]]+)":
-        #    "U.FL2": "0 2"
-        #    "U.FL1": "0 1"
-        #    "SMA2": "0 2"
-        #    "SMA1": "0 1"
+          # Syntax guide:
+          # - The 1st number in each pair must be one of:
+          #    0 - Disabled
+          #    1 - RX
+          #    2 - TX
+          # - The 2nd number in each pair must match the channel number
+          $iface_timeTx:
+            SMA1: 0 1
+            SMA2: 0 2
+            U.FL1: 0 1
+            U.FL2: 0 2
         ublxCmds:
           - args: #ubxtool -P 29.20 -z CFG-HW-ANT_CFG_VOLTCTRL,1
               - "-P"