diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-30 20:34:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-30 20:34:53 +0000 |
| commit | e7b2528c4a4fc221d5efdd88d60ffd95ea4e3f63 (patch) | |
| tree | d636900926903851abdae5ff55a1cda20c24fd15 /openstackclient/tests/unit/compute/v2 | |
| parent | ce448fa50b44147e360125f3f0775d470c169f4b (diff) | |
| parent | 4a3c5207c1b2d628d1ec8b30e28f56e5956bd2e0 (diff) | |
| download | python-openstackclient-e7b2528c4a4fc221d5efdd88d60ffd95ea4e3f63.tar.gz | |
Merge "Show words indicating booted from volume for server image"
Diffstat (limited to 'openstackclient/tests/unit/compute/v2')
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 933c4e7d..2da527c6 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -2609,7 +2609,7 @@ class TestServerList(TestServer): s.status, server._format_servers_list_networks(s.networks), # Image will be an empty string if boot-from-volume - self.image.name if s.image else s.image, + self.image.name if s.image else server.IMAGE_STRING_FOR_BFV, self.flavor.name, )) self.data_long.append(( @@ -2622,8 +2622,8 @@ class TestServerList(TestServer): ), server._format_servers_list_networks(s.networks), # Image will be an empty string if boot-from-volume - self.image.name if s.image else s.image, - s.image['id'] if s.image else s.image, + self.image.name if s.image else server.IMAGE_STRING_FOR_BFV, + s.image['id'] if s.image else server.IMAGE_STRING_FOR_BFV, self.flavor.name, s.flavor['id'], getattr(s, 'OS-EXT-AZ:availability_zone'), @@ -2636,7 +2636,7 @@ class TestServerList(TestServer): s.status, server._format_servers_list_networks(s.networks), # Image will be an empty string if boot-from-volume - s.image['id'] if s.image else s.image, + s.image['id'] if s.image else server.IMAGE_STRING_FOR_BFV, s.flavor['id'] )) |