Merge pull request #912 from kush1093/master

Merging Ocata-devel with the Master branch

Author: jlongstaf

README.rst

@@ -94,8 +94,8 @@ to Openstack_CLA@f5.com prior to their code submission being included
 in this project.
 
 
-.. |Build Status| image:: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver.svg?branch=stable/newton
-    :target: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver?branch=stable/newton
+.. |Build Status| image:: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver.svg?branch=stable/ocata
+    :target: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver?branch=stable/ocata
 .. |slack badge| image:: https://f5-openstack-slack.herokuapp.com/badge.svg
     :target: https://f5-openstack-slack.herokuapp.com/
     :alt: Slack

docs/README.rst

@@ -187,7 +187,7 @@ What's Next
 
 `Configure and start the F5 Agent`_.
 
-.. |Build Status| image:: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver.svg?branch=stable/newton
+.. |Build Status| image:: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver.svg?branch=stable/ocata
     :target: https://travis-ci.org/F5Networks/f5-openstack-lbaasv2-driver
     :alt: Build Status
 

f5lbaasdriver/__init__.py

@@ -1 +1 @@
-__version__ = "10.2.0"
+__version__ = "11.0.0"

f5lbaasdriver/v2/bigip/disconnected_service.py

@@ -13,8 +13,10 @@
 # limitations under the License.
 #
 
+from neutron.db import segments_db
 from neutron.plugins.ml2 import db
 from neutron.plugins.ml2 import models
+
 from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
@@ -50,8 +52,8 @@ def get_network_segment(self, context, agent_configuration, network):
             agent_configuration.get('tunnel_types', [])
         ]
         # look up segment details in the ml2_network_segments table
-        segments = db.get_network_segments(context.session, network['id'],
-                                           filter_dynamic=None)
+        segments = segments_db.get_network_segments(context, network['id'],
+                                                    filter_dynamic=None)
 
         for segment in segments:
             LOG.debug("F5 disconnected service check segment: %s" % segment)

f5lbaasdriver/v2/bigip/neutron_client.py

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-from neutron.api.v2 import attributes
-from neutron.common import constants as neutron_const
 from neutron.extensions import portbindings
 
+from neutron_lib import constants as neutron_const
+
 from oslo_log import helpers as log_helpers
 from oslo_log import log as logging
 
@@ -38,7 +38,7 @@ def create_port_on_subnet(self, context, subnet_id=None,
         port = None
 
         if not mac_address:
-            mac_address = attributes.ATTR_NOT_SPECIFIED
+            mac_address = neutron_const.ATTR_NOT_SPECIFIED
 
         if subnet_id:
             try:

f5lbaasdriver/v2/bigip/plugin_rpc.py

@@ -15,19 +15,21 @@
 # limitations under the License.
 #
 
-from oslo_log import helpers as log_helpers
-from oslo_log import log as logging
+from f5lbaasdriver.v2.bigip import constants_v2 as constants
 
-from neutron.api.v2 import attributes
 from neutron.common import rpc as neutron_rpc
 from neutron.db import agents_db
 from neutron.extensions import portbindings
 from neutron.plugins.common import constants as plugin_constants
+
 from neutron_lbaas.db.loadbalancer import models
 from neutron_lbaas.services.loadbalancer import constants as nlb_constant
+
 from neutron_lib import constants as neutron_const
 
-from f5lbaasdriver.v2.bigip import constants_v2 as constants
+from oslo_log import helpers as log_helpers
+from oslo_log import log as logging
+
 
 LOG = logging.getLogger(__name__)
 
@@ -510,7 +512,7 @@ def create_port_on_subnet(self, context, subnet_id=None,
                     subnet_id
                 )
                 if not mac_address:
-                    mac_address = attributes.ATTR_NOT_SPECIFIED
+                    mac_address = neutron_const.ATTR_NOT_SPECIFIED
                 fixed_ip = {'subnet_id': subnet['id']}
                 if fixed_address_count > 1:
                     fixed_ips = []
@@ -678,7 +680,7 @@ def create_port_on_network(self, context, network_id=None,
             )
 
             if not mac_address:
-                mac_address = attributes.ATTR_NOT_SPECIFIED
+                mac_address = neutron_const.ATTR_NOT_SPECIFIED
             if not host:
                 host = ''
             if not name:
@@ -692,7 +694,7 @@ def create_port_on_network(self, context, network_id=None,
                 'admin_state_up': True,
                 'device_owner': 'network:f5lbaasv2',
                 'status': neutron_const.PORT_STATUS_ACTIVE,
-                'fixed_ips': attributes.ATTR_NOT_SPECIFIED
+                'fixed_ips': neutron_const.ATTR_NOT_SPECIFIED
             }
             if device_id:
                 port_data['device_id'] = device_id

requirements.test.txt

@@ -1,7 +1,7 @@
 -e .
 
-git+https://github.com/openstack/neutron.git@newton-eol
-git+https://github.com/F5Networks/neutron-lbaas.git@stable/newton
+git+https://github.com/openstack/neutron.git@stable/ocata
+git+https://github.com/F5Networks/neutron-lbaas.git@stable/ocata
 git+https://github.com/F5Networks/pytest-symbols.git
 git+https://github.com/F5Networks/f5-openstack-test.git@stable/newton
 
@@ -13,8 +13,7 @@ f5-sdk==2.3.3
 # URL.  If you add a version here it will be ignored, and therefore be
 # misleading to readers of this file.
 #
-# NOTE: As of OCT-26-2017, upper-constraints is still at stable/newton, not newton-eol.
--c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/newton
+-c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata
 
 mock==IGNORED      # See section comment
 pytest==IGNORED    # See section comment