Open newton development

This patch also catches up neutron code refactoring
on Segments database model to avoid test failures.

Change-Id: I57597c049ce93130663ad128e5bb584b9d2d56ed

networking_nec/nwa/l2/rpc/nwa_l2_server_callback.py

@@ -14,9 +14,9 @@
 
 from neutron.db import api as db_api
 from neutron.db import models_v2
+from neutron.db import segments_db
 from neutron import manager
 from neutron.plugins.ml2 import db as db_ml2
-from neutron.plugins.ml2 import models as models_ml2
 from neutron_lib import constants
 from oslo_log import helpers
 from oslo_log import log as logging
@@ -75,7 +75,7 @@ class NwaL2ServerRpcCallback(object):
         session = db_api.get_session()
         with session.begin(subtransactions=True):
             try:
-                query = (session.query(models_ml2.NetworkSegment).
+                query = (session.query(segments_db.NetworkSegment).
                          filter_by(network_id=network_id))
                 query = query.filter_by(physical_network=physical_network)
                 query = query.filter_by(is_dynamic=True)

tools/tox_install.sh

@@ -16,7 +16,7 @@
 ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
 neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?)
 # Neutron branch to be used
-BRANCH_NAME=stable/mitaka
+BRANCH_NAME=master
 
 set -e
 

tox.ini

@@ -8,7 +8,7 @@ usedevelop = True
 install_command =
   # networking-nec is still targetted to Mitaka development,
   # so we need to use upper-constraints.txt from stable/mitaka branch.
-  {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/mitaka} {opts} {packages}
+  {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master} {opts} {packages}
 # Note the hash seed is set to 0 until neutron can be tested with a
 # random hash seed successfully.
 setenv =