From: Lorand Jakab <lojakab@cisco.com>
Date: Sat, 9 Mar 2019 00:55:17 +0000 (+0100)
Subject: LISP: fix MD-SAL Neon git paths
X-Git-Tag: pre-potassium~358
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8fdfa4b884b56b152945dafd4627c6040c81778d;p=integration%2Ftest.git

LISP: fix MD-SAL Neon git paths

Change-Id: I104d99e451bf2b264342c0782e260be51ced7b6b
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---

diff --git a/csit/suites/lispflowmapping/scripts/generate_bindings.sh b/csit/suites/lispflowmapping/scripts/generate_bindings.sh
index 4b06d38083..bd86f549db 100755
--- a/csit/suites/lispflowmapping/scripts/generate_bindings.sh
+++ b/csit/suites/lispflowmapping/scripts/generate_bindings.sh
@@ -9,7 +9,7 @@ DIRECTORY="odl-lispflowmapping-yang-files"
 mkdir -p ${WORKSPACE}/$DIRECTORY
 
 GITWEB_LISP="https://git.opendaylight.org/gerrit/gitweb?p=lispflowmapping.git;a=blob_plain;hb=refs/heads/${DISTROBRANCH}"
-GITWEB_MDSAL="https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=blob_plain;hb=refs/heads/${DISTROBRANCH}"
+GITWEB_MDSAL="https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=blob_plain"
 
 # Download yang-files in the VM on fly using curl before generating
 # binding files.
@@ -17,17 +17,25 @@ curl "$GITWEB_LISP;f=mappingservice/lisp-proto/src/main/yang/odl-lisp-proto.yang
 curl "$GITWEB_LISP;f=mappingservice/lisp-proto/src/main/yang/odl-inet-binary-types.yang" -o ${WORKSPACE}/$DIRECTORY/odl-inet-binary-types.yang
 curl "$GITWEB_LISP;f=mappingservice/api/src/main/yang/odl-mappingservice.yang" -o ${WORKSPACE}/$DIRECTORY/odl-mappingservice.yang
 curl "$GITWEB_LISP;f=mappingservice/lisp-proto/src/main/yang/odl-lisp-address-types.yang" -o ${WORKSPACE}/$DIRECTORY/odl-lisp-address-types.yang
-curl "$GITWEB_MDSAL;f=model/yang-ext/src/main/yang/yang-ext.yang" -o ${WORKSPACE}/$DIRECTORY/yang-ext.yang
-curl "$GITWEB_MDSAL;f=model/ietf/ietf-lisp-address-types/src/main/yang/ietf-lisp-address-types.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-lisp-address-types.yang
 
-# ietf-{inet,yang}-types.yang folder renamed in Neon
+# ietf-{inet,yang}-types.yang folder renamed in Neon, and there is no stable/neon branch
 if [ ${DISTROBRANCH} = "stable/oxygen" -o ${DISTROBRANCH} = "stable/fluorine" ]
 then
-    curl "$GITWEB_MDSAL;f=model/ietf/ietf-yang-types-20130715/src/main/yang/ietf-yang-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-yang-types.yang
-    curl "$GITWEB_MDSAL;f=model/ietf/ietf-inet-types-2013-07-15/src/main/yang/ietf-inet-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-inet-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/yang-ext/src/main/yang/yang-ext.yang" -o ${WORKSPACE}/$DIRECTORY/yang-ext.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/ietf/ietf-lisp-address-types/src/main/yang/ietf-lisp-address-types.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-lisp-address-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/ietf/ietf-yang-types-20130715/src/main/yang/ietf-yang-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-yang-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/ietf/ietf-inet-types-2013-07-15/src/main/yang/ietf-inet-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-inet-types.yang
+elif [ ${DISTROBRANCH} = "stable/neon" ]
+then
+    curl "$GITWEB_MDSAL;hb=refs/tags/v3.0.6;f=model/yang-ext/src/main/yang/yang-ext.yang" -o ${WORKSPACE}/$DIRECTORY/yang-ext.yang
+    curl "$GITWEB_MDSAL;hb=refs/tags/v3.0.6;f=model/ietf/ietf-lisp-address-types/src/main/yang/ietf-lisp-address-types.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-lisp-address-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/tags/v3.0.6;f=model/ietf/rfc6991-ietf-yang-types/src/main/yang/ietf-yang-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-yang-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/tags/v3.0.6;f=model/ietf/rfc6991-ietf-inet-types/src/main/yang/ietf-inet-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-inet-types.yang
 else
-    curl "$GITWEB_MDSAL;f=model/ietf/rfc6991-ietf-yang-types/src/main/yang/ietf-yang-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-yang-types.yang
-    curl "$GITWEB_MDSAL;f=model/ietf/rfc6991-ietf-inet-types/src/main/yang/ietf-inet-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-inet-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/yang-ext/src/main/yang/yang-ext.yang" -o ${WORKSPACE}/$DIRECTORY/yang-ext.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/ietf/ietf-lisp-address-types/src/main/yang/ietf-lisp-address-types.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-lisp-address-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/ietf/rfc6991-ietf-yang-types/src/main/yang/ietf-yang-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-yang-types.yang
+    curl "$GITWEB_MDSAL;hb=refs/heads/${DISTROBRANCH};f=model/ietf/rfc6991-ietf-inet-types/src/main/yang/ietf-inet-types@2013-07-15.yang" -o ${WORKSPACE}/$DIRECTORY/ietf-inet-types.yang
 fi
 
 # Copy bits patch to yang file directory