diff options
| -rw-r--r-- | interface-definitions/policy.xml.in | 12 | ||||
| -rw-r--r-- | python/vyos/config_mgmt.py | 3 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_policy.py | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in index 0d82cd3f8..791fa1d87 100644 --- a/interface-definitions/policy.xml.in +++ b/interface-definitions/policy.xml.in @@ -1124,12 +1124,20 @@ <leafNode name="exclude"> <properties> <help>Remove/exclude from the as-path attribute</help> + <completionHelp> + <list>all</list> + </completionHelp> <valueHelp> - <format>u32</format> + <format>u32:1-4294967295</format> <description>AS number</description> </valueHelp> + <valueHelp> + <format>all</format> + <description>Exclude all AS numbers from the as-path</description> + </valueHelp> <constraint> <validator name="as-number-list"/> + <regex>(all)</regex> </constraint> </properties> </leafNode> @@ -1137,7 +1145,7 @@ <properties> <help>Prepend to the as-path</help> <valueHelp> - <format>u32</format> + <format>u32:1-4294967295</format> <description>AS number</description> </valueHelp> <constraint> diff --git a/python/vyos/config_mgmt.py b/python/vyos/config_mgmt.py index ff078649d..28ccee769 100644 --- a/python/vyos/config_mgmt.py +++ b/python/vyos/config_mgmt.py @@ -132,6 +132,9 @@ class ConfigMgmt: {}).get('source_address', '') if config.exists(['system', 'host-name']): self.hostname = config.return_value(['system', 'host-name']) + if config.exists(['system', 'domain-name']): + tmp = config.return_value(['system', 'domain-name']) + self.hostname += f'.{tmp}' else: self.hostname = 'vyos' diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py index c21d8af4e..ee4445251 100755 --- a/smoketest/scripts/cli/test_policy.py +++ b/smoketest/scripts/cli/test_policy.py @@ -1065,6 +1065,7 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): '20' : { 'action' : 'permit', 'set' : { + 'as-path-exclude' : 'all', 'evpn-gateway-ipv4' : '192.0.2.99', 'evpn-gateway-ipv6' : '2001:db8:f00::1', }, |