diff --git a/networking_bgpvpn/neutron/db/bgpvpn/bgpvpn_db.py b/networking_bgpvpn/neutron/db/bgpvpn_db.py similarity index 99% rename from networking_bgpvpn/neutron/db/bgpvpn/bgpvpn_db.py rename to networking_bgpvpn/neutron/db/bgpvpn_db.py index 2b1bfe17..cd74498f 100644 --- a/networking_bgpvpn/neutron/db/bgpvpn/bgpvpn_db.py +++ b/networking_bgpvpn/neutron/db/bgpvpn_db.py @@ -24,7 +24,7 @@ from neutron.db import models_v2 from oslo_log import log from sqlalchemy.orm import exc -from networking_bgpvpn.neutron.extensions.bgpvpn.bgpvpn import BGPVPNPluginBase +from networking_bgpvpn.neutron.extensions.bgpvpn import BGPVPNPluginBase LOG = log.getLogger(__name__) diff --git a/networking_bgpvpn/neutron/extensions/bgpvpn/bgpvpn.py b/networking_bgpvpn/neutron/extensions/bgpvpn.py similarity index 99% rename from networking_bgpvpn/neutron/extensions/bgpvpn/bgpvpn.py rename to networking_bgpvpn/neutron/extensions/bgpvpn.py index d93cf074..ac34e0c8 100644 --- a/networking_bgpvpn/neutron/extensions/bgpvpn/bgpvpn.py +++ b/networking_bgpvpn/neutron/extensions/bgpvpn.py @@ -17,7 +17,7 @@ import abc import six -from networking_bgpvpn.neutron.extensions import bgpvpn as bgpvpn_ext +from networking_bgpvpn.neutron import extensions as bgpvpn_ext from neutron.api import extensions from neutron.api.v2 import attributes as attr from neutron.api.v2 import resource_helper diff --git a/networking_bgpvpn/neutron/services/bgpvpn/__init__.py b/networking_bgpvpn/neutron/services/bgpvpn/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/__init__.py b/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/ovs_agent/__init__.py b/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/ovs_agent/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/networking_bgpvpn/neutron/services/bgpvpn/plugin.py b/networking_bgpvpn/neutron/services/plugin.py similarity index 97% rename from networking_bgpvpn/neutron/services/bgpvpn/plugin.py rename to networking_bgpvpn/neutron/services/plugin.py index 40e9d8de..2d27ff38 100644 --- a/networking_bgpvpn/neutron/services/bgpvpn/plugin.py +++ b/networking_bgpvpn/neutron/services/plugin.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from networking_bgpvpn.neutron.db.bgpvpn import bgpvpn_db +from networking_bgpvpn.neutron.db import bgpvpn_db from neutron.i18n import _LI from neutron.plugins.common import constants from neutron.services import service_base diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/__init__.py b/networking_bgpvpn/neutron/services/service_drivers/__init__.py similarity index 100% rename from networking_bgpvpn/neutron/services/bgpvpn/service_drivers/__init__.py rename to networking_bgpvpn/neutron/services/service_drivers/__init__.py diff --git a/networking_bgpvpn/neutron/db/bgpvpn/__init__.py b/networking_bgpvpn/neutron/services/service_drivers/bagpipe/__init__.py similarity index 100% rename from networking_bgpvpn/neutron/db/bgpvpn/__init__.py rename to networking_bgpvpn/neutron/services/service_drivers/bagpipe/__init__.py diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/bagpipe.py b/networking_bgpvpn/neutron/services/service_drivers/bagpipe/bagpipe.py similarity index 99% rename from networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/bagpipe.py rename to networking_bgpvpn/neutron/services/service_drivers/bagpipe/bagpipe.py index daae5f97..22871f1b 100644 --- a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/bagpipe.py +++ b/networking_bgpvpn/neutron/services/service_drivers/bagpipe/bagpipe.py @@ -20,8 +20,8 @@ from neutron.common import constants as const from neutron.db import models_v2 from oslo_log import log as logging -from networking_bgpvpn.neutron.db.bgpvpn import bgpvpn_db -from networking_bgpvpn.neutron.services.bgpvpn import service_drivers +from networking_bgpvpn.neutron.db import bgpvpn_db +from networking_bgpvpn.neutron.services import service_drivers from networking_bagpipe_l2.agent.bgpvpn import rpc_client diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/ml2_mech_driver.py b/networking_bgpvpn/neutron/services/service_drivers/bagpipe/ml2_mech_driver.py similarity index 100% rename from networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/ml2_mech_driver.py rename to networking_bgpvpn/neutron/services/service_drivers/bagpipe/ml2_mech_driver.py diff --git a/networking_bgpvpn/neutron/extensions/bgpvpn/__init__.py b/networking_bgpvpn/neutron/services/service_drivers/bagpipe/ovs_agent/__init__.py similarity index 100% rename from networking_bgpvpn/neutron/extensions/bgpvpn/__init__.py rename to networking_bgpvpn/neutron/services/service_drivers/bagpipe/ovs_agent/__init__.py diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/ovs_agent/ovs_bagpipe_neutron_agent.py b/networking_bgpvpn/neutron/services/service_drivers/bagpipe/ovs_agent/ovs_bagpipe_neutron_agent.py similarity index 100% rename from networking_bgpvpn/neutron/services/bgpvpn/service_drivers/bagpipe/ovs_agent/ovs_bagpipe_neutron_agent.py rename to networking_bgpvpn/neutron/services/service_drivers/bagpipe/ovs_agent/ovs_bagpipe_neutron_agent.py diff --git a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/dummy.py b/networking_bgpvpn/neutron/services/service_drivers/dummy.py similarity index 95% rename from networking_bgpvpn/neutron/services/bgpvpn/service_drivers/dummy.py rename to networking_bgpvpn/neutron/services/service_drivers/dummy.py index 0f3f355b..de24a704 100644 --- a/networking_bgpvpn/neutron/services/bgpvpn/service_drivers/dummy.py +++ b/networking_bgpvpn/neutron/services/service_drivers/dummy.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from networking_bgpvpn.neutron.services.bgpvpn import service_drivers +from networking_bgpvpn.neutron.services import service_drivers from oslo_log import log LOG = log.getLogger(__name__) diff --git a/networking_bgpvpn/tests/unit/db/test_db.py b/networking_bgpvpn/tests/unit/db/test_db.py index 21d41721..c1720721 100644 --- a/networking_bgpvpn/tests/unit/db/test_db.py +++ b/networking_bgpvpn/tests/unit/db/test_db.py @@ -17,15 +17,15 @@ from neutron import context from neutron.tests.unit import testlib_api -from networking_bgpvpn.neutron.db.bgpvpn.bgpvpn_db \ +from networking_bgpvpn.neutron.db.bgpvpn_db \ import BGPVPNConnectionNotFound -from networking_bgpvpn.neutron.db.bgpvpn.bgpvpn_db import BGPVPNPluginDb +from networking_bgpvpn.neutron.db.bgpvpn_db import BGPVPNPluginDb -class BGPVPNDBTestCase(testlib_api.SqlTestCase): +class BgpvpnDBTestCase(testlib_api.SqlTestCase): def setUp(self): - super(BGPVPNDBTestCase, self).setUp() + super(BgpvpnDBTestCase, self).setUp() self.ctx = context.get_admin_context() self.plugin_db = BGPVPNPluginDb() diff --git a/networking_bgpvpn/tests/unit/extensions/test_bgpvpn.py b/networking_bgpvpn/tests/unit/extensions/test_bgpvpn.py index 25e71efe..079be223 100644 --- a/networking_bgpvpn/tests/unit/extensions/test_bgpvpn.py +++ b/networking_bgpvpn/tests/unit/extensions/test_bgpvpn.py @@ -23,7 +23,7 @@ from neutron.tests.unit.api.v2 import test_base from neutron.tests.unit.extensions import base as test_extensions_base from webob import exc -from networking_bgpvpn.neutron.extensions.bgpvpn import bgpvpn +from networking_bgpvpn.neutron.extensions import bgpvpn _uuid = uuidutils.generate_uuid _get_path = test_base._get_path

AltStyle によって変換されたページ (->オリジナル) /