Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
HC Test: address and cleanup test failures
[csit.git]
/
resources
/
libraries
/
python
/
honeycomb
/
HcAPIKwInterfaces.py
diff --git
a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index
3a32cbe
..
f317d06
100644
(file)
--- a/
resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
+++ b/
resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
@@
-1,4
+1,4
@@
-# Copyright (c) 201
6
Cisco and/or its affiliates.
+# Copyright (c) 201
7
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-201,6
+201,16
@@
class InterfaceKeywords(object):
:rtype: dict
"""
:rtype: dict
"""
+ try:
+ interface = Topology.convert_interface_reference(
+ node, interface, "name")
+ except RuntimeError:
+ if isinstance(interface, basestring):
+ # Probably name of a custom interface (TAP, VxLAN, Vhost, ...)
+ pass
+ else:
+ raise
+
intfs = InterfaceKeywords.get_all_interfaces_oper_data(node)
for intf in intfs:
if intf["name"] == interface:
intfs = InterfaceKeywords.get_all_interfaces_oper_data(node)
for intf in intfs:
if intf["name"] == interface:
@@
-555,6
+565,9
@@
class InterfaceKeywords(object):
:rtype: bytearray
"""
:rtype: bytearray
"""
+ interface = Topology.convert_interface_reference(
+ node, interface, "name")
+
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv4",
"neighbor")
neighbor = [{"ip": ip_addr, "link-layer-address": link_layer_address}, ]
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv4",
"neighbor")
neighbor = [{"ip": ip_addr, "link-layer-address": link_layer_address}, ]
@@
-626,6
+639,9
@@
class InterfaceKeywords(object):
:rtype: bytearray
"""
:rtype: bytearray
"""
+ interface = Topology.convert_interface_reference(
+ node, interface, "name")
+
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6")
address = {"address": [{"ip": ip_addr, "prefix-length": prefix_len}, ]}
return InterfaceKeywords._set_interface_properties(
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6")
address = {"address": [{"ip": ip_addr, "prefix-length": prefix_len}, ]}
return InterfaceKeywords._set_interface_properties(
@@
-647,6
+663,9
@@
class InterfaceKeywords(object):
:rtype: bytearray
"""
:rtype: bytearray
"""
+ interface = Topology.convert_interface_reference(
+ node, interface, "name")
+
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6",
"address")
address = [{"ip": ip_addr, "prefix-length": prefix_len}, ]
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6",
"address")
address = [{"ip": ip_addr, "prefix-length": prefix_len}, ]
@@
-686,6
+705,9
@@
class InterfaceKeywords(object):
:rtype: bytearray
"""
:rtype: bytearray
"""
+ interface = Topology.convert_interface_reference(
+ node, interface, "name")
+
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6",
"neighbor")
neighbor = [{"ip": ip_addr, "link-layer-address": link_layer_address}, ]
path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6",
"neighbor")
neighbor = [{"ip": ip_addr, "link-layer-address": link_layer_address}, ]
@@
-752,6
+774,9
@@
class InterfaceKeywords(object):
:raises HoneycombError: If the parameter is not valid.
"""
:raises HoneycombError: If the parameter is not valid.
"""
+ interface = Topology.convert_interface_reference(
+ node, interface, "name")
+
if param not in InterfaceKeywords.ROUTING_PARAMS:
raise HoneycombError("The parameter {0} is invalid.".format(param))
if param not in InterfaceKeywords.ROUTING_PARAMS:
raise HoneycombError("The parameter {0} is invalid.".format(param))
@@
-1464,7
+1489,7
@@
class InterfaceKeywords(object):
interface = interface.replace("/", "%2F")
data = {
interface = interface.replace("/", "%2F")
data = {
- "v
3po
:acl": {
+ "v
pp-interface-acl
:acl": {
"ingress": {
"ip4-acl": {
"classify-table": table_name
"ingress": {
"ip4-acl": {
"classify-table": table_name
@@
-1476,7
+1501,7
@@
class InterfaceKeywords(object):
}
}
}
}
- path = "/interface/" + interface + "/v
3po
:acl"
+ path = "/interface/" + interface + "/v
pp-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)
@@
-1502,7
+1527,7
@@
class InterfaceKeywords(object):
interface = interface.replace("/", "%2F")
interface = interface.replace("/", "%2F")
- path = "/interface/" + interface + "/v
3po
:acl"
+ path = "/interface/" + interface + "/v
pp-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)
@@
-1532,7
+1557,7
@@
class InterfaceKeywords(object):
"""
interface = intf.replace("/", "%2F")
"""
interface = intf.replace("/", "%2F")
- path = "/interface/{0}/pbb-rewrite
/
".format(interface)
+ path = "/interface/{0}/pbb-rewrite".format(interface)
status_code, resp = HcUtil. \
put_honeycomb_data(node, "config_vpp_interfaces", params, path,
data_representation=DataRepresentation.JSON)
status_code, resp = HcUtil. \
put_honeycomb_data(node, "config_vpp_interfaces", params, path,
data_representation=DataRepresentation.JSON)