diff options
| author |   selias <samelias@cisco.com> | 2016-09-13 16:51:37 +0200 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2016-10-03 06:41:33 +0000 |
| commit | 19c91adadd57bfc4e7514993b2a711a826d52e04 (patch) | |
| tree | 5c7656c69c6a3936838c5c6ddcf9313e7e98a6ba /resources/libraries/python/honeycomb/HcPersistence.py | |
| parent | c75b9804c9510d0a342563e41407089145b38d50 (diff) | |
CSIT-405: Honeycomb test update and cleanup
- update suite setup and constants to allow test runs again
- cleanup basic interface keywords
- cleanup L2-fib test data
- add "continue on failure" keyword to some partially failing tests
- add teardown to all suites, restarts honeycomb if suite had test failures
- fix minor PEP-8 violations in Topology.py
Change-Id: Ic5b434af71f77855f81461b280299b8318932c5a
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources/libraries/python/honeycomb/HcPersistence.py')
| -rw-r--r-- | resources/libraries/python/honeycomb/HcPersistence.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/resources/libraries/python/honeycomb/HcPersistence.py b/resources/libraries/python/honeycomb/HcPersistence.py index 4d192525d8..3bbc52fa91 100644 --- a/resources/libraries/python/honeycomb/HcPersistence.py +++ b/resources/libraries/python/honeycomb/HcPersistence.py @@ -40,7 +40,7 @@ class HcPersistence(object): :type nodes: list :raises HoneycombError: If persisted configuration could not be removed. """ - cmd = "rm {0}/data/persistence/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() @@ -60,7 +60,7 @@ class HcPersistence(object): @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. @@ -74,8 +74,7 @@ class HcPersistence(object): """ 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() |