openstack/python-openstackclient
Code Issues Proposed changes

Merge "Resolve issues with 'server migration list'"

Browse Source
This commit is contained in:
Zuul 2020-11-12 11:20:21 +00:00 committed by Gerrit Code Review
commit ce31c417de
2 changed files with 11 additions and 12 deletions
openstackclient
compute/v2
server.py
tests/unit/compute/v2
test_server.py

11
openstackclient/compute/v2/server.py

@ -2041,7 +2041,7 @@ revert to release the new server and restart the old one.""")
raise SystemExit raise SystemExit
class ListMigration(command.Command): class ListMigration(command.Lister):
_description = _("""List server migrations""") _description = _("""List server migrations""")
def get_parser(self, prog_name): def get_parser(self, prog_name):
@ -2168,16 +2168,21 @@ class ListMigration(command.Command):
search_opts = { search_opts = {
'host': parsed_args.host, 'host': parsed_args.host,
'server': parsed_args.server,
'status': parsed_args.status, 'status': parsed_args.status,
} }
if parsed_args.server:
search_opts['instance_uuid'] = utils.find_resource(
compute_client.servers,
parsed_args.server,
).id
if parsed_args.type: if parsed_args.type:
migration_type = parsed_args.type migration_type = parsed_args.type
# we're using an alias because the default value is confusing # we're using an alias because the default value is confusing
if migration_type == 'cold-migration': if migration_type == 'cold-migration':
migration_type = 'migration' migration_type = 'migration'
search_opts['type'] = migration_type search_opts['migration_type'] = migration_type
if parsed_args.marker: if parsed_args.marker:
if compute_client.api_version < api_versions.APIVersion('2.59'): if compute_client.api_version < api_versions.APIVersion('2.59'):

12
openstackclient/tests/unit/compute/v2/test_server.py

@ -4079,7 +4079,6 @@ class TestListMigration(TestServer):
kwargs = { kwargs = {
'status': None, 'status': None,
'host': None, 'host': None,
'server': None,
} }
self.migrations_mock.list.assert_called_with(**kwargs) self.migrations_mock.list.assert_called_with(**kwargs)
@ -4106,10 +4105,11 @@ class TestListMigration(TestServer):
kwargs = { kwargs = {
'status': 'migrating', 'status': 'migrating',
'host': 'host1', 'host': 'host1',
'server': 'server1', 'instance_uuid': self.server.id,
'type': 'migration', 'migration_type': 'migration',
} }
self.servers_mock.get.assert_called_with('server1')
self.migrations_mock.list.assert_called_with(**kwargs) self.migrations_mock.list.assert_called_with(**kwargs)
self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(self.MIGRATION_COLUMNS, columns)
@ -4145,7 +4145,6 @@ class TestListMigrationV223(TestListMigration):
kwargs = { kwargs = {
'status': 'migrating', 'status': 'migrating',
'host': None, 'host': None,
'server': None,
} }
self.migrations_mock.list.assert_called_with(**kwargs) self.migrations_mock.list.assert_called_with(**kwargs)
@ -4194,7 +4193,6 @@ class TestListMigrationV259(TestListMigration):
'limit': 1, 'limit': 1,
'marker': 'test_kp', 'marker': 'test_kp',
'host': None, 'host': None,
'server': None,
'changes_since': '2019-08-09T08:03:25Z', 'changes_since': '2019-08-09T08:03:25Z',
} }
@ -4303,7 +4301,6 @@ class TestListMigrationV266(TestListMigration):
'limit': 1, 'limit': 1,
'marker': 'test_kp', 'marker': 'test_kp',
'host': None, 'host': None,
'server': None,
'changes_since': '2019-08-07T08:03:25Z', 'changes_since': '2019-08-07T08:03:25Z',
'changes_before': '2019-08-09T08:03:25Z', 'changes_before': '2019-08-09T08:03:25Z',
} }
@ -4375,7 +4372,6 @@ class TestListMigrationV280(TestListMigration):
'limit': 1, 'limit': 1,
'marker': 'test_kp', 'marker': 'test_kp',
'host': None, 'host': None,
'server': None,
'project_id': '0c2accde-644a-45fa-8c10-e76debc7fbc3', 'project_id': '0c2accde-644a-45fa-8c10-e76debc7fbc3',
'changes_since': '2019-08-07T08:03:25Z', 'changes_since': '2019-08-07T08:03:25Z',
'changes_before': "2019-08-09T08:03:25Z", 'changes_before': "2019-08-09T08:03:25Z",
@ -4438,7 +4434,6 @@ class TestListMigrationV280(TestListMigration):
'limit': 1, 'limit': 1,
'marker': 'test_kp', 'marker': 'test_kp',
'host': None, 'host': None,
'server': None,
'user_id': 'dd214878-ca12-40fb-b035-fa7d2c1e86d6', 'user_id': 'dd214878-ca12-40fb-b035-fa7d2c1e86d6',
'changes_since': '2019-08-07T08:03:25Z', 'changes_since': '2019-08-07T08:03:25Z',
'changes_before': "2019-08-09T08:03:25Z", 'changes_before': "2019-08-09T08:03:25Z",
@ -4500,7 +4495,6 @@ class TestListMigrationV280(TestListMigration):
'status': 'migrating', 'status': 'migrating',
'limit': 1, 'limit': 1,
'host': None, 'host': None,
'server': None,
'project_id': '0c2accde-644a-45fa-8c10-e76debc7fbc3', 'project_id': '0c2accde-644a-45fa-8c10-e76debc7fbc3',
'user_id': 'dd214878-ca12-40fb-b035-fa7d2c1e86d6', 'user_id': 'dd214878-ca12-40fb-b035-fa7d2c1e86d6',
'changes_since': '2019-08-07T08:03:25Z', 'changes_since': '2019-08-07T08:03:25Z',