홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
c5227051 1 parent cbc587c4

Updated leftover references: Apache Karaf-3.0.1 -> 3.0.2

Inline Side-by-side
Showing 4 changed files with 17 additions and 3 deletions
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
196 <dependency> 196 <dependency>
197 <groupId>org.apache.karaf.shell</groupId> 197 <groupId>org.apache.karaf.shell</groupId>
198 <artifactId>org.apache.karaf.shell.console</artifactId> 198 <artifactId>org.apache.karaf.shell.console</artifactId>
199 - <version>3.0.1</version> 199 + <version>3.0.2</version>
200 <scope>provided</scope> 200 <scope>provided</scope>
201 </dependency> 201 </dependency>
202 202
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 # ---------------------------------------------------------------------------- 2 # ----------------------------------------------------------------------------
3 # Continuously watches the Apache Karaf log; survives 'karaf clean' 3 # Continuously watches the Apache Karaf log; survives 'karaf clean'
4 # ---------------------------------------------------------------------------- 4 # ----------------------------------------------------------------------------
5 -KARAF_LOG=${KARAF_LOG:-~/apache-karaf-3.0.1/data/log/karaf.log} 5 +KARAF_LOG=${KARAF_LOG:-~/apache-karaf-3.0.2/data/log/karaf.log}
6 6
7 while true; do 7 while true; do
8 [ ! -f $KARAF_LOG ] && sleep 2 && continue 8 [ ! -f $KARAF_LOG ] && sleep 2 && continue
......
1 +# ONOS DEVA instances 1,2,3,4 & ONOS mininet box
2 +
3 +export ONOS_NIC=10.128.4.*
4 +export OC1="10.128.4.2"
5 +export OC2="10.128.4.3"
6 +export OC3="10.128.4.4"
7 +export OC4="10.128.4.5"
8 +export OCN="10.128.4.2"
9 +export OCI="${OC1}"
10 +
11 +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}"
12 +
13 +#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"
14 +## export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd"
...@@ -36,7 +36,7 @@ class ONOS( Controller ): ...@@ -36,7 +36,7 @@ class ONOS( Controller ):
36 #self.checkListening() 36 #self.checkListening()
37 37
38 self.onosDir = onosDir 38 self.onosDir = onosDir
39 - self.karafDir = onosDir + 'apache-karaf-3.0.1/' 39 + self.karafDir = onosDir + 'apache-karaf-3.0.2/'
40 self.instanceDir = self.karafDir 40 self.instanceDir = self.karafDir
41 41
42 # add default modules 42 # add default modules
......