diff options
Diffstat (limited to 'framework/src/onos/tools')
3 files changed, 29 insertions, 95 deletions
diff --git a/framework/src/onos/tools/package/config/samples/network-cfg.json b/framework/src/onos/tools/package/config/samples/network-cfg.json index c2af8b81..92328479 100644 --- a/framework/src/onos/tools/package/config/samples/network-cfg.json +++ b/framework/src/onos/tools/package/config/samples/network-cfg.json @@ -28,8 +28,8 @@ "routerMac" : "00:00:00:00:01:80", "isEdgeRouter" : true, "adjacencySids" : [ - { "sid" : 100, "port" : [2, 3] }, - { "sid" : 200, "port" : [4, 5] } + { "sid" : 100, "ports" : [2, 3] }, + { "sid" : 200, "ports" : [4, 5] } ] } }, diff --git a/framework/src/onos/tools/package/config/samples/segmentrouting_dell.conf b/framework/src/onos/tools/package/config/samples/segmentrouting_dell.conf deleted file mode 100644 index be489a65..00000000 --- a/framework/src/onos/tools/package/config/samples/segmentrouting_dell.conf +++ /dev/null @@ -1,93 +0,0 @@ -{ - "comment": " Multilayer topology description and configuration", - "restrictSwitches": true, - "restrictLinks": true, - - "switchConfig": - [ - { "nodeDpid" : "of:00010001e88b9368", "name": "Dell-R1", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.1/32", - "routerMac": "00:01:e8:8b:93:6b", - "nodeSid": 101, - "isEdgeRouter" : true, - "subnets": [ - { "portNo": 46, "subnetIp": "10.200.1.1/24" } - ] - } - }, - - { "nodeDpid": "of:00010001e88b939b", "name": "Dell-R2", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.2/32", - "routerMac": "00:01:e8:8b:93:9e", - "nodeSid": 102, - "isEdgeRouter" : true, - "subnets": [ - { "portNo": 46, "subnetIp": "10.200.2.1/24" } - ] - } - }, - - { "nodeDpid": "of:00010001e88b938c", "name": "Dell-R3", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.3/32", - "routerMac": "00:01:e8:8b:93:8f", - "nodeSid": 103, - "isEdgeRouter" : true, - "subnets": [ - { "portNo": 46, "subnetIp": "10.200.3.1/24" } - ] - } - }, - - { "nodeDpid": "of:00010001e88b93ad", "name": "Dell-R4", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.4/32", - "routerMac": "00:01:e8:8b:93:b0", - "nodeSid": 104, - "isEdgeRouter" : true, - "subnets": [ - { "portNo": 46, "subnetIp": "10.200.4.1/24" } - ] - } - }, - - { "nodeDpid": "of:00010001e88b93bc", "name": "Dell-R5", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.5/32", - "routerMac": "00:01:e8:8b:93:bf", - "nodeSid": 105, - "isEdgeRouter" : false - } - }, - - { "nodeDpid": "of:00010001e88b93c2", "name": "Dell-R6", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.6/32", - "routerMac": "00:01:e8:8b:93:c5", - "nodeSid": 106, - "isEdgeRouter" : false - } - }, - - { "nodeDpid": "of:00010001e88b9398", "name": "Dell-R7", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.7/32", - "routerMac": "00:01:e8:8b:93:9b", - "nodeSid": 107, - "isEdgeRouter": false - } - }, - - { "nodeDpid": "of:00010001e88b27e3", "name": "Dell-R8", "type": "Router_SR", "allowed": true, - "latitude": 80.80, "longitude": 90.10, - "params": { "routerIp": "192.168.0.8/32", - "routerMac": "00:01:e8:8b:27:e6", - "nodeSid": 108, - "isEdgeRouter": false - } - } - - ] -} diff --git a/framework/src/onos/tools/test/scenarios/sequential-example.xml b/framework/src/onos/tools/test/scenarios/sequential-example.xml new file mode 100644 index 00000000..eee32d30 --- /dev/null +++ b/framework/src/onos/tools/test/scenarios/sequential-example.xml @@ -0,0 +1,27 @@ +<!-- + ~ Copyright 2015 Open Networking Laboratory + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<scenario name="example" description="sequential scenario example"> + <group name="Wrapup"> + <!-- 'starts' is a comma-separated list of patterns that name steps starting the current iteration of the sequence --> + <!-- 'ends' is a comma-separated list of patterns that name steps ending the previous iteration of the sequence --> + <!-- In this example each Final-Check-Logs-(N) will become dependent on Fetch-Logs-(N-1), for N > 1 --> + <sequential var="${OC#}" starts="Final-Check-Logs-${#}" ends="Fetch-Logs-${#-1}"> + <step name="Final-Check-Logs-${#}" exec="onos-check-logs ${OC#}"/> + <step name="Fetch-Logs-${#}" exec="onos-fetch-logs ${OC#}" + cwd="${WORKSPACE}/tmp/stc" requires="~^"/> + </sequential> + </group> +</scenario> |