Cleanup container driver inferface

* Remove get_container_name (this API is not used)
* Remove get_addresses (this API is not used)
* Remove get_host_info (this is a docker internal method)

Change-Id: I385f5f5526b2e61b7b11c05fadeab40c98a2c5cb

zun/container/driver.py

@@ -172,13 +172,6 @@ class ContainerDriver(object):
         """Display stats of the container."""
         raise NotImplementedError()
 
-    def get_container_name(self, container):
-        """Retrieve container name."""
-        raise NotImplementedError()
-
-    def get_addresses(self, context, container):
-        """Retrieve IP addresses of the container."""
-
     def update(self, context, container):
         """Update a container."""
         raise NotImplementedError()
@@ -194,9 +187,6 @@ class ContainerDriver(object):
     def get_host_mem(self):
         return os_capability_linux.LinuxHost().get_host_mem()
 
-    def get_host_info(self):
-        raise NotImplementedError()
-
     def get_total_disk_for_container(self):
         disk_usage = psutil.disk_usage('/')
         total_disk = disk_usage.total / 1024 ** 3
@@ -284,7 +274,7 @@ class ContainerDriver(object):
             return mem_total // units.Ki
 
         def _get_vcpu_total():
-            return self.get_host_info()['cpus']
+            return psutil.cpu_count()
 
         disk_gb = _get_local_gb_info()
         memory_mb = _get_memory_mb_total()

zun/tests/unit/container/docker/test_docker_driver.py

@@ -750,15 +750,6 @@ class TestDockerDriver(base.DriverTestCase):
         self.mock_docker.commit.assert_called_once_with(
             mock_container.container_id, "repo", "tag")
 
-    def test_get_container_name(self):
-        mock_container = mock.MagicMock(
-            uuid='ea8e2a25-2901-438d-8157-de7ffd68d051')
-        result_container_name = self.driver.get_container_name(
-            mock_container)
-        self.assertEqual(
-            result_container_name,
-            '%sea8e2a25-2901-438d-8157-de7ffd68d051' % consts.NAME_PREFIX)
-
     def test_execute_resize(self):
         self.mock_docker.exec_resize = mock.Mock()
         fake_exec_id = 'fake_id'

zun/tests/unit/container/fake_driver.py

@@ -105,9 +105,6 @@ class FakeDriver(driver.ContainerDriver):
     def resize(self, context, container, height, weight):
         pass
 
-    def get_addresses(self, context, container):
-        pass
-
     @check_container_id
     def update(self, context, container):
         pass