changes in vlan-native after tests
Change-Id: Id0e6fcba7945b5d6476eaec62964aa03ce6d9be9
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson
index 67b0d48..145a28b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params.tucson
@@ -1,5 +1,5 @@
<PARAMS>
- <testcases>6</testcases>
+ <testcases>6,16,26,36,46,56,66,76</testcases>
<GRAPH>
<nodeCluster>pairedleaves</nodeCluster>
@@ -24,7 +24,7 @@
<lib>routinglib.py,trellislib.py,stratum.py</lib>
</DEPENDENCY>
- <jsonFileSuffix>.hw</jsonFileSuffix>
+ <jsonFileSuffix>.tucson</jsonFileSuffix>
<persistent_setup>True</persistent_setup>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
index 61ff208..5aa179c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo.0x2.tucson
@@ -66,7 +66,7 @@
<COMPONENTS>
<mac></mac>
<inband>false</inband>
- <dhcp>True</dhcp>
+ <dhcp>False</dhcp>
<ip>10.32.11.2</ip>
<shortName>h1</shortName>
<port1></port1>
@@ -95,7 +95,7 @@
<COMPONENTS>
<mac></mac>
<inband>false</inband>
- <dhcp>True</dhcp>
+ <dhcp>False</dhcp>
<ip>10.32.11.3</ip>
<shortName>h2</shortName>
<port1></port1>
@@ -124,7 +124,7 @@
<COMPONENTS>
<mac></mac>
<inband>false</inband>
- <dhcp>True</dhcp>
+ <dhcp>False</dhcp>
<ip>10.32.11.194</ip>
<shortName>h3</shortName>
<port1></port1>
@@ -152,7 +152,7 @@
<COMPONENTS>
<mac></mac>
<inband>false</inband>
- <dhcp>True</dhcp>
+ <dhcp>False</dhcp>
<ip>10.32.11.1</ip>
<shortName>mgmt</shortName>
<port1></port1>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
index e2b175f..098db74 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
@@ -59,6 +59,7 @@
print (main.cfgName, "Testcase : CASE 09")
main.Cluster.setRunningNode( onosNodes )
run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
+ suf = main.params.get( 'jsonFileSuffix', None)
if not main.persistentSetup:
if main.useBmv2:
switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', '' )
@@ -69,7 +70,6 @@
translator.ofdpaToBmv2( main, switchPrefix=switchPrefix )
else:
translator.bmv2ToOfdpa( main )
- suf = main.params.get( 'jsonFileSuffix', None)
if suf:
run.loadJson( main, suffix=suf )
else:
@@ -93,7 +93,7 @@
# Run the test with physical devices
run.connectToPhysicalNetwork( main, hostDiscovery=False ) # We don't want to do host discovery in the pod
if main.cfgName:
- returnValue = run.loadNewJson( main )
+ returnValue = run.loadNewJson( main, suffix=suf )
utilities.assert_equals( expect=main.TRUE,
actual=returnValue,
onpass="Successfully changed network config",
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
index a10a0ca..093b740 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
@@ -28,7 +28,7 @@
"ips": [
"10.32.11.126/25"
],
- "vlan-untagged": 111,
+ "vlan-untagged":111,
"name": "compute-2-1"
}
]
@@ -39,7 +39,7 @@
"ips": [
"10.32.11.126/25"
],
- "vlan-untagged": 111,
+ "vlan-untagged":111,
"name": "compute-2-2"
}
]
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json
index c755a30..db7bc19 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json
@@ -103,4 +103,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
new file mode 100644
index 0000000..06c8e7f
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE16.json.tucson
@@ -0,0 +1,48 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[111],
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[111],
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[111],
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[111],
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
new file mode 100644
index 0000000..b3cd310
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE26.json.tucson
@@ -0,0 +1,52 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-native":111,
+ "vlan-tagged":[120],
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-native":111,
+ "vlan-tagged":[120],
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-native":111,
+ "vlan-tagged":[120],
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-native":111,
+ "vlan-tagged":[120],
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
new file mode 100644
index 0000000..25059e5
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE36.json.tucson
@@ -0,0 +1,50 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-native":111,
+ "vlan-tagged":[120],
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-native":111,
+ "vlan-tagged":[120],
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
new file mode 100644
index 0000000..d2b7ed7
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE46.json.tucson
@@ -0,0 +1,48 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":111,
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":111,
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
new file mode 100644
index 0000000..d1e47c8
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE56.json.tucson
@@ -0,0 +1,48 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":120,
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":120,
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
new file mode 100644
index 0000000..615d33b
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE66.json.tucson
@@ -0,0 +1,48 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[111],
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[111],
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[120],
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[120],
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
new file mode 100644
index 0000000..de1aa12
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE76.json.tucson
@@ -0,0 +1,48 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[120],
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-tagged":[120],
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}