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