From 67b74e0aec9c7dda467c14c2cad95c68db7d52d7 Mon Sep 17 00:00:00 2001 From: Sumit Naiksatam Date: Wed, 31 Dec 2014 01:06:31 -0800 Subject: [PATCH] Renaming gbp package to gbpservice Top level gbp directory is renamed to gbpservice. This results in a changes to all gbp imports and other build artifacts. Change-Id: I87cbb7c91b4206c1b8a0caa4ab7a7dc2e8f3e25e Closes-bug: 1406623 --- {gbp => gbpservice}/__init__.py | 0 {gbp => gbpservice}/neutron/__init__.py | 0 {gbp => gbpservice}/neutron/db/__init__.py | 0 .../neutron/db/grouppolicy/__init__.py | 0 .../neutron/db/grouppolicy/group_policy_db.py | 5 ++- .../db/grouppolicy/group_policy_mapping_db.py | 2 +- .../neutron/db/migration/__init__.py | 0 .../neutron/db/migration/alembic.ini | 0 .../db/migration/alembic_migrations/README | 0 .../migration/alembic_migrations/__init__.py | 0 .../db/migration/alembic_migrations/env.py | 2 +- .../alembic_migrations/script.py.mako | 0 .../versions/1bf7555fa01a_gpm_rmd_1.py | 0 .../versions/23b6c4d703c7_gpm_ipd_1.py | 0 .../versions/3ef186997b02_gbp_contracts.py | 0 ...443f15fa3f_servicechain_instance_stacks.py | 0 ...e51f13395a_gbp_classifiers_action_rules.py | 5 ++- .../versions/53de98f7a066_gpm_db_1.py | 0 ...577bb4469944_gbp_network_service_policy.py | 0 ...5c65abe72596_gbp_security_group_mapping.py | 0 .../versions/64fa77aca090_external_gpm.py | 0 ...6bcf836a7_gbp_ptgs_servicechain_mapping.py | 0 .../8e14fcb1587e_sc_instance_spec_mapping.py | 0 .../alembic_migrations/versions/HEAD | 0 .../alembic_migrations/versions/README | 0 ...ab64381ee820_gbp_db_ep_epg_l2_l3_policy.py | 0 .../ceba6e091b2a_nsp_epg_ip_mapping.py | 0 ...2cf3f5_oneconvergence_sc_policy_mapping.py | 0 .../versions/ebfd08bc4714_servicechain.py | 0 .../f16efdc10a71_external_connectivity.py | 0 .../f4d890a9c126_gbp_shared_attribute.py | 0 .../neutron/db/migration/cli.py | 5 ++- .../neutron/db/migration/models/__init__.py | 0 .../neutron/db/migration/models/head.py | 4 +- .../neutron/db/servicechain_db.py | 2 +- .../neutron/extensions/__init__.py | 0 .../neutron/extensions/group_policy.py | 7 ++-- .../extensions/group_policy_mapping.py | 2 +- .../neutron/extensions/servicechain.py | 4 +- .../neutron/plugins/__init__.py | 0 .../neutron/plugins/ml2/__init__.py | 0 .../neutron/plugins/ml2/drivers/__init__.py | 0 .../ml2/drivers/grouppolicy/__init__.py | 0 .../ml2/drivers/grouppolicy/apic/__init__.py | 0 .../ml2/drivers/grouppolicy/apic/driver.py | 5 ++- .../ml2/drivers/grouppolicy/nuage/__init__.py | 0 .../ml2/drivers/grouppolicy/nuage/driver.py | 4 +- .../ml2/drivers/grouppolicy/odl/__init__.py | 0 .../ml2/drivers/grouppolicy/odl/driver.py | 4 +- .../neutron/services/__init__.py | 0 .../neutron/services/grouppolicy/__init__.py | 0 .../services/grouppolicy/common/__init__.py | 0 .../services/grouppolicy/common/constants.py | 0 .../services/grouppolicy/common/exceptions.py | 0 .../neutron/services/grouppolicy/config.py | 5 ++- .../services/grouppolicy/drivers/__init__.py | 0 .../grouppolicy/drivers/cisco/__init__.py | 0 .../drivers/cisco/apic/__init__.py | 0 .../drivers/cisco/apic/apic_mapping.py | 9 ++-- .../grouppolicy/drivers/dummy_driver.py | 3 +- .../grouppolicy/drivers/implicit_policy.py | 5 ++- .../grouppolicy/drivers/nuage/__init__.py | 0 .../drivers/nuage/common/__init__.py | 0 .../drivers/nuage/common/config.py | 0 .../grouppolicy/drivers/nuage/driver.py | 5 ++- .../grouppolicy/drivers/odl/__init__.py | 0 .../grouppolicy/drivers/odl/config.py | 0 .../grouppolicy/drivers/odl/odl_manager.py | 30 +++++++------ .../grouppolicy/drivers/odl/odl_mapping.py | 12 +++--- .../drivers/oneconvergence/__init__.py | 0 .../drivers/oneconvergence/nvsd_gbp_api.py | 2 +- .../drivers/oneconvergence/nvsd_gbp_driver.py | 4 +- .../grouppolicy/drivers/resource_mapping.py | 11 ++--- .../services/grouppolicy/extension_manager.py | 2 +- .../grouppolicy/group_policy_context.py | 5 ++- .../grouppolicy/group_policy_driver_api.py | 0 .../neutron/services/grouppolicy/plugin.py | 17 ++++---- .../grouppolicy/policy_driver_manager.py | 6 +-- .../neutron/services/servicechain/__init__.py | 0 .../services/servicechain/common/__init__.py | 0 .../servicechain/common/exceptions.py | 0 .../neutron/services/servicechain/config.py | 2 +- .../services/servicechain/driver_manager.py | 13 +++--- .../services/servicechain/drivers/__init__.py | 0 .../servicechain/drivers/dummy_driver.py | 0 .../oneconvergence_servicechain_driver.py | 18 ++++---- .../drivers/simplechain_driver.py | 2 +- .../servicechain/servicechain_context.py | 0 .../servicechain/servicechain_plugin.py | 12 +++--- {gbp => gbpservice}/neutron/tests/__init__.py | 0 .../neutron/tests/unit/__init__.py | 0 .../neutron/tests/unit/common.py | 2 +- .../neutron/tests/unit/db/__init__.py | 0 .../tests/unit/db/grouppolicy/__init__.py | 0 .../db/grouppolicy/test_group_policy_db.py | 11 ++--- .../test_group_policy_mapping_db.py | 8 ++-- .../db/grouppolicy/test_servicechain_db.py | 9 ++-- .../neutron/tests/unit/services/__init__.py | 0 .../unit/services/grouppolicy/__init__.py | 0 .../grouppolicy/extensions/__init__.py | 0 .../grouppolicy/extensions/test_extension.py | 2 +- .../services/grouppolicy/test_apic_mapping.py | 27 ++++++------ .../grouppolicy/test_extension_driver_api.py | 17 ++++---- .../grouppolicy/test_grouppolicy_plugin.py | 15 +++---- .../grouppolicy/test_implicit_policy.py | 5 ++- .../grouppolicy/test_nuage_gbp_driver.py | 15 ++++--- .../services/grouppolicy/test_odl_mapping.py | 13 +++--- .../grouppolicy/test_resource_mapping.py | 20 ++++----- .../unit/services/servicechain/__init__.py | 0 .../servicechain/test_servicechain_plugin.py | 9 ++-- .../servicechain/test_simple_chain_driver.py | 6 +-- .../tests/unit/test_extension_group_policy.py | 4 +- .../test_extension_group_policy_mapping.py | 8 ++-- .../tests/unit/test_extension_servicechain.py | 2 +- {gbp => gbpservice}/tests/__init__.py | 0 {gbp => gbpservice}/tests/base.py | 0 {gbp => gbpservice}/tests/test_gbp.py | 2 +- openstack-common.conf | 2 +- run_tests.sh | 6 +-- setup.cfg | 42 +++++++++---------- tools/config/check_uptodate.sh | 2 +- tools/config/generate_sample.sh | 2 +- 122 files changed, 240 insertions(+), 203 deletions(-) rename {gbp => gbpservice}/__init__.py (100%) rename {gbp => gbpservice}/neutron/__init__.py (100%) rename {gbp => gbpservice}/neutron/db/__init__.py (100%) rename {gbp => gbpservice}/neutron/db/grouppolicy/__init__.py (100%) rename {gbp => gbpservice}/neutron/db/grouppolicy/group_policy_db.py (99%) rename {gbp => gbpservice}/neutron/db/grouppolicy/group_policy_mapping_db.py (99%) rename {gbp => gbpservice}/neutron/db/migration/__init__.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic.ini (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/README (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/__init__.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/env.py (97%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/script.py.mako (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/1bf7555fa01a_gpm_rmd_1.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/23b6c4d703c7_gpm_ipd_1.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/3ef186997b02_gbp_contracts.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/43443f15fa3f_servicechain_instance_stacks.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py (96%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/53de98f7a066_gpm_db_1.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/577bb4469944_gbp_network_service_policy.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/5c65abe72596_gbp_security_group_mapping.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/64fa77aca090_external_gpm.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/6d76bcf836a7_gbp_ptgs_servicechain_mapping.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/8e14fcb1587e_sc_instance_spec_mapping.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/HEAD (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/README (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/ab64381ee820_gbp_db_ep_epg_l2_l3_policy.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/ceba6e091b2a_nsp_epg_ip_mapping.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/d595542cf3f5_oneconvergence_sc_policy_mapping.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/ebfd08bc4714_servicechain.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/f16efdc10a71_external_connectivity.py (100%) rename {gbp => gbpservice}/neutron/db/migration/alembic_migrations/versions/f4d890a9c126_gbp_shared_attribute.py (100%) rename {gbp => gbpservice}/neutron/db/migration/cli.py (87%) rename {gbp => gbpservice}/neutron/db/migration/models/__init__.py (100%) rename {gbp => gbpservice}/neutron/db/migration/models/head.py (83%) rename {gbp => gbpservice}/neutron/db/servicechain_db.py (99%) rename {gbp => gbpservice}/neutron/extensions/__init__.py (100%) rename {gbp => gbpservice}/neutron/extensions/group_policy.py (99%) rename {gbp => gbpservice}/neutron/extensions/group_policy_mapping.py (97%) rename {gbp => gbpservice}/neutron/extensions/servicechain.py (98%) rename {gbp => gbpservice}/neutron/plugins/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/apic/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py (92%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/nuage/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py (92%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/odl/__init__.py (100%) rename {gbp => gbpservice}/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py (95%) rename {gbp => gbpservice}/neutron/services/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/common/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/common/constants.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/common/exceptions.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/config.py (85%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/cisco/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/cisco/apic/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py (99%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/dummy_driver.py (98%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/implicit_policy.py (98%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/nuage/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/nuage/common/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/nuage/common/config.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/nuage/driver.py (96%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/odl/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/odl/config.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/odl/odl_manager.py (93%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/odl/odl_mapping.py (98%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/oneconvergence/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py (99%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py (98%) rename {gbp => gbpservice}/neutron/services/grouppolicy/drivers/resource_mapping.py (99%) rename {gbp => gbpservice}/neutron/services/grouppolicy/extension_manager.py (98%) rename {gbp => gbpservice}/neutron/services/grouppolicy/group_policy_context.py (98%) rename {gbp => gbpservice}/neutron/services/grouppolicy/group_policy_driver_api.py (100%) rename {gbp => gbpservice}/neutron/services/grouppolicy/plugin.py (99%) rename {gbp => gbpservice}/neutron/services/grouppolicy/policy_driver_manager.py (98%) rename {gbp => gbpservice}/neutron/services/servicechain/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/servicechain/common/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/servicechain/common/exceptions.py (100%) rename {gbp => gbpservice}/neutron/services/servicechain/config.py (93%) rename {gbp => gbpservice}/neutron/services/servicechain/driver_manager.py (94%) rename {gbp => gbpservice}/neutron/services/servicechain/drivers/__init__.py (100%) rename {gbp => gbpservice}/neutron/services/servicechain/drivers/dummy_driver.py (100%) rename {gbp => gbpservice}/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py (97%) rename {gbp => gbpservice}/neutron/services/servicechain/drivers/simplechain_driver.py (99%) rename {gbp => gbpservice}/neutron/services/servicechain/servicechain_context.py (100%) rename {gbp => gbpservice}/neutron/services/servicechain/servicechain_plugin.py (96%) rename {gbp => gbpservice}/neutron/tests/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/common.py (99%) rename {gbp => gbpservice}/neutron/tests/unit/db/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/db/grouppolicy/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py (99%) rename {gbp => gbpservice}/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py (97%) rename {gbp => gbpservice}/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py (98%) rename {gbp => gbpservice}/neutron/tests/unit/services/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/extensions/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py (98%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py (98%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py (98%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py (98%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py (99%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py (87%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py (97%) rename {gbp => gbpservice}/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py (99%) rename {gbp => gbpservice}/neutron/tests/unit/services/servicechain/__init__.py (100%) rename {gbp => gbpservice}/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py (80%) rename {gbp => gbpservice}/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py (97%) rename {gbp => gbpservice}/neutron/tests/unit/test_extension_group_policy.py (99%) rename {gbp => gbpservice}/neutron/tests/unit/test_extension_group_policy_mapping.py (94%) rename {gbp => gbpservice}/neutron/tests/unit/test_extension_servicechain.py (99%) rename {gbp => gbpservice}/tests/__init__.py (100%) rename {gbp => gbpservice}/tests/base.py (100%) rename {gbp => gbpservice}/tests/test_gbp.py (95%) diff --git a/gbp/__init__.py b/gbpservice/__init__.py similarity index 100% rename from gbp/__init__.py rename to gbpservice/__init__.py diff --git a/gbp/neutron/__init__.py b/gbpservice/neutron/__init__.py similarity index 100% rename from gbp/neutron/__init__.py rename to gbpservice/neutron/__init__.py diff --git a/gbp/neutron/db/__init__.py b/gbpservice/neutron/db/__init__.py similarity index 100% rename from gbp/neutron/db/__init__.py rename to gbpservice/neutron/db/__init__.py diff --git a/gbp/neutron/db/grouppolicy/__init__.py b/gbpservice/neutron/db/grouppolicy/__init__.py similarity index 100% rename from gbp/neutron/db/grouppolicy/__init__.py rename to gbpservice/neutron/db/grouppolicy/__init__.py diff --git a/gbp/neutron/db/grouppolicy/group_policy_db.py b/gbpservice/neutron/db/grouppolicy/group_policy_db.py similarity index 99% rename from gbp/neutron/db/grouppolicy/group_policy_db.py rename to gbpservice/neutron/db/grouppolicy/group_policy_db.py index 18d177570..e828914b5 100644 --- a/gbp/neutron/db/grouppolicy/group_policy_db.py +++ b/gbpservice/neutron/db/grouppolicy/group_policy_db.py @@ -24,8 +24,9 @@ from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils from neutron.plugins.common import constants -from gbp.neutron.extensions import group_policy as gpolicy -from gbp.neutron.services.grouppolicy.common import constants as gp_constants +from gbpservice.neutron.extensions import group_policy as gpolicy +from gbpservice.neutron.services.grouppolicy.common import ( + constants as gp_constants) LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/db/grouppolicy/group_policy_mapping_db.py b/gbpservice/neutron/db/grouppolicy/group_policy_mapping_db.py similarity index 99% rename from gbp/neutron/db/grouppolicy/group_policy_mapping_db.py rename to gbpservice/neutron/db/grouppolicy/group_policy_mapping_db.py index c5ab378bd..254afb688 100644 --- a/gbp/neutron/db/grouppolicy/group_policy_mapping_db.py +++ b/gbpservice/neutron/db/grouppolicy/group_policy_mapping_db.py @@ -18,7 +18,7 @@ from neutron.db import model_base from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils -from gbp.neutron.db.grouppolicy import group_policy_db as gpdb +from gbpservice.neutron.db.grouppolicy import group_policy_db as gpdb LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/db/migration/__init__.py b/gbpservice/neutron/db/migration/__init__.py similarity index 100% rename from gbp/neutron/db/migration/__init__.py rename to gbpservice/neutron/db/migration/__init__.py diff --git a/gbp/neutron/db/migration/alembic.ini b/gbpservice/neutron/db/migration/alembic.ini similarity index 100% rename from gbp/neutron/db/migration/alembic.ini rename to gbpservice/neutron/db/migration/alembic.ini diff --git a/gbp/neutron/db/migration/alembic_migrations/README b/gbpservice/neutron/db/migration/alembic_migrations/README similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/README rename to gbpservice/neutron/db/migration/alembic_migrations/README diff --git a/gbp/neutron/db/migration/alembic_migrations/__init__.py b/gbpservice/neutron/db/migration/alembic_migrations/__init__.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/__init__.py rename to gbpservice/neutron/db/migration/alembic_migrations/__init__.py diff --git a/gbp/neutron/db/migration/alembic_migrations/env.py b/gbpservice/neutron/db/migration/alembic_migrations/env.py similarity index 97% rename from gbp/neutron/db/migration/alembic_migrations/env.py rename to gbpservice/neutron/db/migration/alembic_migrations/env.py index 678cc14ec..6ad70a429 100644 --- a/gbp/neutron/db/migration/alembic_migrations/env.py +++ b/gbpservice/neutron/db/migration/alembic_migrations/env.py @@ -19,7 +19,7 @@ from oslo.db.sqlalchemy import session import sqlalchemy as sa from sqlalchemy import event -from gbp.neutron.db.migration.models import head # noqa +from gbpservice.neutron.db.migration.models import head # noqa # Mirror of the Neutron's env, plus some tweaks in order to set cross DB # FKs. diff --git a/gbp/neutron/db/migration/alembic_migrations/script.py.mako b/gbpservice/neutron/db/migration/alembic_migrations/script.py.mako similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/script.py.mako rename to gbpservice/neutron/db/migration/alembic_migrations/script.py.mako diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/1bf7555fa01a_gpm_rmd_1.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/1bf7555fa01a_gpm_rmd_1.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/1bf7555fa01a_gpm_rmd_1.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/1bf7555fa01a_gpm_rmd_1.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/23b6c4d703c7_gpm_ipd_1.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/23b6c4d703c7_gpm_ipd_1.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/23b6c4d703c7_gpm_ipd_1.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/23b6c4d703c7_gpm_ipd_1.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/3ef186997b02_gbp_contracts.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/3ef186997b02_gbp_contracts.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/3ef186997b02_gbp_contracts.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/3ef186997b02_gbp_contracts.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/43443f15fa3f_servicechain_instance_stacks.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/43443f15fa3f_servicechain_instance_stacks.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/43443f15fa3f_servicechain_instance_stacks.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/43443f15fa3f_servicechain_instance_stacks.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py similarity index 96% rename from gbp/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py index 0374bf805..5f2ae8dca 100644 --- a/gbp/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py +++ b/gbpservice/neutron/db/migration/alembic_migrations/versions/4ae51f13395a_gbp_classifiers_action_rules.py @@ -13,7 +13,7 @@ # under the License. # -"""gbp-classifiers_actions_rules +"""gbp_classifiers_actions_rules Revision ID: 4ae51f13395a Create Date: 2014-07-30 14:16:05.660561 @@ -29,7 +29,8 @@ from alembic import op from neutron.plugins.common import constants import sqlalchemy as sa -from gbp.neutron.services.grouppolicy.common import constants as gp_constants +from gbpservice.neutron.services.grouppolicy.common import ( + constants as gp_constants) def upgrade(active_plugins=None, options=None): diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/53de98f7a066_gpm_db_1.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/53de98f7a066_gpm_db_1.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/53de98f7a066_gpm_db_1.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/53de98f7a066_gpm_db_1.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/577bb4469944_gbp_network_service_policy.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/577bb4469944_gbp_network_service_policy.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/577bb4469944_gbp_network_service_policy.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/577bb4469944_gbp_network_service_policy.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/5c65abe72596_gbp_security_group_mapping.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/5c65abe72596_gbp_security_group_mapping.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/5c65abe72596_gbp_security_group_mapping.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/5c65abe72596_gbp_security_group_mapping.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/64fa77aca090_external_gpm.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/64fa77aca090_external_gpm.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/64fa77aca090_external_gpm.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/64fa77aca090_external_gpm.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/6d76bcf836a7_gbp_ptgs_servicechain_mapping.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/6d76bcf836a7_gbp_ptgs_servicechain_mapping.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/6d76bcf836a7_gbp_ptgs_servicechain_mapping.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/6d76bcf836a7_gbp_ptgs_servicechain_mapping.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/8e14fcb1587e_sc_instance_spec_mapping.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/8e14fcb1587e_sc_instance_spec_mapping.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/8e14fcb1587e_sc_instance_spec_mapping.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/8e14fcb1587e_sc_instance_spec_mapping.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/HEAD b/gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/HEAD rename to gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/README b/gbpservice/neutron/db/migration/alembic_migrations/versions/README similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/README rename to gbpservice/neutron/db/migration/alembic_migrations/versions/README diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/ab64381ee820_gbp_db_ep_epg_l2_l3_policy.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/ab64381ee820_gbp_db_ep_epg_l2_l3_policy.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/ab64381ee820_gbp_db_ep_epg_l2_l3_policy.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/ab64381ee820_gbp_db_ep_epg_l2_l3_policy.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/ceba6e091b2a_nsp_epg_ip_mapping.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/ceba6e091b2a_nsp_epg_ip_mapping.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/ceba6e091b2a_nsp_epg_ip_mapping.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/ceba6e091b2a_nsp_epg_ip_mapping.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/d595542cf3f5_oneconvergence_sc_policy_mapping.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/d595542cf3f5_oneconvergence_sc_policy_mapping.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/d595542cf3f5_oneconvergence_sc_policy_mapping.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/d595542cf3f5_oneconvergence_sc_policy_mapping.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/ebfd08bc4714_servicechain.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/ebfd08bc4714_servicechain.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/ebfd08bc4714_servicechain.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/ebfd08bc4714_servicechain.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/f16efdc10a71_external_connectivity.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/f16efdc10a71_external_connectivity.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/f16efdc10a71_external_connectivity.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/f16efdc10a71_external_connectivity.py diff --git a/gbp/neutron/db/migration/alembic_migrations/versions/f4d890a9c126_gbp_shared_attribute.py b/gbpservice/neutron/db/migration/alembic_migrations/versions/f4d890a9c126_gbp_shared_attribute.py similarity index 100% rename from gbp/neutron/db/migration/alembic_migrations/versions/f4d890a9c126_gbp_shared_attribute.py rename to gbpservice/neutron/db/migration/alembic_migrations/versions/f4d890a9c126_gbp_shared_attribute.py diff --git a/gbp/neutron/db/migration/cli.py b/gbpservice/neutron/db/migration/cli.py similarity index 87% rename from gbp/neutron/db/migration/cli.py rename to gbpservice/neutron/db/migration/cli.py index a0d885804..ebc90999e 100644 --- a/gbp/neutron/db/migration/cli.py +++ b/gbpservice/neutron/db/migration/cli.py @@ -16,8 +16,9 @@ from neutron.db.migration.cli import * # noqa def main(): config = alembic_config.Config( os.path.join(os.path.dirname(__file__), 'alembic.ini')) - config.set_main_option('script_location', - 'gbp.neutron.db.migration:alembic_migrations') + config.set_main_option( + 'script_location', + 'gbpservice.neutron.db.migration:alembic_migrations') config.neutron_config = CONF CONF() CONF.command.func(config, CONF.command.name) diff --git a/gbp/neutron/db/migration/models/__init__.py b/gbpservice/neutron/db/migration/models/__init__.py similarity index 100% rename from gbp/neutron/db/migration/models/__init__.py rename to gbpservice/neutron/db/migration/models/__init__.py diff --git a/gbp/neutron/db/migration/models/head.py b/gbpservice/neutron/db/migration/models/head.py similarity index 83% rename from gbp/neutron/db/migration/models/head.py rename to gbpservice/neutron/db/migration/models/head.py index 246326a70..4c0c8a827 100644 --- a/gbp/neutron/db/migration/models/head.py +++ b/gbpservice/neutron/db/migration/models/head.py @@ -14,8 +14,8 @@ # under the License. -from gbp.neutron.db.grouppolicy import group_policy_db # noqa -from gbp.neutron.db.grouppolicy import group_policy_mapping_db # noqa +from gbpservice.neutron.db.grouppolicy import group_policy_db # noqa +from gbpservice.neutron.db.grouppolicy import group_policy_mapping_db # noqa from neutron.db import model_base diff --git a/gbp/neutron/db/servicechain_db.py b/gbpservice/neutron/db/servicechain_db.py similarity index 99% rename from gbp/neutron/db/servicechain_db.py rename to gbpservice/neutron/db/servicechain_db.py index 33253b1c3..46f99e5de 100644 --- a/gbp/neutron/db/servicechain_db.py +++ b/gbpservice/neutron/db/servicechain_db.py @@ -23,7 +23,7 @@ from neutron.openstack.common import jsonutils from neutron.openstack.common import log as logging from neutron.openstack.common import uuidutils -from gbp.neutron.extensions import servicechain as schain +from gbpservice.neutron.extensions import servicechain as schain LOG = logging.getLogger(__name__) MAX_IPV4_SUBNET_PREFIX_LENGTH = 31 diff --git a/gbp/neutron/extensions/__init__.py b/gbpservice/neutron/extensions/__init__.py similarity index 100% rename from gbp/neutron/extensions/__init__.py rename to gbpservice/neutron/extensions/__init__.py diff --git a/gbp/neutron/extensions/group_policy.py b/gbpservice/neutron/extensions/group_policy.py similarity index 99% rename from gbp/neutron/extensions/group_policy.py rename to gbpservice/neutron/extensions/group_policy.py index d53650a40..460fcd9ad 100644 --- a/gbp/neutron/extensions/group_policy.py +++ b/gbpservice/neutron/extensions/group_policy.py @@ -23,14 +23,15 @@ from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.services import service_base -import gbp.neutron.extensions -from gbp.neutron.services.grouppolicy.common import constants as gp_constants +import gbpservice.neutron.extensions +from gbpservice.neutron.services.grouppolicy.common import ( + constants as gp_constants) # The code below is a monkey patch of key Neutron's modules. This is needed for # the GBP service to be loaded correctly. GBP extensions' path is added # to Neutron's so that it's found at extension scanning time. -extensions.append_api_extensions_path(gbp.neutron.extensions.__path__) +extensions.append_api_extensions_path(gbpservice.neutron.extensions.__path__) constants.GROUP_POLICY = "GROUP_POLICY" constants.COMMON_PREFIXES["GROUP_POLICY"] = "/grouppolicy" constants.EXT_TO_SERVICE_MAPPING['gp'] = constants.GROUP_POLICY diff --git a/gbp/neutron/extensions/group_policy_mapping.py b/gbpservice/neutron/extensions/group_policy_mapping.py similarity index 97% rename from gbp/neutron/extensions/group_policy_mapping.py rename to gbpservice/neutron/extensions/group_policy_mapping.py index a517fcf99..903b0cfbf 100644 --- a/gbp/neutron/extensions/group_policy_mapping.py +++ b/gbpservice/neutron/extensions/group_policy_mapping.py @@ -12,7 +12,7 @@ from neutron.api.v2 import attributes as attr -from gbp.neutron.extensions import group_policy as gp +from gbpservice.neutron.extensions import group_policy as gp # Extended attributes for Group Policy resource to map to Neutron constructs diff --git a/gbp/neutron/extensions/servicechain.py b/gbpservice/neutron/extensions/servicechain.py similarity index 98% rename from gbp/neutron/extensions/servicechain.py rename to gbpservice/neutron/extensions/servicechain.py index f467c98c5..e819cdbac 100644 --- a/gbp/neutron/extensions/servicechain.py +++ b/gbpservice/neutron/extensions/servicechain.py @@ -23,13 +23,13 @@ from neutron.openstack.common import log as logging from neutron.plugins.common import constants from neutron.services import service_base -import gbp.neutron.extensions +import gbpservice.neutron.extensions # The code below is a monkey patch of key Neutron's modules. This is needed for # the GBP service to be loaded correctly. GBP extensions' path is added # to Neutron's so that it's found at extension scanning time. -extensions.append_api_extensions_path(gbp.neutron.extensions.__path__) +extensions.append_api_extensions_path(gbpservice.neutron.extensions.__path__) constants.SERVICECHAIN = "SERVICECHAIN" constants.COMMON_PREFIXES["SERVICECHAIN"] = "/servicechain" diff --git a/gbp/neutron/plugins/__init__.py b/gbpservice/neutron/plugins/__init__.py similarity index 100% rename from gbp/neutron/plugins/__init__.py rename to gbpservice/neutron/plugins/__init__.py diff --git a/gbp/neutron/plugins/ml2/__init__.py b/gbpservice/neutron/plugins/ml2/__init__.py similarity index 100% rename from gbp/neutron/plugins/ml2/__init__.py rename to gbpservice/neutron/plugins/ml2/__init__.py diff --git a/gbp/neutron/plugins/ml2/drivers/__init__.py b/gbpservice/neutron/plugins/ml2/drivers/__init__.py similarity index 100% rename from gbp/neutron/plugins/ml2/drivers/__init__.py rename to gbpservice/neutron/plugins/ml2/drivers/__init__.py diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/__init__.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/__init__.py similarity index 100% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/__init__.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/__init__.py diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/apic/__init__.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/apic/__init__.py similarity index 100% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/apic/__init__.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/apic/__init__.py diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py similarity index 92% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py index 6ffa124f2..122946b3a 100644 --- a/gbp/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py +++ b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/apic/driver.py @@ -17,7 +17,8 @@ from neutron.common import constants as n_constants from neutron.openstack.common import log from neutron.plugins.ml2 import driver_api as api -from gbp.neutron.services.grouppolicy.drivers.cisco.apic import apic_mapping +from gbpservice.neutron.services.grouppolicy.drivers.cisco.apic import ( + apic_mapping as amap) LOG = log.getLogger(__name__) @@ -30,7 +31,7 @@ class APICMechanismGBPDriver(api.MechanismDriver): @property def apic_gbp(self): if not self._apic_gbp: - self._apic_gbp = (apic_mapping.ApicMappingDriver. + self._apic_gbp = (amap.ApicMappingDriver. get_initialized_instance()) return self._apic_gbp diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/nuage/__init__.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/nuage/__init__.py similarity index 100% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/nuage/__init__.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/nuage/__init__.py diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py similarity index 92% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py index c279d09e1..18c83758c 100644 --- a/gbp/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py +++ b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/nuage/driver.py @@ -16,7 +16,7 @@ from neutron.plugins.ml2 import driver_api as api from neutron.plugins.nuage.common import constants as nuage_const -from gbp.neutron.services.grouppolicy.drivers.nuage import driver +from gbpservice.neutron.services.grouppolicy.drivers.nuage import driver class NuageMechanismGBPDriver(api.MechanismDriver): @@ -28,7 +28,7 @@ class NuageMechanismGBPDriver(api.MechanismDriver): def nuage_gbp(self): if not self._nuage_gbp: self._nuage_gbp = (driver.NuageGBPDriver. - get_initialized_instance()) + get_initialized_instance()) return self._nuage_gbp def update_port_postcommit(self, context): diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/odl/__init__.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/odl/__init__.py similarity index 100% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/odl/__init__.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/odl/__init__.py diff --git a/gbp/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py similarity index 95% rename from gbp/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py rename to gbpservice/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py index 3f4f826d7..e8bfa8dcc 100644 --- a/gbp/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py +++ b/gbpservice/neutron/plugins/ml2/drivers/grouppolicy/odl/driver.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from gbp.neutron.services.grouppolicy.drivers.odl import odl_mapping +from gbpservice.neutron.services.grouppolicy.drivers.odl import odl_mapping from neutron.common import constants as n_constants from neutron.extensions import portbindings from neutron.openstack.common import log @@ -71,4 +71,4 @@ class OdlMechanismGBPDriver(api.MechanismDriver): False to indicate this to callers. """ network_type = segment[api.NETWORK_TYPE] - return network_type in [constants.TYPE_VXLAN, ] \ No newline at end of file + return network_type in [constants.TYPE_VXLAN, ] diff --git a/gbp/neutron/services/__init__.py b/gbpservice/neutron/services/__init__.py similarity index 100% rename from gbp/neutron/services/__init__.py rename to gbpservice/neutron/services/__init__.py diff --git a/gbp/neutron/services/grouppolicy/__init__.py b/gbpservice/neutron/services/grouppolicy/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/__init__.py rename to gbpservice/neutron/services/grouppolicy/__init__.py diff --git a/gbp/neutron/services/grouppolicy/common/__init__.py b/gbpservice/neutron/services/grouppolicy/common/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/common/__init__.py rename to gbpservice/neutron/services/grouppolicy/common/__init__.py diff --git a/gbp/neutron/services/grouppolicy/common/constants.py b/gbpservice/neutron/services/grouppolicy/common/constants.py similarity index 100% rename from gbp/neutron/services/grouppolicy/common/constants.py rename to gbpservice/neutron/services/grouppolicy/common/constants.py diff --git a/gbp/neutron/services/grouppolicy/common/exceptions.py b/gbpservice/neutron/services/grouppolicy/common/exceptions.py similarity index 100% rename from gbp/neutron/services/grouppolicy/common/exceptions.py rename to gbpservice/neutron/services/grouppolicy/common/exceptions.py diff --git a/gbp/neutron/services/grouppolicy/config.py b/gbpservice/neutron/services/grouppolicy/config.py similarity index 85% rename from gbp/neutron/services/grouppolicy/config.py rename to gbpservice/neutron/services/grouppolicy/config.py index e5573543e..40965dc95 100644 --- a/gbp/neutron/services/grouppolicy/config.py +++ b/gbpservice/neutron/services/grouppolicy/config.py @@ -18,12 +18,13 @@ group_policy_opts = [ default=['dummy'], help=_("An ordered list of group policy driver " "entrypoints to be loaded from the " - "gbp.neutron.group_policy.policy_drivers namespace.")), + "gbpservice.neutron.group_policy.policy_drivers " + "namespace.")), cfg.ListOpt('extension_drivers', default=[], help=_("An ordered list of extension driver " "entrypoints to be loaded from the " - "gbp.neutron.group_policy.extension_drivers " + "gbpservice.neutron.group_policy.extension_drivers " "namespace.")), ] diff --git a/gbp/neutron/services/grouppolicy/drivers/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/cisco/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/cisco/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/cisco/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/cisco/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/cisco/apic/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/cisco/apic/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py similarity index 99% rename from gbp/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py rename to gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py index 1d1cd0915..abd42d79f 100644 --- a/gbp/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py @@ -24,10 +24,11 @@ from neutron.plugins.ml2.drivers.cisco.apic import config from neutron.plugins.ml2 import models from oslo.config import cfg -from gbp.neutron.db.grouppolicy import group_policy_mapping_db as gpdb -from gbp.neutron.services.grouppolicy.common import constants as g_const -from gbp.neutron.services.grouppolicy.common import exceptions as gpexc -from gbp.neutron.services.grouppolicy.drivers import resource_mapping as api +from gbpservice.neutron.db.grouppolicy import group_policy_mapping_db as gpdb +from gbpservice.neutron.services.grouppolicy.common import constants as g_const +from gbpservice.neutron.services.grouppolicy.common import exceptions as gpexc +from gbpservice.neutron.services.grouppolicy.drivers import ( + resource_mapping as api) LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/grouppolicy/drivers/dummy_driver.py b/gbpservice/neutron/services/grouppolicy/drivers/dummy_driver.py similarity index 98% rename from gbp/neutron/services/grouppolicy/drivers/dummy_driver.py rename to gbpservice/neutron/services/grouppolicy/drivers/dummy_driver.py index 8806a5bda..d923e6b04 100644 --- a/gbp/neutron/services/grouppolicy/drivers/dummy_driver.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/dummy_driver.py @@ -12,7 +12,8 @@ from neutron.common import log -from gbp.neutron.services.grouppolicy import group_policy_driver_api as api +from gbpservice.neutron.services.grouppolicy import ( + group_policy_driver_api as api) class NoopDriver(api.PolicyDriver): diff --git a/gbp/neutron/services/grouppolicy/drivers/implicit_policy.py b/gbpservice/neutron/services/grouppolicy/drivers/implicit_policy.py similarity index 98% rename from gbp/neutron/services/grouppolicy/drivers/implicit_policy.py rename to gbpservice/neutron/services/grouppolicy/drivers/implicit_policy.py index 2a45c1d94..9b06a7c68 100644 --- a/gbp/neutron/services/grouppolicy/drivers/implicit_policy.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/implicit_policy.py @@ -17,8 +17,9 @@ from neutron.common import log from neutron.db import model_base from neutron.openstack.common import log as logging -from gbp.neutron.services.grouppolicy.common import exceptions as exc -from gbp.neutron.services.grouppolicy import group_policy_driver_api as api +from gbpservice.neutron.services.grouppolicy import ( + group_policy_driver_api as api) +from gbpservice.neutron.services.grouppolicy.common import exceptions as exc LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/grouppolicy/drivers/nuage/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/nuage/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/nuage/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/nuage/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/nuage/common/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/nuage/common/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/nuage/common/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/nuage/common/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/nuage/common/config.py b/gbpservice/neutron/services/grouppolicy/drivers/nuage/common/config.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/nuage/common/config.py rename to gbpservice/neutron/services/grouppolicy/drivers/nuage/common/config.py diff --git a/gbp/neutron/services/grouppolicy/drivers/nuage/driver.py b/gbpservice/neutron/services/grouppolicy/drivers/nuage/driver.py similarity index 96% rename from gbp/neutron/services/grouppolicy/drivers/nuage/driver.py rename to gbpservice/neutron/services/grouppolicy/drivers/nuage/driver.py index be525fbf7..47d59e389 100644 --- a/gbp/neutron/services/grouppolicy/drivers/nuage/driver.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/nuage/driver.py @@ -16,8 +16,9 @@ from neutron.openstack.common import importutils from neutron.openstack.common import log as logging from oslo.config import cfg -from gbp.neutron.services.grouppolicy.drivers.nuage.common import config -from gbp.neutron.services.grouppolicy.drivers import resource_mapping as api +from gbpservice.neutron.services.grouppolicy.drivers import ( + resource_mapping as api) +from gbpservice.neutron.services.grouppolicy.drivers.nuage.common import config LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/grouppolicy/drivers/odl/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/odl/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/odl/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/odl/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/odl/config.py b/gbpservice/neutron/services/grouppolicy/drivers/odl/config.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/odl/config.py rename to gbpservice/neutron/services/grouppolicy/drivers/odl/config.py diff --git a/gbp/neutron/services/grouppolicy/drivers/odl/odl_manager.py b/gbpservice/neutron/services/grouppolicy/drivers/odl/odl_manager.py similarity index 93% rename from gbp/neutron/services/grouppolicy/drivers/odl/odl_manager.py rename to gbpservice/neutron/services/grouppolicy/drivers/odl/odl_manager.py index 76cc842d3..31d9b66d5 100644 --- a/gbp/neutron/services/grouppolicy/drivers/odl/odl_manager.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/odl/odl_manager.py @@ -18,18 +18,22 @@ from oslo.serialization import jsonutils from requests import auth LOG = logging.getLogger(__name__) -cfg.CONF.import_opt('odl_username', - 'gbp.neutron.services.grouppolicy.drivers.odl.config', - group='odl_driver') -cfg.CONF.import_opt('odl_password', - 'gbp.neutron.services.grouppolicy.drivers.odl.config', - group='odl_driver') -cfg.CONF.import_opt('odl_host', - 'gbp.neutron.services.grouppolicy.drivers.odl.config', - group='odl_driver') -cfg.CONF.import_opt('odl_port', - 'gbp.neutron.services.grouppolicy.drivers.odl.config', - group='odl_driver') +cfg.CONF.import_opt( + 'odl_username', + 'gbpservice.neutron.services.grouppolicy.drivers.odl.config', + group='odl_driver') +cfg.CONF.import_opt( + 'odl_password', + 'gbpservice.neutron.services.grouppolicy.drivers.odl.config', + group='odl_driver') +cfg.CONF.import_opt( + 'odl_host', + 'gbpservice.neutron.services.grouppolicy.drivers.odl.config', + group='odl_driver') +cfg.CONF.import_opt( + 'odl_port', + 'gbpservice.neutron.services.grouppolicy.drivers.odl.config', + group='odl_driver') class OdlManager(object): @@ -230,4 +234,4 @@ class OdlManager(object): "id": tenant_id } if not self._is_tenant_created(tenant_id): - self.create_update_tenant(tenant_id, tenant) \ No newline at end of file + self.create_update_tenant(tenant_id, tenant) diff --git a/gbp/neutron/services/grouppolicy/drivers/odl/odl_mapping.py b/gbpservice/neutron/services/grouppolicy/drivers/odl/odl_mapping.py similarity index 98% rename from gbp/neutron/services/grouppolicy/drivers/odl/odl_mapping.py rename to gbpservice/neutron/services/grouppolicy/drivers/odl/odl_mapping.py index 05aa6af53..6ed263d31 100644 --- a/gbp/neutron/services/grouppolicy/drivers/odl/odl_mapping.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/odl/odl_mapping.py @@ -12,16 +12,18 @@ import uuid -from gbp.neutron.db.grouppolicy import group_policy_mapping_db as gpdb -from gbp.neutron.services.grouppolicy.common import constants as g_const -from gbp.neutron.services.grouppolicy.common import exceptions as gpexc -from gbp.neutron.services.grouppolicy.drivers.odl import odl_manager -from gbp.neutron.services.grouppolicy.drivers import resource_mapping as api from neutron import manager from neutron.openstack.common import lockutils # noqa from neutron.openstack.common import log as logging from neutron.plugins.common import constants +from gbpservice.neutron.db.grouppolicy import group_policy_mapping_db as gpdb +from gbpservice.neutron.services.grouppolicy.common import constants as g_const +from gbpservice.neutron.services.grouppolicy.common import exceptions as gpexc +from gbpservice.neutron.services.grouppolicy.drivers import ( + resource_mapping as api) +from gbpservice.neutron.services.grouppolicy.drivers.odl import odl_manager + LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/grouppolicy/drivers/oneconvergence/__init__.py b/gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/__init__.py similarity index 100% rename from gbp/neutron/services/grouppolicy/drivers/oneconvergence/__init__.py rename to gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/__init__.py diff --git a/gbp/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py b/gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py similarity index 99% rename from gbp/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py rename to gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py index 8c2853133..ac5089c45 100644 --- a/gbp/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_api.py @@ -19,7 +19,7 @@ import urlparse from oslo.config import cfg -from gbp.neutron.services.grouppolicy.common import exceptions +from gbpservice.neutron.services.grouppolicy.common import exceptions from neutron.openstack.common import jsonutils from neutron.openstack.common import log as logging diff --git a/gbp/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py b/gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py similarity index 98% rename from gbp/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py rename to gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py index 9882eeb75..62a442044 100644 --- a/gbp/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/oneconvergence/nvsd_gbp_driver.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from gbp.neutron.services.grouppolicy.drivers import ( +from gbpservice.neutron.services.grouppolicy.drivers import ( resource_mapping as res_map) -from gbp.neutron.services.grouppolicy.drivers.oneconvergence import ( +from gbpservice.neutron.services.grouppolicy.drivers.oneconvergence import ( nvsd_gbp_api as api) from neutron.common import exceptions as n_exc diff --git a/gbp/neutron/services/grouppolicy/drivers/resource_mapping.py b/gbpservice/neutron/services/grouppolicy/drivers/resource_mapping.py similarity index 99% rename from gbp/neutron/services/grouppolicy/drivers/resource_mapping.py rename to gbpservice/neutron/services/grouppolicy/drivers/resource_mapping.py index d39c6b866..0eee13401 100644 --- a/gbp/neutron/services/grouppolicy/drivers/resource_mapping.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/resource_mapping.py @@ -29,11 +29,12 @@ from neutron.plugins.common import constants as pconst from oslo.config import cfg import sqlalchemy as sa -from gbp.neutron.db.grouppolicy import group_policy_db as gpdb -from gbp.neutron.db import servicechain_db # noqa -from gbp.neutron.services.grouppolicy.common import constants as gconst -from gbp.neutron.services.grouppolicy.common import exceptions as exc -from gbp.neutron.services.grouppolicy import group_policy_driver_api as api +from gbpservice.neutron.db.grouppolicy import group_policy_db as gpdb +from gbpservice.neutron.db import servicechain_db # noqa +from gbpservice.neutron.services.grouppolicy import ( + group_policy_driver_api as api) +from gbpservice.neutron.services.grouppolicy.common import constants as gconst +from gbpservice.neutron.services.grouppolicy.common import exceptions as exc LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/grouppolicy/extension_manager.py b/gbpservice/neutron/services/grouppolicy/extension_manager.py similarity index 98% rename from gbp/neutron/services/grouppolicy/extension_manager.py rename to gbpservice/neutron/services/grouppolicy/extension_manager.py index c4a6a1182..e0ff3ba95 100644 --- a/gbp/neutron/services/grouppolicy/extension_manager.py +++ b/gbpservice/neutron/services/grouppolicy/extension_manager.py @@ -29,7 +29,7 @@ class ExtensionManager(stevedore.named.NamedExtensionManager): LOG.info(_("Configured extension driver names: %s"), cfg.CONF.group_policy.extension_drivers) super(ExtensionManager, self).__init__( - 'gbp.neutron.group_policy.extension_drivers', + 'gbpservice.neutron.group_policy.extension_drivers', cfg.CONF.group_policy.extension_drivers, invoke_on_load=True, name_order=True) diff --git a/gbp/neutron/services/grouppolicy/group_policy_context.py b/gbpservice/neutron/services/grouppolicy/group_policy_context.py similarity index 98% rename from gbp/neutron/services/grouppolicy/group_policy_context.py rename to gbpservice/neutron/services/grouppolicy/group_policy_context.py index 0a57bad8f..d5f5a5c81 100644 --- a/gbp/neutron/services/grouppolicy/group_policy_context.py +++ b/gbpservice/neutron/services/grouppolicy/group_policy_context.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from gbp.neutron.services.grouppolicy import group_policy_driver_api as api +from gbpservice.neutron.services.grouppolicy import ( + group_policy_driver_api as api) class GroupPolicyContext(object): @@ -268,4 +269,4 @@ class ExternalPolicyContext(BaseResouceContext, api.ExternalPolicyContext): class NatPoolContext(BaseResouceContext, api.NatPoolContext): - pass \ No newline at end of file + pass diff --git a/gbp/neutron/services/grouppolicy/group_policy_driver_api.py b/gbpservice/neutron/services/grouppolicy/group_policy_driver_api.py similarity index 100% rename from gbp/neutron/services/grouppolicy/group_policy_driver_api.py rename to gbpservice/neutron/services/grouppolicy/group_policy_driver_api.py diff --git a/gbp/neutron/services/grouppolicy/plugin.py b/gbpservice/neutron/services/grouppolicy/plugin.py similarity index 99% rename from gbp/neutron/services/grouppolicy/plugin.py rename to gbpservice/neutron/services/grouppolicy/plugin.py index 8aa29fc7e..6891b4dd4 100644 --- a/gbp/neutron/services/grouppolicy/plugin.py +++ b/gbpservice/neutron/services/grouppolicy/plugin.py @@ -17,13 +17,16 @@ from neutron.common import log from neutron.openstack.common import excutils from neutron.openstack.common import log as logging -from gbp.neutron.db.grouppolicy import group_policy_db as gdb -from gbp.neutron.db.grouppolicy import group_policy_mapping_db -from gbp.neutron.extensions import group_policy as gpex -from gbp.neutron.services.grouppolicy.common import exceptions as gp_exc -from gbp.neutron.services.grouppolicy import extension_manager as ext_manager -from gbp.neutron.services.grouppolicy import group_policy_context as p_context -from gbp.neutron.services.grouppolicy import policy_driver_manager as manager +from gbpservice.neutron.db.grouppolicy import group_policy_db as gdb +from gbpservice.neutron.db.grouppolicy import group_policy_mapping_db +from gbpservice.neutron.extensions import group_policy as gpex +from gbpservice.neutron.services.grouppolicy import ( + extension_manager as ext_manager) +from gbpservice.neutron.services.grouppolicy import ( + group_policy_context as p_context) +from gbpservice.neutron.services.grouppolicy import ( + policy_driver_manager as manager) +from gbpservice.neutron.services.grouppolicy.common import exceptions as gp_exc LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/grouppolicy/policy_driver_manager.py b/gbpservice/neutron/services/grouppolicy/policy_driver_manager.py similarity index 98% rename from gbp/neutron/services/grouppolicy/policy_driver_manager.py rename to gbpservice/neutron/services/grouppolicy/policy_driver_manager.py index 54d118fce..14b401f6f 100644 --- a/gbp/neutron/services/grouppolicy/policy_driver_manager.py +++ b/gbpservice/neutron/services/grouppolicy/policy_driver_manager.py @@ -15,12 +15,12 @@ from oslo.config import cfg import stevedore -from gbp.neutron.services.grouppolicy.common import exceptions as gp_exc +from gbpservice.neutron.services.grouppolicy.common import exceptions as gp_exc LOG = log.getLogger(__name__) cfg.CONF.import_opt('policy_drivers', - 'gbp.neutron.services.grouppolicy.config', + 'gbpservice.neutron.services.grouppolicy.config', group='group_policy') @@ -66,7 +66,7 @@ class PolicyDriverManager(stevedore.named.NamedExtensionManager): LOG.info(_("Configured policy driver names: %s"), cfg.CONF.group_policy.policy_drivers) super(PolicyDriverManager, - self).__init__('gbp.neutron.group_policy.policy_drivers', + self).__init__('gbpservice.neutron.group_policy.policy_drivers', cfg.CONF.group_policy.policy_drivers, invoke_on_load=True, name_order=True) diff --git a/gbp/neutron/services/servicechain/__init__.py b/gbpservice/neutron/services/servicechain/__init__.py similarity index 100% rename from gbp/neutron/services/servicechain/__init__.py rename to gbpservice/neutron/services/servicechain/__init__.py diff --git a/gbp/neutron/services/servicechain/common/__init__.py b/gbpservice/neutron/services/servicechain/common/__init__.py similarity index 100% rename from gbp/neutron/services/servicechain/common/__init__.py rename to gbpservice/neutron/services/servicechain/common/__init__.py diff --git a/gbp/neutron/services/servicechain/common/exceptions.py b/gbpservice/neutron/services/servicechain/common/exceptions.py similarity index 100% rename from gbp/neutron/services/servicechain/common/exceptions.py rename to gbpservice/neutron/services/servicechain/common/exceptions.py diff --git a/gbp/neutron/services/servicechain/config.py b/gbpservice/neutron/services/servicechain/config.py similarity index 93% rename from gbp/neutron/services/servicechain/config.py rename to gbpservice/neutron/services/servicechain/config.py index 50d9afc58..83babadb4 100644 --- a/gbp/neutron/services/servicechain/config.py +++ b/gbpservice/neutron/services/servicechain/config.py @@ -18,7 +18,7 @@ service_chain_opts = [ default=['dummy'], help=_("An ordered list of service chain drivers " "entrypoints to be loaded from the " - "gbp.neutron.servicechain.servicechain_drivers " + "gbpservice.neutron.servicechain.servicechain_drivers " "namespace.")), cfg.StrOpt('heat_uri', default='http://localhost:8004/v1', diff --git a/gbp/neutron/services/servicechain/driver_manager.py b/gbpservice/neutron/services/servicechain/driver_manager.py similarity index 94% rename from gbp/neutron/services/servicechain/driver_manager.py rename to gbpservice/neutron/services/servicechain/driver_manager.py index 877b2b022..7364e5550 100644 --- a/gbp/neutron/services/servicechain/driver_manager.py +++ b/gbpservice/neutron/services/servicechain/driver_manager.py @@ -14,12 +14,13 @@ from neutron.openstack.common import log from oslo.config import cfg import stevedore -from gbp.neutron.services.servicechain.common import exceptions as sc_exc +from gbpservice.neutron.services.servicechain.common import ( + exceptions as sc_exc) LOG = log.getLogger(__name__) cfg.CONF.import_opt('servicechain_drivers', - 'gbp.neutron.services.servicechain.config', + 'gbpservice.neutron.services.servicechain.config', group='servicechain') @@ -38,10 +39,10 @@ class DriverManager(stevedore.named.NamedExtensionManager): LOG.info(_("Configured servicechain driver names: %s"), cfg.CONF.servicechain.servicechain_drivers) super(DriverManager, - self).__init__('gbp.neutron.servicechain.servicechain_drivers', - cfg.CONF.servicechain.servicechain_drivers, - invoke_on_load=True, - name_order=True) + self).__init__( + 'gbpservice.neutron.servicechain.servicechain_drivers', + cfg.CONF.servicechain.servicechain_drivers, + invoke_on_load=True, name_order=True) LOG.info(_("Loaded servicechain driver names: %s"), self.names()) self._register_drivers() diff --git a/gbp/neutron/services/servicechain/drivers/__init__.py b/gbpservice/neutron/services/servicechain/drivers/__init__.py similarity index 100% rename from gbp/neutron/services/servicechain/drivers/__init__.py rename to gbpservice/neutron/services/servicechain/drivers/__init__.py diff --git a/gbp/neutron/services/servicechain/drivers/dummy_driver.py b/gbpservice/neutron/services/servicechain/drivers/dummy_driver.py similarity index 100% rename from gbp/neutron/services/servicechain/drivers/dummy_driver.py rename to gbpservice/neutron/services/servicechain/drivers/dummy_driver.py diff --git a/gbp/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py b/gbpservice/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py similarity index 97% rename from gbp/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py rename to gbpservice/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py index 71706ccf5..e54c65dd9 100644 --- a/gbp/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py +++ b/gbpservice/neutron/services/servicechain/drivers/oneconvergence_servicechain_driver.py @@ -23,9 +23,9 @@ from neutron.openstack.common import log as logging from oslo.config import cfg import sqlalchemy as sa -from gbp.neutron.services.grouppolicy.drivers.oneconvergence import\ - nvsd_gbp_api -from gbp.neutron.services.servicechain.drivers import simplechain_driver +from gbpservice.neutron.services.grouppolicy.drivers.oneconvergence import ( + nvsd_gbp_api as napi) +from gbpservice.neutron.services.servicechain.drivers import simplechain_driver eventlet.monkey_patch() @@ -75,7 +75,7 @@ class OneconvergenceServiceChainDriver(simplechain_driver.SimpleChainDriver): def __init__(self): self.pending_chain_insertions = list() - self.nvsd_api = nvsd_gbp_api.NVSDServiceApi() + self.nvsd_api = napi.NVSDServiceApi() @log.log def create_servicechain_spec_precommit(self, context): @@ -152,14 +152,14 @@ class OneconvergenceServiceChainDriver(simplechain_driver.SimpleChainDriver): stack_template = jsonutils.loads(stack_template) config_param_values = sc_instance.get('config_param_values', {}) stack_params = {} - #config_param_values has the parameters for all Nodes. Only apply - #the ones relevant for this Node + # config_param_values has the parameters for all Nodes. Only apply + # the ones relevant for this Node if config_param_values: config_param_values = jsonutils.loads(config_param_values) config_param_names = sc_spec.get('config_param_names', []) if config_param_names: config_param_names = ast.literal_eval(config_param_names) - #TODO(magesh):Process on the basis of ResourceType rather than Name + # TODO(magesh):Process on the basis of ResourceType rather than Name provider_ptg_id = sc_instance.get("provider_ptg_id") node_params = (stack_template.get('Parameters') or stack_template.get('parameters')) @@ -168,12 +168,12 @@ class OneconvergenceServiceChainDriver(simplechain_driver.SimpleChainDriver): for key in list(set(config_param_names) & set(node_params.keys())): if key == "PoolMemberIPs": value = self._get_member_ips(context, provider_ptg_id) - #TODO(Magesh):Return one value for now + # TODO(Magesh):Return one value for now value = value[0] if value else "" config_param_values[key] = value elif key == "pool_member_port": value = self._get_member_ports(context, provider_ptg_id) - #TODO(Magesh):Return one value for now + # TODO(Magesh):Return one value for now value = value[0] if value else "" config_param_values[key] = value elif key == "Subnet": diff --git a/gbp/neutron/services/servicechain/drivers/simplechain_driver.py b/gbpservice/neutron/services/servicechain/drivers/simplechain_driver.py similarity index 99% rename from gbp/neutron/services/servicechain/drivers/simplechain_driver.py rename to gbpservice/neutron/services/servicechain/drivers/simplechain_driver.py index 896bb5749..92132ae6e 100644 --- a/gbp/neutron/services/servicechain/drivers/simplechain_driver.py +++ b/gbpservice/neutron/services/servicechain/drivers/simplechain_driver.py @@ -22,7 +22,7 @@ from oslo.config import cfg import sqlalchemy as sa -from gbp.neutron.services.servicechain.common import exceptions as exc +from gbpservice.neutron.services.servicechain.common import exceptions as exc LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/services/servicechain/servicechain_context.py b/gbpservice/neutron/services/servicechain/servicechain_context.py similarity index 100% rename from gbp/neutron/services/servicechain/servicechain_context.py rename to gbpservice/neutron/services/servicechain/servicechain_context.py diff --git a/gbp/neutron/services/servicechain/servicechain_plugin.py b/gbpservice/neutron/services/servicechain/servicechain_plugin.py similarity index 96% rename from gbp/neutron/services/servicechain/servicechain_plugin.py rename to gbpservice/neutron/services/servicechain/servicechain_plugin.py index 862b625cd..22ba0d56d 100644 --- a/gbp/neutron/services/servicechain/servicechain_plugin.py +++ b/gbpservice/neutron/services/servicechain/servicechain_plugin.py @@ -14,11 +14,13 @@ from neutron.common import log from neutron.openstack.common import excutils from neutron.openstack.common import log as logging -import gbp.neutron.db.servicechain_db as servicechain_db -from gbp.neutron.services.servicechain.common import exceptions as sc_exc -from gbp.neutron.services.servicechain import driver_manager as manager -from gbp.neutron.services.servicechain import servicechain_context as \ - servicechain_context +import gbpservice.neutron.db.servicechain_db as servicechain_db +from gbpservice.neutron.services.servicechain import ( + driver_manager as manager) +from gbpservice.neutron.services.servicechain import ( + servicechain_context as servicechain_context) +from gbpservice.neutron.services.servicechain.common import ( + exceptions as sc_exc) LOG = logging.getLogger(__name__) diff --git a/gbp/neutron/tests/__init__.py b/gbpservice/neutron/tests/__init__.py similarity index 100% rename from gbp/neutron/tests/__init__.py rename to gbpservice/neutron/tests/__init__.py diff --git a/gbp/neutron/tests/unit/__init__.py b/gbpservice/neutron/tests/unit/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/__init__.py rename to gbpservice/neutron/tests/unit/__init__.py diff --git a/gbp/neutron/tests/unit/common.py b/gbpservice/neutron/tests/unit/common.py similarity index 99% rename from gbp/neutron/tests/unit/common.py rename to gbpservice/neutron/tests/unit/common.py index 4f3bb2b5e..65dc25b2b 100644 --- a/gbp/neutron/tests/unit/common.py +++ b/gbpservice/neutron/tests/unit/common.py @@ -299,4 +299,4 @@ def get_resource_plural(resource): else: resource_plural = resource + 's' - return resource_plural \ No newline at end of file + return resource_plural diff --git a/gbp/neutron/tests/unit/db/__init__.py b/gbpservice/neutron/tests/unit/db/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/db/__init__.py rename to gbpservice/neutron/tests/unit/db/__init__.py diff --git a/gbp/neutron/tests/unit/db/grouppolicy/__init__.py b/gbpservice/neutron/tests/unit/db/grouppolicy/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/db/grouppolicy/__init__.py rename to gbpservice/neutron/tests/unit/db/grouppolicy/__init__.py diff --git a/gbp/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py b/gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py similarity index 99% rename from gbp/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py rename to gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py index b878d1ce8..689e8032b 100644 --- a/gbp/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py +++ b/gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py @@ -24,10 +24,10 @@ from neutron.tests.unit import test_db_plugin from neutron.tests.unit import test_extensions from oslo.config import cfg -from gbp.neutron.db.grouppolicy import group_policy_db as gpdb -import gbp.neutron.extensions -from gbp.neutron.extensions import group_policy as gpolicy -from gbp.neutron.tests.unit import common as cm +from gbpservice.neutron.db.grouppolicy import group_policy_db as gpdb +import gbpservice.neutron.extensions +from gbpservice.neutron.extensions import group_policy as gpolicy +from gbpservice.neutron.tests.unit import common as cm JSON_FORMAT = 'json' @@ -168,7 +168,8 @@ class GroupPolicyDbTestCase(GroupPolicyDBTestBase, def setUp(self, core_plugin=None, gp_plugin=None, service_plugins=None, ext_mgr=None): - extensions.append_api_extensions_path(gbp.neutron.extensions.__path__) + extensions.append_api_extensions_path( + gbpservice.neutron.extensions.__path__) if not gp_plugin: gp_plugin = DB_GP_PLUGIN_KLASS self.plugin = importutils.import_object(gp_plugin) diff --git a/gbp/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py b/gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py similarity index 97% rename from gbp/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py rename to gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py index b97362fb3..495b4ff68 100644 --- a/gbp/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py +++ b/gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_mapping_db.py @@ -17,8 +17,9 @@ import webob.exc from neutron.tests.unit import test_l3_plugin from neutron.tests.unit import testlib_api -from gbp.neutron.db.grouppolicy import group_policy_mapping_db as gpmdb -from gbp.neutron.tests.unit.db.grouppolicy import test_group_policy_db as tgpdb +from gbpservice.neutron.db.grouppolicy import group_policy_mapping_db as gpmdb +from gbpservice.neutron.tests.unit.db.grouppolicy import ( + test_group_policy_db as tgpdb) class GroupPolicyMappingDBTestPlugin(gpmdb.GroupPolicyMappingDbPlugin): @@ -30,7 +31,8 @@ DB_GP_PLUGIN_KLASS = (GroupPolicyMappingDBTestPlugin.__module__ + '.' + GroupPolicyMappingDBTestPlugin.__name__) SC_PLUGIN_KLASS = ( - "gbp.neutron.services.servicechain.servicechain_plugin.ServiceChainPlugin" + "gbpservice.neutron.services.servicechain.servicechain_plugin." + "ServiceChainPlugin" ) diff --git a/gbp/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py b/gbpservice/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py similarity index 98% rename from gbp/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py rename to gbpservice/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py index a4384cd21..14eda3c02 100644 --- a/gbp/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py +++ b/gbpservice/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py @@ -21,9 +21,9 @@ from neutron.plugins.common import constants from neutron.tests.unit import test_db_plugin from neutron.tests.unit import test_extensions -from gbp.neutron.db import servicechain_db as svcchain_db -import gbp.neutron.extensions -from gbp.neutron.extensions import servicechain as service_chain +from gbpservice.neutron.db import servicechain_db as svcchain_db +import gbpservice.neutron.extensions +from gbpservice.neutron.extensions import servicechain as service_chain JSON_FORMAT = 'json' @@ -212,7 +212,8 @@ class ServiceChainDbTestCase(ServiceChainDBTestBase, def setUp(self, core_plugin=None, sc_plugin=None, service_plugins=None, ext_mgr=None): - extensions.append_api_extensions_path(gbp.neutron.extensions.__path__) + extensions.append_api_extensions_path( + gbpservice.neutron.extensions.__path__) if not sc_plugin: sc_plugin = DB_GP_PLUGIN_KLASS self.plugin = importutils.import_object(sc_plugin) diff --git a/gbp/neutron/tests/unit/services/__init__.py b/gbpservice/neutron/tests/unit/services/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/services/__init__.py rename to gbpservice/neutron/tests/unit/services/__init__.py diff --git a/gbp/neutron/tests/unit/services/grouppolicy/__init__.py b/gbpservice/neutron/tests/unit/services/grouppolicy/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/services/grouppolicy/__init__.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/__init__.py diff --git a/gbp/neutron/tests/unit/services/grouppolicy/extensions/__init__.py b/gbpservice/neutron/tests/unit/services/grouppolicy/extensions/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/services/grouppolicy/extensions/__init__.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/extensions/__init__.py diff --git a/gbp/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py b/gbpservice/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py similarity index 98% rename from gbp/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py index 627d09e12..3288e8809 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/extensions/test_extension.py @@ -13,7 +13,7 @@ from neutron.api import extensions from neutron.api.v2 import attributes as attr -from gbp.neutron.extensions import group_policy as gp +from gbpservice.neutron.extensions import group_policy as gp EXTENDED_ATTRIBUTES_2_0 = { diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py similarity index 98% rename from gbp/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py index cf55c10fc..95298c6af 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_apic_mapping.py @@ -16,19 +16,22 @@ import sys import mock import netaddr +import webob.exc + from neutron.common import rpc as n_rpc from neutron import context from neutron.tests.unit.ml2.drivers.cisco.apic import ( test_cisco_apic_common as mocked) from neutron.tests.unit.ml2 import test_ml2_plugin from oslo.config import cfg -import webob.exc sys.modules["apicapi"] = mock.Mock() -from gbp.neutron.services.grouppolicy import config -from gbp.neutron.services.grouppolicy.drivers.cisco.apic import apic_mapping -from gbp.neutron.tests.unit.services.grouppolicy import test_grouppolicy_plugin +from gbpservice.neutron.services.grouppolicy import config +from gbpservice.neutron.services.grouppolicy.drivers.cisco.apic import ( + apic_mapping as amap) +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + test_grouppolicy_plugin as test_plugin) APIC_L2_POLICY = 'l2_policy' APIC_L3_POLICY = 'l3_policy' @@ -58,7 +61,7 @@ class MockCallRecorder(mock.Mock): class ApicMappingTestCase( - test_grouppolicy_plugin.GroupPolicyPluginTestCase, + test_plugin.GroupPolicyPluginTestCase, mocked.ControllerMixin, mocked.ConfigMixin): def setUp(self): @@ -66,7 +69,7 @@ class ApicMappingTestCase( ['implicit_policy', 'apic'], group='group_policy') n_rpc.create_connection = mock.Mock() - apic_mapping.ApicMappingDriver.get_apic_manager = mock.Mock() + amap.ApicMappingDriver.get_apic_manager = mock.Mock() self.set_up_mocks() ml2_opts = { 'mechanism_drivers': ['openvswitch', 'apic_gbp'], @@ -76,8 +79,8 @@ class ApicMappingTestCase( super(ApicMappingTestCase, self).setUp( core_plugin=test_ml2_plugin.PLUGIN_NAME) - self.driver = apic_mapping.ApicMappingDriver.get_initialized_instance() - apic_mapping.ApicMappingDriver.get_base_synchronizer = mock.Mock() + self.driver = amap.ApicMappingDriver.get_initialized_instance() + amap.ApicMappingDriver.get_base_synchronizer = mock.Mock() self.driver.name_mapper = mock.Mock() self.driver.name_mapper.tenant = echo self.driver.name_mapper.l2_policy = echo @@ -91,8 +94,8 @@ class ApicMappingTestCase( self.driver.apic_manager = mock.Mock(name_mapper=mock.Mock(), ext_net_dict={}) self.driver.apic_manager.apic.transaction = self.fake_transaction - apic_mapping.apic_manager.TENANT_COMMON = 'common' - self.common_tenant = apic_mapping.apic_manager.TENANT_COMMON + amap.apic_manager.TENANT_COMMON = 'common' + self.common_tenant = amap.apic_manager.TENANT_COMMON def _get_object(self, type, id, api): req = self.new_show_request(type, id, self.fmt) @@ -1023,7 +1026,7 @@ class TestExternalSegment(ApicMappingTestCase): def test_update_unsupported_noop(self): self._mock_external_dict([('supported', '192.168.0.2/24')]) es = self.create_external_segment( - name='unsupport', cidr = '192.168.0.0/24', + name='unsupport', cidr='192.168.0.0/24', external_routes=[{'destination': '0.0.0.0/0', 'nexthop': '192.168.0.254'}, {'destination': '128.0.0.0/16', @@ -1044,7 +1047,7 @@ class TestExternalSegment(ApicMappingTestCase): # Verify routes are updated correctly self._mock_external_dict([('supported', '192.168.0.2/24')]) es = self.create_external_segment( - name='supported', cidr = '192.168.0.0/24', shared=shared_es, + name='supported', cidr='192.168.0.0/24', shared=shared_es, external_routes=[{'destination': '0.0.0.0/0', 'nexthop': '192.168.0.254'}, {'destination': '128.0.0.0/16', diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py similarity index 98% rename from gbp/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py index 38a41fdbc..497fab73f 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_extension_driver_api.py @@ -16,15 +16,18 @@ from neutron.api import extensions from neutron.api.v2 import attributes from neutron.db import model_base -from gbp.neutron.services.grouppolicy import config -from gbp.neutron.services.grouppolicy import group_policy_driver_api as api -from gbp.neutron.tests.unit import common as cm -from gbp.neutron.tests.unit.services.grouppolicy import extensions as test_ext -from gbp.neutron.tests.unit.services.grouppolicy import test_grouppolicy_plugin +from gbpservice.neutron.services.grouppolicy import ( + group_policy_driver_api as api) +from gbpservice.neutron.services.grouppolicy import config +from gbpservice.neutron.tests.unit import common as cm +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + extensions as test_ext) +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + test_grouppolicy_plugin as test_plugin) class ExtensionDriverTestCase( - test_grouppolicy_plugin.GroupPolicyPluginTestCase): + test_plugin.GroupPolicyPluginTestCase): _extension_drivers = ['test'] @@ -817,4 +820,4 @@ class TestExtensionDriver(api.ExtensionDriver): def _acronim(type): - return ''.join([x[0] for x in type.split('_')]) \ No newline at end of file + return ''.join([x[0] for x in type.split('_')]) diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py similarity index 98% rename from gbp/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py index 070ec074a..ca0735f32 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_grouppolicy_plugin.py @@ -17,17 +17,18 @@ import webob.exc from neutron import context from oslo.config import cfg -from gbp.neutron.extensions import group_policy as gpolicy -import gbp.neutron.tests.unit.db.grouppolicy.test_group_policy_db as tgpdb -import gbp.neutron.tests.unit.db.grouppolicy.test_group_policy_mapping_db as \ - tgpmdb +from gbpservice.neutron.extensions import group_policy as gpolicy +from gbpservice.neutron.tests.unit.db.grouppolicy import ( + test_group_policy_db as tgpdb) +from gbpservice.neutron.tests.unit.db.grouppolicy import ( + test_group_policy_mapping_db as tgpmdb) cfg.CONF.import_opt('policy_drivers', - 'gbp.neutron.services.grouppolicy.config', + 'gbpservice.neutron.services.grouppolicy.config', group='group_policy') GP_PLUGIN_KLASS = ( - "gbp.neutron.services.grouppolicy.plugin.GroupPolicyPlugin" + "gbpservice.neutron.services.grouppolicy.plugin.GroupPolicyPlugin" ) @@ -392,7 +393,7 @@ class TestPolicyRule(GroupPolicyPluginTestCase): policy_classifier_id=pcns['id'], expected_res_status=400, shared=True) - #Verify shared rule fails with non shared action + # Verify shared rule fails with non shared action self.create_policy_rule( policy_classifier_id=pc['id'], policy_actions=[pans['id']], expected_res_status=400, shared=True) diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py similarity index 99% rename from gbp/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py index 2025f5ab6..61055fc6c 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_implicit_policy.py @@ -14,11 +14,12 @@ from oslo.config import cfg import webob.exc -from gbp.neutron.tests.unit.services.grouppolicy import test_grouppolicy_plugin +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + test_grouppolicy_plugin as test_plugin) class ImplicitPolicyTestCase( - test_grouppolicy_plugin.GroupPolicyPluginTestCase): + test_plugin.GroupPolicyPluginTestCase): def setUp(self): cfg.CONF.set_override('policy_drivers', ['implicit_policy'], diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py similarity index 87% rename from gbp/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py index 903866e28..49f18b58b 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_nuage_gbp_driver.py @@ -17,10 +17,11 @@ from neutron.tests.unit.ml2 import test_ml2_plugin from neutron.tests.unit.nuage import fake_nuageclient from oslo.config import cfg -from gbp.neutron.services.grouppolicy import config -from gbp.neutron.services.grouppolicy.drivers.nuage import ( +from gbpservice.neutron.services.grouppolicy import config +from gbpservice.neutron.services.grouppolicy.drivers.nuage import ( driver as nuage_driver) -from gbp.neutron.tests.unit.services.grouppolicy import test_grouppolicy_plugin +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + test_grouppolicy_plugin as test_plugin) FAKE_GBP_APP = 'ut_gbp_app' FAKE_DEFAULT_ENT = 'default' @@ -45,9 +46,8 @@ class FakeNuageGBPClient(fake_nuageclient.FakeNuageClient): def delete_ptg_postcommit(self, context, application): pass - def create_policyrule_postcommit(self, context, - gbp_action, gbp_classifier, - application): + def create_policyrule_postcommit(self, context, gbp_action, + gbp_classifier, application): pass def delete_policyrule_postcommit(self, context, application): @@ -57,8 +57,7 @@ class FakeNuageGBPClient(fake_nuageclient.FakeNuageClient): pass -class NuageGBPDriverTestCase( - test_grouppolicy_plugin.GroupPolicyPluginTestCase): +class NuageGBPDriverTestCase(test_plugin.GroupPolicyPluginTestCase): def setUp(self): config.cfg.CONF.set_override('policy_drivers', diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py similarity index 97% rename from gbp/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py index 34ebff463..20b8da307 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_odl_mapping.py @@ -13,12 +13,14 @@ import mock -from gbp.neutron.services.grouppolicy.common import constants as g_const -from gbp.neutron.services.grouppolicy.common import exceptions as gpexc -from gbp.neutron.services.grouppolicy import config -from gbp.neutron.tests.unit.services.grouppolicy import test_grouppolicy_plugin from neutron.tests.unit.ml2 import test_ml2_plugin +from gbpservice.neutron.services.grouppolicy.common import constants as g_const +from gbpservice.neutron.services.grouppolicy.common import exceptions as gpexc +from gbpservice.neutron.services.grouppolicy import config +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + test_grouppolicy_plugin as test_plugin) + TENANT_ID = '33336c48e9b84dcfb3a70813bb3b3333' @@ -135,8 +137,7 @@ class FakeGBPPlugin(object): return self._rule_sets[rule_set_id] -class OdlMappingTestCase( - test_grouppolicy_plugin.GroupPolicyPluginTestCase): +class OdlMappingTestCase(test_plugin.GroupPolicyPluginTestCase): def setUp(self): config.cfg.CONF.set_override('policy_drivers', diff --git a/gbp/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py b/gbpservice/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py similarity index 99% rename from gbp/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py rename to gbpservice/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py index 085d720cd..d8224fe6f 100644 --- a/gbp/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py +++ b/gbpservice/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py @@ -29,13 +29,14 @@ from neutron.tests.unit import test_extension_security_group from neutron.tests.unit import test_l3_plugin import webob.exc -from gbp.neutron.db.grouppolicy import group_policy_db as gpdb -from gbp.neutron.db import servicechain_db -from gbp.neutron.services.grouppolicy.common import constants as gconst -from gbp.neutron.services.grouppolicy import config -from gbp.neutron.services.grouppolicy.drivers import resource_mapping -from gbp.neutron.services.servicechain import config as sc_cfg -from gbp.neutron.tests.unit.services.grouppolicy import test_grouppolicy_plugin +from gbpservice.neutron.db.grouppolicy import group_policy_db as gpdb +from gbpservice.neutron.db import servicechain_db +from gbpservice.neutron.services.grouppolicy.common import constants as gconst +from gbpservice.neutron.services.grouppolicy import config +from gbpservice.neutron.services.grouppolicy.drivers import resource_mapping +from gbpservice.neutron.services.servicechain import config as sc_cfg +from gbpservice.neutron.tests.unit.services.grouppolicy import ( + test_grouppolicy_plugin as test_plugin) SERVICECHAIN_NODES = 'servicechain/servicechain_nodes' SERVICECHAIN_SPECS = 'servicechain/servicechain_specs' @@ -49,12 +50,11 @@ class NoL3NatSGTestPlugin( supported_extension_aliases = ["external-net", "security-group"] -CORE_PLUGIN = ('gbp.neutron.tests.unit.services.grouppolicy.' +CORE_PLUGIN = ('gbpservice.neutron.tests.unit.services.grouppolicy.' 'test_resource_mapping.NoL3NatSGTestPlugin') -class ResourceMappingTestCase( - test_grouppolicy_plugin.GroupPolicyPluginTestCase): +class ResourceMappingTestCase(test_plugin.GroupPolicyPluginTestCase): def setUp(self): config.cfg.CONF.set_override('policy_drivers', diff --git a/gbp/neutron/tests/unit/services/servicechain/__init__.py b/gbpservice/neutron/tests/unit/services/servicechain/__init__.py similarity index 100% rename from gbp/neutron/tests/unit/services/servicechain/__init__.py rename to gbpservice/neutron/tests/unit/services/servicechain/__init__.py diff --git a/gbp/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py b/gbpservice/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py similarity index 80% rename from gbp/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py rename to gbpservice/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py index f5533a238..40e3297d3 100644 --- a/gbp/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py +++ b/gbpservice/neutron/tests/unit/services/servicechain/test_servicechain_plugin.py @@ -13,14 +13,15 @@ from oslo.config import cfg -import gbp.neutron.tests.unit.db.grouppolicy.test_servicechain_db as\ - test_servicechain_db +from gbpservice.neutron.tests.unit.db.grouppolicy import ( + test_servicechain_db as test_servicechain_db) cfg.CONF.import_opt('servicechain_drivers', - 'gbp.neutron.services.servicechain.config', + 'gbpservice.neutron.services.servicechain.config', group='servicechain') SC_PLUGIN_KLASS = ( - "gbp.neutron.services.servicechain.servicechain_plugin.ServiceChainPlugin" + "gbpservice.neutron.services.servicechain.servicechain_plugin." + "ServiceChainPlugin" ) diff --git a/gbp/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py b/gbpservice/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py similarity index 97% rename from gbp/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py rename to gbpservice/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py index 42538a1ed..15808104f 100644 --- a/gbp/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py +++ b/gbpservice/neutron/tests/unit/services/servicechain/test_simple_chain_driver.py @@ -18,10 +18,10 @@ from neutron.openstack.common import uuidutils from neutron.plugins.common import constants import webob -from gbp.neutron.services.servicechain import config -import gbp.neutron.services.servicechain.drivers.simplechain_driver as\ +from gbpservice.neutron.services.servicechain import config +import gbpservice.neutron.services.servicechain.drivers.simplechain_driver as\ simplechain_driver -from gbp.neutron.tests.unit.services.servicechain import \ +from gbpservice.neutron.tests.unit.services.servicechain import \ test_servicechain_plugin diff --git a/gbp/neutron/tests/unit/test_extension_group_policy.py b/gbpservice/neutron/tests/unit/test_extension_group_policy.py similarity index 99% rename from gbp/neutron/tests/unit/test_extension_group_policy.py rename to gbpservice/neutron/tests/unit/test_extension_group_policy.py index 57a5e33c2..7bacd7a3c 100644 --- a/gbp/neutron/tests/unit/test_extension_group_policy.py +++ b/gbpservice/neutron/tests/unit/test_extension_group_policy.py @@ -21,8 +21,8 @@ from neutron.tests.unit import test_api_v2 from neutron.tests.unit import test_api_v2_extension from webob import exc -from gbp.neutron.extensions import group_policy as gp -from gbp.neutron.tests.unit import common as cm +from gbpservice.neutron.extensions import group_policy as gp +from gbpservice.neutron.tests.unit import common as cm _uuid = uuidutils.generate_uuid _get_path = test_api_v2._get_path diff --git a/gbp/neutron/tests/unit/test_extension_group_policy_mapping.py b/gbpservice/neutron/tests/unit/test_extension_group_policy_mapping.py similarity index 94% rename from gbp/neutron/tests/unit/test_extension_group_policy_mapping.py rename to gbpservice/neutron/tests/unit/test_extension_group_policy_mapping.py index cb228c064..bc58191bc 100644 --- a/gbp/neutron/tests/unit/test_extension_group_policy_mapping.py +++ b/gbpservice/neutron/tests/unit/test_extension_group_policy_mapping.py @@ -12,10 +12,10 @@ from neutron.plugins.common import constants -from gbp.neutron.extensions import group_policy as gp -from gbp.neutron.extensions import group_policy_mapping as gpm -from gbp.neutron.tests.unit import common as cm -from gbp.neutron.tests.unit import test_extension_group_policy as tgp +from gbpservice.neutron.extensions import group_policy as gp +from gbpservice.neutron.extensions import group_policy_mapping as gpm +from gbpservice.neutron.tests.unit import common as cm +from gbpservice.neutron.tests.unit import test_extension_group_policy as tgp class GroupPolicyMappingExtTestCase(tgp.GroupPolicyExtensionTestCase): diff --git a/gbp/neutron/tests/unit/test_extension_servicechain.py b/gbpservice/neutron/tests/unit/test_extension_servicechain.py similarity index 99% rename from gbp/neutron/tests/unit/test_extension_servicechain.py rename to gbpservice/neutron/tests/unit/test_extension_servicechain.py index 00ed551ab..940c98026 100644 --- a/gbp/neutron/tests/unit/test_extension_servicechain.py +++ b/gbpservice/neutron/tests/unit/test_extension_servicechain.py @@ -20,7 +20,7 @@ from neutron.plugins.common import constants from neutron.tests.unit import test_api_v2 from neutron.tests.unit import test_api_v2_extension -from gbp.neutron.extensions import servicechain +from gbpservice.neutron.extensions import servicechain _uuid = uuidutils.generate_uuid _get_path = test_api_v2._get_path diff --git a/gbp/tests/__init__.py b/gbpservice/tests/__init__.py similarity index 100% rename from gbp/tests/__init__.py rename to gbpservice/tests/__init__.py diff --git a/gbp/tests/base.py b/gbpservice/tests/base.py similarity index 100% rename from gbp/tests/base.py rename to gbpservice/tests/base.py diff --git a/gbp/tests/test_gbp.py b/gbpservice/tests/test_gbp.py similarity index 95% rename from gbp/tests/test_gbp.py rename to gbpservice/tests/test_gbp.py index c33754404..2c465ebb6 100644 --- a/gbp/tests/test_gbp.py +++ b/gbpservice/tests/test_gbp.py @@ -17,7 +17,7 @@ test_group-based-policy Tests for `group-based-policy` module. """ -from gbp.tests import base +from gbpservice.tests import base class TestGroupBasedPolicy(base.TestCase): diff --git a/openstack-common.conf b/openstack-common.conf index 77decc8b2..ce59d48f8 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -8,4 +8,4 @@ module=with_venv module=test # The base module to hold the copy of openstack.common -base=gbp +base=gbpservice diff --git a/run_tests.sh b/run_tests.sh index 2b64736c2..88762ca19 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -110,7 +110,7 @@ function run_tests { if [ "$testropts" = "" ] && [ "$testrargs" = "" ]; then # Default to running all tests if specific test is not # provided. - testrargs="discover ./gbp/" + testrargs="discover ./gbpservice/" fi ${wrapper} python -m testtools.run $testropts $testrargs @@ -130,7 +130,7 @@ function run_tests { set +e testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'` TESTRTESTS="$TESTRTESTS --testr-args='--subunit $testropts $testrargs'" - OS_TEST_PATH=`echo $testrargs|grep -o 'gbp\.tests[^[:space:]:]*\+'|tr . /` + OS_TEST_PATH=`echo $testrargs|grep -o 'gbpservice\.tests[^[:space:]:]*\+'|tr . /` if [ -d "$OS_TEST_PATH" ]; then wrapper="OS_TEST_PATH=$OS_TEST_PATH $wrapper" elif [ -d "$(dirname $OS_TEST_PATH)" ]; then @@ -147,7 +147,7 @@ function run_tests { echo "Generating coverage report in covhtml/" # Don't compute coverage for common code, which is tested elsewhere ${wrapper} coverage combine - ${wrapper} coverage html --include='gbp/*' --omit='gbp/openstack/common/*' -d covhtml -i + ${wrapper} coverage html --include='gbpservice/*' --omit='gbpservice/openstack/common/*' -d covhtml -i fi return $RESULT diff --git a/setup.cfg b/setup.cfg index 980d3cde1..b9659baa6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,32 +23,32 @@ classifier = [files] packages = - gbp + gbpservice [entry_points] console_scripts= - gbp-db-manage = gbp.neutron.db.migration.cli:main + gbp-db-manage = gbpservice.neutron.db.migration.cli:main neutron.service_plugins = - group_policy = gbp.neutron.services.grouppolicy.plugin:GroupPolicyPlugin - servicechain = gbp.neutron.services.servicechain.servicechain_plugin:ServiceChainPlugin -gbp.neutron.group_policy.extension_drivers = - test = gbp.neutron.tests.unit.services.grouppolicy.test_extension_driver_api:TestExtensionDriver -gbp.neutron.group_policy.policy_drivers = - dummy = gbp.neutron.services.grouppolicy.drivers.dummy_driver:NoopDriver - implicit_policy = gbp.neutron.services.grouppolicy.drivers.implicit_policy:ImplicitPolicyDriver - resource_mapping = gbp.neutron.services.grouppolicy.drivers.resource_mapping:ResourceMappingDriver - apic = gbp.neutron.services.grouppolicy.drivers.cisco.apic.apic_mapping:ApicMappingDriver - odl = gbp.neutron.services.grouppolicy.drivers.odl.odl_mapping:OdlMappingDriver - oneconvergence_gbp_driver = gbp.neutron.services.grouppolicy.drivers.oneconvergence.nvsd_gbp_driver:NvsdGbpDriver - nuage_gbp_driver = gbp.neutron.services.grouppolicy.drivers.nuage.driver:NuageGBPDriver + group_policy = gbpservice.neutron.services.grouppolicy.plugin:GroupPolicyPlugin + servicechain = gbpservice.neutron.services.servicechain.servicechain_plugin:ServiceChainPlugin +gbpservice.neutron.group_policy.extension_drivers = + test = gbpservice.neutron.tests.unit.services.grouppolicy.test_extension_driver_api:TestExtensionDriver +gbpservice.neutron.group_policy.policy_drivers = + dummy = gbpservice.neutron.services.grouppolicy.drivers.dummy_driver:NoopDriver + implicit_policy = gbpservice.neutron.services.grouppolicy.drivers.implicit_policy:ImplicitPolicyDriver + resource_mapping = gbpservice.neutron.services.grouppolicy.drivers.resource_mapping:ResourceMappingDriver + apic = gbpservice.neutron.services.grouppolicy.drivers.cisco.apic.apic_mapping:ApicMappingDriver + odl = gbpservice.neutron.services.grouppolicy.drivers.odl.odl_mapping:OdlMappingDriver + oneconvergence_gbp_driver = gbpservice.neutron.services.grouppolicy.drivers.oneconvergence.nvsd_gbp_driver:NvsdGbpDriver + nuage_gbp_driver = gbpservice.neutron.services.grouppolicy.drivers.nuage.driver:NuageGBPDriver neutron.ml2.mechanism_drivers = - apic_gbp = gbp.neutron.plugins.ml2.drivers.grouppolicy.apic.driver:APICMechanismGBPDriver - nuage_gbp = gbp.neutron.plugins.ml2.drivers.grouppolicy.nuage.driver:NuageMechanismGBPDriver - odl_gbp = gbp.neutron.plugins.ml2.drivers.grouppolicy.odl.driver:OdlMechanismGBPDriver -gbp.neutron.servicechain.servicechain_drivers = - dummy = gbp.neutron.services.servicechain.drivers.dummy_driver:NoopDriver - simplechain_driver = gbp.neutron.services.servicechain.drivers.simplechain_driver:SimpleChainDriver - oneconvergence_servicechain_driver = gbp.neutron.services.servicechain.drivers.oneconvergence_servicechain_driver:OneconvergenceServiceChainDriver + apic_gbp = gbpservice.neutron.plugins.ml2.drivers.grouppolicy.apic.driver:APICMechanismGBPDriver + nuage_gbp = gbpservice.neutron.plugins.ml2.drivers.grouppolicy.nuage.driver:NuageMechanismGBPDriver + odl_gbp = gbpservice.neutron.plugins.ml2.drivers.grouppolicy.odl.driver:OdlMechanismGBPDriver +gbpservice.neutron.servicechain.servicechain_drivers = + dummy = gbpservice.neutron.services.servicechain.drivers.dummy_driver:NoopDriver + simplechain_driver = gbpservice.neutron.services.servicechain.drivers.simplechain_driver:SimpleChainDriver + oneconvergence_servicechain_driver = gbpservice.neutron.services.servicechain.drivers.oneconvergence_servicechain_driver:OneconvergenceServiceChainDriver [build_sphinx] source-dir = doc/source diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh index 88381f6be..5df584066 100755 --- a/tools/config/check_uptodate.sh +++ b/tools/config/check_uptodate.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PROJECT_NAME=${PROJECT_NAME:-gbp} +PROJECT_NAME=${PROJECT_NAME:-gbpservice} CFGFILE_NAME=${PROJECT_NAME}.conf.sample if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index 5a4ffaa28..e6993945d 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -121,7 +121,7 @@ export EVENTLET_NO_GREENDNS=yes OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) [ "$OS_VARS" ] && eval "unset \$OS_VARS" -DEFAULT_MODULEPATH=gbp.openstack.common.config.generator +DEFAULT_MODULEPATH=gbpservice.openstack.common.config.generator MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE