Merge pull request #1102 from zhaoqin-github/ci-stable-pike

Fix CI job (stable-pike)

Author: zhaoqin-github

f5lbaasdriver/v2/bigip/neutron_client.py

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-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
 
+from neutron_lib.api.definitions import portbindings
+
 LOG = logging.getLogger(__name__)
 
 
@@ -64,7 +64,8 @@ def create_port_on_subnet(self, context, subnet_id=None,
                 }
 
                 if ('binding:capabilities' in
-                        portbindings.EXTENDED_ATTRIBUTES_2_0['ports']):
+                        portbindings.RESOURCE_ATTRIBUTE_MAP[
+                            portbindings.COLLECTION_NAME]):
                     port_data['binding:capabilities'] = {
                         'port_filter': False}
                 port = self.plugin.db._core_plugin.create_port(

requirements.test.txt

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