From 0a7cde5fdf803eb566e4937146be5236193c98e1 Mon Sep 17 00:00:00 2001 From: Lin Date: Mon, 25 Apr 2016 13:10:51 +0800 Subject: [PATCH] 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 --- magnum/api/attr_validator.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/magnum/api/attr_validator.py b/magnum/api/attr_validator.py index 158a6263d4..e4386ab791 100644 --- a/magnum/api/attr_validator.py +++ b/magnum/api/attr_validator.py @@ -40,14 +40,11 @@ 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: - raise exception.FlavorNotFound(flavor=flavor) + return + raise exception.FlavorNotFound(flavor=flavor) def validate_keypair(cli, keypair): @@ -62,15 +59,12 @@ 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: - raise exception.NetworkNotFound(network=external_network) + return + raise exception.NetworkNotFound(network=external_network) def validate_fixed_network(cli, fixed_network):