Cleanup some validation functions
There is no need to get the resource object in validate_flavor and validate_external_network at all, all the things we want do to are just validate they are there. Change-Id: I7ab980958718ae8681a6fe36f46b97cb0ea77042
This commit is contained in:
parent
dd084a4a20
commit
0a7cde5fdf
|
@ -40,13 +40,10 @@ def validate_flavor(cli, flavor):
|
|||
|
||||
if flavor is None:
|
||||
return
|
||||
flavor_id = None
|
||||
flavor_list = cli.nova().flavors.list()
|
||||
for f in flavor_list:
|
||||
if f.name == flavor or f.id == flavor:
|
||||
flavor_id = f.id
|
||||
break
|
||||
if flavor_id is None:
|
||||
return
|
||||
raise exception.FlavorNotFound(flavor=flavor)
|
||||
|
||||
|
||||
|
@ -62,14 +59,11 @@ def validate_keypair(cli, keypair):
|
|||
def validate_external_network(cli, external_network):
|
||||
"""Validate external network"""
|
||||
|
||||
network_id = None
|
||||
networks = cli.neutron().list_networks()
|
||||
for net in networks.get('networks'):
|
||||
if (net.get('name') == external_network or
|
||||
net.get('id') == external_network):
|
||||
network_id = net.get('id')
|
||||
break
|
||||
if network_id is None:
|
||||
return
|
||||
raise exception.NetworkNotFound(network=external_network)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue