Merge "Move import out of octavia driver's way"

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

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

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

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

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

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

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