zuul
/
nodepool
Code Issues Proposed changes

Use real uuids in fake cloud resource IDs 

When debugging fake cloud interactions between provider managers that
are changing it is really confusing when you see logs that show port 1a
has been deleted but then when ports are listed 1a is still there.

This was happening because we were sharing the id values for fake cloud
resources across fake provider managers. Initially this wasn't clear to
me reading logs.

By updating these resources to use real uuids we can see that $UUID1
does not equal $UUID2 when comparing these items in logs.

Change-Id: I77db55b1a7649c3af91e83c81a906f03a28bb34a
This commit is contained in:
Clark Boylan 2019-10-07 12:32:40 -07:00
parent c4db2a168d
commit 21ae5d7027
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nodepool/driver/fake/provider.py
View File

@ -89,27 +89,28 @@ class FakeOpenStackCloud(object):
metadata={})
]
if networks is None:
networks = [dict(id='fake-public-network-uuid',
self.ipv6_network_uuid = uuid.uuid4().hex
networks = [dict(id=uuid.uuid4().hex,
name='fake-public-network-name'),
dict(id='fake-private-network-uuid',
dict(id=uuid.uuid4().hex,
name='fake-private-network-name'),
dict(id='fake-ipv6-network-uuid',
dict(id=self.ipv6_network_uuid,
name='fake-ipv6-network-name')]
self.networks = networks
self._flavor_list = [
Dummy(Dummy.FLAVOR, id='f1', ram=8192, name='Fake Flavor',
vcpus=4),
Dummy(Dummy.FLAVOR, id='f2', ram=8192, name='Unreal Flavor',
vcpus=4),
Dummy(Dummy.FLAVOR, id=uuid.uuid4().hex, ram=8192,
name='Fake Flavor', vcpus=4),
Dummy(Dummy.FLAVOR, id=uuid.uuid4().hex, ram=8192,
name='Unreal Flavor', vcpus=4),
]
self._azs = ['az1', 'az2']
self._server_list = []
self.max_cores, self.max_instances, self.max_ram = FakeOpenStackCloud.\
_get_quota()
self._down_ports = [
Dummy(Dummy.PORT, id='1a', status='DOWN',
Dummy(Dummy.PORT, id=uuid.uuid4().hex, status='DOWN',
device_owner="compute:nova"),
Dummy(Dummy.PORT, id='2b', status='DOWN',
Dummy(Dummy.PORT, id=uuid.uuid4().hex, status='DOWN',
device_owner=None),
]
@ -138,7 +139,7 @@ class FakeOpenStackCloud(object):
# if keyword 'ipv6-uuid' is found in provider config,
# ipv6 address will be available in public addr dict.
for nic in nics:
if nic['net-id'] != 'fake-ipv6-network-uuid':
if nic['net-id'] != self.ipv6_network_uuid:
continue
addresses = dict(
public=[dict(version=4, addr='fake'),