-if [[ "$NODE_NAME" =~ "-vm" ]]; then
- export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml
+
+cd $WORKSPACE
+
+export OS_VERSION=${COMPASS_OS_VERSION}
+export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
+if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" || "${OPENSTACK_VERSION}" = "newton" ]]; then
+ export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
+ export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
+fi
+
+if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
+ export NETWORK_CONF_FILE=network_ocl.yml
+ export OPENSTACK_VERSION=liberty
+elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then
+ export NETWORK_CONF_FILE=network_onos.yml
+else
+ export NETWORK_CONF_FILE=network.yml
+fi
+
+if [[ "$NODE_NAME" =~ "-virtual" ]]; then
+ export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}