Merge pull request #1 from vthapar/genius

Add support for other projects

Author: jhershberg

.gitignore

@@ -0,0 +1 @@
+mounts/

Dockerfile

@@ -1,3 +1,3 @@
 FROM fedora:latest
 RUN yum install -y java-1.8.0-openjdk-devel iproute iputils procps-ng tcpdump vim
-RUN mkdir -p /netvirt/karaf/target/assembly
+RUN mkdir -p /odlha/karaf/target/assembly

README.md

@@ -12,6 +12,12 @@ can easily be inspected. Each container's files are stored `./mounts/[1|2|3]/ass
 
 Three running (and empty) netvirt containers have been observed to occupy about 1.3GB of memory each.
 
+Currently following projects are supported:
+1. Netvirt
+2. Genius
+3. OVSDB Southbound
+4. HWVTEP Southbound
+5. Neutron
 
 ## What scripts are provided
 
@@ -63,13 +69,14 @@ The containers are networked together like this:
 
 1. You must have docker installed
 2. pull the fedora image, `docker pull fedora:latest`
-3. You must have netvirt cloned and netvirt/karaf fully built (but not run)
+3. You must have your project cloned and project/karaf fully built (but not run)
 
 Note that all scripts must be run from the root directory of this project (where this README file is).
 
 ### Creating the containers
 
-1. Build the overlay mounts and docker image: `./build <path to your netvirt clone>`. 
+1. Build the overlay mounts and docker image: `./build <path to your project clone>`. For OVSDB Southbound or HWVTEP
+   the path should be '<path to ovsdb clone>/southbound|hwvtepsouthbound'.
 
    N.B. that running this script will remove and erase any mount directories from previous runs. If you want to save logs, copy them aside.
 
@@ -92,6 +99,8 @@ Then wait for diagstatus to be ACTIVE (this can take a while):
 
   `./diagstatus 2`
 
+  N.B. that OVSDB projects currently don't support diagstatus, so you will have to check for OVSDB port [6640].
+
 Only then should you
 
   `./start 3`

build

@@ -5,9 +5,26 @@ then
     echo Usage: ./build \<path to netvirt\>
     exit 2
 fi
+targetpath=${path}/karaf/target
+feature="odl-netvirt-openstack"
+if [[ $1 = *"hwvtepsouthbound"* ]];
+then
+    targetpath="$1/hwvtepsouthbound-karaf/target"
+    feature="odl-hwvtepsouthbound-rest"
+elif [[ $1 = *"southbound"* ]];
+then
+    targetpath="$1/southbound-karaf/target"
+    feature="odl-southbound-rest"
+elif [[ $1 = *"genius"* ]];
+then
+    feature="odl-genius-rest"
+elif [[ $1 = *"neutron"* ]];
+then
+    feature="odl-neutron-service"
+fi
 
-wget -O ${path}/karaf/target/assembly/bin/configure_cluster.sh https://raw.githubusercontent.com/opendaylight/integration-distribution/master/karaf/src/main/assembly/bin/configure_cluster.sh
-chmod +x ${path}/karaf/target/assembly/bin/configure_cluster.sh
+wget -O ${targetpath}/assembly/bin/configure_cluster.sh https://raw.githubusercontent.com/opendaylight/integration-distribution/master/karaf/src/main/assembly/bin/configure_cluster.sh
+chmod +x ${targetpath}/assembly/bin/configure_cluster.sh
 
 for i in 1 2 3
 do
@@ -19,9 +36,9 @@ do
     mkdir -p ${base}/assembly
     mkdir -p ${base}/workdir
     mkdir -p ${base}/upper
-    sudo mount -t overlay overlay -o lowerdir=${path}/karaf/target/assembly,upperdir=${base}/upper,workdir=${base}/workdir ${base}/assembly
+    sudo mount -t overlay overlay -o lowerdir=${targetpath}/assembly,upperdir=${base}/upper,workdir=${base}/workdir ${base}/assembly
 
-    sed -i -e 's/\(featuresBoot =.*\)/\1,odl-netvirt-openstack/' ${base}/assembly/etc/org.apache.karaf.features.cfg 
+    sed -i -e "s/\(featuresBoot =.*\)/\1,${feature}/" ${base}/assembly/etc/org.apache.karaf.features.cfg 
 done
 
 sudo docker build . -t odl

diagstatus

@@ -1 +1,7 @@
+set +x
+if [ "$1" = "" ];
+then
+    echo "Usage: ./diagstatus 1|2|3"
+    exit 2
+fi
 curl -u admin:admin http://172.28.5.$1:8181/diagstatus

start

@@ -3,6 +3,6 @@ set +x
 for i in ${@:-1 2 3}
 do
     echo Starting $i...
-    sudo docker exec -td odl_172.28.5.$i /netvirt/karaf/target/assembly/bin/karaf
+    sudo docker exec -td odl_172.28.5.$i /odlha/karaf/target/assembly/bin/karaf
     sleep 5
 done

up

@@ -7,10 +7,10 @@ function launch_container()
     sudo docker run --name odl_${ip} -d -ti \
         --cap-add NET_ADMIN \
         --network=${network} --ip=${ip} \
-        -v $(pwd)/mounts/${index}/assembly:/netvirt/karaf/target/assembly \
+        -v $(pwd)/mounts/${index}/assembly:/odlha/karaf/target/assembly \
         odl bash
     sudo docker exec odl_${ip} \
-        /netvirt/karaf/target/assembly/bin/configure_cluster.sh $index 172.28.5.1 172.28.5.2 172.28.5.3
+        /odlha/karaf/target/assembly/bin/configure_cluster.sh $index 172.28.5.1 172.28.5.2 172.28.5.3
 }
 
 set -x