diff options
author | Kaifeng Wang <kaifeng.w@gmail.com> | 2019-11-18 14:37:49 +0800 |
---|---|---|
committer | Kaifeng Wang <kaifeng.w@gmail.com> | 2019-11-18 14:37:49 +0800 |
commit | 9541179025cbb2bd5b62b3d5e667bc8de6499b45 (patch) | |
tree | 067fbfe803f0a7eb084eb6bfee947bd2c6d4afa9 /ironic/tests/unit/objects | |
parent | f8c4f7b1e4b8c7c177ccb45f4f0d8acba1821279 (diff) | |
download | ironic-9541179025cbb2bd5b62b3d5e667bc8de6499b45.tar.gz |
Remove old online migration codes
The vif migration for port and portgroup has been removed in [1],
this follow up removes unused code in objects.
[1] https://review.opendev.org/#/c/685091
Change-Id: I4ff7d6ce6535be0cb2b2959c8539a6850e189647
Diffstat (limited to 'ironic/tests/unit/objects')
-rw-r--r-- | ironic/tests/unit/objects/test_port.py | 30 | ||||
-rw-r--r-- | ironic/tests/unit/objects/test_portgroup.py | 30 |
2 files changed, 0 insertions, 60 deletions
diff --git a/ironic/tests/unit/objects/test_port.py b/ironic/tests/unit/objects/test_port.py index 2e6948773..5c1d4b205 100644 --- a/ironic/tests/unit/objects/test_port.py +++ b/ironic/tests/unit/objects/test_port.py @@ -349,33 +349,3 @@ class TestMigrateVifPortId(db_base.DbTestCase): address='52:54:00:cf:2d:3%s' % i, extra=extra, version='1.7') self.db_ports.append(port) - - @mock.patch.object(objects.Port, '_convert_to_version', autospec=True) - def test_migrate_vif_port_id_all(self, mock_convert): - with mock.patch.object(self.dbapi, 'get_not_versions', - autospec=True) as mock_get_not_versions: - mock_get_not_versions.return_value = self.db_ports - total, done = objects.port.migrate_vif_port_id(self.context, 0) - self.assertEqual(3, total) - self.assertEqual(3, done) - mock_get_not_versions.assert_called_once_with('Port', ['1.8', - '1.9']) - calls = 3 * [ - mock.call(mock.ANY, '1.9', remove_unavailable_fields=False), - ] - self.assertEqual(calls, mock_convert.call_args_list) - - @mock.patch.object(objects.Port, '_convert_to_version', autospec=True) - def test_migrate_vif_port_id_one(self, mock_convert): - with mock.patch.object(self.dbapi, 'get_not_versions', - autospec=True) as mock_get_not_versions: - mock_get_not_versions.return_value = self.db_ports - total, done = objects.port.migrate_vif_port_id(self.context, 1) - self.assertEqual(3, total) - self.assertEqual(1, done) - mock_get_not_versions.assert_called_once_with('Port', ['1.8', - '1.9']) - calls = [ - mock.call(mock.ANY, '1.9', remove_unavailable_fields=False), - ] - self.assertEqual(calls, mock_convert.call_args_list) diff --git a/ironic/tests/unit/objects/test_portgroup.py b/ironic/tests/unit/objects/test_portgroup.py index ec67695c6..6759ce728 100644 --- a/ironic/tests/unit/objects/test_portgroup.py +++ b/ironic/tests/unit/objects/test_portgroup.py @@ -218,33 +218,3 @@ class TestMigrateVifPortId(db_base.DbTestCase): address='52:54:00:cf:2d:3%s' % i, extra=extra, version='1.3') self.db_portgroups.append(portgroup) - - @mock.patch.object(objects.Portgroup, '_convert_to_version', autospec=True) - def test_migrate_vif_port_id_all(self, mock_convert): - with mock.patch.object(self.dbapi, 'get_not_versions', - autospec=True) as mock_get_not_versions: - mock_get_not_versions.return_value = self.db_portgroups - total, done = objects.portgroup.migrate_vif_port_id( - self.context, 0) - self.assertEqual(3, total) - self.assertEqual(3, done) - mock_get_not_versions.assert_called_once_with('Portgroup', ['1.4']) - calls = 3 * [ - mock.call(mock.ANY, '1.4', remove_unavailable_fields=False), - ] - self.assertEqual(calls, mock_convert.call_args_list) - - @mock.patch.object(objects.Portgroup, '_convert_to_version', autospec=True) - def test_migrate_vif_port_id_one(self, mock_convert): - with mock.patch.object(self.dbapi, 'get_not_versions', - autospec=True) as mock_get_not_versions: - mock_get_not_versions.return_value = self.db_portgroups - total, done = objects.portgroup.migrate_vif_port_id( - self.context, 1) - self.assertEqual(3, total) - self.assertEqual(1, done) - mock_get_not_versions.assert_called_once_with('Portgroup', ['1.4']) - calls = [ - mock.call(mock.ANY, '1.4', remove_unavailable_fields=False), - ] - self.assertEqual(calls, mock_convert.call_args_list) |