From: Jenkins Date: Thu, 5 Dec 2013 11:00:21 +0000 (+0000) Subject: Merge "Improve unit test coverage for Cisco plugin base code" X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=478a3ddceb19067e6f9c81097a49751f9cd9a4c3;p=openstack-build%2Fneutron-build.git Merge "Improve unit test coverage for Cisco plugin base code" --- 478a3ddceb19067e6f9c81097a49751f9cd9a4c3 diff --cc neutron/plugins/cisco/network_plugin.py index c7b0ea57f,74e90f6c1..5097082b4 --- a/neutron/plugins/cisco/network_plugin.py +++ b/neutron/plugins/cisco/network_plugin.py @@@ -16,19 -16,13 +16,14 @@@ # # @author: Sumit Naiksatam, Cisco Systems, Inc. - import inspect import logging - from sqlalchemy import orm import webob.exc as wexc +from neutron.api import extensions as neutron_extensions from neutron.api.v2 import base - from neutron.common import exceptions as exc from neutron.db import db_base_plugin_v2 - from neutron.db import models_v2 from neutron.openstack.common import importutils - from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_exceptions as cexc from neutron.plugins.cisco.common import config from neutron.plugins.cisco.db import network_db_v2 as cdb