starlingx/test
Code Issues Proposed changes

Updated alarm message for phc_ctl time change and timeouts.

Browse Source 
Change-Id: I83890f8484d8a977f727358b46d83feb19e9cccf
Signed-off-by: Guntaka Umashankar Reddy <umashankarguntaka.reddy@windriver.com>
This commit is contained in:
Guntaka Umashankar Reddy
2025-09-17 12:19:17 -04:00
parent 61901ebe4c
commit 4878c9d90e
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keywords/cloud_platform/system/ptp/ptp_setup_executor_keywords.py
View File

@@ -229,7 +229,6 @@ class PTPSetupExecutorKeywords(BaseKeyword):
validate_equals_with_retry(check_ptp4l_status, True, "systemctl status for ptp4l", 120, 30)
# wait for SMA status
check_sma_status = False
for clock_instance_obj in self.clock_setup_list:
ifaces_to_check = [(host, iface) for host in clock_instance_obj.get_instance_hostnames() for ptp_host_if in clock_instance_obj.get_ptp_interfaces() if "input" in ptp_host_if.get_ptp_interface_parameter() for iface in filter(None, ptp_host_if.get_interfaces_for_hostname(host))]
@@ -238,14 +237,8 @@ class PTPSetupExecutorKeywords(BaseKeyword):
pci_address = gnss_keywords.get_pci_slot_name(host, interface)
cgu_location = f"/sys/kernel/debug/ice/{pci_address}/cgu"
gnss_keywords.validate_sma1_and_gnss_1pps_eec_pps_dpll_status_with_retry(host, cgu_location, "SMA1", timeout=180, polling_interval=30)
check_sma_status = True
break
if check_sma_status:
break
# wait for GNSS status
check_gnss_status = False
for ts2phc_instance_obj in self.ts2phc_setup_list:
expected_gnss_port = gnss_keywords.extract_gnss_port(ts2phc_instance_obj.get_instance_parameters())
if not expected_gnss_port:
@@ -264,8 +257,3 @@ class PTPSetupExecutorKeywords(BaseKeyword):
pci_address = gnss_keywords.get_pci_slot_name(host, interface)
cgu_location = f"/sys/kernel/debug/ice/{pci_address}/cgu"
gnss_keywords.validate_sma1_and_gnss_1pps_eec_pps_dpll_status_with_retry(host, cgu_location, timeout=180, polling_interval=30)
check_gnss_status = True
break
if check_gnss_status:
break

2
keywords/ptp/phc_ctl_keywords.py
View File

@@ -114,7 +114,7 @@ class PhcCtlKeywords(BaseKeyword):
else:
raise "output_str.split() is expected to be a List with five elements."
def wait_for_phc_ctl_adjustment_alarm(self, interface: str, alarms: List[AlarmListObject], timeout: int = 120, polling_interval: int = 10) -> None:
def wait_for_phc_ctl_adjustment_alarm(self, interface: str, alarms: List[AlarmListObject], timeout: int = 180, polling_interval: int = 10) -> None:
"""
Run a remote phc_ctl adjustment loop on the controller as root, and stop it once the specified PTP alarm(s) are detected or a timeout occurs.

8
testcases/cloud_platform/regression/ptp/test_ptp.py
View File

@@ -803,12 +803,12 @@ def test_ptp_operation_phc_ctl_time_change():
ctrl0_ptp1_oot_alarm_obj = AlarmListObject()
ctrl0_ptp1_oot_alarm_obj.set_alarm_id("100.119")
ctrl0_ptp1_oot_alarm_obj.set_reason_text(r"controller-0 Precision Time Protocol \(PTP\) clocking is out of tolerance by ((\d+\.\d+) (milli|micro)secs")
ctrl0_ptp1_oot_alarm_obj.set_reason_text(r"controller-0 Precision Time Protocol \(PTP\) clocking is out of tolerance by (\d+\.\d+) (milli|micro)secs")
ctrl0_ptp1_oot_alarm_obj.set_entity_id("host=controller-0.instance=ptp1.ptp=out-of-tolerance")
ctrl1_ptp1_oot_alarm_obj = AlarmListObject()
ctrl1_ptp1_oot_alarm_obj.set_alarm_id("100.119")
ctrl1_ptp1_oot_alarm_obj.set_reason_text(r"controller-1 Precision Time Protocol \(PTP\) clocking is out of tolerance by ((\d+\.\d+) (milli|micro)secs")
ctrl1_ptp1_oot_alarm_obj.set_reason_text(r"controller-1 Precision Time Protocol \(PTP\) clocking is out of tolerance by (\d+\.\d+) (milli|micro)secs")
ctrl1_ptp1_oot_alarm_obj.set_entity_id("host=controller-1.instance=ptp1.ptp=out-of-tolerance")
phc_ctl_keywords = PhcCtlKeywords(lab_connect_keywords.get_ssh_for_hostname("controller-0"))
@@ -825,7 +825,7 @@ def test_ptp_operation_phc_ctl_time_change():
ctrl1_ptp4_oot_alarm_obj = AlarmListObject()
ctrl1_ptp4_oot_alarm_obj.set_alarm_id("100.119")
ctrl1_ptp4_oot_alarm_obj.set_reason_text(r"controller-1 Precision Time Protocol \(PTP\) clocking is out of tolerance by ((\d+\.\d+) (milli|micro)secs")
ctrl1_ptp4_oot_alarm_obj.set_reason_text(r"controller-1 Precision Time Protocol \(PTP\) clocking is out of tolerance by (\d+\.\d+) (milli|micro)secs")
ctrl1_ptp4_oot_alarm_obj.set_entity_id("host=controller-1.instance=ptp4.ptp=out-of-tolerance")
phc_ctl_keywords = PhcCtlKeywords(lab_connect_keywords.get_ssh_for_hostname("controller-1"))
@@ -950,7 +950,7 @@ def test_ptp_operation_service_stop_start_restart():
get_logger().log_info("Waiting for alarms 100.119 due to service stop...")
ctrl0_alarm = AlarmListObject()
ctrl0_alarm.set_alarm_id("100.119")
ctrl0_alarm.set_reason_text("controller-0 PTP service ptp4l@ptp1.service enabled but not running")
ctrl0_alarm.set_entity_id("host=controller-0.instance=ptp1.ptp")