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

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

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")
 

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

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.

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.
 

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.
 
 

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.
 
 

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.
 
 

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.
 
 

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
-#

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

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.
 #

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):

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"

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"