From 643ee33289bd2cb9e6afbfb09b4ed72d467ba1c2 Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@wildernessvoice.com>
Date: Tue, 3 Nov 2015 14:08:10 -0800
Subject: This updates ONOS src tree to commit id
 03fa5e571cabbd001ddb1598847e1150b11c7333

Change-Id: I13b554026d6f902933e35887d29bd5fdb669c0bd
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
---
 framework/src/onos/tools/dev/bin/onos-build-selective        |  8 +++++---
 .../src/onos/tools/dev/bin/onos-build-selective.exclude      |  3 ++-
 framework/src/onos/tools/dev/bin/onos-setup-karaf            | 12 +++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'framework/src/onos/tools/dev')

diff --git a/framework/src/onos/tools/dev/bin/onos-build-selective b/framework/src/onos/tools/dev/bin/onos-build-selective
index ac2dec8e..351c53ac 100755
--- a/framework/src/onos/tools/dev/bin/onos-build-selective
+++ b/framework/src/onos/tools/dev/bin/onos-build-selective
@@ -15,9 +15,11 @@ if [ -n "$projects" ]; then
     # Ascertain artifact IDs of the projects to be rebuilt
     modulesERE=""
     for pd in ${projects//,/ }; do
-        artifactId=$(grep -E "^    <artifactId>.*</artifactId>$" ${pd}/pom.xml | \
-                        sed 's/.[^>]*>//;s/<.*//')
-        modulesERE="$modulesERE|$artifactId"
+        if [ -f ${pd}/pom.xml ]; then
+            artifactId=$(grep -E "^    <artifactId>.*</artifactId>$" ${pd}/pom.xml | \
+                            sed 's/.[^>]*>//;s/<.*//')
+            modulesERE="$modulesERE|$artifactId"
+        fi
     done
     modulesERE=${modulesERE#|*}
 
diff --git a/framework/src/onos/tools/dev/bin/onos-build-selective.exclude b/framework/src/onos/tools/dev/bin/onos-build-selective.exclude
index 1265494e..487f848c 100644
--- a/framework/src/onos/tools/dev/bin/onos-build-selective.exclude
+++ b/framework/src/onos/tools/dev/bin/onos-build-selective.exclude
@@ -6,4 +6,5 @@
 .*/cord-gui/.*
 .*/jdvue/.*
 .*/ovsdb/api/.*
-.*/netconf/flow/.*
\ No newline at end of file
+.*/netconf/flow/.*
+.*/vtn/sfcmgr/.*
\ No newline at end of file
diff --git a/framework/src/onos/tools/dev/bin/onos-setup-karaf b/framework/src/onos/tools/dev/bin/onos-setup-karaf
index 3323d9d1..cbe62253 100755
--- a/framework/src/onos/tools/dev/bin/onos-setup-karaf
+++ b/framework/src/onos/tools/dev/bin/onos-setup-karaf
@@ -97,13 +97,11 @@ fi
 echo "Creating local cluster configs for IP $IP..."
 [ -d $STAGE/config ] || mkdir -p $STAGE/config
 cat > $STAGE/config/cluster.json <<EOF
-    { "ipPrefix": "$SUBNET.*",
-      "nodes":[ { "id": "$IP", "ip": "$IP", "tcpPort": 9876 }]}
-EOF
-
-cat > $STAGE/config/tablets.json <<EOF
-    { "nodes": [ { "ip": "$IP", "id": "$IP", "tcpPort": 9876 }],
-      "partitions": { "p1": [ { "ip": "$IP", "id": "$IP", "tcpPort": 9876 }]}}
+{
+  "name": "default",
+  "nodes": [ {"id": "$IP", "ip": "$IP", "port": 9876 } ],
+  "partitions": [ { "name": "p1", "members": [ "$IP" ] } ]
+}
 EOF
 
 if [ "$CLEAN" = "true" ]; then
-- 
cgit 1.2.3-korg