Final decomposition of the nuage plugin

This removes what's left of the nuage code and artifacts from the
neutron tree. All the vendor code is now in the
nuagenetworks/nuage-openstack-neutron repo on github.

Closes-Bug: #1518643

Change-Id: Ifbb9484f36a3e42c6039c42c7f8d0bcbd482bbf8

diff --git a/doc/source/stadium/sub_projects.rst b/doc/source/stadium/sub_projects.rst
index 1f32437ddbff93fb968cdebd2ff1e8c5a3f1a7dd..03986892f708af8ddfbe3db4f8ab824d5d74a3a9 100644 (file)
--- a/doc/source/stadium/sub_projects.rst
+++ b/doc/source/stadium/sub_projects.rst
@@ -335,7 +335,7 @@ NEC
 Nuage
 +++++
 
-* Git: https://github.com/nuage-networks/nuage-openstack-neutron
+* Git: https://github.com/nuagenetworks/nuage-openstack-neutron
 
 .. _networking-odl:
 

diff --git a/etc/neutron/plugins/nuage/nuage_plugin.ini b/etc/neutron/plugins/nuage/nuage_plugin.ini
deleted file mode 100644 (file)
index aad37bd..0000000
--- a/etc/neutron/plugins/nuage/nuage_plugin.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-# Please fill in the correct data for all the keys below and uncomment key-value pairs
-[restproxy]
-# (StrOpt) Default Network partition in which VSD will
-# orchestrate network resources using openstack
-#
-#default_net_partition_name = <default-net-partition-name>
-
-# (StrOpt) Nuage provided uri for initial authorization to
-# access VSD
-#
-#auth_resource = /auth
-
-# (StrOpt) IP Address and Port of VSD
-#
-#server = ip:port
-
-# (StrOpt) Organization name in which VSD will orchestrate
-# network resources using openstack
-#
-#organization = org
-
-# (StrOpt) Username and password of VSD for authentication
-#
-#serverauth = uname:pass
-
-# (BoolOpt) Boolean for SSL connection with VSD server
-#
-#serverssl = True
-
-# (StrOpt) Nuage provided base uri to reach out to VSD
-#
-#base_uri = /base
-
-[syncmanager]
-# (BoolOpt) Boolean to enable sync between openstack and VSD
-#
-#enable_sync = False
-
-# (IntOpt) Sync interval in seconds between openstack and VSD
-#
-#sync_interval = 0
\ No newline at end of file

diff --git a/neutron/db/migration/alembic_migrations/external.py b/neutron/db/migration/alembic_migrations/external.py
index 84ae298fe80efdd44b4dfede71b8f7ce79d0baaf..51b6e394e2d0c08769d578373f832209405ff166 100644 (file)
--- a/neutron/db/migration/alembic_migrations/external.py
+++ b/neutron/db/migration/alembic_migrations/external.py
@@ -115,10 +115,19 @@ REPO_BIGSWITCH_TABLES = [
     'nexthops',
 ]
 
+# Nuage models are in github.com/nuagenetworks/nuage-openstack-neutron
+REPO_NUAGE_TABLES = [
+    'nuage_net_partitions',
+    'nuage_net_partition_router_mapping',
+    'nuage_provider_net_bindings',
+    'nuage_subnet_l2dom_mapping',
+]
+
 TABLES = (FWAAS_TABLES + LBAAS_TABLES + VPNAAS_TABLES +
           REPO_ARISTA_TABLES +
           REPO_CISCO_TABLES +
           REPO_VMWARE_TABLES +
           REPO_NEC_TABLES +
           REPO_BROCADE_TABLES +
-          REPO_BIGSWITCH_TABLES)
+          REPO_BIGSWITCH_TABLES +
+          REPO_NUAGE_TABLES)

diff --git a/neutron/db/migration/models/head.py b/neutron/db/migration/models/head.py
index 3db6b4b701024b824cd506c96f1a636eba18d8c2..db811544564aa8f185872fff575533aa466c1790 100644 (file)
--- a/neutron/db/migration/models/head.py
+++ b/neutron/db/migration/models/head.py
@@ -53,7 +53,6 @@ from neutron.plugins.ml2.drivers import type_gre  # noqa
 from neutron.plugins.ml2.drivers import type_vlan  # noqa
 from neutron.plugins.ml2.drivers import type_vxlan  # noqa
 from neutron.plugins.ml2 import models  # noqa
-from neutron.plugins.nuage import nuage_models  # noqa
 
 
 def get_metadata():

