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:
diff --git a/src/test/setup/manifest-fabric.json b/src/test/setup/manifest-fabric.json
new file mode 100644
index 0000000..07c176a
--- /dev/null
+++ b/src/test/setup/manifest-fabric.json
@@ -0,0 +1,13 @@
+{
+ "onos_instances": 1,
+ "olt": true,
+ "start_switch": true,
+ "onos_image": "onosproject/onos:latest",
+ "onos" : "172.20.0.2",
+ "onos_cord" : "/home/vagrant/onos-fabric",
+ "service_profile" : "/home/vagrant/service-profile/cord-pod",
+ "synchronizer" : "vtn",
+ "docker_network" : "onosfabric_default",
+ "log_level" : "INFO",
+ "jvm_heap_size" : "1G"
+}
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),