Merge "Rename kolla_docker to kolla_container"

5 files changed, 19 insertions, 19 deletions

diff --git a/tests/kolla_docker_tests/__init__.py b/tests/kolla_container_tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/tests/kolla_docker_tests/__init__.py
+++ b/tests/kolla_container_tests/__init__.py
diff --git a/tests/kolla_docker_tests/test_docker_worker.py b/tests/kolla_container_tests/test_docker_worker.py
index 550882e88..7c7909e6a 100644
--- a/tests/kolla_docker_tests/test_docker_worker.py
+++ b/tests/kolla_container_tests/test_docker_worker.py
@@ -28,11 +28,11 @@ sys.modules['dbus'] = mock.MagicMock()
 
 this_dir = os.path.dirname(sys.modules[__name__].__file__)
 ansible_dir = os.path.join(this_dir, '..', '..', 'ansible')
-kolla_docker_file = os.path.join(ansible_dir,
-                                 'library', 'kolla_docker.py')
+kolla_container_file = os.path.join(ansible_dir,
+                                    'library', 'kolla_container.py')
 docker_worker_file = os.path.join(ansible_dir,
                                   'module_utils', 'kolla_docker_worker.py')
-kd = imp.load_source('kolla_docker', kolla_docker_file)
+kc = imp.load_source('kolla_container', kolla_container_file)
 dwm = imp.load_source('kolla_docker_worker', docker_worker_file)
 
 
@@ -212,20 +212,20 @@ class TestMainModule(base.BaseTestCase):
         self.fake_data_common_opts['params']['common_options'] = \
             FAKE_DATA_COMMON_OPTS
 
-    @mock.patch("kolla_docker.traceback.format_exc")
+    @mock.patch("kolla_container.traceback.format_exc")
     @mock.patch("kolla_docker_worker.get_docker_client")
-    @mock.patch("kolla_docker.generate_module")
+    @mock.patch("kolla_container.generate_module")
     def test_docker_client_exception(self, mock_generate_module, mock_dclient,
                                      mock_traceback):
         module_mock = mock.MagicMock()
         mock_generate_module.return_value = module_mock
         mock_dclient.side_effect = AttributeError()
         mock_traceback.return_value = "Some very ugly traceback"
-        kd.main()
+        kc.main()
         module_mock.fail_json.assert_called_once_with(
             changed=True, msg=repr("Some very ugly traceback"))
 
-    @mock.patch("kolla_docker.generate_module")
+    @mock.patch("kolla_container.generate_module")
     def test_execute_module(self, mock_generate_module):
         module_mock = mock.MagicMock()
         module_mock.params = self.fake_data['params']
@@ -237,7 +237,7 @@ class TestMainModule(base.BaseTestCase):
             mock_dw.return_value.check_image.return_value = False
             mock_dw.return_value.changed = False
             mock_dw.return_value.result = {"some_key": "some_value"}
-            kd.main()
+            kc.main()
             mock_dw.assert_called_once_with(module_mock)
             mock_dw.return_value.check_image.assert_called_once_with()
         module_mock.exit_json.assert_called_once_with(changed=False,
diff --git a/tests/kolla_docker_tests/test_podman_worker.py b/tests/kolla_container_tests/test_podman_worker.py
index 7f8ca6b80..6767a9100 100644
--- a/tests/kolla_docker_tests/test_podman_worker.py
+++ b/tests/kolla_container_tests/test_podman_worker.py
@@ -27,11 +27,11 @@ sys.modules['dbus'] = mock.MagicMock()
 
 this_dir = os.path.dirname(sys.modules[__name__].__file__)
 ansible_dir = os.path.join(this_dir, '..', '..', 'ansible')
-kolla_docker_file = os.path.join(ansible_dir,
-                                 'library', 'kolla_docker.py')
+kolla_container_file = os.path.join(ansible_dir,
+                                    'library', 'kolla_container.py')
 podman_worker_file = os.path.join(ansible_dir,
                                   'module_utils', 'kolla_podman_worker.py')
-kd = imp.load_source('kolla_docker', kolla_docker_file)
+kc = imp.load_source('kolla_container', kolla_container_file)
 pwm = imp.load_source('kolla_podman_worker', podman_worker_file)
 
 FAKE_DATA = {
@@ -165,7 +165,7 @@ class TestMainModule(base.BaseTestCase):
         super(TestMainModule, self).setUp()
         self.fake_data = copy.deepcopy(FAKE_DATA)
 
-    @mock.patch("kolla_docker.generate_module")
+    @mock.patch("kolla_container.generate_module")
     def test_execute_module(self, mock_generate_module):
         module_mock = mock.MagicMock()
         module_mock.params = self.fake_data['params']
@@ -177,7 +177,7 @@ class TestMainModule(base.BaseTestCase):
             mock_pw.return_value.check_image.return_value = False
             mock_pw.return_value.changed = False
             mock_pw.return_value.result = {"some_key": "some_value"}
-            kd.main()
+            kc.main()
             mock_pw.assert_called_once_with(module_mock)
             mock_pw.return_value.check_image.assert_called_once_with()
         module_mock.exit_json.assert_called_once_with(changed=False,
diff --git a/tests/kolla_docker_tests/test_systemd.py b/tests/kolla_container_tests/test_systemd.py
index 9f2b624f0..9f2b624f0 100644
--- a/tests/kolla_docker_tests/test_systemd.py
+++ b/tests/kolla_container_tests/test_systemd.py
diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_container.py
index 2d398d5cb..0fe257bd0 100644
--- a/tests/test_kolla_docker.py
+++ b/tests/test_kolla_container.py
@@ -24,11 +24,11 @@ from oslotest import base
 
 this_dir = os.path.dirname(sys.modules[__name__].__file__)
 ansible_dir = os.path.join(this_dir, '..', 'ansible')
-kolla_docker_file = os.path.join(ansible_dir,
-                                 'library', 'kolla_docker.py')
+kolla_container_file = os.path.join(ansible_dir,
+                                    'library', 'kolla_container.py')
 docker_worker_file = os.path.join(ansible_dir,
                                   'module_utils', 'kolla_docker_worker.py')
-kd = imp.load_source('kolla_docker', kolla_docker_file)
+kc = imp.load_source('kolla_container', kolla_container_file)
 dwm = imp.load_source('kolla_docker_worker', docker_worker_file)
 
 
@@ -122,9 +122,9 @@ class ModuleArgsTest(base.BaseTestCase):
             ['action', 'stop_and_remove_container', ['name']],
         ]
 
-        kd.AnsibleModule = mock.MagicMock()
-        kd.generate_module()
-        kd.AnsibleModule.assert_called_with(
+        kc.AnsibleModule = mock.MagicMock()
+        kc.generate_module()
+        kc.AnsibleModule.assert_called_with(
             argument_spec=argument_spec,
             required_if=required_if,
             bypass_checks=False