Fix the mapping of the deployment name

Fixed the mapping of the deployment name. Deployment name was hard-coded
in test cases that is making to only return raw_name. This will fix this
issue.

Change-Id: Ie884c346930fdbcb0ec08fc96f4fa73865d78fde

kube_utility_container/tests/utility/base.py

@@ -16,6 +16,8 @@ import unittest
 
 from kube_utility_container.services.utility_container_client\
     import UtilityContainerClient
+from kube_utility_container.services.dataloader import \
+    DeploymentMapping
 
 
 class TestBase(unittest.TestCase):
@@ -23,3 +25,14 @@ class TestBase(unittest.TestCase):
     def setUpClass(cls):
         cls.client = UtilityContainerClient()
 
+    def _get_deployment_name(deployment_name):
+        """
+        :param deployment_name: if specified the deployment name of the utility pod
+            where the utilscli command is to be executed.
+        :type deployment_name: string
+            where the utilscli command is to be executed.
+        :return: deployment_name extracted from the deployment
+        """
+        namesMapping = DeploymentMapping(deployment_name)
+        deployment_name = namesMapping._get_mapping_realname()
+        return deployment_name

kube_utility_container/tests/utility/calico/test_calico_utility_container.py

@@ -24,7 +24,7 @@ from kube_utility_container.tests.utility.base import TestBase
 class TestCalicoUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'calicoctl-utility'
+        cls.deployment_name = cls._get_deployment_name("calicoctl-utility")
         super(TestCalicoUtilityContainer, cls).setUpClass()
 
     def test_verify_calico_client_calicoctl_is_present(self):

kube_utility_container/tests/utility/ceph/test_ceph_utility_container.py

@@ -25,7 +25,7 @@ from kube_utility_container.tests.utility.base import TestBase
 class TestCephUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'ceph-utility'
+        cls.deployment_name = cls._get_deployment_name("ceph-utility")
         super(TestCephUtilityContainer, cls).setUpClass()
 
     def test_verify_ceph_client_is_present(self):

kube_utility_container/tests/utility/compute/test_compute_utility_container.py

@@ -29,7 +29,7 @@ node = os.uname().nodename
 class TestComputeUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'compute-utility'
+        cls.deployment_name = cls._get_deployment_name("compute-utility")
         super(TestComputeUtilityContainer, cls).setUpClass()
 
     @unittest.expectedFailure

kube_utility_container/tests/utility/etcd/test_etcd_utility_container.py

@@ -27,7 +27,7 @@ from kube_utility_container.tests.utility.base import TestBase
 class TestEtcdUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'etcdctl-utility'
+        cls.deployment_name = cls._get_deployment_name("etcdctl-utility")
         super(TestEtcdUtilityContainer, cls).setUpClass()
 
     def test_verify_etcd_ctl_is_present(self):

kube_utility_container/tests/utility/mysqlclient/test_mysqlclient_utility_container.py

@@ -20,7 +20,7 @@ from kube_utility_container.tests.utility.base import TestBase
 class TestMysqlclientUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'mysqlclient-utility'
+        cls.deployment_name = cls._get_deployment_name("mysqlclient-utility")
         super(TestMysqlclientUtilityContainer, cls).setUpClass()
 
     def test_verify_mysql_client_is_present(self):

kube_utility_container/tests/utility/openstack/test_openstack_utility_container.py

@@ -25,7 +25,7 @@ from kube_utility_container.tests.utility.base import TestBase
 class TestOpenstackUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'openstack-utility'
+        cls.deployment_name = cls._get_deployment_name("openstack-utility")
         super(TestOpenstackUtilityContainer, cls).setUpClass()
 
     def test_verify_openstack_client_is_present(self):

kube_utility_container/tests/utility/postgresql/test_postgresql_utility_container.py

@@ -19,7 +19,7 @@ from kube_utility_container.tests.utility.base import TestBase
 class TestPostgresqlUtilityContainer(TestBase):
     @classmethod
     def setUpClass(cls):
-        cls.deployment_name = 'postgresql-utility'
+        cls.deployment_name = cls._get_deployment_name("postgresql-utility")
         super(TestPostgresqlUtilityContainer, cls).setUpClass()
 
     def test_verify_readonly_rootfs(self):