Updates for OCPBUGS-28651

Author: aireilly

snippets/ptp_PtpConfigDualCardGmWpc.yaml

@@ -9,7 +9,7 @@ spec:
   profile:
   - name: "grandmaster"
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: -r -u 0 -m -O -37 -N 8 -R 16 -s $iface_master -n 24
+    phc2sysOpts: -r -u 0 -m -O -37 -N 8 -R 16 -s $iface_nic1 -n 24
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -22,16 +22,16 @@ spec:
           LocalHoldoverTimeout: 14400
           MaxInSpecOffset: 100
         pins:
-          "$iface_master_nic1":
-            "U.FL2": "0 2"
-            "U.FL1": "0 1"
-            "SMA2": "0 2"
-            "SMA1": "2 1"
-          "$iface_master_nic2":
-            "U.FL2": "0 2"
-            "U.FL1": "0 1"
-            "SMA2": "0 2"
-            "SMA1": "1 1"
+         "$iface_nic1":
+           "U.FL2": "0 2"
+           "U.FL1": "0 1"
+           "SMA2": "0 2"
+           "SMA1": "2 1"
+         "$iface_nic2":
+           "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"
@@ -79,7 +79,7 @@ spec:
               - "1"
               - "-e"
               - "SURVEYIN,600,50000"
-            reportOutput: true
+            reportOutput: true  
           - args: #ubxtool -P 29.20 -p MON-HW
               - "-P"
               - "29.20"
@@ -99,30 +99,30 @@ spec:
       #example value of gnss_serialport is /dev/ttyGNSS_1700_0
       ts2phc.nmea_serialport $gnss_serialport
       leapfile  /usr/share/zoneinfo/leap-seconds.list
-      [$iface_master]
+      [$iface_nic1]
       ts2phc.extts_polarity rising
       ts2phc.extts_correction 0
-      [$iface_master_nic2]
+      [$iface_nic2]
       ts2phc.master 0
       ts2phc.extts_polarity rising
       #this is a measured value in nanoseconds to compensate for SMA cable delay
       ts2phc.extts_correction -10
     ptp4lConf: |
-      [$iface_master]
+      [$iface_nic1]
       masterOnly 1
-      [$iface_master_1]
+      [$iface_nic1_1]
       masterOnly 1
-      [$iface_master_2]
+      [$iface_nic1_2]
       masterOnly 1
-      [$iface_master_3]
+      [$iface_nic1_3]
       masterOnly 1
-      [$iface_master_nic2]
+      [$iface_nic2]
       masterOnly 1
-      [$iface_master_nic2_1]
+      [$iface_nic2_1]
       masterOnly 1
-      [$iface_master_nic2_2]
+      [$iface_nic2_2]
       masterOnly 1
-      [$iface_master_nic2_3]
+      [$iface_nic2_3]
       masterOnly 1
       [global]
       #