From: Aaron Rosen Date: Fri, 4 Jan 2013 00:52:42 +0000 (-0800) Subject: Remove relative imports from NVP plugin X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=20ea05f5d230d1bf9e70c9cc79a1089c2e4595df;p=openstack-build%2Fneutron-build.git 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 --- diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/NvpApiClient.py b/quantum/plugins/nicira/nicira_nvp_plugin/NvpApiClient.py index 48a8d60e9..b83648a9e 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 9daefca06..11c7b2ca3 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 f76d4a961..07dd0007e 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 87f79ba05..268462585 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 a0cdb81b0..391112d0c 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 , 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 8e10ee128..840643b75 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 bd61ca7b3..70e5db379 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 a398a31c5..de8ad3821 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 1c878d382..398dce4da 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 5d93ae4b3..07dd0007e 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 570e0bc0d..7fbae42a1 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 256bb5316..1a176be06 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 a55f185a3..0a07785ba 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 97d929595..8d0753ea5 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 5e7098088..1a2b67bbf 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"