X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftest_data%2Fhoneycomb%2Fsub_interfaces.py;h=1ab270b33cbf8c547787422b2b0a8ee699a74042;hp=6904b48015bbd2342fa7df8e24917f8bc8957bbd;hb=82094363f6077e1b28845719db3a6191c0c93a99;hpb=dec1188c7f89f5f8f97085b5f68c6f1d918586b8

diff --git a/resources/test_data/honeycomb/sub_interfaces.py b/resources/test_data/honeycomb/sub_interfaces.py
index 6904b48015..1ab270b33c 100644
--- a/resources/test_data/honeycomb/sub_interfaces.py
+++ b/resources/test_data/honeycomb/sub_interfaces.py
@@ -13,10 +13,12 @@
 
 """Test variables for Honeycomb sub-interface test suite."""
 
+from copy import deepcopy
+
 # Sub-interface 1 and its settings:
 sub_if_1_settings = {
     "identifier": "1",
-    "vlan-type": "802dot1q",
+    "vlan-type": "_802dot1q",
     "enabled": "false"
 }
 
@@ -37,7 +39,7 @@ sub_if_1_tags = [
     }
 ]
 
-sub_if_1_match = "vlan-tagged-exact-match"
+sub_if_1_match = "vlan-tagged"
 
 # Expected operational data: sub-interface.
 sub_if_1_oper = {
@@ -47,19 +49,19 @@ sub_if_1_oper = {
     "tags": {
         "tag": [
             {
-                "index": 1,
+                "index": 0,
                 "dot1q-tag": {
-                    "tag-type": "dot1q-types:c-vlan",
-                    "vlan-id": "any"
+                    "tag-type": "dot1q-types:s-vlan",
+                    "vlan-id": 100
                 }
             },
             {
-                "index": 0,
+                "index": 1,
                 "dot1q-tag": {
-                    "tag-type": "dot1q-types:s-vlan",
-                    "vlan-id": "100"
+                    "tag-type": "dot1q-types:c-vlan",
+                    "vlan-id": "any"
                 }
-            }
+            },
         ]
     },
     "match": {
@@ -91,13 +93,13 @@ 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,
             "dot1q-tag": {
                 "tag-type": "dot1q-types:s-vlan",
-                "vlan-id":123
+                "vlan-id": 123
             }
         },
         {
@@ -112,20 +114,20 @@ 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": 1,
+            "index": 0,
             "dot1q-tag": {
-                "tag-type": "dot1q-types:c-vlan",
-                "vlan-id": 456
+                "tag-type": "dot1q-types:s-vlan",
+                "vlan-id": 123
             }
         },
         {
-            "index": 0,
+            "index": 1,
             "dot1q-tag": {
-                "tag-type": "dot1q-types:s-vlan",
-                "vlan-id": 123
+                "tag-type": "dot1q-types:c-vlan",
+                "vlan-id": 456
             }
         }
     ]
@@ -154,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
 }
 
@@ -176,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": [
         {
@@ -198,23 +200,23 @@ 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": [
         {
-            "index": 1,
+            "index": 0,
             "dot1q-tag": {
-                "tag-type": "dot1q-types:c-vlan",
-                "vlan-id": 222
+                "tag-type": "dot1q-types:s-vlan",
+                "vlan-id": 111
             }
         },
         {
-            "index": 0,
+            "index": 1,
             "dot1q-tag": {
-                "tag-type": "dot1q-types:s-vlan",
-                "vlan-id": 111
+                "tag-type": "dot1q-types:c-vlan",
+                "vlan-id": 222
             }
-        }
+        },
     ]
 }
 
@@ -285,3 +287,16 @@ ipv4_2 = {
     "address": "192.168.0.5",
     "netmask": "255.255.0.0",
     "prefix-length": 16}
+
+sub_if_2_settings = sub_if_1_settings
+sub_if_2_tags = sub_if_1_tags
+sub_if_2_match = "vlan-tagged-exact-match"
+sub_if_2_oper = deepcopy(sub_if_1_oper)
+sub_if_2_oper["match"]["vlan-tagged"]["match-exact-tags"] = True
+
+ipv6 = {
+    "address": "10::10",
+    "prefix-length": 24}
+ipv6_2 = {
+    "address": "10::11",
+    "prefix-length": 16}