홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
4abe8443 1 parent 82101d9d

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

Change-Id: I5310c54bb295f86a6f384a0f4bf18ed75cda1ef5
Inline Side-by-side
Showing 4 changed files with 34 additions and 12 deletions
...@@ -73,8 +73,9 @@ CORE = [ ...@@ -73,8 +73,9 @@ CORE = [
73 ] 73 ]
74 74
75 APPS = [ 75 APPS = [
76 - #Drivers 76 + # Drivers
77 '//drivers/default:onos-drivers-default-oar', 77 '//drivers/default:onos-drivers-default-oar',
78 + '//drivers/corsa:onos-drivers-corsa-oar',
78 79
79 # Providers 80 # Providers
80 '//providers/bgp:onos-providers-bgp-oar', 81 '//providers/bgp:onos-providers-bgp-oar',
......
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:openflowj',
4 + '//drivers/utilities:onos-drivers-utilities',
5 + '//protocols/openflow/api:onos-protocols-openflow-api',
6 +]
7 +
8 +osgi_jar_with_tests (
9 + deps = COMPILE_DEPS,
10 + resources_root = 'src/main/resources',
11 + resources = glob(['src/main/resources/**']),
12 +)
13 +
14 +onos_app (
15 + title = 'Corsa device drivers',
16 + category = 'Drivers',
17 + url = 'http://onosproject.org',
18 + description = 'ONOS Corsa device drivers application.',
19 + required_apps = [ 'org.onosproject.openflow' ],
20 +)
...@@ -15,8 +15,9 @@ FEATURES = [ ...@@ -15,8 +15,9 @@ FEATURES = [
15 15
16 #FIXME this list is currently mirrored from the root Buck file 16 #FIXME this list is currently mirrored from the root Buck file
17 APPS = [ 17 APPS = [
18 - #Drivers 18 + # Drivers
19 '//drivers/default:onos-drivers-default-oar', 19 '//drivers/default:onos-drivers-default-oar',
20 + '//drivers/corsa:onos-drivers-corsa-oar',
20 21
21 # Providers 22 # Providers
22 '//providers/bgp:onos-providers-bgp-oar', 23 '//providers/bgp:onos-providers-bgp-oar',
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
18 <group name="Drivers-Test"> 18 <group name="Drivers-Test">
19 19
20 <!-- Check initial state of select drivers --> 20 <!-- Check initial state of select drivers -->
21 - <step name="DriversTest.FindOvsCorsa" 21 + <step name="DriversTest.FindCelesticaCorsa"
22 - exec="onos-find-driver ${OC1} ovs-corsa ovs" /> 22 + exec="onos-find-driver ${OC1} celestica celestica" />
23 - <step name="DriversTest.CheckOvsCorsa" requires="^" 23 + <step name="DriversTest.CheckCelesticaCorsa" requires="^"
24 - exec="test '${ovsDriver}' != ''"/> 24 + exec="test '${celesticaDriver}' != ''"/>
25 <step name="DriversTest.Default" requires="^" 25 <step name="DriversTest.Default" requires="^"
26 exec="onos-find-driver ${OC1} default default" /> 26 exec="onos-find-driver ${OC1} default default" />
27 <step name="DriversTest.CheckDefault" requires="^" 27 <step name="DriversTest.CheckDefault" requires="^"
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
32 exec="onos ${OCI} onos:app deactivate org.onosproject.drivers"/> 32 exec="onos ${OCI} onos:app deactivate org.onosproject.drivers"/>
33 33
34 <!-- Check that drivers are no longer present --> 34 <!-- Check that drivers are no longer present -->
35 - <step name="DriversTest.AfterDeactivateFindOvsCorsa" requires="^" 35 + <step name="DriversTest.AfterDeactivateFindCelesticaCorsa" requires="^"
36 - exec="onos-find-driver ${OC1} ovs-corsa ovsInactive" env="!"/> 36 + exec="onos-find-driver ${OC1} celestica celesticaInactive" env="!"/>
37 <step name="DriversTest.AfterDeactivateFindDefault" requires="^" 37 <step name="DriversTest.AfterDeactivateFindDefault" requires="^"
38 exec="onos-find-driver ${OC1} default defaultInactive" env="!"/> 38 exec="onos-find-driver ${OC1} default defaultInactive" env="!"/>
39 39
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
42 exec="onos ${OCI} onos:app activate org.onosproject.drivers"/> 42 exec="onos ${OCI} onos:app activate org.onosproject.drivers"/>
43 43
44 <!-- Check reactivated state of drivers --> 44 <!-- Check reactivated state of drivers -->
45 - <step name="DriversTest.ReactivatedFindOvsCorsa" requires="^" 45 + <step name="DriversTest.ReactivatedFindCelesticaCorsa" requires="^"
46 - exec="onos-find-driver ${OC1} ovs-corsa ovs" /> 46 + exec="onos-find-driver ${OC1} celestica celestica" />
47 - <step name="DriversTest.ReactivatedCheckOvsCorsa" requires="^" 47 + <step name="DriversTest.ReactivatedCheckCelesticaCorsa" requires="^"
48 - exec="test '${ovsDriver}' != ''"/> 48 + exec="test '${celesticaDriver}' != ''"/>
49 <step name="DriversTest.ReactivatedDefault" requires="^" 49 <step name="DriversTest.ReactivatedDefault" requires="^"
50 exec="onos-find-driver ${OC1} default default" /> 50 exec="onos-find-driver ${OC1} default default" />
51 <step name="DriversTest.ReactivatedCheckDefault" requires="^" 51 <step name="DriversTest.ReactivatedCheckDefault" requires="^"
......