Merge "Change default value of multi_instance_display_name_template"
This commit is contained in:
commit
7bc88c6a29
|
@ -102,7 +102,7 @@ compute_opts = [
|
||||||
help='Kernel image that indicates not to use a kernel, but to '
|
help='Kernel image that indicates not to use a kernel, but to '
|
||||||
'use a raw disk image instead'),
|
'use a raw disk image instead'),
|
||||||
cfg.StrOpt('multi_instance_display_name_template',
|
cfg.StrOpt('multi_instance_display_name_template',
|
||||||
default='%(name)s-%(uuid)s',
|
default='%(name)s-%(count)d',
|
||||||
help='When creating multiple instances with a single request '
|
help='When creating multiple instances with a single request '
|
||||||
'using the os-multiple-create API extension, this '
|
'using the os-multiple-create API extension, this '
|
||||||
'template will be used to build the display name for '
|
'template will be used to build the display name for '
|
||||||
|
|
|
@ -129,14 +129,14 @@ class CellsSchedulerTestCase(test.TestCase):
|
||||||
['default'], block_device_mapping)
|
['default'], block_device_mapping)
|
||||||
self.assertEqual(instance_uuids, call_info['uuids'])
|
self.assertEqual(instance_uuids, call_info['uuids'])
|
||||||
|
|
||||||
for instance_uuid in instance_uuids:
|
for count, instance_uuid in enumerate(instance_uuids):
|
||||||
instance = db.instance_get_by_uuid(self.ctxt, instance_uuid)
|
instance = db.instance_get_by_uuid(self.ctxt, instance_uuid)
|
||||||
meta = utils.instance_meta(instance)
|
meta = utils.instance_meta(instance)
|
||||||
self.assertEqual('cow', meta['moo'])
|
self.assertEqual('cow', meta['moo'])
|
||||||
sys_meta = utils.instance_sys_meta(instance)
|
sys_meta = utils.instance_sys_meta(instance)
|
||||||
self.assertEqual('cat', sys_meta['meow'])
|
self.assertEqual('cat', sys_meta['meow'])
|
||||||
self.assertEqual('meow', instance['hostname'])
|
self.assertEqual('meow', instance['hostname'])
|
||||||
self.assertEqual('moo-%s' % instance['uuid'],
|
self.assertEqual('moo-%d' % (count + 1),
|
||||||
instance['display_name'])
|
instance['display_name'])
|
||||||
self.assertEqual('fake_image_ref', instance['image_ref'])
|
self.assertEqual('fake_image_ref', instance['image_ref'])
|
||||||
|
|
||||||
|
|
|
@ -8643,14 +8643,8 @@ class ComputeAPITestCase(BaseTestCase):
|
||||||
self.assertEqual(refs[1]['display_name'], 'x')
|
self.assertEqual(refs[1]['display_name'], 'x')
|
||||||
self.assertEqual(refs[1]['hostname'], 'x')
|
self.assertEqual(refs[1]['hostname'], 'x')
|
||||||
|
|
||||||
self.flags(multi_instance_display_name_template='%(name)s-%(count)s')
|
self.flags(multi_instance_display_name_template='%(name)s-%(count)d')
|
||||||
(refs, resv_id) = self.compute_api.create(self.context,
|
self._multi_instance_display_name_default()
|
||||||
flavors.get_default_flavor(), image_href='some-fake-image',
|
|
||||||
min_count=2, max_count=2, display_name='x')
|
|
||||||
self.assertEqual(refs[0]['display_name'], 'x-1')
|
|
||||||
self.assertEqual(refs[0]['hostname'], 'x-1')
|
|
||||||
self.assertEqual(refs[1]['display_name'], 'x-2')
|
|
||||||
self.assertEqual(refs[1]['hostname'], 'x-2')
|
|
||||||
|
|
||||||
self.flags(multi_instance_display_name_template='%(name)s-%(uuid)s')
|
self.flags(multi_instance_display_name_template='%(name)s-%(uuid)s')
|
||||||
(refs, resv_id) = self.compute_api.create(self.context,
|
(refs, resv_id) = self.compute_api.create(self.context,
|
||||||
|
@ -8661,6 +8655,18 @@ class ComputeAPITestCase(BaseTestCase):
|
||||||
self.assertEqual(refs[1]['display_name'], 'x-%s' % refs[1]['uuid'])
|
self.assertEqual(refs[1]['display_name'], 'x-%s' % refs[1]['uuid'])
|
||||||
self.assertEqual(refs[1]['hostname'], 'x-%s' % refs[1]['uuid'])
|
self.assertEqual(refs[1]['hostname'], 'x-%s' % refs[1]['uuid'])
|
||||||
|
|
||||||
|
def test_multi_instance_display_name_default(self):
|
||||||
|
self._multi_instance_display_name_default()
|
||||||
|
|
||||||
|
def _multi_instance_display_name_default(self):
|
||||||
|
(refs, resv_id) = self.compute_api.create(self.context,
|
||||||
|
flavors.get_default_flavor(), image_href='some-fake-image',
|
||||||
|
min_count=2, max_count=2, display_name='x')
|
||||||
|
self.assertEqual(refs[0]['display_name'], 'x-1')
|
||||||
|
self.assertEqual(refs[0]['hostname'], 'x-1')
|
||||||
|
self.assertEqual(refs[1]['display_name'], 'x-2')
|
||||||
|
self.assertEqual(refs[1]['hostname'], 'x-2')
|
||||||
|
|
||||||
def test_instance_architecture(self):
|
def test_instance_architecture(self):
|
||||||
# Test the instance architecture.
|
# Test the instance architecture.
|
||||||
i_ref = self._create_fake_instance_obj()
|
i_ref = self._create_fake_instance_obj()
|
||||||
|
|
Loading…
Reference in New Issue