Using Box file to remove external dependencies such as github.

- Quicker more stable.
- Box file can be semantically versioned for the release of ODL GBP

Change-Id: I24eb68a22f3ec26edc3e7b52402acf5d64e5b56c
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

diff --git a/demos/gbpsfc-env/README.md b/demos/gbpsfc-env/README.md
index 3f99b0639e0c09e0f6d19414e70603ba29a7ab3a..90a176b5939873afde2d98ff47ec061e364de8c0 100644 (file)
--- a/demos/gbpsfc-env/README.md
+++ b/demos/gbpsfc-env/README.md
@@ -2,7 +2,11 @@
 
 This is a demonstration/development environment for show-casing OpenDaylight GroupBasedPolicy (GBP) with ServiceFunctionChaining (SFC)
 
-The initial instalation may take some time, with vagrant and docker image downloads. 
+This version is using a vagrant box: alagalah/gbpsfc-trusty64 v1.0.1
+
+It is important to ./cleandemo.sh before using. A demo.lock file will be added to repo so that first run will fail unless you ./cleandemo.sh
+
+This is to ensure that each OVS gets a unique UUID as the Box file will re-use the same UUID for each OVS.
 
 After the first time it is very quick.
 
@@ -17,14 +21,13 @@ After the first time it is very quick.
 source ./env.sh
 vagrant up
 ```
-  * This takes quite some time initially.
   * If the starting process fail with '/sbin/mount.vboxsf: mounting failed with the error: No such device' line
     (usually occur after first halt) run 'vagrant plugin install vagrant-vbguest' command on host. It should solve the problem.
 
 3. Start controller.
   * Currently it is expected that that controller runs on the host hosting the VMs.
-  * Tested using groupbasedpolicy stable/lithium.
-               If you are building stable/lithium and you get 'illegal unicode escape' error, 
+  * Tested using groupbasedpolicy beryllium
+               If you are building and get 'illegal unicode escape' error, 
                you have to rename two yang files in 'groupbasedpolicy\ui-backend\src\main\yang'. 
                These files have to start with a character other than 'u'. 
                E.g. rename 'ui-backend.yang' to 'aui-backend.yang' and 'ui-backend-impl.yang' to 'aui-backend-impl.yang'.

diff --git a/demos/gbpsfc-env/Vagrantfile b/demos/gbpsfc-env/Vagrantfile
index c435791c20e57bc5b2474a2e359b8b14d428e556..d1624336fb6d070d01dafd0f9eb37824d33b76f7 100644 (file)
--- a/demos/gbpsfc-env/Vagrantfile
+++ b/demos/gbpsfc-env/Vagrantfile
@@ -8,8 +8,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     vb.memory = "512"
   end
   # run our bootstrapping for the system
-  config.vm.provision 'shell', path: 'bootstrap.sh', :args => odl
-
   num_nodes = (ENV['NUM_NODES'] || 1).to_i
 
   # ip configuration
@@ -20,8 +18,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.define "gbpsfc#{n+1}", autostart: true do |compute|
       vm_ip = ips[n]
       vm_index = n+1
-      compute.vm.box = "ubuntu/trusty64"
-      compute.vm.box_version = "20151130.0.0"
+      compute.vm.box = "alagalah/gbpsfc-trusty64"
+      compute.vm.box_version = "1.0.1"
       compute.vm.hostname = "gbpsfc#{vm_index}"
       compute.vm.network "private_network", ip: "#{vm_ip}"
       compute.vm.provider :virtualbox do |vb|

diff --git a/demos/gbpsfc-env/demo.lock b/demos/gbpsfc-env/demo.lock
new file mode 100644 (file)
index 0000000..0f5b955
--- /dev/null
+++ b/demos/gbpsfc-env/demo.lock
@@ -0,0 +1 @@
+Uninitialised. Please do a ./cleandemo.sh