Merge "Shorten the path of the nicira nvp plugin."

quantum/plugins/__init__.py

@@ -14,3 +14,11 @@
 #    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 sys
+
+from quantum.plugins import nicira
+
+# Provide a mapping for the nicira_nvp_plugin package to ensure
+# backwards compatibilty for configuration.
+sys.modules['quantum.plugins.nicira.nicira_nvp_plugin'] = nicira

quantum/plugins/nicira/NvpApiClient.py

@@ -19,7 +19,7 @@
 
 import httplib  # basic HTTP library for HTTPS connections
 import logging
-from quantum.plugins.nicira.nicira_nvp_plugin.api_client import (
+from quantum.plugins.nicira.api_client import (
     client_eventlet, request_eventlet)
 
 LOG = logging.getLogger("NVPApiHelper")

quantum/plugins/nicira/QuantumPlugin.py

@@ -51,27 +51,20 @@ from quantum.extensions import providernet as pnet
 from quantum.extensions import securitygroup as ext_sg
 from quantum.openstack.common import importutils
 from quantum.openstack.common import rpc
-from quantum.plugins.nicira.nicira_nvp_plugin.common import (metadata_access
-                                                             as nvp_meta)
-from quantum.plugins.nicira.nicira_nvp_plugin.common import (securitygroups
-                                                             as nvp_sec)
+from quantum.plugins.nicira.common import metadata_access as nvp_meta
+from quantum.plugins.nicira.common import securitygroups as nvp_sec
 from quantum import policy
-from quantum.plugins.nicira.nicira_nvp_plugin.common import config
-from quantum.plugins.nicira.nicira_nvp_plugin.common import (exceptions
-                                                             as nvp_exc)
-from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_networkgw
-                                                                 as networkgw)
-from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_qos
-                                                                 as ext_qos)
-from quantum.plugins.nicira.nicira_nvp_plugin import nicira_db
-from quantum.plugins.nicira.nicira_nvp_plugin import (nicira_networkgw_db
-                                                      as networkgw_db)
-from quantum.plugins.nicira.nicira_nvp_plugin import nicira_qos_db as qos_db
-from quantum.plugins.nicira.nicira_nvp_plugin import nvp_cluster
-from quantum.plugins.nicira.nicira_nvp_plugin.nvp_plugin_version import (
-    PLUGIN_VERSION)
-from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
-from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
+from quantum.plugins.nicira.common import config
+from quantum.plugins.nicira.common import exceptions as nvp_exc
+from quantum.plugins.nicira.extensions import nvp_networkgw as networkgw
+from quantum.plugins.nicira.extensions import nvp_qos as ext_qos
+from quantum.plugins.nicira import nicira_db
+from quantum.plugins.nicira import nicira_networkgw_db as networkgw_db
+from quantum.plugins.nicira import nicira_qos_db as qos_db
+from quantum.plugins.nicira import nvp_cluster
+from quantum.plugins.nicira.nvp_plugin_version import PLUGIN_VERSION
+from quantum.plugins.nicira import NvpApiClient
+from quantum.plugins.nicira import nvplib
 
 LOG = logging.getLogger("QuantumPlugin")
 NVP_NOSNAT_RULES_ORDER = 10