diff --git a/neutron/plugins/nuage/__init__.py b/neutron/plugins/nuage/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/neutron/plugins/nuage/nuage_models.py b/neutron/plugins/nuage/nuage_models.py
deleted file mode 100644 (file)
index 15e89e7..0000000
--- a/neutron/plugins/nuage/nuage_models.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2014 Alcatel-Lucent USA Inc.
-# All Rights Reserved.
-#
-#    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.
-
-import sqlalchemy as sa
-from sqlalchemy import orm
-
-from neutron.db import model_base
-from neutron.db import models_v2
-
-
-class NetPartition(model_base.BASEV2, models_v2.HasId):
-    __tablename__ = 'nuage_net_partitions'
-    name = sa.Column(sa.String(64))
-    l3dom_tmplt_id = sa.Column(sa.String(36))
-    l2dom_tmplt_id = sa.Column(sa.String(36))
-    isolated_zone = sa.Column(sa.String(64))
-    shared_zone = sa.Column(sa.String(64))
-
-
-class NetPartitionRouter(model_base.BASEV2):
-    __tablename__ = "nuage_net_partition_router_mapping"
-    net_partition_id = sa.Column(sa.String(36),
-                                 sa.ForeignKey('nuage_net_partitions.id',
-                                 ondelete="CASCADE"),
-                                 primary_key=True)
-    router_id = sa.Column(sa.String(36),
-                          sa.ForeignKey('routers.id', ondelete="CASCADE"),
-                          primary_key=True)
-    nuage_router_id = sa.Column(sa.String(36), unique=True)
-    nuage_rtr_rt = sa.Column(sa.String(36))
-    nuage_rtr_rd = sa.Column(sa.String(36))
-
-
-class ProviderNetBinding(model_base.BASEV2):
-    """Represents binding of virtual network to physical_network and vlan."""
-    __tablename__ = 'nuage_provider_net_bindings'
-
-    network_id = sa.Column(sa.String(36),
-                           sa.ForeignKey('networks.id', ondelete="CASCADE"),
-                           primary_key=True)
-    network_type = sa.Column(sa.String(32), nullable=False)
-    physical_network = sa.Column(sa.String(64), nullable=False)
-    vlan_id = sa.Column(sa.Integer, nullable=False)
-
-    network = orm.relationship(
-        models_v2.Network,
-        backref=orm.backref("pnetbinding", lazy='joined',
-                            uselist=False, cascade='delete'))
-
-
-class SubnetL2Domain(model_base.BASEV2):
-    __tablename__ = 'nuage_subnet_l2dom_mapping'
-    subnet_id = sa.Column(sa.String(36),
-                          sa.ForeignKey('subnets.id', ondelete="CASCADE"),
-                          primary_key=True)
-    net_partition_id = sa.Column(sa.String(36),
-                                 sa.ForeignKey('nuage_net_partitions.id',
-                                 ondelete="CASCADE"))
-    nuage_subnet_id = sa.Column(sa.String(36), unique=True)
-    nuage_l2dom_tmplt_id = sa.Column(sa.String(36))
-    nuage_user_id = sa.Column(sa.String(36))
-    nuage_group_id = sa.Column(sa.String(36))
-    nuage_managed_subnet = sa.Column(sa.Boolean())

diff --git a/neutron/plugins/nuage/plugin.py b/neutron/plugins/nuage/plugin.py
deleted file mode 100644 (file)
index 082d949..0000000
--- a/neutron/plugins/nuage/plugin.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2014 Alcatel-Lucent USA 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.
-
-from nuage_neutron.plugins.nuage import plugin
-
-
-class NuagePlugin(plugin.NuagePlugin):
-
-    vendor_extensions = plugin.NuagePlugin.vendor_extensions
-    supported_extension_aliases = ["router", "binding", "external-net",
-                                   "quotas", "provider", "extraroute",
-                                   "security-group"] + vendor_extensions
-
-    def __init__(self):
-        super(NuagePlugin, self).__init__()

diff --git a/setup.cfg b/setup.cfg
index 8f0061738d4910abb038682887373a3b2a267d86..d27a39159772272a67d3aba2caa52d6ab493a45b 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,7 +39,6 @@ data_files =
         etc/neutron/plugins/cisco/cisco_vpn_agent.ini
     etc/neutron/plugins/ml2 =
         etc/neutron/plugins/ml2/ml2_conf_ofa.ini
-    etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini
 scripts =
     bin/neutron-rootwrap-xen-dom0
 
@@ -71,7 +70,6 @@ console_scripts =
     neutron-sanity-check = neutron.cmd.sanity_check:main
 neutron.core_plugins =
     ml2 = neutron.plugins.ml2.plugin:Ml2Plugin
-    nuage = neutron.plugins.nuage.plugin:NuagePlugin
 neutron.service_plugins =
     dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin
     router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin