aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-03-07 17:45:16 +0100
committerselias <samelias@cisco.com>2017-03-15 12:43:56 +0100
commit38722703b8ca56a334c6fc77b2cfab9d16c978f9 (patch)
tree330952127b52b5703f84a39c42f0531844f7fcef
parent0b4ceb8d40f0b667eb6083298a4f133b8ae9adaa (diff)
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>
-rw-r--r--resources/libraries/python/honeycomb/HcAPIKwInterfaces.py6
-rw-r--r--resources/libraries/robot/honeycomb/access_control_lists.robot9
2 files changed, 8 insertions, 7 deletions
diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index eff0719e26..3351ebf5d3 100644
--- 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 = {
- "v3po:acl": {
+ "vpp-interface-acl:acl": {
"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)
@@ -1514,7 +1514,7 @@ class InterfaceKeywords(object):
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)
diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot
index 29af35f0f5..d45c1f8948 100644
--- 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['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\
@@ -306,8 +306,9 @@
| | ... | \| ${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\