@@ -125,7 +118,7 @@ def parse_config():
     if not cfg.CONF.api_extensions_path:
         cfg.CONF.set_override(
             'api_extensions_path',
-            'quantum/plugins/nicira/nicira_nvp_plugin/extensions')
+            'quantum/plugins/nicira/extensions')
     if (cfg.CONF.NVP.metadata_mode == "access_network" and
         not cfg.CONF.allow_overlapping_ips):
         LOG.warn(_("Overlapping IPs must be enabled in order to setup "

quantum/plugins/nicira/README

@@ -44,5 +44,5 @@ Quantum Configuration
     Modify your Quantum configuration for using the NVP Plugin:
 
     core_plugin =
-        quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin.NvpPluginV2
+        quantum.plugins.nicira.QuantumPlugin.NvpPluginV2
 

quantum/plugins/nicira/__init__.py

@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 Nicira Networks, 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.

quantum/plugins/nicira/api_client/client.py

@@ -25,7 +25,7 @@ import time
 import logging
 
 
-from quantum.plugins.nicira.nicira_nvp_plugin.api_client.common import (
+from quantum.plugins.nicira.api_client.common import (
     _conn_str)
 
 

quantum/plugins/nicira/api_client/client_eventlet.py

@@ -22,8 +22,8 @@ import eventlet
 import logging
 import time
 
-from quantum.plugins.nicira.nicira_nvp_plugin.api_client import client
-from quantum.plugins.nicira.nicira_nvp_plugin.api_client import (
+from quantum.plugins.nicira.api_client import client
+from quantum.plugins.nicira.api_client import (
     request_eventlet)
 
 eventlet.monkey_patch()

quantum/plugins/nicira/api_client/request.py

@@ -26,7 +26,7 @@ import logging
 import time
 import urlparse
 
-from quantum.plugins.nicira.nicira_nvp_plugin.api_client.common import (
+from quantum.plugins.nicira.api_client.common import (
     _conn_str)
 
 logging.basicConfig(level=logging.INFO)

quantum/plugins/nicira/api_client/request_eventlet.py

@@ -24,7 +24,7 @@ import json
 import logging
 import urllib
 
-from quantum.plugins.nicira.nicira_nvp_plugin.api_client import request
+from quantum.plugins.nicira.api_client import request
 
 eventlet.monkey_patch()
 logging.basicConfig(level=logging.INFO)

quantum/plugins/nicira/check_nvp_config.py

@@ -24,9 +24,9 @@ import sys
 from oslo.config import cfg
 
 from quantum.common import config
-from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
-from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
-from quantum.plugins.nicira.nicira_nvp_plugin import QuantumPlugin
+from quantum.plugins.nicira import NvpApiClient
+from quantum.plugins.nicira import nvplib
+from quantum.plugins.nicira import QuantumPlugin
 
 config.setup_logging(cfg.CONF)
 

quantum/plugins/nicira/common/metadata_access.py

@@ -27,9 +27,8 @@ from quantum.common import exceptions as q_exc
 from quantum.db import l3_db
 from quantum.db import models_v2
 from quantum.openstack.common import log as logging
-from quantum.plugins.nicira.nicira_nvp_plugin.common import (exceptions
-                                                             as nvp_exc)
-from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
+from quantum.plugins.nicira.common import exceptions as nvp_exc
+from quantum.plugins.nicira import NvpApiClient
 
 
 LOG = logging.getLogger(__name__)

quantum/plugins/nicira/nicira_db.py

@@ -19,8 +19,8 @@ from sqlalchemy.orm import exc
 
 import quantum.db.api as db
 from quantum.openstack.common import log as logging
-from quantum.plugins.nicira.nicira_nvp_plugin import nicira_models
-from quantum.plugins.nicira.nicira_nvp_plugin import nicira_networkgw_db
+from quantum.plugins.nicira import nicira_models
+from quantum.plugins.nicira import nicira_networkgw_db
 
 LOG = logging.getLogger(__name__)
 

quantum/plugins/nicira/nicira_networkgw_db.py

@@ -31,7 +31,7 @@ from quantum.db import model_base
 from quantum.db import models_v2
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import uuidutils
-from quantum.plugins.nicira.nicira_nvp_plugin.extensions import nvp_networkgw
+from quantum.plugins.nicira.extensions import nvp_networkgw
 
 
 LOG = logging.getLogger(__name__)

quantum/plugins/nicira/nicira_nvp_plugin/common/__init__.py

@@ -1,16 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Nicira Networks, 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.

quantum/plugins/nicira/nicira_qos_db.py

@@ -23,9 +23,8 @@ from quantum.api.v2 import attributes as attr
 from quantum.db import model_base
 from quantum.db import models_v2
 from quantum.openstack.common import uuidutils
-from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_qos
-                                                                 as ext_qos)
-from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
+from quantum.plugins.nicira.extensions import nvp_qos as ext_qos
+from quantum.plugins.nicira import nvplib
 
 
 class QoSQueue(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):

quantum/plugins/nicira/nvplib.py

@@ -30,9 +30,9 @@ import logging
 # no quantum-specific logic in it
 from quantum.common import constants
 from quantum.common import exceptions as exception
-from quantum.plugins.nicira.nicira_nvp_plugin.common import (
+from quantum.plugins.nicira.common import (
     exceptions as nvp_exc)
-from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
+from quantum.plugins.nicira import NvpApiClient
 
 
 # HTTP METHODS CONSTANTS