Fix flavor keyerror when nova boot vm

When creating a server (the 'nova boot' command),
it calls 'POST /servers' API.

The response does not have 'addresses' and 'flavor' attributes.
When accessing 'networks' attribute in the '_print_server' function,
it calls 'GET /servers/{server_id}' and get the 'addresses' and
'flavor' attributes.

If 'GET /servers/{server_id}' fails, the server object does not have
the 'flavor' attribute, then KeyError is raised when accessing it.

Fix the issue by making it raise a CommandError
when the 'GET /servers/{server_id}' fails.

Co-Authored-By: Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
Change-Id: I3ef096c61b0e05a637ab0c4a1027338fa87e4f09
Closes-Bug: #1781368
This commit is contained in:
zhaolihui 2018-07-12 11:12:54 +00:00 committed by Takashi NATSUME
parent a789bd30ae
commit b13ba0138f
3 changed files with 18 additions and 2 deletions

View File

@ -1334,6 +1334,18 @@ class ShellTest(utils.TestCase):
}},
)
@mock.patch.object(servers.Server, 'networks',
new_callable=mock.PropertyMock)
def test_boot_with_not_found_when_accessing_addresses_attribute(
self, mock_networks):
mock_networks.side_effect = exceptions.NotFound(
404, 'Instance %s could not be found.' % FAKE_UUID_1)
ex = self.assertRaises(
exceptions.CommandError, self.run_command,
'boot --flavor 1 --image %s some-server' % FAKE_UUID_2)
self.assertIn('Instance %s could not be found.' % FAKE_UUID_1,
six.text_type(ex))
def test_flavor_list(self):
out, _ = self.run_command('flavor-list')
self.assert_called_anytime('GET', '/flavors/detail')

View File

@ -405,7 +405,7 @@ class Server(base.Resource):
for network_label, address_list in self.addresses.items():
networks[network_label] = [a['addr'] for a in address_list]
return networks
except Exception:
except AttributeError:
return {}
@api_versions.wraps("2.0", "2.24")

View File

@ -2368,7 +2368,11 @@ def _print_server(cs, args, server=None, wrap=0):
minimal = getattr(args, "minimal", False)
networks = server.networks
try:
networks = server.networks
except Exception as e:
raise exceptions.CommandError(six.text_type(e))
info = server.to_dict()
for network_label, address_list in networks.items():
info['%s network' % network_label] = ', '.join(address_list)