Skip to content

Commit 56a3a68

Browse files
BryanMLimaBryanMLima
committed
Add cfg file for quota tests
1 parent 19d5762 commit 56a3a68

File tree

2 files changed

+262
-1
lines changed

2 files changed

+262
-1
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,11 @@ jobs:
271271
TESTS=($(echo $TESTS | tr -d '\n' | tr -s ' '))
272272
for suite in "${TESTS[@]}" ; do
273273
echo -e "Currently running test: $suite\n"
274-
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;
274+
if [[ "$suite" == *"quota"* ]]; then
275+
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced-with-quota-enabled.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;
276+
else
277+
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;
278+
fi
275279
done
276280
277281
echo -e "Stopping Simulator, integration tests run completed\n"

‎setup/dev/advanced-with-quota-enabled.cfg‎

Lines changed: 257 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,257 @@
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": "Sandbox-simulator",
21+
"guestcidraddress": "10.1.1.0/24",
22+
"dns1": "10.147.28.6",
23+
"physical_networks": [
24+
{
25+
"broadcastdomainrange": "Zone",
26+
"vlan": "100-200",
27+
"name": "Sandbox-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.2.2",
67+
"endip": "192.168.2.200",
68+
"netmask": "255.255.255.0",
69+
"vlan": "50",
70+
"gateway": "192.168.2.1"
71+
}
72+
],
73+
"networktype": "Advanced",
74+
"pods": [
75+
{
76+
"endip": "172.16.15.200",
77+
"name": "POD0",
78+
"startip": "172.16.15.2",
79+
"netmask": "255.255.255.0",
80+
"clusters": [
81+
{
82+
"clustername": "C0",
83+
"hypervisor": "simulator",
84+
"hosts": [
85+
{
86+
"username": "root",
87+
"url": "http://sim/c0/h0",
88+
"password": "password"
89+
},
90+
{
91+
"username": "root",
92+
"url": "http://sim/c0/h1",
93+
"password": "password"
94+
}
95+
],
96+
"clustertype": "CloudManaged",
97+
"primaryStorages": [
98+
{
99+
"url": "nfs://10.147.28.6:/export/home/sandbox/primary0",
100+
"name": "PS0"
101+
},
102+
{
103+
"url": "nfs://10.147.28.6:/export/home/sandbox/primary1",
104+
"name": "PS1"
105+
}
106+
]
107+
},
108+
{
109+
"clustername": "C1",
110+
"hypervisor": "simulator",
111+
"hosts": [
112+
{
113+
"username": "root",
114+
"url": "http://sim/c1/h0",
115+
"password": "password"
116+
},
117+
{
118+
"username": "root",
119+
"url": "http://sim/c1/h1",
120+
"password": "password"
121+
}
122+
],
123+
"clustertype": "CloudManaged",
124+
"primaryStorages": [
125+
{
126+
"url": "nfs://10.147.28.6:/export/home/sandbox/primary2",
127+
"name": "PS2"
128+
},
129+
{
130+
"url": "nfs://10.147.28.6:/export/home/sandbox/primary3",
131+
"name": "PS3"
132+
}
133+
]
134+
}
135+
],
136+
"gateway": "172.16.15.1"
137+
}
138+
],
139+
"internaldns1": "10.147.28.6",
140+
"secondaryStorages": [
141+
{
142+
"url": "nfs://10.147.28.6:/export/home/sandbox/secondary",
143+
"provider" : "NFS"
144+
}
145+
]
146+
}
147+
],
148+
"dbSvr": {
149+
"dbSvr": "localhost",
150+
"passwd": "cloud",
151+
"db": "cloud",
152+
"port": 3306,
153+
"user": "cloud"
154+
},
155+
"logger":
156+
{
157+
"LogFolderPath": "/tmp"
158+
},
159+
"globalConfig": [
160+
{
161+
"name": "network.gc.wait",
162+
"value": "20"
163+
},
164+
{
165+
"name": "storage.cleanup.interval",
166+
"value": "40"
167+
},
168+
{
169+
"name": "vm.op.wait.interval",
170+
"value": "5"
171+
},
172+
{
173+
"name": "default.page.size",
174+
"value": "500"
175+
},
176+
{
177+
"name": "network.gc.interval",
178+
"value": "20"
179+
},
180+
{
181+
"name": "instance.name",
182+
"value": "QA"
183+
},
184+
{
185+
"name": "workers",
186+
"value": "10"
187+
},
188+
{
189+
"name": "account.cleanup.interval",
190+
"value": "20"
191+
},
192+
{
193+
"name": "guest.domain.suffix",
194+
"value": "sandbox.simulator"
195+
},
196+
{
197+
"name": "expunge.delay",
198+
"value": "20"
199+
},
200+
{
201+
"name": "vm.allocation.algorithm",
202+
"value": "random"
203+
},
204+
{
205+
"name": "expunge.interval",
206+
"value": "20"
207+
},
208+
{
209+
"name": "expunge.workers",
210+
"value": "3"
211+
},
212+
{
213+
"name": "check.pod.cidrs",
214+
"value": "true"
215+
},
216+
{
217+
"name": "secstorage.allowed.internal.sites",
218+
"value": "10.147.28.0/24"
219+
},
220+
{
221+
"name": "direct.agent.load.size",
222+
"value": "1000"
223+
},
224+
{
225+
"name": "enable.dynamic.scale.vm",
226+
"value": "true"
227+
},
228+
{
229+
"name": "ping.interval",
230+
"value": "10"
231+
},
232+
{
233+
"name": "ping.timeout",
234+
"value": "2.0"
235+
},
236+
{
237+
"name": "enable.usage.server",
238+
"value": "true"
239+
},
240+
{
241+
"name": "quota.enable.service",
242+
"value": "true"
243+
}
244+
],
245+
"mgtSvr": [
246+
{
247+
"mgtSvrIp": "localhost",
248+
"passwd": "password",
249+
"user": "root",
250+
"port": 8096,
251+
"hypervisor": "simulator",
252+
"useHttps": "False",
253+
"certCAPath": "NA",
254+
"certPath": "NA"
255+
}
256+
]
257+
}

0 commit comments

Comments
 (0)