Skip to content

Commit 1942f57

Browse files
DaanHooglandDaanHoogland
authored
cleanup for resources left by test_accounts and test_project(#3657)
1 parent 6f98906 commit 1942f57

6 files changed

Lines changed: 566 additions & 234 deletions

File tree

‎setup/dev/advanced.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
},
129129
{
130130
"url": "nfs://10.147.28.6:/export/home/sandbox/primary3",
131-
"name": "PS2"
131+
"name": "PS3"
132132
}
133133
]
134134
}

‎setup/dev/dualsim.cfg‎

Lines changed: 377 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,377 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
{
18+
"zones": [
19+
{
20+
"name": "zim1",
21+
"guestcidraddress": "10.100.1.0/24",
22+
"dns1": "10.147.100.6",
23+
"physical_networks": [
24+
{
25+
"broadcastdomainrange": "Zone",
26+
"vlan": "1100-1200",
27+
"name": "z1-pnet",
28+
"traffictypes": [
29+
{
30+
"typ": "Guest"
31+
},
32+
{
33+
"typ": "Management"
34+
},
35+
{
36+
"typ": "Public"
37+
}
38+
],
39+
"providers": [
40+
{
41+
"broadcastdomainrange": "ZONE",
42+
"name": "VirtualRouter"
43+
},
44+
{
45+
"broadcastdomainrange": "ZONE",
46+
"name": "VpcVirtualRouter"
47+
},
48+
{
49+
"broadcastdomainrange": "ZONE",
50+
"name": "InternalLbVm"
51+
}
52+
],
53+
"isolationmethods": [
54+
"VLAN"
55+
]
56+
}
57+
],
58+
"vmwaredc": {
59+
"username": "",
60+
"vcenter": "",
61+
"password": "",
62+
"name": ""
63+
},
64+
"ipranges": [
65+
{
66+
"startip": "192.168.100.2",
67+
"endip": "192.168.100.200",
68+
"netmask": "255.255.255.0",
69+
"vlan": "50",
70+
"gateway": "192.168.100.1"
71+
}
72+
],
73+
"networktype": "Advanced",
74+
"pods": [
75+
{
76+
"endip": "172.16.100.200",
77+
"name": "Z1P1",
78+
"startip": "172.16.100.2",
79+
"netmask": "255.255.255.0",
80+
"clusters": [
81+
{
82+
"clustername": "Z1P1C1",
83+
"hypervisor": "simulator",
84+
"hosts": [
85+
{
86+
"username": "root",
87+
"url": "http://sim1/c1/h1",
88+
"password": "password"
89+
},
90+
{
91+
"username": "root",
92+
"url": "http://sim1/c1/h2",
93+
"password": "password"
94+
}
95+
],
96+
"clustertype": "CloudManaged",
97+
"primaryStorages": [
98+
{
99+
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p1",
100+
"name": "Z1PS1"
101+
},
102+
{
103+
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p2",
104+
"name": "Z1PS2"
105+
}
106+
]
107+
},
108+
{
109+
"clustername": "Z1P1C2",
110+
"hypervisor": "simulator",
111+
"hosts": [
112+
{
113+
"username": "root",
114+
"url": "http://sim1/c2/h1",
115+
"password": "password"
116+
},
117+
{
118+
"username": "root",
119+
"url": "http://sim1/c2/h2",
120+
"password": "password"
121+
}
122+
],
123+
"clustertype": "CloudManaged",
124+
"primaryStorages": [
125+
{
126+
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p3",
127+
"name": "Z1PS3"
128+
},
129+
{
130+
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p4",
131+
"name": "Z1PS4"
132+
}
133+
]
134+
}
135+
],
136+
"gateway": "172.16.100.1"
137+
}
138+
],
139+
"internaldns1": "10.147.100.6",
140+
"secondaryStorages": [
141+
{
142+
"url": "nfs://10.147.100.6:/export/home/sandbox/z1secondary",
143+
"provider" : "NFS"
144+
}
145+
]
146+
},
147+
{
148+
"name": "zim2",
149+
"guestcidraddress": "10.200.1.0/24",
150+
"dns1": "10.147.200.6",
151+
"physical_networks": [
152+
{
153+
"broadcastdomainrange": "Zone",
154+
"vlan": "2100-2200",
155+
"name": "z2-pnet",
156+
"traffictypes": [
157+
{
158+
"typ": "Guest"
159+
},
160+
{
161+
"typ": "Management"
162+
},
163+
{
164+
"typ": "Public"
165+
}
166+
],
167+
"providers": [
168+
{
169+
"broadcastdomainrange": "ZONE",
170+
"name": "VirtualRouter"
171+
},
172+
{
173+
"broadcastdomainrange": "ZONE",
174+
"name": "VpcVirtualRouter"
175+
},
176+
{
177+
"broadcastdomainrange": "ZONE",
178+
"name": "InternalLbVm"
179+
}
180+
],
181+
"isolationmethods": [
182+
"VLAN"
183+
]
184+
}
185+
],
186+
"vmwaredc": {
187+
"username": "",
188+
"vcenter": "",
189+
"password": "",
190+
"name": ""
191+
},
192+
"ipranges": [
193+
{
194+
"startip": "192.168.200.2",
195+
"endip": "192.168.200.200",
196+
"netmask": "255.255.255.0",
197+
"vlan": "50",
198+
"gateway": "192.168.200.1"
199+
}
200+
],
201+
"networktype": "Advanced",
202+
"pods": [
203+
{
204+
"endip": "172.16.200.200",
205+
"name": "Z2P1",
206+
"startip": "172.16.200.2",
207+
"netmask": "255.255.255.0",
208+
"clusters": [
209+
{
210+
"clustername": "Z2P1C1",
211+
"hypervisor": "simulator",
212+
"hosts": [
213+
{
214+
"username": "root",
215+
"url": "http://sim2/c1/h1",
216+
"password": "password"
217+
},
218+
{
219+
"username": "root",
220+
"url": "http://sim2/c1/h2",
221+
"password": "password"
222+
}
223+
],
224+
"clustertype": "CloudManaged",
225+
"primaryStorages": [
226+
{
227+
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p1",
228+
"name": "Z2PS1"
229+
},
230+
{
231+
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p2",
232+
"name": "Z2PS2"
233+
}
234+
]
235+
},
236+
{
237+
"clustername": "Z2P2C1",
238+
"hypervisor": "simulator",
239+
"hosts": [
240+
{
241+
"username": "root",
242+
"url": "http://sim2/c1/h1",
243+
"password": "password"
244+
},
245+
{
246+
"username": "root",
247+
"url": "http://sim2/c1/h2",
248+
"password": "password"
249+
}
250+
],
251+
"clustertype": "CloudManaged",
252+
"primaryStorages": [
253+
{
254+
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p3",
255+
"name": "Z2PS3"
256+
},
257+
{
258+
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p4",
259+
"name": "Z2PS4"
260+
}
261+
]
262+
}
263+
],
264+
"gateway": "172.16.200.1"
265+
}
266+
],
267+
"internaldns1": "10.147.200.6",
268+
"secondaryStorages": [
269+
{
270+
"url": "nfs://10.147.200.6:/export/home/sandbox/z2secondary",
271+
"provider" : "NFS"
272+
}
273+
]
274+
}
275+
],
276+
"dbSvr": {
277+
"dbSvr": "localhost",
278+
"passwd": "cloud",
279+
"db": "cloud",
280+
"port": 3306,
281+
"user": "cloud"
282+
},
283+
"logger":
284+
{
285+
"LogFolderPath": "/tmp"
286+
},
287+
"globalConfig": [
288+
{
289+
"name": "network.gc.wait",
290+
"value": "20"
291+
},
292+
{
293+
"name": "storage.cleanup.interval",
294+
"value": "40"
295+
},
296+
{
297+
"name": "vm.op.wait.interval",
298+
"value": "5"
299+
},
300+
{
301+
"name": "default.page.size",
302+
"value": "500"
303+
},
304+
{
305+
"name": "network.gc.interval",
306+
"value": "20"
307+
},
308+
{
309+
"name": "instance.name",
310+
"value": "QA"
311+
},
312+
{
313+
"name": "workers",
314+
"value": "10"
315+
},
316+
{
317+
"name": "account.cleanup.interval",
318+
"value": "20"
319+
},
320+
{
321+
"name": "guest.domain.suffix",
322+
"value": "sandbox.simulator"
323+
},
324+
{
325+
"name": "expunge.delay",
326+
"value": "20"
327+
},
328+
{
329+
"name": "vm.allocation.algorithm",
330+
"value": "random"
331+
},
332+
{
333+
"name": "expunge.interval",
334+
"value": "20"
335+
},
336+
{
337+
"name": "expunge.workers",
338+
"value": "3"
339+
},
340+
{
341+
"name": "check.pod.cidrs",
342+
"value": "true"
343+
},
344+
{
345+
"name": "secstorage.allowed.internal.sites",
346+
"value": "10.147.0.0/16"
347+
},
348+
{
349+
"name": "direct.agent.load.size",
350+
"value": "1000"
351+
},
352+
{
353+
"name": "enable.dynamic.scale.vm",
354+
"value": "true"
355+
},
356+
{
357+
"name": "ping.interval",
358+
"value": "10"
359+
},
360+
{
361+
"name": "ping.timeout",
362+
"value": "2.0"
363+
}
364+
],
365+
"mgtSvr": [
366+
{
367+
"mgtSvrIp": "localhost",
368+
"passwd": "password",
369+
"user": "root",
370+
"port": 8096,
371+
"hypervisor": "simulator",
372+
"useHttps": "False",
373+
"certCAPath": "NA",
374+
"certPath": "NA"
375+
}
376+
]
377+
}

0 commit comments

Comments
 (0)