X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fvariables%2Ftopoprocessing%2FTopologies.py;h=2056d3bb837ac17f9665f1999b36024977e101d9;hb=39ee1426c6814d5d5a045d48a48600dae983530e;hp=f4473dde53d48f07f72bc9fec547ec1f655956b2;hpb=b75cf48c2c53177f3e8b57bab8543d2227ccc939;p=integration%2Ftest.git
diff --git a/csit/variables/topoprocessing/Topologies.py b/csit/variables/topoprocessing/Topologies.py
index f4473dde53..2056d3bb83 100644
--- a/csit/variables/topoprocessing/Topologies.py
+++ b/csit/variables/topoprocessing/Topologies.py
@@ -16,10 +16,16 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''
tp:1:1
1119
+
+ 192.168.1.5
+
tp:1:2
1119
+
+ 192.168.1.6
+
tp:1:3
@@ -48,10 +54,16 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''
tp:3:1
1118
+
+ 192.168.1.5
+
tp:3:2
2118
+
+ 192.168.1.6
+
@@ -66,10 +78,16 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''
tp:4:1
1117
+
+ 192.168.2.6
+
tp:4:2
1117
+
+ 192.168.2.7
+
@@ -84,8 +102,63 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''
tp:5:1
1116
+
+ 192.168.2.8
+
+
+ link:1:4
+
+ bgp:1
+
+
+ bgp:4
+
+
+ linkA
+ 12
+
+
+
+ link:1:3
+
+ bgp:1
+
+
+ bgp:3
+
+
+ linkB
+ 11
+
+
+
+ link:1:2-1
+
+ bgp:1
+
+
+ bgp:2
+
+
+ linkA
+ 12
+
+
+
+ link:1:2-2
+
+ bgp:1
+
+
+ bgp:2
+
+
+ linkC
+ 14
+
+
'''
NETWORK_UNDERLAY_TOPOLOGY_2 = '''network-topo:2
bgp:6
+ 10
@@ -106,10 +180,15 @@ NETWORK_UNDERLAY_TOPOLOGY_2 = '''
tp:6:1
1116
+ portA
+
+ 192.168.1.7
+
bgp:7
+ 20
@@ -119,11 +198,24 @@ NETWORK_UNDERLAY_TOPOLOGY_2 = '''
tp:7:1
+ 1119
+ portD
+
+ 192.168.1.8
+
+
+
+ tp:7:2
1117
+ portC
+
+ 192.168.1.9
+
bgp:8
+ 21
@@ -138,6 +230,7 @@ NETWORK_UNDERLAY_TOPOLOGY_2 = '''
bgp:9
+ 25
@@ -152,6 +245,7 @@ NETWORK_UNDERLAY_TOPOLOGY_2 = '''
bgp:10
+ 25
@@ -162,8 +256,358 @@ NETWORK_UNDERLAY_TOPOLOGY_2 = '''
tp:10:1
1122
+ portB
+
+ 192.168.2.9
+
+
+
+ '''
+
+NETWORK_UNDERLAY_TOPOLOGY_3 = '''
+ network-topo:3
+
+ bgp:11
+
+
+
+ fe80:0:0:0:0:0:c0a8:103
+
+
+
+
+ tp:11:1
+
+ fe80:0:0:0:0:0:c0a8:107
+
+
+
+
+ bgp:12
+
+
+
+ fe80:0:0:0:0:0:c0a8:104
+
+
+
+
+
+ bgp:13
+
+
+
+ fe80:0:0:0:0:0:c0a8:204
+
+
+
+
+
+ bgp:14
+
+
+
+ fe80:0:0:0:0:0:c0a8:205
+
+
+
+
+ tp:14:1
+
+ fe80:0:0:0:0:0:c0a8:207
+
+
+
+ tp:14:2
+
+ fe80:0:0:0:0:0:c0a8:209
+
+
+
+
+ bgp:15
+
+
+
+ fe80:0:0:0:0:0:c0a8:203
+
+
+
+
+ '''
+
+NETWORK_UNDERLAY_TOPOLOGY_4 = '''
+ network-topo:4
+
+ bgp:16
+
+
+
+ 192.168.1.1
+
+
+
+
+
+ bgp:17
+
+
+
+ 192.168.1.2
+
+
+
+
+
+ bgp:18
+
+
+
+ 192.168.2.1
+
+
+
+
+
+ bgp:19
+
+
+
+ 192.168.2.2
+
+
+
+
+
+ bgp:20
+
+
+
+ 192.168.2.1
+
+
+
+
+ '''
+
+NETWORK_UNDERLAY_TOPOLOGY_5 = '''
+ network-topo:5
+
+ bgp:21
+
+
+
+ 192.168.1.1
+
+
+
+
+ tp:21:1
+
+ 192.168.1.9
+
+
+
+ tp:21:2
+
+ 192.168.1.8
+
+
+
+ tp:21:3
+
+ 192.168.1.8
+
+
+
+
+ bgp:22
+
+
+
+ 192.168.1.2
+
+
+
+
+ tp:22:1
+
+ 192.168.2.9
+
+
+ tp:22:2
+
+ 192.168.1.7
+
+
+
+
+ bgp:23
+
+
+
+ 192.168.2.1
+
+
+
+
+
+ bgp:24
+
+
+
+ 192.168.2.2
+
+
+
+
+ tp:24:1
+
+ 192.168.1.7
+
+
+
+ tp:24:2
+
+ 192.168.1.7
+
+
+
+ tp:24:3
+
+ 192.168.1.7
+
+
+
+
+ bgp:25
+
+
+
+ 192.168.2.1
+
+
+
+
+ '''
+
+NETWORK_UNDERLAY_TOPOLOGY_6 = '''
+ network-topo:6
+
+ bgp:26
+
+
+
+ 192.168.1.1
+
+
+
+
+
+ bgp:27
+
+
+
+ 192.168.1.2
+
+
+
+
+
+ bgp:28
+
+
+
+ 192.168.2.1
+
+
+
+
+
+ bgp:29
+
+
+
+ 192.168.2.1
+
+
+
+
+
+ bgp:30
+
+
+
+ 192.168.2.3
+
+
+
+
+ link:26:28
+
+ bgp:26
+
+
+ bgp:28
+
+
+ linkA
+ 17
+
+
+
+ link:28:29
+
+ bgp:28
+
+
+ bgp:29
+
+
+ linkB
+ 11
+
+
+
+ link:29:30-1
+
+ bgp:29
+
+
+ bgp:30
+
+
+ linkA
+ 12
+
+
+
+ link:29:30-2
+
+ bgp:29
+
+
+ bgp:30
+
+
+ linkC
+ 12
+
+
'''
OPENFLOW_UNDERLAY_NODES = '''
@@ -175,6 +619,7 @@ OPENFLOW_UNDERLAY_NODES = '''
openflow:1:1
1
+ portC
openflow:1:2
@@ -182,19 +627,28 @@ OPENFLOW_UNDERLAY_NODES = '''
Pantheon Technologies
192.168.1.1
+ 19
openflow:2
openflow:2:1
1
+ portB
openflow:2:2
2
+ portD
+
+
+ openflow:2:3
+ 3
+ portA
Pantheon Technologies
192.168.1.2
+ 20
openflow:3
@@ -212,6 +666,7 @@ OPENFLOW_UNDERLAY_NODES = '''
Pantheon Technologies
192.168.1.3
+ 8
openflow:4
@@ -229,40 +684,163 @@ OPENFLOW_UNDERLAY_NODES = '''
Cisco
192.168.2.1
+ 21
openflow:5
openflow:5:1
3
+ portB
Cisco
192.168.2.2
+ 25
openflow:6
Pantheon Technologies
192.168.1.1
+ 26
openflow:7
Pantheon Technologies
192.168.2.3
+ 19
openflow:8
Cisco
192.168.1.4
+ 21
openflow:9
Cisco
192.168.2.3
+ 21
openflow:10
Cisco
192.168.2.1
+ 25
+
+
+ openflow:11
+ Pantheon Technologies
+ fe80:0:0:0:0:0:c0a8:103
+ 29
+
+
+ openflow:12
+ Pantheon Technologies
+ fe80:0:0:0:0:0:c0a8:201
+ 19
+
+
+ openflow:13
+ Cisco
+ fe80:0:0:0:0:0:c0a8:104
+ 21
+
+
+ openflow:14
+ Cisco
+ fe80:0:0:0:0:0:c0a8:205
+ 21
+
+
+ openflow:15
+ Cisco
+ fe80:0:0:0:0:0:c0a8:203
+ 12
+
+
+ openflow:16
+ Pantheon Technologies
+ 192.168.1.1
+ 26
+
+
+ openflow:17
+ Pantheon Technologies
+ 192.168.2.3
+ 19
+
+
+ openflow:18
+ Cisco
+ 192.168.2.4
+ 21
+
+
+ openflow:19
+ Cisco
+ 192.168.2.3
+ 21
+
+
+ openflow:20
+ Cisco
+ 192.168.2.3
+ 25
+
+
+ openflow:21
+ Pantheon Technologies
+ 192.168.1.1
+ 19
+
+ openflow:21:1
+ 1
+ portC
+
+
+
+ openflow:22
+ Pantheon Technologies
+ 192.168.1.2
+ 20
+
+ openflow:22:1
+ 2
+ portB
+
+
+ openflow:22:2
+ 3
+ portD
+
+
+ openflow:22:3
+ 1
+ portA
+
+
+
+ openflow:23
+ Pantheon Technologies
+ 192.168.1.3
+ 8
+
+
+ openflow:24
+ Cisco
+ 192.168.2.1
+ 21
+
+
+ openflow:25
+ Cisco
+ 192.168.2.2
+ 25
+
+ openflow:25:1
+ 4
+ portB
+
'''
@@ -304,6 +882,12 @@ OPENFLOW_UNDERLAY_TOPOLOGY_1 = '''
/inventory:nodes/inventory:node[inventory:id="openflow:2"]/inventory:node-connector[inventory:id="openflow:2:2"]
+
+ tp:3
+
+ /inventory:nodes/inventory:node[inventory:id="openflow:2"]/inventory:node-connector[inventory:id="openflow:2:3"]
+
+
of-node:3
@@ -390,3 +974,201 @@ OPENFLOW_UNDERLAY_TOPOLOGY_2 = '''
'''
+
+OPENFLOW_UNDERLAY_TOPOLOGY_3 = '''
+
+ openflow-topo:3
+
+ of-node:11
+ /inventory:nodes/inventory:node[inventory:id="openflow:11"]
+
+
+ of-node:12
+ /inventory:nodes/inventory:node[inventory:id="openflow:12"]
+
+
+ of-node:13
+ /inventory:nodes/inventory:node[inventory:id="openflow:13"]
+
+
+ of-node:14
+ /inventory:nodes/inventory:node[inventory:id="openflow:14"]
+
+
+ of-node:15
+ /inventory:nodes/inventory:node[inventory:id="openflow:15"]
+
+
+ link:11:12
+
+ of-node:11
+
+
+ of-node:12
+
+
+ linkB
+ 16
+
+
+
+ link:14:12
+
+ of-node:14
+
+
+ of-node:12
+
+
+ linkC
+ 14
+
+
+
+ link:15:13
+
+ of-node:15
+
+
+ of-node:13
+
+
+ linkD
+ 15
+
+
+
+ link:11:13
+
+ of-node:11
+
+
+ of-node:13
+
+
+ linkA
+ 13
+
+
+
+'''
+OPENFLOW_UNDERLAY_TOPOLOGY_4 = '''
+
+ openflow-topo:4
+
+ of-node:16
+ /inventory:nodes/inventory:node[inventory:id="openflow:16"]
+
+
+ of-node:17
+ /inventory:nodes/inventory:node[inventory:id="openflow:17"]
+
+
+ of-node:18
+ /inventory:nodes/inventory:node[inventory:id="openflow:18"]
+
+
+ of-node:19
+ /inventory:nodes/inventory:node[inventory:id="openflow:19"]
+
+
+ of-node:20
+ /inventory:nodes/inventory:node[inventory:id="openflow:20"]
+
+
+'''
+
+OPENFLOW_UNDERLAY_TOPOLOGY_5 = '''
+
+ openflow-topo:5
+
+ of-node:21
+ /inventory:nodes/inventory:node[inventory:id="openflow:21"]
+
+ tp:1
+
+ /inventory:nodes/inventory:node[inventory:id="openflow:21"]/inventory:node-connector[inventory:id="openflow:21:1"]
+
+
+
+
+ of-node:22
+ /inventory:nodes/inventory:node[inventory:id="openflow:22"]
+
+ tp:1
+
+ /inventory:nodes/inventory:node[inventory:id="openflow:22"]/inventory:node-connector[inventory:id="openflow:22:1"]
+
+
+
+ tp:2
+
+ /inventory:nodes/inventory:node[inventory:id="openflow:22"]/inventory:node-connector[inventory:id="openflow:22:2"]
+
+
+
+ tp:3
+
+ /inventory:nodes/inventory:node[inventory:id="openflow:22"]/inventory:node-connector[inventory:id="openflow:22:3"]
+
+
+
+
+ of-node:23
+ /inventory:nodes/inventory:node[inventory:id="openflow:23"]
+
+
+ of-node:24
+ /inventory:nodes/inventory:node[inventory:id="openflow:24"]
+
+
+ of-node:25
+ /inventory:nodes/inventory:node[inventory:id="openflow:25"]
+
+ tp:1
+
+ /inventory:nodes/inventory:node[inventory:id="openflow:25"]/inventory:node-connector[inventory:id="openflow:25:1"]
+
+
+
+
+'''
+
+OPENFLOW_UNDERLAY_TOPOLOGY_6 = '''
+
+ openflow-topo:6
+
+ of-node:26
+ /inventory:nodes/inventory:node[inventory:id="openflow:6"]
+
+
+ of-node:27
+ /inventory:nodes/inventory:node[inventory:id="openflow:7"]
+
+
+ of-node:28
+ /inventory:nodes/inventory:node[inventory:id="openflow:8"]
+
+
+ of-node:29
+ /inventory:nodes/inventory:node[inventory:id="openflow:9"]
+
+
+ of-node:30
+ /inventory:nodes/inventory:node[inventory:id="openflow:10"]
+
+
+'''