Skip to content

Commit

Permalink
Merge "match the project name too to get uuid, else in multiproject c…
Browse files Browse the repository at this point in the history
…ases it gets uuid of wrong project"
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Dec 4, 2015
2 parents c75c760 + b88281e commit e233fc8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fixtures/ipam_test.py
Expand Up @@ -64,7 +64,7 @@ def create(self):
self.name = str(self.fq_name[2])

for ipam in self.vnc.network_ipams_list()['network-ipams']:
if self.name in ipam['fq_name'] and self.project_name in ipam['fq_name']:
if self.name == ipam['fq_name'][2] and self.project_name == ipam['fq_name'][1]:
self.fq_name = ipam['fq_name']
self.already_present = True
self.ipam_id = ipam['uuid']
Expand All @@ -83,7 +83,7 @@ def create(self):
else:
self.vnc.network_ipam_create(self.obj)
for ipam in self.vnc.network_ipams_list()['network-ipams']:
if self.name in ipam['fq_name']:
if self.name == ipam['fq_name'][2] and self.project_name == ipam['fq_name'][1]:
self.fq_name = ipam['fq_name']
self.ipam_id = ipam['uuid']
break
Expand Down

0 comments on commit e233fc8

Please sign in to comment.