From 89728b067408fcbe9e609a7a70270589397449bd Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 24 Aug 2012 16:09:27 +0100 Subject: Clean up network create exception handling The NetworkManager code will not raise webob exceptions, so there's no point in explicitly catching those. Also, the contrib.networks module is unused in nova-manage. Change-Id: I5f9fe7fa7f4365f44e7a70b3d9536da8f10b8fa7 --- bin/nova-manage | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 01b27ef2d..264c13426 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -83,7 +83,6 @@ from nova import db from nova.db import migration from nova import exception from nova import flags -from nova.api.openstack.compute.contrib import networks from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging @@ -95,8 +94,6 @@ from nova import utils from nova import version from nova.volume import volume_types -from webob import exc - FLAGS = flags.FLAGS flags.DECLARE('flat_network_bridge', 'nova.network.manager') flags.DECLARE('num_networks', 'nova.network.manager') @@ -479,10 +476,7 @@ class NetworkCommands(object): if multi_host is not None: kwargs['multi_host'] = multi_host == 'T' net_manager = importutils.import_object(FLAGS.network_manager) - try: - net_manager.create_networks(context.get_admin_context(), **kwargs) - except exc.HTTPBadRequest as ex: - print ex + net_manager.create_networks(context.get_admin_context(), **kwargs) def list(self): """List all created networks""" -- cgit