Merge "Drop for 'tenant_id' column for 'cisco_csr_identifier_map' table"

neutron_vpnaas/db/migration/alembic_migrations/versions/HEADS

@@ -1,2 +1,2 @@
 24f28869838b
-333dfd6afaa2
+2c82e782d734

neutron_vpnaas/db/migration/alembic_migrations/versions/liberty/contract/2c82e782d734_drop_tenant_id_in_cisco_csr_identifier_.py

@@ -0,0 +1,32 @@
+# Copyright 2015 Mirantis Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+
+"""drop_tenant_id_in_cisco_csr_identifier_map
+
+Revision ID: 2c82e782d734
+Revises: 333dfd6afaa2
+Create Date: 2015-08-20 15:17:09.897944
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '2c82e782d734'
+down_revision = '333dfd6afaa2'
+
+from alembic import op
+
+
+def upgrade():
+    op.drop_column('cisco_csr_identifier_map', 'tenant_id')

neutron_vpnaas/services/vpn/service_drivers/cisco_csr_db.py

@@ -14,7 +14,6 @@
 
 from neutron.common import exceptions
 from neutron.db import model_base
-from neutron.db import models_v2
 from neutron.i18n import _LI
 from oslo_db import exception as db_exc
 from oslo_log import log as logging
@@ -45,7 +44,7 @@ class CsrInternalError(exceptions.NeutronException):
     message = _("Fatal - %(reason)s")
 
 
-class IdentifierMap(model_base.BASEV2, models_v2.HasTenant):
+class IdentifierMap(model_base.BASEV2):
 
     """Maps OpenStack IDs to compatible numbers for Cisco CSR."""