Add a manifest-fabric.json to test cord-tester against CIAB onos-fabric instance.
Also cleanup radius/quagga containers on cord-test.py cleanup.
Do not try to restore the ONOS cord instances if they were already restored.
Change-Id: Ieca2f5a69528ded74c62dd7d8ea0f14a8fe42095
diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 309e085..0ae5f8e 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -395,6 +395,9 @@
restore = self.start_wrapper is True or force is True
if not restore:
return
+ #nothing to restore
+ if not os.access(self.docker_yaml_saved, os.F_OK):
+ return
#restore the config files back. The synchronizer restore should bring the last config back
cmds = ['cd {} && docker-compose down'.format(self.onos_cord_dir),
'rm -rf {}'.format(self.onos_config_dir),