commit c522705108ff7c3641966a36b899dd5b126672f7
author Pavlin Radoslavov <pavlin@onlab.us> Tue Nov 04 10:55:19 2014 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Nov 04 10:55:19 2014 -0800
tree 8abfd80249e191ed439d37745b49e2138fd03142
parent cbc587c47b0d3f517d3b4c8bd2a0d5afb6d62b5a

Updated leftover references: Apache Karaf-3.0.1 -> 3.0.2

pom.xml

diff --git a/pom.xml b/pom.xml
index 57362b0..e84c846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.apache.karaf.shell</groupId>
                 <artifactId>org.apache.karaf.shell.console</artifactId>
-                <version>3.0.1</version>
+                <version>3.0.2</version>
                 <scope>provided</scope>
             </dependency>
 

tools/dev/bin/onos-local-log

diff --git a/tools/dev/bin/onos-local-log b/tools/dev/bin/onos-local-log
index 83bdf9c..ea93d7f 100755
--- a/tools/dev/bin/onos-local-log
+++ b/tools/dev/bin/onos-local-log
@@ -2,7 +2,7 @@
 # ----------------------------------------------------------------------------
 # Continuously watches the Apache Karaf log; survives 'karaf clean'
 # ----------------------------------------------------------------------------
-KARAF_LOG=${KARAF_LOG:-~/apache-karaf-3.0.1/data/log/karaf.log}
+KARAF_LOG=${KARAF_LOG:-~/apache-karaf-3.0.2/data/log/karaf.log}
 
 while true; do
     [ ! -f $KARAF_LOG ] && sleep 2 && continue

tools/test/cells/deva

diff --git a/tools/test/cells/deva b/tools/test/cells/deva
new file mode 100644
index 0000000..8e21f02
--- /dev/null
+++ b/tools/test/cells/deva
@@ -0,0 +1,14 @@
+# ONOS DEVA instances 1,2,3,4 & ONOS mininet box
+
+export ONOS_NIC=10.128.4.*
+export OC1="10.128.4.2"
+export OC2="10.128.4.3"
+export OC3="10.128.4.4"
+export OC4="10.128.4.5"
+export OCN="10.128.4.2"
+export OCI="${OC1}"
+
+export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-tvue,onos-app-metrics}"
+
+#export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd,onos-app-mobility,onos-app-tvue,onos-app-proxyarp"
+## export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd"

tools/test/topos/onos.py

diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index 9566d00..80a8005 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -36,7 +36,7 @@
         #self.checkListening()
 
         self.onosDir = onosDir
-        self.karafDir = onosDir + 'apache-karaf-3.0.1/'
+        self.karafDir = onosDir + 'apache-karaf-3.0.2/'
         self.instanceDir = self.karafDir
 
         # add default modules