summaryrefslogtreecommitdiffstats
path: root/networking-odl/devstack/pre_test_hook.sh
diff options
context:
space:
mode:
authorWojciech Dec <wdec@cisco.com>2016-08-17 13:14:23 +0200
committerWojciech Dec <wdec@cisco.com>2016-08-17 13:14:23 +0200
commit4979a23b8b2c0094ced98cf05eebb692d6609937 (patch)
treec49ceeb5b127fdb0e10c0f5ac0516be96cbd31a9 /networking-odl/devstack/pre_test_hook.sh
parentc3b2c2a9a22bac5cf17813c589444d3abebaa23b (diff)
Correcting networking-odl to mitaka/stable + app topology patch
Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035 Signed-off-by: Wojciech Dec <wdec@cisco.com>
Diffstat (limited to 'networking-odl/devstack/pre_test_hook.sh')
-rw-r--r--networking-odl/devstack/pre_test_hook.sh47
1 files changed, 4 insertions, 43 deletions
diff --git a/networking-odl/devstack/pre_test_hook.sh b/networking-odl/devstack/pre_test_hook.sh
index df11e2a..fbb7f7e 100644
--- a/networking-odl/devstack/pre_test_hook.sh
+++ b/networking-odl/devstack/pre_test_hook.sh
@@ -7,14 +7,14 @@ GATE_DEST=$BASE/new
DEVSTACK_PATH=$GATE_DEST/devstack
case "$ODL_RELEASE_BASE" in
- carbon-snapshot)
- ODL_RELEASE=carbon-snapshot-0.6.0
- ;;
boron-snapshot)
ODL_RELEASE=boron-snapshot-0.5.0
;;
beryllium-snapshot)
- ODL_RELEASE=beryllium-snapshot-0.4.4
+ ODL_RELEASE=beryllium-snapshot-0.4.2
+ ;;
+ lithium-snapshot)
+ ODL_RELEASE=lithium-snapshot-0.3.5
;;
*)
echo "Unknown ODL release base: $ODL_RELEASE_BASE"
@@ -22,36 +22,6 @@ case "$ODL_RELEASE_BASE" in
;;
esac
-case "$ODL_GATE_V2DRIVER" in
- v2driver)
- ODL_V2DRIVER=True
- ;;
- v1driver|*)
- ODL_V2DRIVER=False
- ;;
-esac
-
-case "$ODL_GATE_PORT_BINDING" in
- pseudo-agentdb-binding)
- ODL_PORT_BINDING_CONTROLLER=pseudo-agentdb-binding
- ;;
- legacy-port-binding)
- ODL_PORT_BINDING_CONTROLLER=legacy-port-binding
- ;;
- network-topology|*)
- ODL_PORT_BINDING_CONTROLLER=network-topology
- ;;
-esac
-
-case "$ODL_GATE_SERVICE_PROVIDER" in
- vpnservice)
- ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack
- ;;
- netvirt|*)
- ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack
- ;;
-esac
-
cat <<EOF >> $DEVSTACK_PATH/localrc
IS_GATE=True
@@ -59,15 +29,6 @@ IS_GATE=True
# Set here the ODL release to use for the Gate job
ODL_RELEASE=${ODL_RELEASE}
-# Set here which driver, v1 or v2 driver
-ODL_V2DRIVER=${ODL_V2DRIVER}
-
-# Set here which port binding controller
-ODL_PORT_BINDING_CONTROLLER=${ODL_PORT_BINDING_CONTROLLER}
-
-# Set here which ODL openstack service provider to use
-ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE}
-
# Switch to using the ODL's L3 implementation
ODL_L3=True