Skip to content

Commit cff8e1a

Browse files
vishesh92vishesh92
committed
Update advdualzone.cfg to be similar to advanced.cfg & fixup test_metrics_api.py
1 parent e2d3488 commit cff8e1a

2 files changed

Lines changed: 30 additions & 31 deletions

File tree

‎setup/dev/advdualzone.cfg‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"zones": [
1919
{
2020
"name": "zim1",
21-
"guestcidraddress": "10.100.1.0/24",
22-
"dns1": "10.147.100.6",
21+
"guestcidraddress": "10.1.1.0/24",
22+
"dns1": "10.147.28.6",
2323
"physical_networks": [
2424
{
2525
"broadcastdomainrange": "Zone",
26-
"vlan": "1100-1200",
26+
"vlan": "100-200",
2727
"name": "z1-pnet",
2828
"traffictypes": [
2929
{
@@ -63,19 +63,19 @@
6363
},
6464
"ipranges": [
6565
{
66-
"startip": "192.168.100.2",
67-
"endip": "192.168.100.200",
66+
"startip": "192.168.2.2",
67+
"endip": "192.168.2.200",
6868
"netmask": "255.255.255.0",
6969
"vlan": "50",
70-
"gateway": "192.168.100.1"
70+
"gateway": "192.168.2.1"
7171
}
7272
],
7373
"networktype": "Advanced",
7474
"pods": [
7575
{
76-
"endip": "172.16.100.200",
76+
"endip": "172.16.15.200",
7777
"name": "Z1P1",
78-
"startip": "172.16.100.2",
78+
"startip": "172.16.15.2",
7979
"netmask": "255.255.255.0",
8080
"clusters": [
8181
{
@@ -96,11 +96,11 @@
9696
"clustertype": "CloudManaged",
9797
"primaryStorages": [
9898
{
99-
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p1",
99+
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p1",
100100
"name": "Z1PS1"
101101
},
102102
{
103-
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p2",
103+
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p2",
104104
"name": "Z1PS2"
105105
}
106106
]
@@ -123,35 +123,35 @@
123123
"clustertype": "CloudManaged",
124124
"primaryStorages": [
125125
{
126-
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p3",
126+
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p3",
127127
"name": "Z1PS3"
128128
},
129129
{
130-
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p4",
130+
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p4",
131131
"name": "Z1PS4"
132132
}
133133
]
134134
}
135135
],
136-
"gateway": "172.16.100.1"
136+
"gateway": "172.16.15.1"
137137
}
138138
],
139-
"internaldns1": "10.147.100.6",
139+
"internaldns1": "10.147.28.6",
140140
"secondaryStorages": [
141141
{
142-
"url": "nfs://10.147.100.6:/export/home/sandbox/z1secondary",
142+
"url": "nfs://10.147.28.6:/export/home/sandbox/z1secondary",
143143
"provider" : "NFS"
144144
}
145145
]
146146
},
147147
{
148148
"name": "zim2",
149-
"guestcidraddress": "10.200.1.0/24",
150-
"dns1": "10.147.200.6",
149+
"guestcidraddress": "10.1.2.0/24",
150+
"dns1": "10.147.29.6",
151151
"physical_networks": [
152152
{
153153
"broadcastdomainrange": "Zone",
154-
"vlan": "2100-2200",
154+
"vlan": "300-400",
155155
"name": "z2-pnet",
156156
"traffictypes": [
157157
{
@@ -191,19 +191,19 @@
191191
},
192192
"ipranges": [
193193
{
194-
"startip": "192.168.200.2",
195-
"endip": "192.168.200.200",
194+
"startip": "192.168.3.2",
195+
"endip": "192.168.3.200",
196196
"netmask": "255.255.255.0",
197-
"vlan": "50",
198-
"gateway": "192.168.200.1"
197+
"vlan": "51",
198+
"gateway": "192.168.3.1"
199199
}
200200
],
201201
"networktype": "Advanced",
202202
"pods": [
203203
{
204-
"endip": "172.16.200.200",
204+
"endip": "172.16.16.200",
205205
"name": "Z2P1",
206-
"startip": "172.16.200.2",
206+
"startip": "172.16.16.2",
207207
"netmask": "255.255.255.0",
208208
"clusters": [
209209
{
@@ -224,11 +224,11 @@
224224
"clustertype": "CloudManaged",
225225
"primaryStorages": [
226226
{
227-
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p1",
227+
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p1",
228228
"name": "Z2PS1"
229229
},
230230
{
231-
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p2",
231+
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p2",
232232
"name": "Z2PS2"
233233
}
234234
]
@@ -251,20 +251,20 @@
251251
"clustertype": "CloudManaged",
252252
"primaryStorages": [
253253
{
254-
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p3",
254+
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p3",
255255
"name": "Z2PS3"
256256
},
257257
{
258-
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p4",
258+
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p4",
259259
"name": "Z2PS4"
260260
}
261261
]
262262
}
263263
],
264-
"gateway": "172.16.200.1"
264+
"gateway": "172.16.16.1"
265265
}
266266
],
267-
"internaldns1": "10.147.200.6",
267+
"internaldns1": "10.147.29.6",
268268
"secondaryStorages": [
269269
{
270270
"url": "nfs://10.147.200.6:/export/home/sandbox/z2secondary",

‎test/integration/smoke/test_metrics_api.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ def test_list_infrastructure_metrics(self):
289289
self.assertTrue(hasattr(li, 'hosts'))
290290

291291
self.assertEqual(li.hosts, len(list_hosts(self.apiclient,
292-
zoneid=self.zone.id,
293292
type='Routing')))
294293

295294
self.assertTrue(hasattr(li, 'imagestores'))

0 commit comments

Comments
 (0)