Merge "fix physical id should not be 'UNKNOWN'"
This commit is contained in:
commit
4c8c6647a3
|
@ -849,7 +849,7 @@ class ServerProfile(base.Profile):
|
||||||
kwargs['scheduler_hints'] = hints
|
kwargs['scheduler_hints'] = hints
|
||||||
|
|
||||||
server = None
|
server = None
|
||||||
resource_id = 'UNKNOWN'
|
resource_id = None
|
||||||
try:
|
try:
|
||||||
server = self.compute(obj).server_create(**kwargs)
|
server = self.compute(obj).server_create(**kwargs)
|
||||||
self.compute(obj).wait_for_server(server.id)
|
self.compute(obj).wait_for_server(server.id)
|
||||||
|
|
|
@ -491,7 +491,7 @@ class TestNovaServerBasic(base.SenlinTestCase):
|
||||||
cc.wait_for_server.side_effect = err
|
cc.wait_for_server.side_effect = err
|
||||||
ex = self.assertRaises(exc.EResourceCreation, profile.do_create,
|
ex = self.assertRaises(exc.EResourceCreation, profile.do_create,
|
||||||
node_obj)
|
node_obj)
|
||||||
|
self.assertEqual('FAKE_ID', ex.resource_id)
|
||||||
self.assertEqual('Failed in creating server: TIMEOUT.',
|
self.assertEqual('Failed in creating server: TIMEOUT.',
|
||||||
six.text_type(ex))
|
six.text_type(ex))
|
||||||
cc.wait_for_server.assert_called_once_with('FAKE_ID')
|
cc.wait_for_server.assert_called_once_with('FAKE_ID')
|
||||||
|
@ -522,6 +522,7 @@ class TestNovaServerBasic(base.SenlinTestCase):
|
||||||
# assertions
|
# assertions
|
||||||
self.assertEqual('Failed in creating server: creation failed.',
|
self.assertEqual('Failed in creating server: creation failed.',
|
||||||
six.text_type(ex))
|
six.text_type(ex))
|
||||||
|
self.assertIsNone(ex.resource_id)
|
||||||
self.assertEqual(0, cc.wait_for_server.call_count)
|
self.assertEqual(0, cc.wait_for_server.call_count)
|
||||||
self.assertEqual(0, mock_zone_info.call_count)
|
self.assertEqual(0, mock_zone_info.call_count)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue