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,14 +40,11 @@ def validate_flavor(cli, flavor):
|
||||||
|
|
||||||
if flavor is None:
|
if flavor is None:
|
||||||
return
|
return
|
||||||
flavor_id = None
|
|
||||||
flavor_list = cli.nova().flavors.list()
|
flavor_list = cli.nova().flavors.list()
|
||||||
for f in flavor_list:
|
for f in flavor_list:
|
||||||
if f.name == flavor or f.id == flavor:
|
if f.name == flavor or f.id == flavor:
|
||||||
flavor_id = f.id
|
return
|
||||||
break
|
raise exception.FlavorNotFound(flavor=flavor)
|
||||||
if flavor_id is None:
|
|
||||||
raise exception.FlavorNotFound(flavor=flavor)
|
|
||||||
|
|
||||||
|
|
||||||
def validate_keypair(cli, keypair):
|
def validate_keypair(cli, keypair):
|
||||||
|
@ -62,15 +59,12 @@ def validate_keypair(cli, keypair):
|
||||||
def validate_external_network(cli, external_network):
|
def validate_external_network(cli, external_network):
|
||||||
"""Validate external network"""
|
"""Validate external network"""
|
||||||
|
|
||||||
network_id = None
|
|
||||||
networks = cli.neutron().list_networks()
|
networks = cli.neutron().list_networks()
|
||||||
for net in networks.get('networks'):
|
for net in networks.get('networks'):
|
||||||
if (net.get('name') == external_network or
|
if (net.get('name') == external_network or
|
||||||
net.get('id') == external_network):
|
net.get('id') == external_network):
|
||||||
network_id = net.get('id')
|
return
|
||||||
break
|
raise exception.NetworkNotFound(network=external_network)
|
||||||
if network_id is None:
|
|
||||||
raise exception.NetworkNotFound(network=external_network)
|
|
||||||
|
|
||||||
|
|
||||||
def validate_fixed_network(cli, fixed_network):
|
def validate_fixed_network(cli, fixed_network):
|
||||||
|
|
Loading…
Reference in New Issue