From 84e35ad1e675bc7e2ac69b0ed12cb6ce3a4c697f Mon Sep 17 00:00:00 2001
From: Ray Kinsella <ray.kinsella@intel.com>
Date: Tue, 28 Mar 2017 11:55:43 +0100
Subject: vpp-userdemo: updated to VPP 17.01

Updated the vpp-userdemo to support VPP 17.01, plus
a number of other bug fixes.

Change-Id: I79aebebdeaa4ad20690351f820e2efb5e62fdbee
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
---
 vpp-userdemo/CHANGELOG  |  6 ++++++
 vpp-userdemo/install.sh | 18 ++++++++++++++++--
 vpp-userdemo/run        |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 vpp-userdemo/CHANGELOG

diff --git a/vpp-userdemo/CHANGELOG b/vpp-userdemo/CHANGELOG
new file mode 100644
index 0000000..8adeb5a
--- /dev/null
+++ b/vpp-userdemo/CHANGELOG
@@ -0,0 +1,6 @@
+2017-03-28  Ray Kinsella  <ray.kinsella@intel.com>
+
+	* Updated Userdemo to support VPP 17.01
+	* Bug fixes:
+		* npm: setting npm proxy correctly
+		* run: setting directories correctly
diff --git a/vpp-userdemo/install.sh b/vpp-userdemo/install.sh
index 72669f1..3d96b82 100755
--- a/vpp-userdemo/install.sh
+++ b/vpp-userdemo/install.sh
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+VPP_VERSION="17.01-rc0~287-g7e4edc8~b1622"
+
 sysctl -w vm.nr_hugepages=1024
 HUGEPAGES=`sysctl -n  vm.nr_hugepages`
 if [ $HUGEPAGES != 1024 ]; then
@@ -22,7 +24,7 @@ fi
 
 echo "deb https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.trusty.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list
 apt-get -qq update
-apt-get -qq install -y --force-yes vpp vpp-dpdk-dkms bridge-utils lxc
+apt-get -qq install -y --force-yes vpp=$VPP_VERSION vpp-lib=$VPP_VERSION vpp-dpdk-dkms=$VPP_VERSION bridge-utils lxc
 service vpp start
 
 #Configure LXC network to create an inteface for Linux bridge and a unconsumed second inteface
@@ -74,7 +76,19 @@ done
 #UI dependencies
 curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
 sudo apt-get install -y nodejs
+
+#setup the npm proxy config correctly
+if [[ -v http_proxy ]]; then
+        sudo npm config set proxy $http_proxy
+fi
+
+if [[ -v https_proxy ]]; then
+	npm_https_proxy=$(sed 's/https/http/' <<< $https_proxy)
+        sudo npm config set https-proxy $npm_https_proxy
+fi
+
+#install nodeJS backend
 sudo npm install /vagrant/ui/backend/
 sudo mv node_modules/vppsb/node_modules/ /vagrant/ui/backend/
 sudo npm install -g forever
-sudo forever start /vagrant/ui/backend/server.js
\ No newline at end of file
+sudo forever start /vagrant/ui/backend/server.js
diff --git a/vpp-userdemo/run b/vpp-userdemo/run
index b3582de..293c942 100755
--- a/vpp-userdemo/run
+++ b/vpp-userdemo/run
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-vagrant ssh -c "/vagrant/vmrun /vagrant/${1}"
+vagrant ssh -c "/vagrant/vmrun /vagrant/tutorials/${1}"
-- 
cgit 1.2.3-korg