Code Review
/
integration
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
SFC New testcase addition.
[integration/test.git]
/
csit
/
libraries
/
Sxp.py
diff --git
a/csit/libraries/Sxp.py
b/csit/libraries/Sxp.py
index 0757687f7590971c4bdb3755d422efa70aefd489..4aaf3b094f86c25a85ec6356351daf94163d699a 100644
(file)
--- a/
csit/libraries/Sxp.py
+++ b/
csit/libraries/Sxp.py
@@
-414,11
+414,13
@@
def parse_connections(connections_json):
"""
data = json.loads(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):
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
<keep-alive-time>30</keep-alive-time>
<reconciliation-time>$timeout</reconciliation-time>
<delete-hold-down-time>$timeout</delete-hold-down-time>
<keep-alive-time>30</keep-alive-time>
<reconciliation-time>$timeout</reconciliation-time>
<delete-hold-down-time>$timeout</delete-hold-down-time>
+ <hold-time>90</hold-time>
+ <hold-time-max>180</hold-time-max>
+ <hold-time-min>90</hold-time-min>
</connection-timers>
</connection>
</connections>
</connection-timers>
</connection>
</connections>
@@
-991,7
+996,13
@@
def delete_domain_xml(node_id, name):
:returns: String containing xml data for request
"""
:returns: String containing xml data for request
"""
- return add_domain_xml(node_id, name)
+ templ = Template('''<input xmlns="urn:opendaylight:sxp:controller">
+ <node-id>$node_id</node-id>
+ <domain-name>$name</domain-name>
+</input>''')
+
+ data = templ.substitute({'node_id': node_id, 'name': name})
+ return data
def get_domain_name(domain_name):
def get_domain_name(domain_name):