HC Tests: use vpp-fib-management module in dhcp tests (HC2VPP-348)

Addaps HC DHCP tests to https://gerrit.fd.io/r/#/c/13299/

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

diff --git a/resources/libraries/python/honeycomb/DHCP.py b/resources/libraries/python/honeycomb/DHCP.py
index 13cc4a7..f93a8fd 100644 (file)
--- a/resources/libraries/python/honeycomb/DHCP.py
+++ b/resources/libraries/python/honeycomb/DHCP.py
@@ -73,7 +73,7 @@ class DHCPRelayKeywords(object):
         :rtype: bytearray
         """
 
-        path = "/relay/dhcp:{0}/{1}".format(ip_version, entry_id)
+        path = "/relay/vpp-fib-table-management:{0}/{1}".format(ip_version, entry_id)
 
         return DHCPRelayKeywords._set_dhcp_relay_properties(node, path, data)
 

diff --git a/resources/test_data/honeycomb/dhcp_relay.py b/resources/test_data/honeycomb/dhcp_relay.py
index f5cb4a1..0d2427f 100644 (file)
--- a/resources/test_data/honeycomb/dhcp_relay.py
+++ b/resources/test_data/honeycomb/dhcp_relay.py
@@ -32,7 +32,7 @@ prefix_length_v6 = 64
 relay1 = {
     "relay": [
         {
-            "address-type": "ipv4",
+            "address-family": "vpp-fib-table-management:ipv4",
             "rx-vrf-id": 0,
             "gateway-address": dut_to_tg_if1_ip,
             "server": [
@@ -46,7 +46,7 @@ relay1 = {
 }
 
 relay1_oper = {
-    "address-type": "dhcp:ipv4",
+    "address-family": "vpp-fib-table-management:ipv4",
     "rx-vrf-id": 0,
     "gateway-address": dut_to_tg_if1_ip,
     "server": [
@@ -60,7 +60,7 @@ relay1_oper = {
 relay2 = {
     "relay": [
         {
-            "address-type": "ipv4",
+            "address-family": "vpp-fib-table-management:ipv4",
             "rx-vrf-id": 0,
             "gateway-address": dut_to_tg_if1_ip,
             "server": [
@@ -78,7 +78,7 @@ relay2 = {
 }
 
 relay2_oper = {
-    "address-type": "dhcp:ipv4",
+    "address-family": "vpp-fib-table-management:ipv4",
     "rx-vrf-id": 0,
     "gateway-address": dut_to_tg_if1_ip,
     "server": [
@@ -96,7 +96,7 @@ relay2_oper = {
 relay_v6 = {
     "relay": [
         {
-            "address-type": "ipv6",
+            "address-family": "vpp-fib-table-management:ipv6",
             "rx-vrf-id": 0,
             "gateway-address": dut_to_tg_if1_ip6,
             "server": [
@@ -110,7 +110,7 @@ relay_v6 = {
 }
 
 relay_v6_oper = {
-    "address-type": "dhcp:ipv6",
+    "address-family": "vpp-fib-table-management:ipv6",
     "rx-vrf-id": 0,
     "gateway-address": dut_to_tg_if1_ip6,
     "server": [