Fixing UT issues to support Python 3 Train Version

Change-Id: I5b779f093a465812dbca745ce4b226370b6a6bd5

.zuul.yaml

@@ -3,5 +3,5 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - periodic-stable-jobs

nova_powervm/tests/virt/powervm/test_media.py

@@ -103,7 +103,8 @@ class TestConfigDrivePowerVM(test.NoDBTestCase):
         cfg_dr_builder.create_cfg_drv_vopt(mock_instance, 'files', 'netinfo',
                                            'fake_lpar', admin_pass='pass')
         mock_ntf.assert_called_once_with(mode='rb')
-        mock_ccdi.assert_called_once_with(cfg_dr_builder, mock_instance,
+        #mock_ccdi.assert_called_once_with(cfg_dr_builder, mock_instance,
+        mock_ccdi.assert_called_once_with(mock_instance,
                                           'files', 'netinfo', 'iso_path',
                                           admin_pass='pass')
         mock_getsize.assert_called_once_with('iso_path')

nova_powervm/tests/virt/powervm/volume/test_iscsi.py

@@ -263,7 +263,7 @@ class TestISCSIAdapter(test_vol.TestVolumeAdapter):
         mock_active_vioses.return_value = [mock_vios]
         self.vol_drv.extend_volume()
         mock_rescan.assert_called_once_with(self.vol_drv.vios_uuids[0],
-                                            "vstor_uuid", self.adpt)
+                                            "vstor_uuid", adapter=self.adpt)
         mock_rescan.side_effect = pvm_exc.JobRequestFailed(
             operation_name='RescanVirtualDisk', error='fake_err')
         self.assertRaises(p_exc.VolumeExtendFailed, self.vol_drv.extend_volume)
@@ -401,7 +401,7 @@ class TestISCSIAdapter(test_vol.TestVolumeAdapter):
         # mock_remove_maps.assert_not_called()
         self.assertEqual(0, mock_remove_maps.call_count)
         self.assertEqual(0, mock_remove_iscsi.call_count)
-        mock_hdisk_from_uuid.assert_called_with(mock.ANY, 'vstor_uuid')
+        mock_hdisk_from_uuid.assert_called_with('vstor_uuid')
         self.assertFalse(status)
 
         # Ensures that if UDID not found, then mappings are not
@@ -586,7 +586,7 @@ class TestISCSIAdapter(test_vol.TestVolumeAdapter):
         volume_key = 'vscsi-' + self.serial
         mig_vol_stor = {volume_key: 'udid'}
         self.vol_drv.post_live_migration_at_destination(mig_vol_stor)
-        mock_set_udid.assert_called_with(mock.ANY, 'udid')
+        mock_set_udid.assert_called_with('udid')
 
     def test_post_live_migr_source(self):
 

nova_powervm/tests/virt/powervm/volume/test_npiv.py

@@ -118,7 +118,7 @@ class TestNPIVAdapter(test_vol.TestVolumeAdapter):
         self.assertEqual(1, mock_add_map.call_count)
         mock_add_map.assert_called_once_with(
             mock.ANY, 'host_uuid', '1234', ('21000024FF649104', 'AA BB'),
-            lpar_slot_num='62', provided={})
+            lpar_slot_num='62')
         self.assertEqual(1, self.ft_fx.patchers['update'].mock.call_count)
         self.assertEqual(npiv.FS_INST_MAPPED,
                          self.vol_drv._get_fabric_state('A'))

setup.cfg

@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py36,py27,pep8
+envlist = py27,py37,pep8
 skipsdist = True
 # Automatic envs (pyXX) will use the python version appropriate to that
 # env and ignore basepython inherited from [testenv]. That's what we