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/setup/cord-test.py b/src/test/setup/cord-test.py
index b71e68e..ef516f3 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -920,6 +920,10 @@
Onos.remove_data_map(volume, Onos.guest_data_dir)
Onos.cleanup_runtime()
+ radius_container = '{}{}:candidate'.format(prefix, Radius.IMAGE)
+ quagga_container = '{}{}:candidate'.format(prefix, Quagga.IMAGE)
+ Container.cleanup(radius_container)
+ Container.cleanup(quagga_container)
if args.onos_cord:
#try restoring the onos cord instance
try: