From 398a04cdc6db8f72db4bee0b6d7bd6873f30da70 Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Thu, 30 May 2019 15:31:10 +0300 Subject: [PATCH] Move import out of octavia driver's way Octavia driver fails due to misplaced import Also remove wrong #noqa from plugins Change-Id: Icf03d089a383d253b9f2e9a62d71577dd9341f48 --- vmware_nsx/__init__.py | 1 - vmware_nsx/extensions/__init__.py | 13 +++++++++++++ vmware_nsx/plugins/dvs/plugin.py | 2 +- vmware_nsx/plugins/nsx/plugin.py | 2 +- vmware_nsx/plugins/nsx_p/plugin.py | 2 +- vmware_nsx/plugins/nsx_v/plugin.py | 2 +- vmware_nsx/plugins/nsx_v3/plugin.py | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/vmware_nsx/__init__.py b/vmware_nsx/__init__.py index 8971d311f9..99c772c822 100644 --- a/vmware_nsx/__init__.py +++ b/vmware_nsx/__init__.py @@ -11,7 +11,6 @@ # under the License. from neutron.common import eventlet_utils -from neutron.db.models import securitygroup # noqa eventlet_utils.monkey_patch() diff --git a/vmware_nsx/extensions/__init__.py b/vmware_nsx/extensions/__init__.py index e69de29bb2..8675b16078 100644 --- a/vmware_nsx/extensions/__init__.py +++ b/vmware_nsx/extensions/__init__.py @@ -0,0 +1,13 @@ +# 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 neutron.db.models import securitygroup # noqa diff --git a/vmware_nsx/plugins/dvs/plugin.py b/vmware_nsx/plugins/dvs/plugin.py index deb0f73d42..255f19ee7a 100644 --- a/vmware_nsx/plugins/dvs/plugin.py +++ b/vmware_nsx/plugins/dvs/plugin.py @@ -41,7 +41,7 @@ from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import dns_db from neutron.db import external_net_db from neutron.db import l3_db -from neutron.db.models import securitygroup as securitygroup_model # noqa +from neutron.db.models import securitygroup as securitygroup_model from neutron.db import models_v2 from neutron.db import portbindings_db from neutron.db import portsecurity_db diff --git a/vmware_nsx/plugins/nsx/plugin.py b/vmware_nsx/plugins/nsx/plugin.py index b9b070f50a..e21a5e9fd9 100644 --- a/vmware_nsx/plugins/nsx/plugin.py +++ b/vmware_nsx/plugins/nsx/plugin.py @@ -40,7 +40,7 @@ from neutron.db import extraroute_db from neutron.db import l3_db from neutron.db import l3_gwmode_db from neutron.db.models import l3 as l3_db_models -from neutron.db.models import securitygroup as securitygroup_model # noqa +from neutron.db.models import securitygroup as securitygroup_model from neutron.db import models_v2 from neutron.db import portsecurity_db from neutron.db import securitygroups_db diff --git a/vmware_nsx/plugins/nsx_p/plugin.py b/vmware_nsx/plugins/nsx_p/plugin.py index 80a6ab4f44..b3f4b12f3e 100644 --- a/vmware_nsx/plugins/nsx_p/plugin.py +++ b/vmware_nsx/plugins/nsx_p/plugin.py @@ -26,7 +26,7 @@ from oslo_utils import uuidutils from neutron.db import agents_db from neutron.db import l3_db from neutron.db.models import l3 as l3_db_models -from neutron.db.models import securitygroup as securitygroup_model # noqa +from neutron.db.models import securitygroup as securitygroup_model from neutron.db import models_v2 from neutron.extensions import securitygroup as ext_sg from neutron.quota import resource_registry diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py index 121b10a742..d7bb459831 100644 --- a/vmware_nsx/plugins/nsx_v/plugin.py +++ b/vmware_nsx/plugins/nsx_v/plugin.py @@ -86,7 +86,7 @@ from neutron.db import extraroute_db from neutron.db import l3_db from neutron.db import l3_gwmode_db from neutron.db.models import l3 as l3_db_models -from neutron.db.models import securitygroup as securitygroup_model # noqa +from neutron.db.models import securitygroup as securitygroup_model from neutron.db import models_v2 from neutron.db import portsecurity_db from neutron.db import securitygroups_db diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index b42717e50c..f2befdc71a 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -56,7 +56,7 @@ from neutron.api.rpc.handlers import metadata_rpc from neutron.db import agents_db from neutron.db import l3_db from neutron.db.models import l3 as l3_db_models -from neutron.db.models import securitygroup as securitygroup_model # noqa +from neutron.db.models import securitygroup as securitygroup_model from neutron.db import models_v2 from neutron.extensions import securitygroup as ext_sg from neutron.quota import resource_registry