Ray Milkey
Committed by Gerrit Code Review

STC drivers test now uses a driver that is always present; added buck build for corsa driver

Change-Id: I5310c54bb295f86a6f384a0f4bf18ed75cda1ef5
......@@ -73,8 +73,9 @@ CORE = [
]
APPS = [
#Drivers
# Drivers
'//drivers/default:onos-drivers-default-oar',
'//drivers/corsa:onos-drivers-corsa-oar',
# Providers
'//providers/bgp:onos-providers-bgp-oar',
......
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//drivers/utilities:onos-drivers-utilities',
'//protocols/openflow/api:onos-protocols-openflow-api',
]
osgi_jar_with_tests (
deps = COMPILE_DEPS,
resources_root = 'src/main/resources',
resources = glob(['src/main/resources/**']),
)
onos_app (
title = 'Corsa device drivers',
category = 'Drivers',
url = 'http://onosproject.org',
description = 'ONOS Corsa device drivers application.',
required_apps = [ 'org.onosproject.openflow' ],
)
......@@ -15,8 +15,9 @@ FEATURES = [
#FIXME this list is currently mirrored from the root Buck file
APPS = [
#Drivers
# Drivers
'//drivers/default:onos-drivers-default-oar',
'//drivers/corsa:onos-drivers-corsa-oar',
# Providers
'//providers/bgp:onos-providers-bgp-oar',
......@@ -114,4 +115,4 @@ genrule(
bash = 'sed "s#ONOS_TAR=#ONOS_TAR=$(location :onos-package)#" $SRCS > $OUT; chmod +x $OUT',
executable = True,
visibility = [ 'PUBLIC' ],
)
\ No newline at end of file
)
......
......@@ -18,10 +18,10 @@
<group name="Drivers-Test">
<!-- Check initial state of select drivers -->
<step name="DriversTest.FindOvsCorsa"
exec="onos-find-driver ${OC1} ovs-corsa ovs" />
<step name="DriversTest.CheckOvsCorsa" requires="^"
exec="test '${ovsDriver}' != ''"/>
<step name="DriversTest.FindCelesticaCorsa"
exec="onos-find-driver ${OC1} celestica celestica" />
<step name="DriversTest.CheckCelesticaCorsa" requires="^"
exec="test '${celesticaDriver}' != ''"/>
<step name="DriversTest.Default" requires="^"
exec="onos-find-driver ${OC1} default default" />
<step name="DriversTest.CheckDefault" requires="^"
......@@ -32,8 +32,8 @@
exec="onos ${OCI} onos:app deactivate org.onosproject.drivers"/>
<!-- Check that drivers are no longer present -->
<step name="DriversTest.AfterDeactivateFindOvsCorsa" requires="^"
exec="onos-find-driver ${OC1} ovs-corsa ovsInactive" env="!"/>
<step name="DriversTest.AfterDeactivateFindCelesticaCorsa" requires="^"
exec="onos-find-driver ${OC1} celestica celesticaInactive" env="!"/>
<step name="DriversTest.AfterDeactivateFindDefault" requires="^"
exec="onos-find-driver ${OC1} default defaultInactive" env="!"/>
......@@ -42,10 +42,10 @@
exec="onos ${OCI} onos:app activate org.onosproject.drivers"/>
<!-- Check reactivated state of drivers -->
<step name="DriversTest.ReactivatedFindOvsCorsa" requires="^"
exec="onos-find-driver ${OC1} ovs-corsa ovs" />
<step name="DriversTest.ReactivatedCheckOvsCorsa" requires="^"
exec="test '${ovsDriver}' != ''"/>
<step name="DriversTest.ReactivatedFindCelesticaCorsa" requires="^"
exec="onos-find-driver ${OC1} celestica celestica" />
<step name="DriversTest.ReactivatedCheckCelesticaCorsa" requires="^"
exec="test '${celesticaDriver}' != ''"/>
<step name="DriversTest.ReactivatedDefault" requires="^"
exec="onos-find-driver ${OC1} default default" />
<step name="DriversTest.ReactivatedCheckDefault" requires="^"
......