diff options
| -rw-r--r-- | data/templates/chrony/chrony.conf.j2 | 4 | ||||
| -rw-r--r-- | interface-definitions/service_ntp.xml.in | 96 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_ntp.py | 2 |
3 files changed, 51 insertions, 51 deletions
diff --git a/data/templates/chrony/chrony.conf.j2 b/data/templates/chrony/chrony.conf.j2 index 2838f5524..cc80e4d64 100644 --- a/data/templates/chrony/chrony.conf.j2 +++ b/data/templates/chrony/chrony.conf.j2 @@ -67,9 +67,9 @@ binddevice {{ interface }} {% endif %} {% endif %} -{% if ptp.timestamp.interface is vyos_defined %} +{% if timestamp.interface is vyos_defined %} # Enable hardware timestamping on the specified interfaces -{% for iface, iface_config in ptp.timestamp.interface.items() %} +{% for iface, iface_config in timestamp.interface.items() %} {% if iface == "all" %} {% set iface = "*" %} {% endif %} diff --git a/interface-definitions/service_ntp.xml.in b/interface-definitions/service_ntp.xml.in index 5dc0cd295..c31b572bd 100644 --- a/interface-definitions/service_ntp.xml.in +++ b/interface-definitions/service_ntp.xml.in @@ -13,72 +13,72 @@ #include <include/generic-interface.xml.i> #include <include/listen-address.xml.i> #include <include/interface/vrf.xml.i> - <node name="ptp"> + <node name="timestamp"> <properties> - <help>Enable Precision Time Protocol (PTP) transport</help> + <help>Enable timestamping of packets in the NIC hardware</help> </properties> <children> - #include <include/port-number.xml.i> - <leafNode name="port"> - <defaultValue>319</defaultValue> - </leafNode> - <node name="timestamp"> + <tagNode name="interface"> <properties> - <help>Enable timestamping of packets in the NIC hardware</help> + <help>Interface to enable timestamping on</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces</script> + <list>all</list> + </completionHelp> + <valueHelp> + <format>all</format> + <description>Select all interfaces</description> + </valueHelp> + <valueHelp> + <format>txt</format> + <description>Interface name</description> + </valueHelp> + <constraint> + #include <include/constraint/interface-name.xml.i> + <regex>all</regex> + </constraint> </properties> <children> - <tagNode name="interface"> + <leafNode name="receive-filter"> <properties> - <help>Interface to enable timestamping on</help> + <help>Selects which inbound packets are timestamped by the NIC</help> <completionHelp> - <script>${vyos_completion_dir}/list_interfaces</script> - <list>all</list> + <list>all ntp ptp none</list> </completionHelp> <valueHelp> <format>all</format> - <description>Select all interfaces</description> + <description>All packets are timestamped</description> </valueHelp> <valueHelp> - <format>txt</format> - <description>Interface name</description> + <format>ntp</format> + <description>Only NTP packets are timestamped</description> + </valueHelp> + <valueHelp> + <format>ptp</format> + <description>Only PTP or NTP packets using the PTP transport are timestamped</description> + </valueHelp> + <valueHelp> + <format>none</format> + <description>No packet is timestamped</description> </valueHelp> <constraint> - #include <include/constraint/interface-name.xml.i> - <regex>all</regex> + <regex>(all|ntp|ptp|none)</regex> </constraint> </properties> - <children> - <leafNode name="receive-filter"> - <properties> - <help>Selects which inbound packets are timestamped by the NIC</help> - <completionHelp> - <list>all ntp ptp none</list> - </completionHelp> - <valueHelp> - <format>all</format> - <description>All packets are timestamped</description> - </valueHelp> - <valueHelp> - <format>ntp</format> - <description>Only NTP packets are timestamped</description> - </valueHelp> - <valueHelp> - <format>ptp</format> - <description>Only PTP or NTP packets using the PTP transport are timestamped</description> - </valueHelp> - <valueHelp> - <format>none</format> - <description>No packet is timestamped</description> - </valueHelp> - <constraint> - <regex>(all|ntp|ptp|none)</regex> - </constraint> - </properties> - </leafNode> - </children> - </tagNode> + </leafNode> </children> - </node> + </tagNode> + </children> + </node> + <node name="ptp"> + <properties> + <help>Enable Precision Time Protocol (PTP) transport</help> + </properties> + <children> + #include <include/port-number.xml.i> + <leafNode name="port"> + <defaultValue>319</defaultValue> + </leafNode> </children> </node> <leafNode name="leap-second"> diff --git a/smoketest/scripts/cli/test_service_ntp.py b/smoketest/scripts/cli/test_service_ntp.py index 07af4f5eb..469d44eaa 100755 --- a/smoketest/scripts/cli/test_service_ntp.py +++ b/smoketest/scripts/cli/test_service_ntp.py @@ -203,7 +203,7 @@ class TestSystemNTP(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['server', server, 'ptp']) self.cli_set(base_path + ['ptp', 'port', ptp_port]) - self.cli_set(base_path + ['ptp', 'timestamp', 'interface', 'all']) + self.cli_set(base_path + ['timestamp', 'interface', 'all']) # commit changes self.cli_commit() |