홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
cce11ca2 1 parent 97839bb7

Fixing some cell definitions and features.

Inline Side-by-side
Showing 4 changed files with 16 additions and 11 deletions
1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" 2 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
3 name="onos-1.0.0"> 3 name="onos-1.0.0">
4 - <repository>mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features</repository> 4 + <repository>mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features
5 + </repository>
5 6
6 <feature name="onos-thirdparty-base" version="1.0.0" 7 <feature name="onos-thirdparty-base" version="1.0.0"
7 description="ONOS 3rd party dependencies"> 8 description="ONOS 3rd party dependencies">
...@@ -28,21 +29,22 @@ ...@@ -28,21 +29,22 @@
28 29
29 <bundle>mvn:org.onlab.onos/onlab-nio/1.0.0-SNAPSHOT</bundle> 30 <bundle>mvn:org.onlab.onos/onlab-nio/1.0.0-SNAPSHOT</bundle>
30 31
31 - <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle> 32 + <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
32 - <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle> 33 + <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
33 - <bundle>mvn:org.onlab.onos/onlab-thirdparty/1.0.0-SNAPSHOT</bundle> 34 + <bundle>mvn:org.onlab.onos/onlab-thirdparty/1.0.0-SNAPSHOT</bundle>
34 </feature> 35 </feature>
35 36
36 <feature name="onos-thirdparty-web" version="1.0.0" 37 <feature name="onos-thirdparty-web" version="1.0.0"
37 description="ONOS 3rd party dependencies"> 38 description="ONOS 3rd party dependencies">
38 <feature>war</feature> 39 <feature>war</feature>
39 <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.2</bundle> 40 <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.2</bundle>
40 - <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.2</bundle> 41 + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.2
42 + </bundle>
41 <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2</bundle> 43 <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2</bundle>
42 <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle> 44 <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
43 <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle> 45 <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
44 <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle> 46 <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
45 - 47 +
46 </feature> 48 </feature>
47 49
48 <feature name="onos-api" version="1.0.0" 50 <feature name="onos-api" version="1.0.0"
...@@ -96,16 +98,18 @@ ...@@ -96,16 +98,18 @@
96 </feature> 98 </feature>
97 99
98 <feature name="onos-openflow" version="1.0.0" 100 <feature name="onos-openflow" version="1.0.0"
99 - description="ONOS OpenFlow API, Controller &amp; Providers"> 101 + description="ONOS OpenFlow API, Controller &amp; Providers">
100 <feature>onos-api</feature> 102 <feature>onos-api</feature>
101 <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> 103 <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
102 <bundle>mvn:org.onlab.onos/onos-of-api/1.0.0-SNAPSHOT</bundle> 104 <bundle>mvn:org.onlab.onos/onos-of-api/1.0.0-SNAPSHOT</bundle>
103 <bundle>mvn:org.onlab.onos/onos-of-ctl/1.0.0-SNAPSHOT</bundle> 105 <bundle>mvn:org.onlab.onos/onos-of-ctl/1.0.0-SNAPSHOT</bundle>
104 106
105 - <bundle>mvn:org.onlab.onos/onos-of-provider-device/1.0.0-SNAPSHOT</bundle> 107 + <bundle>mvn:org.onlab.onos/onos-of-provider-device/1.0.0-SNAPSHOT
108 + </bundle>
106 <bundle>mvn:org.onlab.onos/onos-of-provider-link/1.0.0-SNAPSHOT</bundle> 109 <bundle>mvn:org.onlab.onos/onos-of-provider-link/1.0.0-SNAPSHOT</bundle>
107 <bundle>mvn:org.onlab.onos/onos-of-provider-host/1.0.0-SNAPSHOT</bundle> 110 <bundle>mvn:org.onlab.onos/onos-of-provider-host/1.0.0-SNAPSHOT</bundle>
108 - <bundle>mvn:org.onlab.onos/onos-of-provider-packet/1.0.0-SNAPSHOT</bundle> 111 + <bundle>mvn:org.onlab.onos/onos-of-provider-packet/1.0.0-SNAPSHOT
112 + </bundle>
109 <bundle>mvn:org.onlab.onos/onos-of-provider-flow/1.0.0-SNAPSHOT</bundle> 113 <bundle>mvn:org.onlab.onos/onos-of-provider-flow/1.0.0-SNAPSHOT</bundle>
110 114
111 </feature> 115 </feature>
......
...@@ -68,6 +68,7 @@ function cell { ...@@ -68,6 +68,7 @@ function cell {
68 echo "No such cell: $1" >&2 && return 1 68 echo "No such cell: $1" >&2 && return 1
69 unset ONOS_CELL ONOS_NIC ONOS_FEATURES 69 unset ONOS_CELL ONOS_NIC ONOS_FEATURES
70 unset OC1 OC2 OC3 OC4 OC5 OC6 OC7 OC8 OC9 OCN OCI 70 unset OC1 OC2 OC3 OC4 OC5 OC6 OC7 OC8 OC9 OCN OCI
71 + export ONOS_CELL=$1
71 . $ONOS_ROOT/tools/test/cells/$1 72 . $ONOS_ROOT/tools/test/cells/$1
72 cell 73 cell
73 else 74 else
......
...@@ -8,4 +8,4 @@ export OC2="192.168.56.102" ...@@ -8,4 +8,4 @@ export OC2="192.168.56.102"
8 export OCN="192.168.56.103" 8 export OCN="192.168.56.103"
9 export OCI="${OC1}" 9 export OCI="${OC1}"
10 10
11 -export ONOS_FEATURES="" 11 +export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}"
......
...@@ -7,4 +7,4 @@ export OC1="192.168.56.101" ...@@ -7,4 +7,4 @@ export OC1="192.168.56.101"
7 export OCN="192.168.56.103" 7 export OCN="192.168.56.103"
8 export OCI="${OC1}" 8 export OCI="${OC1}"
9 9
10 -export ONOS_FEATURES="" 10 +export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}"
......