diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-17 22:26:30 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-04-17 22:26:30 +0200 |
| commit | c79e93b4ba1c9fbd4cf1bf2d3b880fbf20405d7d (patch) | |
| tree | 2f48fc4281cc393d4449cea69c97915dcc84bba5 /smoketest | |
| parent | ccfd6d24c41dc229f24317a90d1387c70ca2c674 (diff) | |
| parent | ebece7a4cdb942ea1ff7582ceda0f8765c329c9b (diff) | |
| download | vyos-1x-c79e93b4ba1c9fbd4cf1bf2d3b880fbf20405d7d.tar.gz vyos-1x-c79e93b4ba1c9fbd4cf1bf2d3b880fbf20405d7d.zip | |
Merge branch 't2425-policy' of github.com:c-po/vyos-1x into current
* 't2425-policy' of github.com:c-po/vyos-1x:
policy: T2425: re-implement "policy" tree from vyatta-cfg-quagga in XML/Python
Diffstat (limited to 'smoketest')
| -rwxr-xr-x | smoketest/scripts/cli/test_policy.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py index 57c1bb088..59425b789 100755 --- a/smoketest/scripts/cli/test_policy.py +++ b/smoketest/scripts/cli/test_policy.py @@ -767,9 +767,8 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): '10' : { 'action' : 'deny', 'set' : { -# Disabled b/c of https://phabricator.vyos.net/T3479 -# 'aggregator-as' : '1234567890', -# 'aggregator-ip' : '10.255.255.0', + 'aggregator-as' : '1234567890', + 'aggregator-ip' : '10.255.255.0', 'as-path-exclude' : '1234', 'as-path-prepend' : '1234567890 987654321', 'atomic-aggregate' : '', @@ -1036,12 +1035,12 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): tmp += 'atomic-aggregate' elif 'distance' in rule_config['set']: tmp += 'distance ' + rule_config['set']['distance'] + elif 'ip-next-hop' in rule_config['set']: + tmp += 'ip next-hop ' + rule_config['set']['ip-next-hop'] elif 'ipv6-next-hop-global' in rule_config['set']: tmp += 'ipv6 next-hop global ' + rule_config['set']['ipv6-next-hop-global'] elif 'ipv6-next-hop-local' in rule_config['set']: tmp += 'ipv6 next-hop local ' + rule_config['set']['ipv6-next-hop-local'] - elif 'ip-next-hop' in rule_config['set']: - tmp += 'ip next-hop ' + rule_config['set']['ip-next-hop'] elif 'large-community' in rule_config['set']: tmp += 'large-community ' + rule_config['set']['large-community'] elif 'local-preference' in rule_config['set']: |