Change GUI and GUI2 to be apps rather than core features
Change-Id: I862e5bdbccc29fd78716159e168e7a14bc5053e1
diff --git a/tools/test/cells/beast b/tools/test/cells/beast
index a4a161d..6f5de2b 100644
--- a/tools/test/cells/beast
+++ b/tools/test/cells/beast
@@ -18,4 +18,4 @@
# IP address of Mininet
export OCN=10.192.19.69
-export ONOS_APPS="drivers,null,intentperf"
+export ONOS_APPS="gui,drivers,null,intentperf"
diff --git a/tools/test/cells/beast-1 b/tools/test/cells/beast-1
index 27ef405..eb20452 100644
--- a/tools/test/cells/beast-1
+++ b/tools/test/cells/beast-1
@@ -12,4 +12,4 @@
# IP address of Mininet
export OCN=10.192.19.69
-export ONOS_APPS="drivers,null,intentperf"
+export ONOS_APPS="gui,drivers,null,intentperf"
diff --git a/tools/test/cells/beast-3 b/tools/test/cells/beast-3
index fc39f70..d736da7 100644
--- a/tools/test/cells/beast-3
+++ b/tools/test/cells/beast-3
@@ -14,4 +14,4 @@
# IP address of Mininet
export OCN=10.192.19.69
-export ONOS_APPS="drivers,null,intentperf"
+export ONOS_APPS="gui,drivers,null,intentperf"
diff --git a/tools/test/cells/beast-5 b/tools/test/cells/beast-5
index 0c84dbb..a11c2b0 100644
--- a/tools/test/cells/beast-5
+++ b/tools/test/cells/beast-5
@@ -16,4 +16,4 @@
# IP address of Mininet
export OCN=10.192.19.69
-export ONOS_APPS="drivers,null,intentperf"
+export ONOS_APPS="gui,drivers,null,intentperf"
diff --git a/tools/test/cells/demo b/tools/test/cells/demo
index 6211ed9..73137dc 100644
--- a/tools/test/cells/demo
+++ b/tools/test/cells/demo
@@ -6,6 +6,6 @@
export OC3="10.0.3.103"
export OCN="10.0.3.1"
-export ONOS_APPS=drivers,openflow,proxyarp
+export ONOS_APPS=gui,drivers,openflow,proxyarp
alias sshnet="ssh onos@$OCN"
diff --git a/tools/test/cells/demo-eu b/tools/test/cells/demo-eu
index 414fddd..0f7e8ef 100644
--- a/tools/test/cells/demo-eu
+++ b/tools/test/cells/demo-eu
@@ -6,7 +6,7 @@
export OC3="10.100.198.203"
export OCN="10.100.198.200"
export ONOS_NIC="10.100.198.*"
-export ONOS_APPS=drivers,openflow,proxyarp,mobility,mlb,pathpainter
+export ONOS_APPS=gui,drivers,openflow,proxyarp,mobility,mlb,pathpainter
export ONOS_GROUP=sdn
export ONOS_SCENARIOS=$ONOS/tools/test/scenarios
export ONOS_TOPO=geant
diff --git a/tools/test/cells/ec2 b/tools/test/cells/ec2
index 3d64be2..842f59d 100644
--- a/tools/test/cells/ec2
+++ b/tools/test/cells/ec2
@@ -15,4 +15,4 @@
export OC6=192.168.200.106
export OC7=192.168.200.107
-export ONOS_APPS="drivers,null,intentperf"
+export ONOS_APPS="gui,drivers,null,intentperf"
diff --git a/tools/test/cells/local b/tools/test/cells/local
index c9a1b1b..5310495 100644
--- a/tools/test/cells/local
+++ b/tools/test/cells/local
@@ -7,4 +7,4 @@
export OCC2="192.168.56.102"
export OCN="192.168.56.103"
-export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
+export ONOS_APPS="gui,drivers,openflow,fwd,proxyarp,mobility"
diff --git a/tools/test/cells/office b/tools/test/cells/office
index 09405f3..1a03ee2 100644
--- a/tools/test/cells/office
+++ b/tools/test/cells/office
@@ -3,4 +3,4 @@
export ONOS_NIC="10.1.10.*"
export OC1="10.1.10.223"
-export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
+export ONOS_APPS="gui,drivers,openflow,fwd,proxyarp,mobility"
diff --git a/tools/test/cells/sdnip-pmox b/tools/test/cells/sdnip-pmox
index e95b7e7..3e0bed9 100644
--- a/tools/test/cells/sdnip-pmox
+++ b/tools/test/cells/sdnip-pmox
@@ -5,4 +5,4 @@
export OC2="10.128.4.66"
export OC3="10.128.4.67"
-export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility,config,sdnip"
+export ONOS_APPS="gui,drivers,openflow,fwd,proxyarp,mobility,config,sdnip"
diff --git a/tools/test/cells/simon-single b/tools/test/cells/simon-single
index 8e15a2b..7ce6ec1 100644
--- a/tools/test/cells/simon-single
+++ b/tools/test/cells/simon-single
@@ -4,4 +4,4 @@
export OC1="192.168.36.1"
export OCN="192.168.36.101"
-export ONOS_APPS="drivers,openflow,fwd,drivermatrix,null"
+export ONOS_APPS="gui,drivers,openflow,fwd,drivermatrix,null"
diff --git a/tools/test/cells/simon-uk b/tools/test/cells/simon-uk
index 703be03..6fae098 100644
--- a/tools/test/cells/simon-uk
+++ b/tools/test/cells/simon-uk
@@ -39,7 +39,7 @@
export ONOS_USER=sdn
## the apps we want activated at startup
-export ONOS_APPS="drivers,openflow,proxyarp,drivermatrix,mlb"
+export ONOS_APPS="gui,drivers,openflow,proxyarp,drivermatrix,mlb"
## mininet VM
export OCN="192.168.56.99"
diff --git a/tools/test/cells/simon-uk4 b/tools/test/cells/simon-uk4
index 58ea829..5f81f64 100644
--- a/tools/test/cells/simon-uk4
+++ b/tools/test/cells/simon-uk4
@@ -37,7 +37,7 @@
export ONOS_USER=sdn
## the apps we want activated at startup
-export ONOS_APPS="drivers,openflow,proxyarp,drivermatrix,mlb"
+export ONOS_APPS="gui,drivers,openflow,proxyarp,drivermatrix,mlb"
## mininet VM
export OCN="192.168.56.99"
diff --git a/tools/test/cells/single b/tools/test/cells/single
index dd03e49..1c20c21 100644
--- a/tools/test/cells/single
+++ b/tools/test/cells/single
@@ -4,4 +4,4 @@
export OC1="192.168.56.101"
export OCN="192.168.56.103"
-export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
+export ONOS_APPS="gui,drivers,openflow,fwd,proxyarp,mobility"
diff --git a/tools/test/cells/single_optical b/tools/test/cells/single_optical
index ac4fc27..f95c3bd 100644
--- a/tools/test/cells/single_optical
+++ b/tools/test/cells/single_optical
@@ -4,4 +4,4 @@
export OC1="192.168.56.101"
export OCN="192.168.56.103"
-export ONOS_APPS="drivers,drivers.optical,openflow,fwd,proxyarp,mobility,optical"
+export ONOS_APPS="gui,drivers,drivers.optical,openflow,fwd,proxyarp,mobility,optical"
diff --git a/tools/test/cells/triple b/tools/test/cells/triple
index 4247122..2d882d9 100644
--- a/tools/test/cells/triple
+++ b/tools/test/cells/triple
@@ -6,4 +6,4 @@
export OC3="192.168.56.104"
export OCN="192.168.56.103"
-export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
+export ONOS_APPS="gui,drivers,openflow,fwd,proxyarp,mobility"
diff --git a/tools/test/cells/tutorial b/tools/test/cells/tutorial
index 4e06eed..6daf0c6 100644
--- a/tools/test/cells/tutorial
+++ b/tools/test/cells/tutorial
@@ -6,4 +6,4 @@
export OC3="10.0.3.103"
export OCN="10.0.3.1"
-export ONOS_APPS=drivers,openflow,proxyarp
+export ONOS_APPS=gui,drivers,openflow,proxyarp
diff --git a/tools/test/cells/vagrant b/tools/test/cells/vagrant
index e851733..b4c495e 100644
--- a/tools/test/cells/vagrant
+++ b/tools/test/cells/vagrant
@@ -3,7 +3,7 @@
export OC2=10.100.198.202
export OC3=10.100.198.203
export OCN=10.100.198.100
-export ONOS_APPS=drivers,openflow,proxyarp
+export ONOS_APPS=gui,drivers,openflow,proxyarp
export ONOS_NIC=10.100.198.*
export ONOS_SCENARIOS=$ONOS_ROOT/tools/test/scenarios
export ONOS_USER=ubuntu
diff --git a/tools/test/cells/virtual b/tools/test/cells/virtual
index aa6589e..1657da1 100644
--- a/tools/test/cells/virtual
+++ b/tools/test/cells/virtual
@@ -6,8 +6,8 @@
export OC3="192.168.56.103"
export OCN="192.168.56.100"
-export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
+export ONOS_APPS="gui,drivers,openflow,fwd,proxyarp,mobility"
export ONOS_USER=sdn
export ONOS_WEB_PASS=sdnrocks
-export ONOS_WEB_USER=onos
\ No newline at end of file
+export ONOS_WEB_USER=onos