From f2542a59f14a35764c7a74cc683185d8b48ecb65 Mon Sep 17 00:00:00 2001 From: Cole Walker Date: Wed, 20 Sep 2023 13:12:20 -0400 Subject: [PATCH] Update default ptp4lClockClassLockedList values In order to better support the default configuration when ptp-notification is deployed on a BC, the ptp4lClockClassLockedList values should in include 135 as a locked clockClass. This change ensures that classes 6, 7 and 135 are considered acceptable for the ptp-notification locked state by default, with the ability to override the acceptable clockClasses available to the user. Test plan: PASS: Build ptp-notification helm charts PASS: Deploy ptp-notification PASS: v1 api - test ptp4lClockClassLockedList with the default list PASS: v2 api - test ptp4lClockClassLockedList with the default list Partial-bug: 2033539 Signed-off-by: Cole Walker Change-Id: Ic569c373dc2ddf1771e83b12832ef1460266c93a --- .../trackingfunctionsdk/common/helpers/constants.py | 3 ++- .../trackingfunctionsdk/common/helpers/constants.py | 3 ++- .../helm-charts/ptp-notification/values.yaml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/notificationservice-base-v2/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py b/notificationservice-base-v2/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py index 22c42af..2434616 100644 --- a/notificationservice-base-v2/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py +++ b/notificationservice-base-v2/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py @@ -29,7 +29,8 @@ TIME_IS_TRACEABLE2 = "true" GM_IS_PRESENT = "true" CLOCK_CLASS_VALUE6 = "6" CLOCK_CLASS_VALUE7 = "7" -CLOCK_CLASS_LOCKED_LIST = [CLOCK_CLASS_VALUE6, CLOCK_CLASS_VALUE7] +CLOCK_CLASS_VALUE135 = "135" +CLOCK_CLASS_LOCKED_LIST = [CLOCK_CLASS_VALUE6, CLOCK_CLASS_VALUE7, CLOCK_CLASS_VALUE135] # ts2phc constants NMEA_SERIALPORT = "ts2phc.nmea_serialport" GNSS_PIN = "GNSS-1PPS" diff --git a/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py index 74312ca..b3347eb 100644 --- a/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py +++ b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py @@ -27,7 +27,8 @@ TIME_IS_TRACEABLE2 = "true" GM_IS_PRESENT = "true" CLOCK_CLASS_VALUE6 = "6" CLOCK_CLASS_VALUE7 = "7" -CLOCK_CLASS_LOCKED_LIST = [CLOCK_CLASS_VALUE6, CLOCK_CLASS_VALUE7] +CLOCK_CLASS_VALUE135 = "135" +CLOCK_CLASS_LOCKED_LIST = [CLOCK_CLASS_VALUE6, CLOCK_CLASS_VALUE7, CLOCK_CLASS_VALUE135] if path.exists('/ptp/linuxptp/ptpinstance'): LINUXPTP_CONFIG_PATH = '/ptp/linuxptp/ptpinstance/' diff --git a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml index 59f95e3..20a225a 100644 --- a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml +++ b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml @@ -70,7 +70,7 @@ ptptracking: imagePullSecrets: default-registry-key ptp4lSocket: /var/run/ptp4l-ptp4l-legacy ptp4lServiceName: ptp4l-legacy - ptp4lClockClassLockedList: "6,7" + ptp4lClockClassLockedList: "6,7,135" phc2sysServiceName: phc2sys-legacy phc2sysComSocket: False logging_level: INFO @@ -88,7 +88,7 @@ ptptrackingv2: imagePullSecrets: default-registry-key ptp4lSocket: /var/run/ptp4l-ptp4l-legacy ptp4lServiceName: True - ptp4lClockClassLockedList: "6,7" + ptp4lClockClassLockedList: "6,7,135" phc2sysServiceName: True phc2sysToleranceThreshold: 1000 ts2phcServiceName: True