[R5.0-122]- Automation- container name are changed for few db service, need to change the test code accordingly

[alok kumar]

Few cases failed while checking cluster status with below containers reported as inactive.

AssertionError: Hash of error nodes and services : defaultdict(<type 'dict'>, {'10.204.216.96': {'config-zookeeper': {'status': 'inactive', 'description': None}, 'analytics-zookeeper': {'status': 'inactive', 'description': None}, 'analytics-kafka': {'status': 'inactive', 'description': None}, 'config-cassandra': {'status': 'inactive', 'description': None}, 'analyticsdb-nodemgr': {'status': 'inactive', 'description': None}, 'analytics-cassandra': {'status': 'inactive', 'description': None}}, '10.204.216.95': {'config-zookeeper': {'status': 'inactive', 'description': None}, 'analytics-zookeeper': {'status': 'inactive', 'description': None}, 'analytics-kafka': {'status': 'inactive', 'description': None}, 'config-cassandra': {'status': 'inactive', 'description': None}, 'analyticsdb-nodemgr': {'status': 'inactive', 'description': None}, 'analytics-cassandra': {'status': 'inactive', 'description': None}}, '10.204.216.103': {'config-zookeeper': {'status': 'inactive', 'description': None}, 'analytics-zookeeper': {'status': 'inactive', 'description': None}, 'analytics-kafka': {'status': 'inactive', 'description': None}, 'config-cassandra': {'status': 'inactive', 'description': None}, 'analyticsdb-nodemgr': {'status': 'inactive', 'description': None}, 'analytics-cassandra': {'status': 'inactive', 'description': None}}})

Looks like container names for these services are changed by adding extra '_' in the name.
eg. analyticsdatabase_zookeeper_1 to analytics_database_zookeeper_1

[root@nodem14 ~]# docker ps |grep -i zoo
51f7bd0c605b        10.204.217.152:5000/contrail-external-zookeeper:ocata-5.0-122             "/contrail-entrypo..."   23 hours ago        Up 22 hours                             analytics_database_zookeeper_1
946c38ef31e0        10.204.217.152:5000/contrail-external-zookeeper:ocata-5.0-122             "/contrail-entrypo..."   23 hours ago        Up 22 hours                             config_database_zookeeper_1

we need to add new container names in CONTRAIL_SERVICES_CONTAINER_MAP.

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/44378
Submitter: alok kumar (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/44378
Committed: http://github.com/Juniper/contrail-test/commit/2b044e38060531a2dafd662f08b9b40d039df4b6
Submitter: Zuul v3 CI (<email address hidden>)
Branch: R5.0

commit 2b044e38060531a2dafd662f08b9b40d039df4b6
Author: Alok Kumar <email address hidden>
Date: Thu Jul 5 12:17:26 2018 +0530

Add new container names to check cluster status

Change-Id: I8aff2040161d160d546c477bd016b40933ddc0f5
Closes-Bug: #1780190

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/44404
Submitter: alok kumar (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/44404
Committed: http://github.com/Juniper/contrail-test/commit/ee26e2bbfc998822fcc6e1ed314b99575ce31b79
Submitter: Zuul v3 CI (<email address hidden>)
Branch: master

commit ee26e2bbfc998822fcc6e1ed314b99575ce31b79
Author: Alok Kumar <email address hidden>
Date: Thu Jul 5 12:17:26 2018 +0530

Add new container names to check cluster status

Change-Id: I8aff2040161d160d546c477bd016b40933ddc0f5
Closes-Bug: #1780190