remove some driver apps from the restart test because they depend on the default drivers
Change-Id: Ia4a3b476c4e42f83199822f369df2ea32692c994
diff --git a/tools/test/bin/onos-activate-all-scenario-default-app-list b/tools/test/bin/onos-activate-all-scenario-default-app-list
index c990237..771a5df 100644
--- a/tools/test/bin/onos-activate-all-scenario-default-app-list
+++ b/tools/test/bin/onos-activate-all-scenario-default-app-list
@@ -38,8 +38,6 @@
odtn-api
restsb
optical-model
-drivers.optical
-drivers.odtn-driver
configsync-netconf
# crashes in Atomix
#odtn-service
@@ -64,7 +62,6 @@
lldpprovider
openflow-base
openflow
-drivers.corsa
network-troubleshoot
drivers.mellanox
drivermatrix
@@ -92,7 +89,6 @@
null
# Application cannot be shut down
#transaction-perf
-drivers.server
drivers.gnmi
drivers.stratum
workflow
@@ -123,7 +119,6 @@
routeradvertisement
packet-stats
mlb
-drivers.flowspec
pcep
ofagent
demo
@@ -133,7 +128,6 @@
drivers.ciena.c5170
drivers.oplink
isis
-drivers.hp
drivers.cisco.rest
roadm
drivers.bmv2
@@ -142,28 +136,21 @@
p4tutorial.mytunnel
openstacktroubleshoot
models.ciena.waveserverai
-drivers.ciena.waveserverai
-drivers.fujitsu
-drivers.polatis.openflow
layout
graphitemetrics
powermanagement
optical-rest
tl1
-drivers.lumentum
acl
cord-support
intentperf
mfwd
-drivers.ciena.waveserver
imr
dhcp
-drivers.cisco.netconf
openstacknetworkingui
cfm
scalablegateway
cluster-ha
-drivers.microsemi.ea1000
reactive-routing
nodemetrics
mobility
diff --git a/tools/test/bin/onos-set-up-minimal-apps b/tools/test/bin/onos-set-up-minimal-apps
index 666c96c..1d450eb 100755
--- a/tools/test/bin/onos-set-up-minimal-apps
+++ b/tools/test/bin/onos-set-up-minimal-apps
@@ -1,14 +1,15 @@
#!/usr/bin/env python
-import subprocess, sys, json, os
+import subprocess
+import sys
+import json
+import os
REQUIRED_APPS = ["org.onosproject.drivers"]
def _main():
# Get the ONOS node address
- onos_node = ""
-
if len(sys.argv) > 1:
onos_node = sys.argv[1]
else:
@@ -22,23 +23,18 @@
config = json.loads(current_apps_json)
for app_description in config:
- apps_to_deactivate.append(app_description["name"])
+ app_name = app_description["name"]
+ if app_name not in REQUIRED_APPS:
+ apps_to_deactivate.append(app_name)
# Deactivate all apps
if len(apps_to_deactivate) > 0:
deactivate_command = ["onos", onos_node, "onos:app", "deactivate"]
for app_to_deactivate in apps_to_deactivate:
- deactivate_command.append(app_to_deactivate)
+
+ deactivate_command.append(app_to_deactivate)
subprocess.check_output(deactivate_command)
- # Activate apps that are part of the base set
- if len(REQUIRED_APPS) > 0:
- activate_command = ["onos", onos_node, "onos:app", "activate"]
- for app_to_activate in REQUIRED_APPS:
- activate_command.append(app_to_activate)
- subprocess.check_output(activate_command)
-
-
if __name__ == "__main__":
_main()