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: fix restconf binding configuration
[csit.git]
/
resources
/
libraries
/
python
/
honeycomb
/
HcAPIKwBridgeDomain.py
diff --git
a/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py
b/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py
index
e3fd6fb
..
3c629c9
100644
(file)
--- a/
resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py
+++ b/
resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py
@@
-61,7
+61,7
@@
class BridgeDomainKeywords(object):
status_code, resp = HcUtil.\
put_honeycomb_data(node, "config_bridge_domain", data,
data_representation=data_representation)
status_code, resp = HcUtil.\
put_honeycomb_data(node, "config_bridge_domain", data,
data_representation=data_representation)
- if status_code
!= HTTPCodes.OK
:
+ if status_code
not in (HTTPCodes.OK, HTTPCodes.ACCEPTED)
:
raise HoneycombError(
"The configuration of bridge domain '{0}' was not successful. "
"Status code: {1}.".format(bd_name, status_code))
raise HoneycombError(
"The configuration of bridge domain '{0}' was not successful. "
"Status code: {1}.".format(bd_name, status_code))
@@
-90,7
+90,7
@@
class BridgeDomainKeywords(object):
status_code, resp = HcUtil.\
get_honeycomb_data(node, "config_bridge_domain")
status_code, resp = HcUtil.\
get_honeycomb_data(node, "config_bridge_domain")
- if status_code
!= HTTPCodes.OK
:
+ if status_code
not in (HTTPCodes.OK, HTTPCodes.ACCEPTED)
:
raise HoneycombError(
"Not possible to get configuration information about the "
"bridge domains. Status code: {0}.".format(status_code))
raise HoneycombError(
"Not possible to get configuration information about the "
"bridge domains. Status code: {0}.".format(status_code))
@@
-186,7
+186,7
@@
class BridgeDomainKeywords(object):
"Not possible to get operational information about the "
"bridge domains. Status code: {0}.".format(status_code))
try:
"Not possible to get operational information about the "
"bridge domains. Status code: {0}.".format(status_code))
try:
- return resp["bridge-domains"]["bridge-domain"]
+ return resp["bridge-domains
-state
"]["bridge-domain"]
except (KeyError, TypeError):
return []
except (KeyError, TypeError):
return []
@@
-226,11
+226,9
@@
class BridgeDomainKeywords(object):
:rtype: dict
"""
:rtype: dict
"""
- path = ("bridge-domains", )
new_bd = BridgeDomainKeywords._create_bd_structure(bd_name, **kwargs)
new_bd = BridgeDomainKeywords._create_bd_structure(bd_name, **kwargs)
- bridge_domain = {"bridge-domain": [new_bd, ]}
- return BridgeDomainKeywords._set_bd_properties(node, bd_name, path,
- bridge_domain)
+ bridge_domain = {"bridge-domains": {"bridge-domain": [new_bd, ]}}
+ return BridgeDomainKeywords._configure_bd(node, bd_name, bridge_domain)
@staticmethod
def add_bd(node, bd_name, **kwargs):
@staticmethod
def add_bd(node, bd_name, **kwargs):
@@
-254,7
+252,7
@@
class BridgeDomainKeywords(object):
bridge_domain)
@staticmethod
bridge_domain)
@staticmethod
- def remove_all_b
d
s(node):
+ def remove_all_b
ridge_domain
s(node):
"""Remove all bridge domains.
:param node: Honeycomb node.
"""Remove all bridge domains.
:param node: Honeycomb node.
@@
-266,9
+264,11
@@
class BridgeDomainKeywords(object):
"""
data = {"bridge-domains": {"bridge-domain": []}}
"""
data = {"bridge-domains": {"bridge-domain": []}}
+
status_code, resp = HcUtil.\
put_honeycomb_data(node, "config_bridge_domain", data)
status_code, resp = HcUtil.\
put_honeycomb_data(node, "config_bridge_domain", data)
- if status_code != HTTPCodes.OK:
+
+ if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
raise HoneycombError("Not possible to remove all bridge domains. "
"Status code: {0}.".format(status_code))
return resp
raise HoneycombError("Not possible to remove all bridge domains. "
"Status code: {0}.".format(status_code))
return resp