From: Gulsum Atici Date: Mon, 14 Nov 2022 10:06:06 +0000 (+0300) Subject: Fix Bug 2180 Adding VIO Numa support with unit tests X-Git-Tag: release-v14.0-start~30 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d0571febfae2dea93305bd99d09ff52204c26662;p=osm%2FRO.git Fix Bug 2180 Adding VIO Numa support with unit tests Change-Id: I7a7b18a00b22156c6b8116f07e3a04d8c2dd8a99 Signed-off-by: Gulsum Atici --- diff --git a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py index a351d532..eb8da2ff 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py @@ -5945,6 +5945,7 @@ class TestNewFlavor(unittest.TestCase): for mocking in mocks: mocking.assert_not_called() + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -5961,6 +5962,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, id, memory, vcpu exist, vim type is VIO, paired-threads, cores, threads do not exist in numa. @@ -5972,8 +5974,6 @@ class TestNewFlavor(unittest.TestCase): extra_specs = {} expected_extra_specs = { "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", "hw:cpu_sockets": "2", } self.vimconn.vim_type = "VIO" @@ -5981,6 +5981,7 @@ class TestNewFlavor(unittest.TestCase): self.assertEqual(mock_process_numa_memory.call_count, 2) self.assertEqual(mock_process_numa_vcpu.call_count, 2) + mock_process_vio_numa_nodes.assert_called_once_with(2, {"hw:numa_nodes": "2"}) _call_mock_process_numa_memory = mock_process_numa_memory.call_args_list self.assertEqual( _call_mock_process_numa_memory[0].args, @@ -5989,8 +5990,6 @@ class TestNewFlavor(unittest.TestCase): 0, { "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) @@ -6002,8 +6001,6 @@ class TestNewFlavor(unittest.TestCase): { "hw:cpu_sockets": "2", "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) @@ -6015,8 +6012,6 @@ class TestNewFlavor(unittest.TestCase): 0, { "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) @@ -6028,8 +6023,6 @@ class TestNewFlavor(unittest.TestCase): { "hw:cpu_sockets": "2", "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) @@ -6042,6 +6035,7 @@ class TestNewFlavor(unittest.TestCase): ] ) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6058,6 +6052,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, id, memory, vcpu exist, vim type is openstack, paired-threads, cores, threads do not exist in numa. @@ -6119,6 +6114,7 @@ class TestNewFlavor(unittest.TestCase): ] ) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6135,6 +6131,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, id, paired-threads exist, vim type is openstack. vcpus calculation according to paired-threads in numa, there is extra_spec. @@ -6176,6 +6173,7 @@ class TestNewFlavor(unittest.TestCase): ) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6192,6 +6190,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, id, paired-threads exist, vim type is VIO. vcpus calculation according to paired-threads in numa, there is extra_spec. @@ -6200,8 +6199,6 @@ class TestNewFlavor(unittest.TestCase): extra_specs = {"some-key": "some-value"} expected_extra_specs = { "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", "hw:cpu_sockets": "2", "hw:cpu_threads": "8", "some-key": "some-value", @@ -6218,6 +6215,9 @@ class TestNewFlavor(unittest.TestCase): _call_mock_process_numa_paired_threads = ( mock_process_numa_paired_threads.call_args_list ) + mock_process_vio_numa_nodes.assert_called_once_with( + 2, {"some-key": "some-value", "hw:numa_nodes": "2"} + ) self.assertEqual( _call_mock_process_numa_paired_threads[0].args, ( @@ -6226,8 +6226,6 @@ class TestNewFlavor(unittest.TestCase): "hw:cpu_sockets": "2", "hw:numa_nodes": "2", "some-key": "some-value", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) @@ -6239,13 +6237,12 @@ class TestNewFlavor(unittest.TestCase): "hw:cpu_sockets": "2", "hw:numa_nodes": "2", "some-key": "some-value", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6262,6 +6259,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, id, cores exist, vim type is openstack. vcpus calculation according to cores in numa. @@ -6295,6 +6293,7 @@ class TestNewFlavor(unittest.TestCase): ) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6311,6 +6310,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, id, cores exist, vim type is VIO. vcpus calculation according to cores in numa. @@ -6321,8 +6321,6 @@ class TestNewFlavor(unittest.TestCase): "hw:cpu_cores": "3", "hw:cpu_sockets": "2", "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", } self.vimconn.vim_type = "VIO" mock_process_numa_cores.side_effect = [1, 2] @@ -6333,6 +6331,7 @@ class TestNewFlavor(unittest.TestCase): self.assertEqual(mock_process_numa_memory.call_count, 2) self.assertEqual(mock_process_numa_vcpu.call_count, 2) self.assertEqual(mock_process_numa_cores.call_count, 2) + mock_process_vio_numa_nodes.assert_called_once_with(2, {"hw:numa_nodes": "2"}) _call_mock_process_numa_cores = mock_process_numa_cores.call_args_list self.assertEqual( _call_mock_process_numa_cores[0].args, @@ -6341,8 +6340,6 @@ class TestNewFlavor(unittest.TestCase): { "hw:cpu_sockets": "2", "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) @@ -6353,13 +6350,12 @@ class TestNewFlavor(unittest.TestCase): { "hw:cpu_sockets": "2", "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6376,6 +6372,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, memory, vcpu, thread exist, vim type is VIO, vcpus calculation according threads in numa, there are not numa ids. @@ -6387,8 +6384,6 @@ class TestNewFlavor(unittest.TestCase): extra_specs = {} expected_extra_specs = { "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", "hw:cpu_sockets": "2", "hw:cpu_threads": "3", } @@ -6403,6 +6398,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, ] ) + mock_process_vio_numa_nodes.assert_called_once_with(2, {"hw:numa_nodes": "2"}) self.assertEqual(mock_process_numa_threads.call_count, 1) _call_mock_process_numa_threads = mock_process_numa_threads.call_args_list self.assertEqual( @@ -6412,13 +6408,12 @@ class TestNewFlavor(unittest.TestCase): { "hw:cpu_sockets": "2", "hw:numa_nodes": "2", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", }, ), ) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6435,6 +6430,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Process numa parameters, memory, vcpu, thread exist, vim type is openstack, vcpus calculation according threads in numa, there are not numa ids. @@ -6459,6 +6455,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_vcpu, mock_process_numa_cores, mock_process_numa_paired_threads, + mock_process_vio_numa_nodes, ] ) self.assertEqual(mock_process_numa_threads.call_count, 1) @@ -6472,6 +6469,7 @@ class TestNewFlavor(unittest.TestCase): ) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6488,15 +6486,12 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Numa list is empty, vim type is VIO.""" numas = [] extra_specs = {} - expected_extra_specs = { - "hw:numa_nodes": "0", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', - "vmware:latency_sensitivity_level": "high", - } + expected_extra_specs = {"hw:numa_nodes": "0"} self.vimconn.vim_type = "VIO" self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) self.check_if_assert_not_called( @@ -6508,8 +6503,10 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_threads, ] ) + mock_process_vio_numa_nodes.assert_called_once_with(0, {"hw:numa_nodes": "0"}) self.assertDictEqual(extra_specs, expected_extra_specs) + @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @patch.object( @@ -6526,6 +6523,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads, mock_process_numa_vcpu, mock_process_numa_memory, + mock_process_vio_numa_nodes, ): """Numa list is empty, vim type is openstack.""" numas = [] @@ -6542,6 +6540,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_cores, mock_process_numa_paired_threads, mock_process_numa_threads, + mock_process_vio_numa_nodes, ] ) self.assertDictEqual(extra_specs, expected_extra_specs) @@ -7760,6 +7759,53 @@ class TestNewFlavor(unittest.TestCase): ) self.assertEqual(mock_format_exception.call_count, 1) + def test_process_process_vio_numa_nodes_without_numa_with_extra_spec(self): + numa_nodes = 0 + extra_specs = {"hw:numa_nodes": "0"} + expected_extra_spec = { + "vmware:extra_config": '{"numa.nodeAffinity":"0"}', + "vmware:latency_sensitivity_level": "high", + "hw:numa_nodes": "0", + } + self.vimconn.process_vio_numa_nodes(numa_nodes, extra_specs) + self.assertDictEqual(extra_specs, expected_extra_spec) + + def test_process_process_vio_numa_nodes_list_type_numa_nodes_empty_extra_spec(self): + numa_nodes = [7, 9, 4] + extra_specs = {} + expected_extra_spec = { + "vmware:latency_sensitivity_level": "high", + } + self.vimconn.process_vio_numa_nodes(numa_nodes, extra_specs) + self.assertDictEqual(extra_specs, expected_extra_spec) + + def test_process_process_vio_numa_nodes_with_numa_with_extra_spec(self): + numa_nodes = 5 + extra_specs = {"hw:numa_nodes": "5"} + expected_extra_spec = { + "vmware:latency_sensitivity_level": "high", + "hw:numa_nodes": "5", + } + self.vimconn.process_vio_numa_nodes(numa_nodes, extra_specs) + self.assertDictEqual(extra_specs, expected_extra_spec) + + def test_process_process_vio_numa_nodes_none_numa_nodes(self): + numa_nodes = None + extra_specs = {"hw:numa_nodes": "None"} + expected_extra_spec = { + "vmware:latency_sensitivity_level": "high", + "hw:numa_nodes": "None", + "vmware:extra_config": '{"numa.nodeAffinity":"0"}', + } + self.vimconn.process_vio_numa_nodes(numa_nodes, extra_specs) + self.assertDictEqual(extra_specs, expected_extra_spec) + + def test_process_process_vio_numa_nodes_invalid_type_extra_specs(self): + numa_nodes = 5 + extra_specs = [] + with self.assertRaises(TypeError): + self.vimconn.process_vio_numa_nodes(numa_nodes, extra_specs) + if __name__ == "__main__": unittest.main() diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 5f66f09a..3eac3a1a 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -1353,8 +1353,7 @@ class vimconnector(vimconn.VimConnector): cpu_cores, cpu_threads = 0, 0 if self.vim_type == "VIO": - extra_specs["vmware:extra_config"] = '{"numa.nodeAffinity":"0"}' - extra_specs["vmware:latency_sensitivity_level"] = "high" + self.process_vio_numa_nodes(numa_nodes, extra_specs) for numa in numas: if "id" in numa: @@ -1384,6 +1383,23 @@ class vimconnector(vimconn.VimConnector): if cpu_threads: extra_specs["hw:cpu_threads"] = str(cpu_threads) + @staticmethod + def process_vio_numa_nodes(numa_nodes: int, extra_specs: Dict) -> None: + """According to number of numa nodes, updates the extra_specs for VIO. + + Args: + + numa_nodes (int): List keeps the numa node numbers + extra_specs (dict): Extra specs dict to be updated + + """ + # If there is not any numa, numas_nodes equals to 0. + if not numa_nodes: + extra_specs["vmware:extra_config"] = '{"numa.nodeAffinity":"0"}' + + # If there are several numas, we do not define specific affinity. + extra_specs["vmware:latency_sensitivity_level"] = "high" + def _change_flavor_name( self, name: str, name_suffix: int, flavor_data: dict ) -> str: diff --git a/releasenotes/notes/adding_vio_numa_support-6717ff4c02776dda.yaml b/releasenotes/notes/adding_vio_numa_support-6717ff4c02776dda.yaml new file mode 100644 index 00000000..b8d6179c --- /dev/null +++ b/releasenotes/notes/adding_vio_numa_support-6717ff4c02776dda.yaml @@ -0,0 +1,22 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +####################################################################################### +--- +fixes: + - | + Bug 2180 Adding VIO Numa support with unit tests. + +