Updating test for TOST QA Pod
Add more robust topology check to Segment routing tests
Fix Typos
Include minimum flow count # in the comparision (>= vs > )
Add option for username and password in onos-app function
Don't add app prefix if it looks like it is already the full name
Change-Id: Ib4af0f72df8e7dcc5c179fafea1fd9c61d931246
(cherry picked from commit cda0902ee85041b22da8ad7638a8518914d07322)
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
index ac9c2ca..b6699f0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
@@ -1,9 +1,7 @@
{
"devices":{
- "of:0000000000000001":{
- "basic":{
- "driver":"ofdpa-ovs"
- },
+ "device:tofino:leaf1":{
+ "basic":{},
"segmentrouting":{
"adjacencySids":[],
"ipv4Loopback":"192.168.0.1",
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw
index 31c166a..b2eb1e6 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw
@@ -1,17 +1,17 @@
{
"devices":{
- "of:0000000000000001":{
+ "device:tofino:leaf1":{
"segmentrouting":{
"adjacencySids":[],
- "ipv4Loopback":"10.128.13.232",
+ "ipv4Loopback":"10.128.13.211",
"ipv4NodeSid":201,
"isEdgeRouter":true,
- "routerMac":"00:90:fb:64:cc:9e"
+ "routerMac":"00:00:00:00:00:01"
}
}
},
"ports":{
- "of:0000000000000001/160":{
+ "device:tofino:leaf1/128":{
"interfaces":[
{
"ips":[
@@ -21,7 +21,7 @@
}
]
},
- "of:0000000000000001/168":{
+ "device:tofino:leaf1/136":{
"interfaces":[
{
"ips":[
@@ -32,4 +32,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/tofino-onos-netcfg.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/tofino-onos-netcfg.json
index 5cc17ed..8c8995a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/tofino-onos-netcfg.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/tofino-onos-netcfg.json
@@ -3,7 +3,7 @@
"device:tofino:leaf1": {
"basic": {
"name": "leaf1",
- "managementAddress": "grpc://10.128.13.232:28000?device_id=1",
+ "managementAddress": "grpc://10.128.13.211:28000?device_id=1",
"driver": "stratum-tofino",
"pipeconf": "org.opencord.fabric.tofino.montara_sde_9_0_0"
}