Merge pull request #8 from stackhpc/py3

Fix for inspector py2 drop, support py3
stackhpc · Jan 2, 2020 · d8286d8 · d8286d8
2 parents 1eb8f4b + 68eb6a9
commit d8286d8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/stackhpc_inspector_plugins/tests/unit/test_plugins_base_physnet.py b/stackhpc_inspector_plugins/tests/unit/test_plugins_base_physnet.py
@@ -66,7 +66,7 @@ def test_expected_data(self, mock_get, mock_patch, mock_client):
         ]
         mock_get.return_value = 'physnet2'
         self.hook.before_update(self.data, self.node_info)
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         mock_get.assert_called_once_with(port, 'em1', self.data)
         self.assertCalledWithPatch(patches, mock_patch)
 

diff --git a/stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py b/stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py
@@ -54,22 +54,22 @@ def setUp(self):
     def test_expected_data_ib(self):
         cfg.CONF.set_override('ib_physnet', 'physnet1',
                               group='port_physnet')
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertEqual(physnet, 'physnet1')
 
     def test_expected_data_client_id_is_none(self):
         cfg.CONF.set_override('ib_physnet', 'physnet1',
                               group='port_physnet')
         self.data['all_interfaces']['em1']['client_id'] = None
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertIsNone(physnet)
 
     def test_expected_data_no_client_id(self):
         cfg.CONF.set_override('ib_physnet', 'physnet1',
                               group='port_physnet')
         del self.data['all_interfaces']['em1']['client_id']
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertIsNone(physnet)
diff --git a/stackhpc_inspector_plugins/tests/unit/test_plugins_system_name_physnet.py b/stackhpc_inspector_plugins/tests/unit/test_plugins_system_name_physnet.py
@@ -56,35 +56,35 @@ def test_expected_data(self):
         sys_name_mapping = 'switch-1:physnet1,switch-2:physnet2'
         cfg.CONF.set_override('switch_sys_name_mapping', sys_name_mapping,
                               group='port_physnet')
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertEqual(physnet, 'physnet1')
 
     def test_no_lldp_processed(self):
         del self.data['all_interfaces']['em1']['lldp_processed']
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertIsNone(physnet)
 
     def test_no_lldp_system_name(self):
         proc_data = self.data['all_interfaces']['em1']
         del proc_data['lldp_processed']['switch_system_name']
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertIsNone(physnet)
 
     def test_no_mapping(self):
         sys_name_mapping = 'switch-2:physnet2'
         cfg.CONF.set_override('switch_sys_name_mapping', sys_name_mapping,
                               group='port_physnet')
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         physnet = self.hook.get_physnet(port, 'em1', self.data)
         self.assertIsNone(physnet)
 
     def test_invalid_mapping(self):
         sys_name_mapping = 'switch-2:physnet1,switch-2:physnet2'
         cfg.CONF.set_override('switch_sys_name_mapping', sys_name_mapping,
                               group='port_physnet')
-        port = self.node_info.ports().values()[0]
+        port = list(self.node_info.ports().values())[0]
         self.assertRaises(ValueError,
                           self.hook.get_physnet, port, 'em1', self.data)
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -9,5 +9,5 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 testresources>=0.2.4 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
--e git+https://opendev.org/openstack/ironic-inspector.git@master#egg=ironic_inspector # Apache-2.0
-
+ironic_inspector<10.0.0;python_version<'3.0' # Apache-2.0
+ironic_inspector;python_version>='3.0' # Apache-2.0