diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-03-21 16:04:14 +0100 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2018-03-21 18:53:53 +0000 |
| commit | 0b7cd94108fa950ea4d664e8585e1976753f16d9 (patch) | |
| tree | f7c65da7b6b7f4753d51b1d59eb6ca3b71d3915d /resources/test_data/honeycomb | |
| parent | efdcf6470f6e15dcc918c70e5a61d10e10653f1e (diff) | |
HC Tests: adapt sub-interface tests to recent api changes (HC2VPP-289)
Follows:
https://gerrit.fd.io/r/#/c/11228/
Change-Id: If1a281fc04c3b8015519c97788e1dae213e74b0e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'resources/test_data/honeycomb')
| -rw-r--r-- | resources/test_data/honeycomb/netconf/triggers.py | 2 | ||||
| -rw-r--r-- | resources/test_data/honeycomb/persistence.py | 4 | ||||
| -rw-r--r-- | resources/test_data/honeycomb/sub_interfaces.py | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/resources/test_data/honeycomb/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py index 5d47853352..899c258c06 100644 --- a/resources/test_data/honeycomb/netconf/triggers.py +++ b/resources/test_data/honeycomb/netconf/triggers.py @@ -502,7 +502,7 @@ trigger_vlan = u""" <match-exact-tags>true</match-exact-tags> </vlan-tagged> </match> -<vlan-type>802dot1q</vlan-type> +<vlan-type>_802dot1q</vlan-type> <enabled>false</enabled> <tags> <tag> diff --git a/resources/test_data/honeycomb/persistence.py b/resources/test_data/honeycomb/persistence.py index 129b09a512..88d2137bae 100644 --- a/resources/test_data/honeycomb/persistence.py +++ b/resources/test_data/honeycomb/persistence.py @@ -58,7 +58,7 @@ def get_variables(interface): 'sub_if_name': sub_if_name, 'sub_if_1_settings': { "identifier": sub_if_id, - "vlan-type": "802dot1q", + "vlan-type": "_802dot1q", "enabled": "false" }, 'sub_if_1_tags': [ @@ -116,7 +116,7 @@ def get_variables(interface): }, 'tag_rewrite_pop_1_oper': { - "vlan-type": "vpp-vlan:802dot1ad", + "vlan-type": "vpp-vlan:_802dot1ad", "pop-tags": 1 }, diff --git a/resources/test_data/honeycomb/sub_interfaces.py b/resources/test_data/honeycomb/sub_interfaces.py index 3955089b56..1ab270b33c 100644 --- a/resources/test_data/honeycomb/sub_interfaces.py +++ b/resources/test_data/honeycomb/sub_interfaces.py @@ -18,7 +18,7 @@ from copy import deepcopy # Sub-interface 1 and its settings: sub_if_1_settings = { "identifier": "1", - "vlan-type": "802dot1q", + "vlan-type": "_802dot1q", "enabled": "false" } @@ -93,7 +93,7 @@ sub_bd_settings = { # Configuration data: Enable tag-rewrite push. tag_rewrite_push = { - "vlan-type": "vpp-vlan:802dot1q", + "vlan-type": "vpp-vlan:_802dot1q", "push-tags": [ { "index": 0, @@ -114,7 +114,7 @@ tag_rewrite_push = { # Expected operational data: tag-rewrite push. tag_rewrite_push_oper = { - "vlan-type": "vpp-vlan:802dot1q", + "vlan-type": "vpp-vlan:_802dot1q", "push-tags": [ { "index": 0, @@ -156,7 +156,7 @@ tag_rewrite_pop_1 = { # Expected operational data: tag-rewrite pop 1. tag_rewrite_pop_1_oper = { - "vlan-type": "vpp-vlan:802dot1ad", + "vlan-type": "vpp-vlan:_802dot1ad", "pop-tags": 1 } @@ -178,7 +178,7 @@ tag_rewrite_pop_1_VAT = { # Configuration data: Enable tag-rewrite translate 1-2. tag_rewrite_translate_1_2 = { - "vlan-type": "vpp-vlan:802dot1q", + "vlan-type": "vpp-vlan:_802dot1q", "pop-tags": "1", "push-tags": [ { @@ -200,7 +200,7 @@ tag_rewrite_translate_1_2 = { # Expected operational data: tag-rewrite translate 1-2. tag_rewrite_translate_1_2_oper = { - "vlan-type": "vpp-vlan:802dot1q", + "vlan-type": "vpp-vlan:_802dot1q", "pop-tags": 1, "push-tags": [ { |