From 9188df45846472741fd78a82d2bbf0a4e079642d Mon Sep 17 00:00:00 2001
From: Aaron Rosen <arosen@nicira.com>
Date: Thu, 3 Jan 2013 16:52:42 -0800
Subject: [PATCH] Remove relative imports from NVP plugin

The majority of relative imports in the nvp plugin will be fixed in
blueprint nvp-api-client-loadbalance-request. This patch removes the
rest of them in and moves the vim tabstop line to the top of the
header file to be consistent with the rest of the files in quantum.
Fixes bug 1091596

Change-Id: I6c8299ca73ae5df75c87f302680908f863f81f02
---
 .../nicira/nicira_nvp_plugin/NvpApiClient.py  |  4 ++--
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py | 20 +++++++------------
 .../nicira/nicira_nvp_plugin/__init__.py      |  4 ++--
 .../nicira_nvp_plugin/api_client/__init__.py  |  4 ++--
 .../nicira_nvp_plugin/api_client/client.py    |  4 ++--
 .../api_client/client_eventlet.py             |  4 ++--
 .../nicira_nvp_plugin/api_client/common.py    |  4 ++--
 .../nicira_nvp_plugin/api_client/request.py   |  4 ++--
 .../api_client/request_eventlet.py            |  4 ++--
 .../nicira_nvp_plugin/common/__init__.py      |  5 ++---
 .../nicira/nicira_nvp_plugin/nicira_db.py     |  2 ++
 .../nicira/nicira_nvp_plugin/nicira_models.py |  1 +
 .../nicira/nicira_nvp_plugin/nvp_cluster.py   |  5 ++---
 .../nicira_nvp_plugin/nvp_plugin_version.py   |  4 ++--
 .../nicira/nicira_nvp_plugin/nvplib.py        | 19 +++++-------------
 15 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/NvpApiClient.py b/quantum/plugins/nicira/nicira_nvp_plugin/NvpApiClient.py
index 48a8d60e92..b83648a9e3 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/NvpApiClient.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/NvpApiClient.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Somik Behera, Nicira Networks, Inc.
 
 import httplib  # basic HTTP library for HTTPS connections
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
index 9daefca066..11c7b2ca3d 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Somik Behera, Nicira Networks, Inc.
 # @author: Brad Hall, Nicira Networks, Inc.
 # @author: Aaron Rosen, Nicira Networks, Inc.
@@ -25,13 +25,6 @@ import logging
 
 import webob.exc
 
-# FIXME(salvatore-orlando): get rid of relative imports
-from common import config
-from nvp_plugin_version import PLUGIN_VERSION
-
-from quantum.plugins.nicira.nicira_nvp_plugin import nicira_models
-
-
 from quantum.api.v2 import attributes
 from quantum.api.v2 import base
 from quantum.common import constants
@@ -47,14 +40,15 @@ from quantum.extensions import providernet as pnet
 from quantum.openstack.common import cfg
 from quantum.openstack.common import rpc
 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 import nicira_db
+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 nvp_cluster
-
-import NvpApiClient
-import nvplib
-
+from quantum.plugins.nicira.nicira_nvp_plugin.nvp_plugin_version import (
+    PLUGIN_VERSION)
 
 LOG = logging.getLogger("QuantumPlugin")
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/__init__.py b/quantum/plugins/nicira/nicira_nvp_plugin/__init__.py
index f76d4a9610..07dd0007e2 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/__init__.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/__init__.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira Networks, Inc.
 # All Rights Reserved
 #
@@ -12,5 +14,3 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/__init__.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/__init__.py
index 87f79ba055..2684625857 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/__init__.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/__init__.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,6 +15,4 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Aaron Rosen, Nicira Networks, Inc.
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client.py
index a0cdb81b09..391112d0cd 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: David Lapsley <dlapsley@nicira.com>, Nicira Networks, Inc.
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py
index 8e10ee1285..840643b75a 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/common.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/common.py
index bd61ca7b3a..70e5db3795 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/common.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/common.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request.py
index a398a31c55..de8ad38218 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py
index 1c878d3822..398dce4daa 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/common/__init__.py b/quantum/plugins/nicira/nicira_nvp_plugin/common/__init__.py
index 5d93ae4b3a..07dd0007e2 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/common/__init__.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/common/__init__.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira Networks, Inc.
 # All Rights Reserved
 #
@@ -12,6 +14,3 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py
index 570e0bc0d5..7fbae42a1f 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py
@@ -1,4 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved.
 #
@@ -14,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+
 import logging
 
 from sqlalchemy.orm import exc
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py
index 256bb53163..1a176be060 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py
@@ -1,4 +1,5 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved.
 #
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nvp_cluster.py b/quantum/plugins/nicira/nicira_nvp_plugin/nvp_cluster.py
index a55f185a3f..0a07785ba3 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nvp_cluster.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nvp_cluster.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira, Inc.
 # All Rights Reserved
 #
@@ -12,9 +14,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 
 
 class NVPCluster(object):
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nvp_plugin_version.py b/quantum/plugins/nicira/nicira_nvp_plugin/nvp_plugin_version.py
index 97d9295953..8d0753ea5c 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nvp_plugin_version.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nvp_plugin_version.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira Networks, Inc.
 # All Rights Reserved
 #
@@ -13,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 
 # This will get updated at build time.  Version 0 indicates developer build.
 PLUGIN_VERSION = "0"
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py b/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
index 5e7098088c..1a2b67bbfd 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
@@ -1,3 +1,5 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
 # Copyright 2012 Nicira Networks, Inc.
 # All Rights Reserved
 #
@@ -13,34 +15,23 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 # @author: Brad Hall, Nicira Networks, Inc.
 # @author: Dave Lapsley, Nicira Networks, Inc.
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
 
-# TODO(bgh): We should break this into separate files.  It will just keep
-# growing as we add more features :)
-
 from copy import copy
-import functools
+import hashlib
 import itertools
 import json
-import hashlib
 import logging
-import random
-import re
-import uuid
-
-from eventlet import semaphore
-
-import NvpApiClient
 
 #FIXME(danwent): I'd like this file to get to the point where it has
 # 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 import NvpApiClient
+
 
 # HTTP METHODS CONSTANTS
 HTTP_GET = "GET"