Remove "distutils" library

Library "distutils" is deprecated in Python 3.10:
https://peps.python.org/pep-0632/

The versions previously referenced using StrictVersion should be old
enough that they will not be used in a Dalmatian deployment:

- Ansible 2.11
- Docker API 1.42, included since Docker engine 23.0.0

Change-Id: Ie315004715a1cb5a91dd54bc64b0a8fd0af650ec

1 files changed, 6 insertions, 39 deletions

diff --git a/tests/kolla_container_tests/test_docker_worker.py b/tests/kolla_container_tests/test_docker_worker.py
index e6e6f0de2..564f93a66 100644
--- a/tests/kolla_container_tests/test_docker_worker.py
+++ b/tests/kolla_container_tests/test_docker_worker.py
@@ -244,22 +244,8 @@ class TestMainModule(base.BaseTestCase):
                                                       result=False,
                                                       some_key="some_value")
 
-    def test_sets_cgroupns_mode_supported_false(self):
-        self.dw = get_DockerWorker(self.fake_data['params'])
-        self.assertFalse(self.dw._cgroupns_mode_supported)
-
-    def test_sets_cgroupns_mode_supported_true(self):
-        self.dw = get_DockerWorker(self.fake_data['params'],
-                                   docker_api_version='1.41')
-        self.assertTrue(self.dw._cgroupns_mode_supported)
-
-    def test_sets_dimensions_kernelmemory_supported_true(self):
-        self.dw = get_DockerWorker(self.fake_data['params'])
-        self.assertFalse(self.dw._dimensions_kernel_memory_removed)
-
     def test_sets_dimensions_kernelmemory_supported_false(self):
-        self.dw = get_DockerWorker(self.fake_data['params'],
-                                   docker_api_version='1.42')
+        self.dw = get_DockerWorker(self.fake_data['params'])
         self.assertTrue(self.dw._dimensions_kernel_memory_removed)
 
     def test_common_options_defaults(self):
@@ -1416,38 +1402,20 @@ class TestAttrComp(base.BaseTestCase):
         self.dw.module.fail_json.assert_not_called()
         self.assertFalse(resp)
 
-    def test_compare_dimensions_key_no_more_supported(self):
-        self.fake_data['params']['dimensions'] = {
-            'mem_limit': '1024', 'mem_reservation': '3M',
-            'memswap_limit': '2g', 'kernel_memory': '4M'}
-        container_info = dict()
-        container_info['HostConfig'] = {
-            'CpuPeriod': 0, 'Memory': 1024, 'CpuQuota': 0,
-            'CpusetCpus': '', 'CpuShares': 0, 'BlkioWeight': 0,
-            'CpusetMems': '', 'MemorySwap': 2 * 1024 * 1024 * 1024,
-            'MemoryReservation': 3 * 1024 * 1024, 'Ulimits': []}
-        self.dw = get_DockerWorker(self.fake_data['params'])
-        self.dw.compare_dimensions(container_info)
-        expected_msg = ("The dimension [kernel_memory] is no more "
-                        "supported by Docker, please remove it from "
-                        "yours configs or change to the new one.")
-        self.dw.module.fail_json.assert_called_once_with(
-            failed=True, msg=expected_msg)
-
     def test_compare_dimensions_invalid_unit(self):
         self.fake_data['params']['dimensions'] = {
             'mem_limit': '1024', 'mem_reservation': '3M',
-            'memswap_limit': '2g', 'kernel_memory': '4E'}
+            'memswap_limit': '2E'}
         container_info = dict()
         container_info['HostConfig'] = {
-            'CpuPeriod': 0, 'KernelMemory': 0, 'Memory': 1024, 'CpuQuota': 0,
+            'CpuPeriod': 0, 'Memory': 1024, 'CpuQuota': 0,
             'CpusetCpus': '', 'CpuShares': 0, 'BlkioWeight': 0,
             'CpusetMems': '', 'MemorySwap': 2 * 1024 * 1024 * 1024,
             'MemoryReservation': 3 * 1024 * 1024, 'Ulimits': []}
         self.dw = get_DockerWorker(self.fake_data['params'])
         self.dw.compare_dimensions(container_info)
         expected_msg = ("The docker dimension unit [e] is "
-                        "not supported for the dimension [4E]."
+                        "not supported for the dimension [2E]."
                         " The currently supported units are "
                         "['b', 'k', 'm', 'g'].")
         self.dw.module.fail_json.assert_called_once_with(
@@ -1538,7 +1506,7 @@ class TestAttrComp(base.BaseTestCase):
         self.dw = get_DockerWorker(self.fake_data['params'])
         self.assertFalse(self.dw.compare_dimensions(container_info))
 
-    def test_compare_dimensions_kernel_memory_1_42(self):
+    def test_compare_dimensions_kernel_memory_unsupported(self):
         self.fake_data['params']['dimensions'] = {
             'kernel_memory': '1024'}
         container_info = dict()
@@ -1547,8 +1515,7 @@ class TestAttrComp(base.BaseTestCase):
             'CpusetCpus': '', 'CpuShares': 0, 'BlkioWeight': 0,
             'CpusetMems': '', 'MemorySwap': 0, 'MemoryReservation': 0,
             'Ulimits': []}
-        self.dw = get_DockerWorker(self.fake_data['params'],
-                                   docker_api_version='1.42')
+        self.dw = get_DockerWorker(self.fake_data['params'])
         self.dw.compare_dimensions(container_info)
         self.dw.module.exit_json.assert_called_once_with(
             failed=True, msg=repr("Unsupported dimensions"),