aboutsummaryrefslogtreecommitdiffstats
path: root/framework/src/onos/tools/dev/bin
diff options
context:
space:
mode:
Diffstat (limited to 'framework/src/onos/tools/dev/bin')
-rwxr-xr-xframework/src/onos/tools/dev/bin/onos-build-selective8
-rw-r--r--framework/src/onos/tools/dev/bin/onos-build-selective.exclude3
-rwxr-xr-xframework/src/onos/tools/dev/bin/onos-setup-karaf12
3 files changed, 12 insertions, 11 deletions
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