x
/
novajoin-tempest-plugin
Code Issues Proposed changes

Fix index errors 

Avoid throwing an index error when there are no servers or networks
returned.

Resolves: rhbz#1730757
Co-Authored-By: Ade Lee <alee@redhat.com>
Change-Id: I22983ffad0e0801cc192de2d37fae611fa6f11aa
This commit is contained in:
Grzegorz Grasza 2019-08-30 09:16:15 +02:00
parent 36fa6833af
commit baf78c5d5b
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
novajoin_tempest_plugin/tests/scenario/novajoin_manager.py
View File

@ -260,12 +260,13 @@ class NovajoinScenarioTest(manager.ScenarioTest):
def get_server_id(self, name):
params = {'all_tenants': '', 'name': name}
resp = self.servers_client.list_servers(detail=True, **params)
print(resp)
links = resp['servers'][0]['links']
for link in links:
if link['rel'] == 'self':
href = link['href']
return href.split('/')[-1]
servers = resp['servers']
if servers:
links = resp['servers'][0]['links']
for link in links:
if link['rel'] == 'self':
href = link['href']
return href.split('/')[-1]
return None
def get_overcloud_server_ip(self, host):

10
novajoin_tempest_plugin/tests/scenario/test_novajoin_enrollment.py
View File

@ -119,7 +119,10 @@ class ServerTest(novajoin_manager.NovajoinScenarioTest):
def test_enrollment_metadata_in_instance(self):
networks = self.networks_client.list_networks(name=NETWORK)
net_id = networks['networks'][0]['id']
if networks['networks']:
net_id = networks['networks'][0]['id']
else:
net_id = None
flavor_name = data_utils.rand_name('flv_metadata_in_instance')
flavor_id = self._create_flavor(flavor_name,
CONF.novajoin.flavor_tag)
@ -148,7 +151,10 @@ class ServerTest(novajoin_manager.NovajoinScenarioTest):
def test_enrollment_metadata_in_image(self):
networks = self.networks_client.list_networks(name=NETWORK)
net_id = networks['networks'][0]['id']
if networks['networks']:
net_id = networks['networks'][0]['id']
else:
net_id = None
flavor_name = data_utils.rand_name('flv_metadata_in_image')
flavor_id = self._create_flavor(flavor_name,
CONF.novajoin.flavor_tag)