Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-427: Honeycomb ietf-ACL tests - mixed layers
[csit.git]
/
resources
/
libraries
/
python
/
honeycomb
/
HcPersistence.py
diff --git
a/resources/libraries/python/honeycomb/HcPersistence.py
b/resources/libraries/python/honeycomb/HcPersistence.py
index
adb55f5
..
3bbc52f
100644
(file)
--- a/
resources/libraries/python/honeycomb/HcPersistence.py
+++ b/
resources/libraries/python/honeycomb/HcPersistence.py
@@
-40,8
+40,7
@@
class HcPersistence(object):
:type nodes: list
:raises HoneycombError: If persisted configuration could not be removed.
"""
:type nodes: list
:raises HoneycombError: If persisted configuration could not be removed.
"""
- cmd = "rm {0}/etc/opendaylight/honeycomb/*".format(
- Const.REMOTE_HC_DIR)
+ cmd = "rm -rf {}/*".format(Const.REMOTE_HC_PERSIST)
for node in nodes:
if node['type'] == NodeType.DUT:
ssh = SSH()
for node in nodes:
if node['type'] == NodeType.DUT:
ssh = SSH()
@@
-61,7
+60,7
@@
class HcPersistence(object):
@staticmethod
def modify_persistence_files(node, find, replace):
@staticmethod
def modify_persistence_files(node, find, replace):
- """Searches contents of persistence file
config
.json for the provided
+ """Searches contents of persistence file
data
.json for the provided
string, and replaces all occurrences with another string.
:param node: Honeycomb node.
string, and replaces all occurrences with another string.
:param node: Honeycomb node.
@@
-75,8
+74,7
@@
class HcPersistence(object):
"""
argument = "\"s/{0}/{1}/g\"".format(find, replace)
"""
argument = "\"s/{0}/{1}/g\"".format(find, replace)
- path = "{0}/etc/opendaylight/honeycomb/config.json".format(
- Const.REMOTE_HC_DIR)
+ path = "{0}/config/data.json".format(Const.REMOTE_HC_PERSIST)
command = "sed -i {0} {1}".format(argument, path)
ssh = SSH()
command = "sed -i {0} {1}".format(argument, path)
ssh = SSH()