Fix uuid cases with real UUID
From http://logs.openstack.org/64/302064/6/check/ gate-magnum-python27/6c92a13/console.html the log clearly said bay-xx-xx-xx-xx is an invalid UUID. Using UUIDFields with invalid UUIDs is no longer supported, so in our test let's use real UUID case for that. Change-Id: I0f3dbd8748293741cb5501365aee710220eb3ea0 Co-Authored-By: Spyros Trigazis <strigazi@gmail.com>
This commit is contained in:
parent
a8d125c282
commit
b20d411090
|
@ -47,7 +47,7 @@ class TestBayConductorWithK8s(base.TestCase):
|
|||
'server_type': 'vm'
|
||||
}
|
||||
self.bay_dict = {
|
||||
'uuid': 'bay-xx-xx-xx-xx',
|
||||
'uuid': '5d12f6fd-a196-4bf0-ae4c-1f639a523a52',
|
||||
'baymodel_id': 'xx-xx-xx-xx',
|
||||
'name': 'bay1',
|
||||
'stack_id': 'xx-xx-xx-xx',
|
||||
|
|
|
@ -44,7 +44,7 @@ class TestBayConductorWithMesos(base.TestCase):
|
|||
}
|
||||
self.bay_dict = {
|
||||
'id': 1,
|
||||
'uuid': 'some_uuid',
|
||||
'uuid': '5d12f6fd-a196-4bf0-ae4c-1f639a523a52',
|
||||
'baymodel_id': 'xx-xx-xx-xx',
|
||||
'name': 'bay1',
|
||||
'stack_id': 'xx-xx-xx-xx',
|
||||
|
|
|
@ -48,7 +48,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
}
|
||||
self.bay_dict = {
|
||||
'id': 1,
|
||||
'uuid': 'some_uuid',
|
||||
'uuid': '5d12f6fd-a196-4bf0-ae4c-1f639a523a52',
|
||||
'baymodel_id': 'xx-xx-xx-xx',
|
||||
'name': 'bay1',
|
||||
'stack_id': 'xx-xx-xx-xx',
|
||||
|
@ -99,7 +99,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
'http_proxy': 'http_proxy',
|
||||
'https_proxy': 'https_proxy',
|
||||
'no_proxy': 'no_proxy',
|
||||
'bay_uuid': 'some_uuid',
|
||||
'bay_uuid': '5d12f6fd-a196-4bf0-ae4c-1f639a523a52',
|
||||
'magnum_url': self.mock_osc.magnum_url.return_value,
|
||||
'tls_disabled': False,
|
||||
'network_driver': 'network_driver',
|
||||
|
@ -142,7 +142,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
'number_of_masters': 1,
|
||||
'number_of_nodes': 1,
|
||||
'discovery_url': 'https://discovery.etcd.io/test',
|
||||
'bay_uuid': 'some_uuid',
|
||||
'bay_uuid': '5d12f6fd-a196-4bf0-ae4c-1f639a523a52',
|
||||
'magnum_url': self.mock_osc.magnum_url.return_value,
|
||||
'tls_disabled': False,
|
||||
'flannel_network_cidr': u'10.101.0.0/16',
|
||||
|
|
|
@ -176,7 +176,7 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
|
|||
mock_baymodel = mock.MagicMock()
|
||||
mock_baymodel.tls_disabled = False
|
||||
mock_bay = mock.MagicMock()
|
||||
mock_bay.uuid = 'bay-xx-xx-xx-xx'
|
||||
mock_bay.uuid = '5d12f6fd-a196-4bf0-ae4c-1f639a523a52'
|
||||
del mock_bay.stack_id
|
||||
mock_scale_manager = mock.MagicMock()
|
||||
mock_osc = mock.MagicMock()
|
||||
|
@ -228,7 +228,7 @@ class AtomicK8sTemplateDefinitionTestCase(base.TestCase):
|
|||
mock_baymodel = mock.MagicMock()
|
||||
mock_baymodel.tls_disabled = True
|
||||
mock_bay = mock.MagicMock()
|
||||
mock_bay.uuid = 'bay-xx-xx-xx-xx'
|
||||
mock_bay.uuid = '5d12f6fd-a196-4bf0-ae4c-1f639a523a52'
|
||||
del mock_bay.stack_id
|
||||
mock_scale_manager = mock.MagicMock()
|
||||
mock_osc = mock.MagicMock()
|
||||
|
@ -406,7 +406,7 @@ class AtomicSwarmTemplateDefinitionTestCase(base.TestCase):
|
|||
mock_baymodel = mock.MagicMock()
|
||||
mock_baymodel.tls_disabled = False
|
||||
mock_bay = mock.MagicMock()
|
||||
mock_bay.uuid = 'bay-xx-xx-xx-xx'
|
||||
mock_bay.uuid = '5d12f6fd-a196-4bf0-ae4c-1f639a523a52'
|
||||
del mock_bay.stack_id
|
||||
mock_osc = mock.MagicMock()
|
||||
mock_osc.magnum_url.return_value = 'http://127.0.0.1:9511/v1'
|
||||
|
@ -525,7 +525,7 @@ class UbuntuMesosTemplateDefinitionTestCase(base.TestCase):
|
|||
mock_baymodel.tls_disabled = False
|
||||
rexray_preempt = mock_baymodel.labels.get('rexray_preempt')
|
||||
mock_bay = mock.MagicMock()
|
||||
mock_bay.uuid = 'bay-xx-xx-xx-xx'
|
||||
mock_bay.uuid = '5d12f6fd-a196-4bf0-ae4c-1f639a523a52'
|
||||
del mock_bay.stack_id
|
||||
mock_osc = mock.MagicMock()
|
||||
mock_osc.cinder_region_name.return_value = 'RegionOne'
|
||||
|
|
|
@ -74,11 +74,11 @@ class TestConductorUtils(base.TestCase):
|
|||
@patch('magnum.objects.Bay.get_by_name')
|
||||
def test_retrieve_bay_uuid_from_name(self, mock_bay_get_by_name,
|
||||
mock_uuid_like):
|
||||
bay = objects.Bay(uuid=1)
|
||||
bay = objects.Bay(uuid='5d12f6fd-a196-4bf0-ae4c-1f639a523a52')
|
||||
mock_uuid_like.return_value = False
|
||||
mock_bay_get_by_name.return_value = bay
|
||||
bay_uuid = utils.retrieve_bay_uuid('context', 'fake_name')
|
||||
self.assertEqual('1', bay_uuid)
|
||||
self.assertEqual('5d12f6fd-a196-4bf0-ae4c-1f639a523a52', bay_uuid)
|
||||
|
||||
mock_uuid_like.assert_called_once_with('fake_name')
|
||||
mock_bay_get_by_name.assert_called_once_with('context', 'fake_name')
|
||||
|
@ -87,7 +87,9 @@ class TestConductorUtils(base.TestCase):
|
|||
@patch('magnum.objects.Bay.get_by_name')
|
||||
def test_retrieve_bay_uuid_from_uuid(self, mock_bay_get_by_name,
|
||||
mock_uuid_like):
|
||||
bay_uuid = utils.retrieve_bay_uuid('context', '1')
|
||||
self.assertEqual('1', bay_uuid)
|
||||
bay_uuid = utils.retrieve_bay_uuid(
|
||||
'context',
|
||||
'5d12f6fd-a196-4bf0-ae4c-1f639a523a52')
|
||||
self.assertEqual('5d12f6fd-a196-4bf0-ae4c-1f639a523a52', bay_uuid)
|
||||
mock_uuid_like.return_value = True
|
||||
mock_bay_get_by_name.assert_not_called()
|
||||
|
|
Loading…
Reference in New Issue