X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FSxp.py;h=4aaf3b094f86c25a85ec6356351daf94163d699a;hb=43c30c4829b5f75d106a79d12029db2190b6ff5d;hp=0757687f7590971c4bdb3755d422efa70aefd489;hpb=22c4831c19ec535b621691a1a53df3b12fc08d88;p=integration%2Ftest.git diff --git a/csit/libraries/Sxp.py b/csit/libraries/Sxp.py index 0757687f75..4aaf3b094f 100644 --- a/csit/libraries/Sxp.py +++ b/csit/libraries/Sxp.py @@ -414,11 +414,13 @@ def parse_connections(connections_json): """ data = json.loads(connections_json) - connections = data['output']['connections'] - output = [] - for connection in connections.values(): - output += connection - return output + output = data['output'] + result = [] + if output: + connections = output['connections'] + for connection in connections.values(): + result += connection + return result def find_connection(connections_json, version, mode, ip, port, state): @@ -572,6 +574,9 @@ def add_connection_xml(version, mode, ip, port, node, password_, domain_name, bi 30 $timeout $timeout + 90 + 180 + 90 @@ -991,7 +996,13 @@ def delete_domain_xml(node_id, name): :returns: String containing xml data for request """ - return add_domain_xml(node_id, name) + templ = Template(''' + $node_id + $name +''') + + data = templ.substitute({'node_id': node_id, 'name': name}) + return data def get_domain_name(domain_name):