diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-05-30 15:00:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 15:00:48 +0200 |
| commit | 4c93173548151cf374097131f7cd4226dcc3075b (patch) | |
| tree | de05481c3d6184439a0e343e3f50594ecd8396f7 /smoketest/scripts | |
| parent | 96a88c1990a974c5291553e8b9cd3220795366fb (diff) | |
| parent | fda276bd0bb60f0ac4289103956e07c66c8e0f1e (diff) | |
| download | vyos-1x-4c93173548151cf374097131f7cd4226dcc3075b.tar.gz vyos-1x-4c93173548151cf374097131f7cd4226dcc3075b.zip | |
Merge pull request #1342 from nicolas-fort/T4450
Policy: T4450: Expand options for ip|ipv6 address match.
Diffstat (limited to 'smoketest/scripts')
| -rwxr-xr-x | smoketest/scripts/cli/test_policy.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py index 2a8843faf..5a8d6995f 100755 --- a/smoketest/scripts/cli/test_policy.py +++ b/smoketest/scripts/cli/test_policy.py @@ -719,7 +719,8 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): goto = '25' ipv4_nexthop_address= '192.0.2.2' - ipv4_nexthop_plen= '18' + ipv4_prefix_len= '18' + ipv6_prefix_len= '122' ipv4_nexthop_type= 'blackhole' @@ -791,6 +792,7 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): 'action' : 'permit', 'match' : { 'ipv6-nexthop' : ipv6_nexthop, + 'ipv6-address-pfx-len' : ipv6_prefix_len, 'large-community' : large_community_list, 'local-pref' : local_pref, 'metric': metric, @@ -802,12 +804,13 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): 'action' : 'permit', 'match' : { 'ip-nexthop-addr' : ipv4_nexthop_address, + 'ip-address-pfx-len' : ipv4_prefix_len, }, }, '42' : { 'action' : 'deny', 'match' : { - 'ip-nexthop-plen' : ipv4_nexthop_plen, + 'ip-nexthop-plen' : ipv4_prefix_len, }, }, '44' : { @@ -940,6 +943,8 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): self.cli_set(path + ['rule', rule, 'match', 'ip', 'address', 'access-list', rule_config['match']['ip-address-acl']]) if 'ip-address-pfx' in rule_config['match']: self.cli_set(path + ['rule', rule, 'match', 'ip', 'address', 'prefix-list', rule_config['match']['ip-address-pfx']]) + if 'ip-address-pfx-len' in rule_config['match']: + self.cli_set(path + ['rule', rule, 'match', 'ip', 'address', 'prefix-len', rule_config['match']['ip-address-pfx-len']]) if 'ip-nexthop-acl' in rule_config['match']: self.cli_set(path + ['rule', rule, 'match', 'ip', 'nexthop', 'access-list', rule_config['match']['ip-nexthop-acl']]) if 'ip-nexthop-pfx' in rule_config['match']: @@ -958,6 +963,8 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): self.cli_set(path + ['rule', rule, 'match', 'ipv6', 'address', 'access-list', rule_config['match']['ipv6-address-acl']]) if 'ipv6-address-pfx' in rule_config['match']: self.cli_set(path + ['rule', rule, 'match', 'ipv6', 'address', 'prefix-list', rule_config['match']['ipv6-address-pfx']]) + if 'ipv6-address-pfx-len' in rule_config['match']: + self.cli_set(path + ['rule', rule, 'match', 'ipv6', 'address', 'prefix-len', rule_config['match']['ipv6-address-pfx-len']]) if 'ipv6-nexthop' in rule_config['match']: self.cli_set(path + ['rule', rule, 'match', 'ipv6', 'nexthop', rule_config['match']['ipv6-nexthop']]) if 'large-community' in rule_config['match']: @@ -1086,6 +1093,9 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): if 'ip-address-pfx' in rule_config['match']: tmp = f'match ip address prefix-list {rule_config["match"]["ip-address-pfx"]}' self.assertIn(tmp, config) + if 'ip-address-pfx-len' in rule_config['match']: + tmp = f'match ip address prefix-len {rule_config["match"]["ip-address-pfx-len"]}' + self.assertIn(tmp, config) if 'ip-nexthop-acl' in rule_config['match']: tmp = f'match ip next-hop {rule_config["match"]["ip-nexthop-acl"]}' self.assertIn(tmp, config) @@ -1113,6 +1123,9 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase): if 'ipv6-address-pfx' in rule_config['match']: tmp = f'match ipv6 address prefix-list {rule_config["match"]["ipv6-address-pfx"]}' self.assertIn(tmp, config) + if 'ipv6-address-pfx-len' in rule_config['match']: + tmp = f'match ipv6 address prefix-len {rule_config["match"]["ipv6-address-pfx-len"]}' + self.assertIn(tmp, config) if 'ipv6-nexthop' in rule_config['match']: tmp = f'match ipv6 next-hop address {rule_config["match"]["ipv6-nexthop"]}' self.assertIn(tmp, config) |