HC Test: update URL paths for vpp-acl

 - needed due to v3po model split https://gerrit.fd.io/r/5530

Change-Id: I8a82c22f1999e81e3bb19b287be3cf3c01b50333
Signed-off-by: selias <samelias@cisco.com>

diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index eff0719..3351ebf 100644 (file)
--- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
@@ -1476,7 +1476,7 @@ class InterfaceKeywords(object):
         interface = interface.replace("/", "%2F")
 
         data = {
         interface = interface.replace("/", "%2F")
 
         data = {

-            "v3po:acl": {
+            "vpp-interface-acl:acl": {

                 "ingress": {
                     "ip4-acl": {
                         "classify-table": table_name
                 "ingress": {
                     "ip4-acl": {
                         "classify-table": table_name


@@ -1488,7 +1488,7 @@ class InterfaceKeywords(object):
             }
         }
 
             }
         }
 

-        path = "/interface/" + interface + "/v3po:acl"
+        path = "/interface/" + interface + "/vpp-interface-acl:acl"

         status_code, resp = HcUtil.\
             put_honeycomb_data(node, "config_vpp_interfaces", data, path,
                                data_representation=DataRepresentation.JSON)
         status_code, resp = HcUtil.\
             put_honeycomb_data(node, "config_vpp_interfaces", data, path,
                                data_representation=DataRepresentation.JSON)


@@ -1514,7 +1514,7 @@ class InterfaceKeywords(object):
 
         interface = interface.replace("/", "%2F")
 
 
         interface = interface.replace("/", "%2F")
 

-        path = "/interface/" + interface + "/v3po:acl"
+        path = "/interface/" + interface + "/vpp-interface-acl:acl"

 
         status_code, resp = HcUtil.\
             delete_honeycomb_data(node, "config_vpp_interfaces", path)
 
         status_code, resp = HcUtil.\
             delete_honeycomb_data(node, "config_vpp_interfaces", path)

diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot
index 29af35f..d45c1f8 100644 (file)
--- a/resources/libraries/robot/honeycomb/access_control_lists.robot
+++ b/resources/libraries/robot/honeycomb/access_control_lists.robot
@@ -271,8 +271,8 @@
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
 | | Should be equal
 | | ... | ${table_name}
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
 | | Should be equal
 | | ... | ${table_name}

-| | ... | ${data['v3po:acl']['ingress']['l2-acl']['classify-table']}
-| | ... | ${data['v3po:acl']['ingress']['ip4-acl']['classify-table']}
+| | ... | ${data['vpp-interface-acl:acl']['ingress']['l2-acl']['classify-table']}
+| | ... | ${data['vpp-interface-acl:acl']['ingress']['ip4-acl']['classify-table']}

 
 | Interface ACL settings from VAT should be
 | | [Documentation] | Retrieves ACL interface settings from VAT\
 
 | Interface ACL settings from VAT should be
 | | [Documentation] | Retrieves ACL interface settings from VAT\


@@ -306,8 +306,9 @@
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}

-| | Run keyword and expect error | *KeyError: 'v3po:acl'
-| | ... | Set Variable | ${data['v3po:acl']['l2-acl']['classify-table']}
+| | Run keyword and expect error | *KeyError: 'vpp-interface-acl:acl'
+| | ... | Set Variable
+| | ... | ${data['vpp-interface-acl:acl']['l2-acl']['classify-table']}

 
 | Interface ACL settings from VAT should be empty
 | | [Documentation] | Retrieves ACL interface settings from VAT\
 
 | Interface ACL settings from VAT should be empty
 | | [Documentation] | Retrieves ACL interface settings from VAT\