Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>

1 files changed, 24 insertions, 22 deletions

diff --git a/networking-odl/devstack/functions b/networking-odl/devstack/functions
index ebd14da..970828d 100644
--- a/networking-odl/devstack/functions
+++ b/networking-odl/devstack/functions
@@ -20,46 +20,48 @@ function odl_update_maven_metadata_xml {
     wget -O $MAVENMETAFILE ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
 }
 
-function _odl_export_snapshot_url_pkg {
+function odl_export_snapshot_url_pkg {
     local ODL_DIR=$1
     local ODL_URL_PREFIX=$2
     local BUNDLEVERSION=$3
     local OFFLINE=$4
-    local BUNDLE_TIMESTAMP=$5
 
     local MAVENMETAFILE=$ODL_DIR/maven-metadata.xml
-    local NEXUSPATH="${ODL_URL_PREFIX}/${ODL_URL_SNAPSHOT_REPOSITORY_PATH}/org/opendaylight/integration/distribution-karaf"
-
-    if [ "$BUNDLE_TIMESTAMP" == "latest" ]; then
-        odl_update_maven_metadata_xml $MAVENMETAFILE $NEXUSPATH $BUNDLEVERSION $OFFLINE
-        if is_ubuntu; then
-            install_package libxml-xpath-perl
-            BUNDLE_TIMESTAMP=`xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" $MAVENMETAFILE 2>/dev/null`
-        else
-            yum_install perl-XML-XPath
-            BUNDLE_TIMESTAMP=`xpath $MAVENMETAFILE "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
-        fi
+    local NEXUSPATH="${ODL_URL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
+    local BUNDLE_TIMESTAMP
+
+    odl_update_maven_metadata_xml $MAVENMETAFILE $NEXUSPATH $BUNDLEVERSION $OFFLINE
+    if is_ubuntu; then
+        install_package libxml-xpath-perl
+        BUNDLE_TIMESTAMP=`xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" $MAVENMETAFILE 2>/dev/null`
+    else
+        yum_install perl-XML-XPath
+        BUNDLE_TIMESTAMP=`xpath $MAVENMETAFILE "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
     fi
 
     export ODL_URL=${NEXUSPATH}/${BUNDLEVERSION}
     export ODL_PKG=distribution-karaf-${BUNDLE_TIMESTAMP}.zip
+
+    # The network virtualization feature used by opendaylight loaded by Karaf
+    ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack}
+
+    # The url that this version of ODL netvirt can use to know ODL is fully up
+    export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL:-restconf/operational/network-topology:network-topology/topology/netvirt:1}
 }
 
-function _odl_export_release_url_pkg {
+function odl_export_release_url_pkg {
     local ODL_URL_PREFIX=$1
     local BUNDLEVERSION=$2
-    local NEXUSPATH="${ODL_URL_PREFIX}/${ODL_URL_RELEASE_REPOSITORY_PATH}/org/opendaylight/integration/distribution-karaf"
+    local NEXUSPATH="${ODL_URL_PREFIX}/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf"
 
     export ODL_URL=${NEXUSPATH}/${BUNDLEVERSION}
     export ODL_PKG=distribution-karaf-${BUNDLEVERSION}.zip
-}
 
-function setup_opendaylight_package {
-    if [[ -n "$ODL_SNAPSHOT_VERSION" ]]; then
-        _odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${ODL_BUNDLEVERSION} ${OFFLINE} ${ODL_SNAPSHOT_VERSION}
-    else
-        _odl_export_release_url_pkg ${ODL_URL_PREFIX} ${ODL_BUNDLEVERSION}
-    fi
+    # The network virtualization feature used by opendaylight loaded by Karaf
+    ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack}
+
+    # The url that this version of ODL netvirt can use to know ODL is fully up
+    export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL:-restconf/operational/network-topology:network-topology/topology/netvirt:1}
 }
 
 # Test if OpenDaylight is enabled