Revision 850be460 test/py/cmdlib/testsupport/config_mock.py

b/test/py/cmdlib/testsupport/config_mock.py
257 257
                 spindles=None,
258 258
                 primary_node=None,
259 259
                 secondary_node=None,
260
                 create_nodes=False):
260
                 create_nodes=False,
261
                 instance_disk_index=0):
261 262
    """Create a new L{objecs.Disk} object
262 263

  
263 264
    @rtype: L{objects.Disk}
......
305 306
    if children is None:
306 307
      children = []
307 308
    if iv_name is None:
308
      iv_name = "mock_disk/%d" % disk_id
309
      iv_name = "disk/%d" % instance_disk_index
309 310
    if params is None:
310 311
      params = {}
311 312

  
......
389 390
      os_hvp={"mocked_os": constants.HVC_DEFAULTS.copy()},
390 391
      beparams=None,
391 392
      osparams=None,
392
      nicparams=None,
393
      nicparams={constants.PP_DEFAULT: constants.NICC_DEFAULTS},
393 394
      ndparams=None,
394 395
      diskparams=None,
395 396
      candidate_pool_size=3,

Also available in: Unified diff