X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHcAPIKwBridgeDomain.py;h=3c629c96e47f3977efa45db10c022603077b91e6;hp=e3fd6fb4fc40b6d590ecbe5d342107e5f7d404c1;hb=dc0288317e241f6cb18b0978993a1e2f396c793c;hpb=95253bdf705a06ec01c2a04f437bae2ef23355c3 diff --git a/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py b/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py index e3fd6fb4fc..3c629c96e4 100644 --- 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) - 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)) @@ -90,7 +90,7 @@ class BridgeDomainKeywords(object): 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)) @@ -186,7 +186,7 @@ class BridgeDomainKeywords(object): "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 [] @@ -226,11 +226,9 @@ class BridgeDomainKeywords(object): :rtype: dict """ - path = ("bridge-domains", ) 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): @@ -254,7 +252,7 @@ class BridgeDomainKeywords(object): bridge_domain) @staticmethod - def remove_all_bds(node): + def remove_all_bridge_domains(node): """Remove all bridge domains. :param node: Honeycomb node. @@ -266,9 +264,11 @@ class BridgeDomainKeywords(object): """ data = {"bridge-domains": {"bridge-domain": []}} + 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