Fixes scriptplan file name issue and bits.patch path issue.

Changed scriptplans/lispflowmapping-pyangbind-generate-bindings.txt
to scriptplans/lispflowmapping-msmr.txt as per the format of
\$project-\$functionality.txt

Changed bits.patch to global path.

Change-Id: I1bf183d9f6ff9cc7f380cf9bef6484a1bf04d4be
Signed-off-by: Ashish <ashishk.iiit@gmail.com>

diff --git a/csit/scriptplans/lispflowmapping-pyangbind-generate-bindings.txt b/csit/scriptplans/lispflowmapping-msmr.txt
similarity index 100%
rename from csit/scriptplans/lispflowmapping-pyangbind-generate-bindings.txt
rename to csit/scriptplans/lispflowmapping-msmr.txt

diff --git a/csit/suites/lispflowmapping/scripts/generate_bindings.sh b/csit/suites/lispflowmapping/scripts/generate_bindings.sh
index e51952a847153b7ce02cdaf9f1d7860db6acbace..03a7a05736ed3d92468c456855b4da3297151c61 100755 (executable)
--- a/csit/suites/lispflowmapping/scripts/generate_bindings.sh
+++ b/csit/suites/lispflowmapping/scripts/generate_bindings.sh
@@ -25,10 +25,10 @@ curl "$GITWEB_MDSAL;f=model/yang-ext/src/main/yang/yang-ext.yang" -o ${WORKSPACE
 curl "$GITWEB_CONTROLLER;f=opendaylight/config/config-api/src/main/yang/config.yang" -o ${WORKSPACE}/$DIRECTORY/config.yang
 
 # Copy bits patch to yang file directory
-cp bits.patch ${WORKSPACE}/$DIRECTORY
+cp ${WORKSPACE}/test/csit/suites/lispflowmapping/scripts/bits.patch ${WORKSPACE}/$DIRECTORY
 
 # Go to odl-lispflowmapping-yang-files directory
-cd ${WORKSPACE}/$DIRECTORY
+pushd ${WORKSPACE}/$DIRECTORY
 
 # Currently bits are not supported in pyangbind plugin so
 # We need to apply patch to generate pyangbind bindings
@@ -40,6 +40,6 @@ PYBINDPLUGIN=`/usr/bin/env python -c 'import pyangbind; import os; print "%s/plu
 pyang --plugindir $PYBINDPLUGIN -f pybind --build-rpcs --split-class-dir ${WORKSPACE}/$DIRECTORY/LISPFlowMappingYANGBindings ./odl-mappingservice.yang
 
 # Go back the main direcory
-cd ../../
+popd
 
 echo "Yang Dependencies and bindings downloaded successfully in ${WORKSPACE}/$DIRECTORY"