Move actions to kolla_container_facts

Move actions responsible for info about containers
from kolla_container module to kolla_container_facts.
Also fixes a bug with inconsistencies between docker
and podman in kolla_container_facts.

Closes-bug: #2084878
Change-Id: I1db88e28a828ebf073f018b2bae1d9556ec22807
Signed-off-by: Ivan Halomi <ivan.halomi@tietoevry.com>
Signed-off-by: Martin Hiner <martin.hiner@tietoevry.com>
Signed-off-by: Roman Krček <roman.krcek@tietoevry.com>

2 files changed, 0 insertions, 113 deletions

diff --git a/tests/kolla_container_tests/test_docker_worker.py b/tests/kolla_container_tests/test_docker_worker.py
index 564f93a66..1e386d918 100644
--- a/tests/kolla_container_tests/test_docker_worker.py
+++ b/tests/kolla_container_tests/test_docker_worker.py
@@ -682,62 +682,6 @@ class TestContainer(base.BaseTestCase):
             force=True
         )
 
-    def test_get_container_env(self):
-        fake_env = dict(KOLLA_BASE_DISTRO='ubuntu')
-        self.dw = get_DockerWorker({'name': 'my_container',
-                                    'action': 'get_container_env'})
-        self.dw.dc.containers.return_value = self.fake_data['containers']
-        self.fake_data['container_inspect'].update(
-            self.fake_data['containers'][0])
-        self.dw.dc.inspect_container.return_value = (
-            self.fake_data['container_inspect'])
-        self.dw.get_container_env()
-
-        self.assertFalse(self.dw.changed)
-        self.dw.dc.containers.assert_called_once_with(all=True)
-        self.dw.dc.inspect_container.assert_called_once_with('my_container')
-        self.dw.module.exit_json.assert_called_once_with(**fake_env)
-
-    def test_get_container_env_negative(self):
-        self.dw = get_DockerWorker({'name': 'fake_container',
-                                    'action': 'get_container_env'})
-        self.dw.dc.containers.return_value = self.fake_data['containers']
-        self.dw.get_container_env()
-
-        self.assertFalse(self.dw.changed)
-        self.dw.module.fail_json.assert_called_once_with(
-            msg="No such container: fake_container")
-
-    def test_get_container_state(self):
-        State = {'Dead': False,
-                 'ExitCode': 0,
-                 'Pid': 12475,
-                 'StartedAt': '2016-06-07T11:22:37.66876269Z',
-                 'Status': 'running'}
-        self.fake_data['container_inspect'].update({'State': State})
-        self.dw = get_DockerWorker({'name': 'my_container',
-                                    'action': 'get_container_state'})
-        self.dw.dc.containers.return_value = self.fake_data['containers']
-        self.dw.dc.inspect_container.return_value = (
-            self.fake_data['container_inspect'])
-        self.dw.get_container_state()
-
-        self.assertFalse(self.dw.changed)
-        self.dw.dc.containers.assert_called_once_with(all=True)
-        self.dw.dc.inspect_container.assert_called_once_with('my_container')
-        self.dw.module.exit_json.assert_called_once_with(**State)
-
-    def test_get_container_state_negative(self):
-        self.dw = get_DockerWorker({'name': 'fake_container',
-                                    'action': 'get_container_state'})
-        self.dw.dc.containers.return_value = self.fake_data['containers']
-        self.dw.get_container_state()
-
-        self.assertFalse(self.dw.changed)
-        self.dw.dc.containers.assert_called_once_with(all=True)
-        self.dw.module.fail_json.assert_called_once_with(
-            msg="No such container: fake_container")
-
     def test_recreate_or_restart_container_not_container(self):
         self.dw = get_DockerWorker({
             'environment': dict(KOLLA_CONFIG_STRATEGY='COPY_ALWAYS')})
diff --git a/tests/kolla_container_tests/test_podman_worker.py b/tests/kolla_container_tests/test_podman_worker.py
index 60691b1a2..e225bd653 100644
--- a/tests/kolla_container_tests/test_podman_worker.py
+++ b/tests/kolla_container_tests/test_podman_worker.py
@@ -597,63 +597,6 @@ class TestContainer(base.BaseTestCase):
         self.assertTrue(self.pw.changed)
         my_container.remove.assert_called_once_with(force=True)
 
-    def test_get_container_env(self):
-        fake_env = dict(KOLLA_BASE_DISTRO='ubuntu',
-                        KOLLA_INSTALL_TYPE='binary',
-                        KOLLA_INSTALL_METATYPE='rdo')
-        self.pw = get_PodmanWorker({'name': 'my_container',
-                                    'action': 'get_container_env'})
-        self.fake_data['containers'][0].update(
-            self.fake_data['container_inspect'])
-        full_cont_list = get_containers(self.fake_data['containers'])
-        self.pw.pc.containers.list.return_value = full_cont_list
-        self.pw.get_container_env()
-
-        self.assertFalse(self.pw.changed)
-        self.pw.pc.containers.list.assert_called_once_with(all=True)
-        self.pw.module.exit_json.assert_called_once_with(**fake_env)
-
-    def test_get_container_env_negative(self):
-        self.pw = get_PodmanWorker({'name': 'fake_container',
-                                    'action': 'get_container_env'})
-        self.pw.pc.containers.list.return_value = get_containers(
-            self.fake_data['containers'])
-        self.pw.get_container_env()
-
-        self.assertFalse(self.pw.changed)
-        self.pw.module.fail_json.assert_called_once_with(
-            msg="No such container: fake_container")
-
-    def test_get_container_state(self):
-        State = {'Dead': False,
-                 'ExitCode': 0,
-                 'Pid': 12475,
-                 'StartedAt': '2016-06-07T11:22:37.66876269Z',
-                 'Status': 'running'}
-        self.fake_data['container_inspect'].update({'State': State})
-        self.pw = get_PodmanWorker({'name': 'my_container',
-                                    'action': 'get_container_state'})
-        self.fake_data['containers'][0].update({'State': State})
-        self.pw.pc.containers.list.return_value = get_containers(
-            self.fake_data['containers'])
-        self.pw.get_container_state()
-
-        self.assertFalse(self.pw.changed)
-        self.pw.pc.containers.list.assert_called_once_with(all=True)
-        self.pw.module.exit_json.assert_called_once_with(**State)
-
-    def test_get_container_state_negative(self):
-        self.pw = get_PodmanWorker({'name': 'fake_container',
-                                    'action': 'get_container_state'})
-        self.pw.pc.containers.list.return_value = get_containers(
-            self.fake_data['containers'])
-        self.pw.get_container_state()
-
-        self.assertFalse(self.pw.changed)
-        self.pw.pc.containers.list.assert_called_once_with(all=True)
-        self.pw.module.fail_json.assert_called_once_with(
-            msg="No such container: fake_container")
-
     def test_recreate_or_restart_container_not_container(self):
         self.pw = get_PodmanWorker({
             'environment': dict(KOLLA_CONFIG_STRATEGY='COPY_ALWAYS')})