HC Test: update routing suite to use compressed IPv6 addresses

HC reports IPv6 addresses using compressed form since
https://gerrit.fd.io/r/#/c/9497/

Change-Id: I7771ce796a4ec4817e7ee4a68fdb8e6a95f5da37
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/resources/test_data/honeycomb/routing.py b/resources/test_data/honeycomb/routing.py
index df7d941..c28b221 100644 (file)
--- a/resources/test_data/honeycomb/routing.py
+++ b/resources/test_data/honeycomb/routing.py
@@ -44,8 +44,7 @@ def get_variables(node, ip_version, out_interface):
         "dut_to_tg_if2_ip": "11::1",
         "src_ip": "10::2",
         "dst_ip": "12::1",
-        "dst_net": "12::0",
-        "dst_net_full": "12:0:0:0:0:0:0:0",
+        "dst_net": "12::",
         "prefix_len": 64,
         "next_hop": "11::2",
         "next_hop1": "11::3",
@@ -177,7 +176,7 @@ def get_variables(node, ip_version, out_interface):
         },
         "table4_oper": {
             "destination-prefix":
-                "{0}/{1}".format(ipv6_base["dst_net_full"],
+                "{0}/{1}".format(ipv6_base["dst_net"],
                                  ipv6_base["prefix_len"]),
             "next-hop": ipv6_base["next_hop"],
             "outgoing-interface": out_interface,
@@ -185,7 +184,7 @@ def get_variables(node, ip_version, out_interface):
         },
         "table5_oper": {
             "destination-prefix":
-                "{0}/{1}".format(ipv6_base["dst_net_full"],
+                "{0}/{1}".format(ipv6_base["dst_net"],
                                  ipv6_base["prefix_len"]),
             "next-hop-list": {
                 "next-hop": [
@@ -205,7 +204,7 @@ def get_variables(node, ip_version, out_interface):
         },
         "table6_oper": {
             "destination-prefix":
-                "{0}/{1}".format(ipv6_base["dst_net_full"],
+                "{0}/{1}".format(ipv6_base["dst_net"],
                                  ipv6_base["prefix_len"]),
             "special-next-hop": "blackhole",
             'vpp-ipv6-route-state': {}

diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
index e40f9ff..7661526 100644 (file)
--- a/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
@@ -22,8 +22,6 @@
 | ... | encap-vrf-id=${0}
 | &{vxlan_settings_ipv6}= | src=10::10 | dst=10::11 | vni=${88}
 | ... | encap-vrf-id=${0}
-| &{vxlan_settings_ipv6_long}= | src=10:0:0:0:0:0:0:10 | dst=10:0:0:0:0:0:0:11
-| ... | vni=${88} | encap-vrf-id=${0}
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
@@ -134,6 +132,6 @@
 | | When Honeycomb sets interface VxLAN configuration
 | | ... | ${node} | ${vx_interface} | ${vxlan_settings_ipv6}
 | | Then VxLAN Operational Data From Honeycomb Should Be
-| | ... | ${node} | ${vx_interface} | ${vxlan_settings_ipv6_long}
+| | ... | ${node} | ${vx_interface} | ${vxlan_settings_ipv6}
 | | And VxLAN Operational Data From VAT Should Be
 | | ... | ${node} | ${vxlan_settings_ipv6}