CORD-2720 fixing diag + sanity pod tests to reflect removal of consul and registrator containers
Change-Id: If0d86f8fd0e8c51e387e1781d687f3ccc86fdc69
diff --git a/src/test/diag/dockerContainers.json b/src/test/diag/dockerContainers.json
index 69140b4..df2d8f3 100644
--- a/src/test/diag/dockerContainers.json
+++ b/src/test/diag/dockerContainers.json
@@ -13,13 +13,11 @@
"mavenrepo",
"onosfabric_xos-onos_1",
"onoscord_xos-onos_1",
- "rcord_consul_1",
"rcord_onos-synchronizer_1",
"rcord_xos_chameleon_1",
"rcord_xos_redis_1",
"rcord_xos_core_1",
"rcord_xos_tosca_1",
- "rcord_registrator_1",
"rcord_xos_db_1",
"rcord_xos_gui_1",
"rcord_xos_ws_1",
@@ -33,7 +31,6 @@
],
"docker-containers-ecord-global":
[
- "ecordglobal_consul_1",
"ecordglobal_onos-synchronizer_1",
"ecordglobal_xos_chameleon_1",
"ecordglobal_xos_redis_1",
@@ -41,7 +38,6 @@
"ecordglobal_xos_core_1",
"ecordglobal_xos_tosca_1",
"onoscord_xos-onos_1",
- "ecordglobal_registrator_1",
"ecordglobal_xos_db_1",
"ecordglobal_vnaas-synchronizer_1",
"ecordglobal_xos_gui_1",
@@ -61,7 +57,6 @@
"ecord_onos-synchronizer_1",
"ecord_vrouter-synchronizer_1",
"ecord_addressmanager-synchronizer_1",
- "ecord_consul_1",
"ecord_fabric-synchronizer_1",
"ecord_openstack-synchronizer_1",
"ecord_registrator_1",
@@ -106,8 +101,6 @@
"mcordng40_vspgwu-synchronizer_1",
"mcordng40_xos_redis_1",
"mcordng40_xos_db_1",
- "mcordng40_registrator_1",
- "mcordng40_consul_1",
"onosfabric_xos-onos_1",
"onoscord_xos-onos_1"
]
diff --git a/src/test/robot/SanityPhyPOD.robot b/src/test/robot/SanityPhyPOD.robot
index 5e17572..85536e7 100755
--- a/src/test/robot/SanityPhyPOD.robot
+++ b/src/test/robot/SanityPhyPOD.robot
@@ -116,7 +116,7 @@
Verify Docker Containers State
${dockerContainers} utils.jsonToList ${DOCKER_CONTAINERS_FILE} docker-containers-${CORD_PROFILE}
: FOR ${container} IN @{dockerContainers}
- \ Verify Containers ${container}
+ \ Run Keyword And Continue On Failure Verify Containers ${container}
Verify Juju Services State
[Template] Verify JUJU Service