Revision 27619aac test/py/cmdlib/testsupport/config_mock.py
b/test/py/cmdlib/testsupport/config_mock.py | ||
---|---|---|
176 | 176 |
name=None, |
177 | 177 |
primary_node=None, |
178 | 178 |
os=None, |
179 |
hypervisor=constants.HT_FAKE,
|
|
179 |
hypervisor=None,
|
|
180 | 180 |
hvparams=None, |
181 | 181 |
beparams=None, |
182 | 182 |
osparams=None, |
... | ... | |
208 | 208 |
if os is None: |
209 | 209 |
os = self.GetDefaultOs().name + objects.OS.VARIANT_DELIM +\ |
210 | 210 |
self.GetDefaultOs().supported_variants[0] |
211 |
if hypervisor is None: |
|
212 |
hypervisor = self.GetClusterInfo().enabled_hypervisors[0] |
|
211 | 213 |
if hvparams is None: |
212 | 214 |
hvparams = {} |
213 | 215 |
if beparams is None: |
... | ... | |
281 | 283 |
if network is None: |
282 | 284 |
network = "192.168.123.0/24" |
283 | 285 |
if gateway is None: |
284 |
gateway = "192.168.123.1" |
|
286 |
if network[-3:] == "/24": |
|
287 |
gateway = network[:-4] + "1" |
|
288 |
else: |
|
289 |
gateway = "192.168.123.1" |
|
285 | 290 |
if network[-3:] == "/24" and gateway == network[:-4] + "1": |
286 | 291 |
if reservations is None: |
287 | 292 |
reservations = "0" * 256 |
... | ... | |
503 | 508 |
name = "mock_nic_%d" % nic_id |
504 | 509 |
if mac is None: |
505 | 510 |
mac = "aa:00:00:aa:%02x:%02x" % (nic_id / 0xff, nic_id % 0xff) |
511 |
if isinstance(network, objects.Network): |
|
512 |
network = network.uuid |
|
506 | 513 |
if nicparams is None: |
507 | 514 |
nicparams = {} |
508 | 515 |
|
Also available in: Unified diff