diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | interface-definitions/bcast-relay.xml | 4 | ||||
| -rw-r--r-- | interface-definitions/dns-forwarding.xml | 4 | ||||
| -rw-r--r-- | interface-definitions/mdns-repeater.xml | 4 |
5 files changed, 8 insertions, 10 deletions
@@ -38,7 +38,7 @@ clean: .PHONY: test test: - python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators --verbose + PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators --verbose .PHONY: sonar sonar: diff --git a/debian/control b/debian/control index 21d8c4263..6919c7d4c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,9 @@ Build-Depends: debhelper (>= 9), python3, python3-setuptools, quilt, - python3-lxml + python3-lxml, + python3-nose, + python3-coverage Standards-Version: 3.9.6 Package: vyos-1x diff --git a/interface-definitions/bcast-relay.xml b/interface-definitions/bcast-relay.xml index 98c54051e..0437192fa 100644 --- a/interface-definitions/bcast-relay.xml +++ b/interface-definitions/bcast-relay.xml @@ -1,7 +1,5 @@ <?xml version="1.0"?> - <!-- UDP broadcast relay configuration --> - <interfaceDefinition> <node name="service"> <children> @@ -44,7 +42,7 @@ <properties> <help>Interface to repeat UDP broadcasts to [REQUIRED]</help> <completionHelp> - <script>${vyatta_sbindir}/vyatta-interfaces.pl --show all</script> + <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <multi/> </properties> diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml index 30a67ed2b..a00b23d8d 100644 --- a/interface-definitions/dns-forwarding.xml +++ b/interface-definitions/dns-forwarding.xml @@ -27,7 +27,7 @@ <properties> <help>Use DNS servers received from DHCP server for specified interface</help> <completionHelp> - <script>${vyatta_sbindir}/vyatta-interfaces.pl --show all</script> + <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <multi/> </properties> @@ -85,7 +85,7 @@ <properties> <help>Interface to listen for DNS queries [DEPRECATED]</help> <completionHelp> - <script>${vyatta_sbindir}/vyatta-interfaces.pl --show all</script> + <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <multi/> </properties> diff --git a/interface-definitions/mdns-repeater.xml b/interface-definitions/mdns-repeater.xml index 066b665cf..d74e203d6 100644 --- a/interface-definitions/mdns-repeater.xml +++ b/interface-definitions/mdns-repeater.xml @@ -1,7 +1,5 @@ <?xml version="1.0"?> - <!-- mDNS repeater configuration --> - <interfaceDefinition> <node name="service"> <children> @@ -20,7 +18,7 @@ <properties> <help>Interface to repeat mdns advertisements to [REQUIRED]</help> <completionHelp> - <script>${vyatta_sbindir}/vyatta-interfaces.pl --show all</script> + <script>${vyos_completion_dir}/list_interfaces.py</script> </completionHelp> <multi/> </properties> |