From eaa9ab1d39406c460c5dc135d4dfdee1c08e8d90 Mon Sep 17 00:00:00 2001
From: Manjeet Singh Bhatia <manjeet.s.bhatia@intel.com>
Date: Mon, 10 Jul 2017 20:31:32 +0000
Subject: [PATCH] Update Full stack config

Fixing the config for fullstack tests to use new netvirt
and force the creation of br-int.

Change-Id: I33e230b9fcf9333f6c588a964fc7c38285628723
---
 devstack/plugin.sh                  | 1 +
 devstack/pre_test_hook.sh           | 5 ++++-
 tools/configure_for_func_testing.sh | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 52ef80814..9b18525ee 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -81,6 +81,7 @@ if is_service_enabled odl-compute; then
             create_nova_conf_neutron
         fi
         bind_opendaylight_controller
+        sudo ovs-vsctl --may-exist add-br $OVS_BR
         wait_for_active_bridge $OVS_BR $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT
 
         # L3 needs to be configured only for netvirt-ovsdb - in netvirt-vpnservice L3 is configured
diff --git a/devstack/pre_test_hook.sh b/devstack/pre_test_hook.sh
index 8c6429d09..bee4985c7 100644
--- a/devstack/pre_test_hook.sh
+++ b/devstack/pre_test_hook.sh
@@ -6,6 +6,7 @@ set -xe
 GATE_DEST=$BASE/new
 DEVSTACK_PATH=$GATE_DEST/devstack
 # for localrc_set
+ODL_NETVIRT_COMMON=odl-neutron-service,odl-restconf-all,odl-aaa-authn
 source $DEVSTACK_PATH/inc/ini-config
 
 case "$ODL_RELEASE_BASE" in
@@ -99,7 +100,9 @@ case "$ODL_RELEASE_BASE" in
         ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger
         ;;
     carbon-snapshot|nitrogen-snapshot)
-        ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger,odl-neutron-hostconfig-ovs
+        ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_COMMON,odl-netvirt-openstack,odl-neutron-logger,odl-neutron-hostconfig-ovs
+        ODL_GATE_SERVICE_PROVIDER="netvirt"
+        ODL_MAPPING_KEY="public"
         ;;
     *)
         ;;
diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index adcb3d348..05412da8a 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -190,7 +190,8 @@ function _install_opendaylight {
     ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-neutron-logger
     if [[ "$VENV" =~ "fullstack" ]]; then
         # TODO: in future switch to new netvirt
-        ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack,odl-neutron-logger
+        ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack,odl-neutron-logger
+        ODL_PROVIDER_MAPPINGS=public:${Q_PUBLIC_VETH_INT}
     fi
     ODL_BOOT_WAIT_URL=controller/nb/v2/neutron/networks
     source $NETWORKING_ODL_DIR/devstack/settings.odl