From 7203f2c67138d8266204a85feaeb3d0aa6817bc7 Mon Sep 17 00:00:00 2001 From: Shih-Hao Li Date: Mon, 14 Sep 2015 16:45:18 -0700 Subject: [PATCH] Move vmware_nsx/neutron/db to vmware_nsx/db This is part of new vmware_nsx directory structure proposed in https://goo.gl/GdWXyH. Change-Id: I50468e8ecf81a636ac6a0f195c75b4bef25423b4 --- setup.cfg | 2 +- vmware_nsx/{neutron => }/db/__init__.py | 0 vmware_nsx/{neutron => }/db/migration/__init__.py | 0 .../{neutron => }/db/migration/alembic_migrations/__init__.py | 0 .../{neutron => }/db/migration/alembic_migrations/env.py | 2 +- .../db/migration/alembic_migrations/script.py.mako | 0 .../db/migration/alembic_migrations/versions/HEADS | 0 .../db/migration/alembic_migrations/versions/kilo_release.py | 0 .../393bf843b96_initial_liberty_no_op_contract_script.py | 0 .../expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py | 0 .../liberty/expand/28430956782d_nsxv3_security_groups.py | 0 .../53a3254aa95e_initial_liberty_no_op_expand_script.py | 0 vmware_nsx/{neutron => }/db/migration/models/__init__.py | 0 vmware_nsx/{neutron => }/db/migration/models/head.py | 0 vmware_nsx/neutron/tests/functional/db/test_migrations.py | 4 ++-- 15 files changed, 4 insertions(+), 4 deletions(-) rename vmware_nsx/{neutron => }/db/__init__.py (100%) rename vmware_nsx/{neutron => }/db/migration/__init__.py (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/__init__.py (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/env.py (98%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/script.py.mako (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/versions/HEADS (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/versions/kilo_release.py (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/versions/liberty/contract/393bf843b96_initial_liberty_no_op_contract_script.py (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/versions/liberty/expand/28430956782d_nsxv3_security_groups.py (100%) rename vmware_nsx/{neutron => }/db/migration/alembic_migrations/versions/liberty/expand/53a3254aa95e_initial_liberty_no_op_expand_script.py (100%) rename vmware_nsx/{neutron => }/db/migration/models/__init__.py (100%) rename vmware_nsx/{neutron => }/db/migration/models/head.py (100%) diff --git a/setup.cfg b/setup.cfg index 668b59c463..a4544e2064 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ data_files = console_scripts = neutron-check-nsx-config = vmware_nsx.neutron.plugins.vmware.check_nsx_config:main neutron.db.alembic_migrations = - vmware-nsx = vmware_nsx.neutron.db.migration:alembic_migrations + vmware-nsx = vmware_nsx.db.migration:alembic_migrations neutron.core_plugins = vmware = vmware_nsx.neutron.plugins.vmware.plugin:NsxMhPlugin neutron.service_plugins = diff --git a/vmware_nsx/neutron/db/__init__.py b/vmware_nsx/db/__init__.py similarity index 100% rename from vmware_nsx/neutron/db/__init__.py rename to vmware_nsx/db/__init__.py diff --git a/vmware_nsx/neutron/db/migration/__init__.py b/vmware_nsx/db/migration/__init__.py similarity index 100% rename from vmware_nsx/neutron/db/migration/__init__.py rename to vmware_nsx/db/migration/__init__.py diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/__init__.py b/vmware_nsx/db/migration/alembic_migrations/__init__.py similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/__init__.py rename to vmware_nsx/db/migration/alembic_migrations/__init__.py diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/env.py b/vmware_nsx/db/migration/alembic_migrations/env.py similarity index 98% rename from vmware_nsx/neutron/db/migration/alembic_migrations/env.py rename to vmware_nsx/db/migration/alembic_migrations/env.py index 34ead54e4d..5b7aa46247 100644 --- a/vmware_nsx/neutron/db/migration/alembic_migrations/env.py +++ b/vmware_nsx/db/migration/alembic_migrations/env.py @@ -24,7 +24,7 @@ from neutron.db.migration.alembic_migrations import external from neutron.db.migration.models import head # noqa from neutron.db import model_base -from vmware_nsx.neutron.db.migration import alembic_migrations +from vmware_nsx.db.migration import alembic_migrations MYSQL_ENGINE = None diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/script.py.mako b/vmware_nsx/db/migration/alembic_migrations/script.py.mako similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/script.py.mako rename to vmware_nsx/db/migration/alembic_migrations/script.py.mako diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/versions/HEADS b/vmware_nsx/db/migration/alembic_migrations/versions/HEADS similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/versions/HEADS rename to vmware_nsx/db/migration/alembic_migrations/versions/HEADS diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/versions/kilo_release.py b/vmware_nsx/db/migration/alembic_migrations/versions/kilo_release.py similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/versions/kilo_release.py rename to vmware_nsx/db/migration/alembic_migrations/versions/kilo_release.py diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/contract/393bf843b96_initial_liberty_no_op_contract_script.py b/vmware_nsx/db/migration/alembic_migrations/versions/liberty/contract/393bf843b96_initial_liberty_no_op_contract_script.py similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/contract/393bf843b96_initial_liberty_no_op_contract_script.py rename to vmware_nsx/db/migration/alembic_migrations/versions/liberty/contract/393bf843b96_initial_liberty_no_op_contract_script.py diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py b/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py rename to vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/expand/28430956782d_nsxv3_security_groups.py b/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/28430956782d_nsxv3_security_groups.py similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/expand/28430956782d_nsxv3_security_groups.py rename to vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/28430956782d_nsxv3_security_groups.py diff --git a/vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/expand/53a3254aa95e_initial_liberty_no_op_expand_script.py b/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/53a3254aa95e_initial_liberty_no_op_expand_script.py similarity index 100% rename from vmware_nsx/neutron/db/migration/alembic_migrations/versions/liberty/expand/53a3254aa95e_initial_liberty_no_op_expand_script.py rename to vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/53a3254aa95e_initial_liberty_no_op_expand_script.py diff --git a/vmware_nsx/neutron/db/migration/models/__init__.py b/vmware_nsx/db/migration/models/__init__.py similarity index 100% rename from vmware_nsx/neutron/db/migration/models/__init__.py rename to vmware_nsx/db/migration/models/__init__.py diff --git a/vmware_nsx/neutron/db/migration/models/head.py b/vmware_nsx/db/migration/models/head.py similarity index 100% rename from vmware_nsx/neutron/db/migration/models/head.py rename to vmware_nsx/db/migration/models/head.py diff --git a/vmware_nsx/neutron/tests/functional/db/test_migrations.py b/vmware_nsx/neutron/tests/functional/db/test_migrations.py index 3cbde99dd6..757a549512 100644 --- a/vmware_nsx/neutron/tests/functional/db/test_migrations.py +++ b/vmware_nsx/neutron/tests/functional/db/test_migrations.py @@ -21,8 +21,8 @@ from neutron.db.migration import cli as migration from neutron.tests.common import base from neutron.tests.functional.db import test_migrations -from vmware_nsx.neutron.db.migration import alembic_migrations -from vmware_nsx.neutron.db.models import head +from vmware_nsx.db.migration import alembic_migrations +from vmware_nsx.db.models import head # EXTERNAL_TABLES should contain all names of tables that are not related to # current repo.