From 36b1532c8731bb2d09ced7dbd2ba2e513f3c1ef7 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Thu, 29 Sep 2011 21:27:18 +0000 Subject: [PATCH] Fixes bug 862637 -- make instance_name_template more flexible Allow use of %(uuid)s in the template.. along with any other Instance attribute. Change-Id: I0c0ed8cf51d5cfc632c957c4559014eb1d7844d1 --- nova/tests/test_compute.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 6ac8ca7d..323cd365 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1411,6 +1411,34 @@ class ComputeTestCase(test.TestCase): self.assertEqual(instance['reservation_id'], resv_id) db.instance_destroy(self.context, instance['id']) + def test_instance_name_template(self): + """Test the instance_name template""" + self.flags(instance_name_template='instance-%d') + instance_id = self._create_instance() + i_ref = db.instance_get(self.context, instance_id) + self.assertEqual(i_ref['name'], 'instance-%d' % i_ref['id']) + db.instance_destroy(self.context, i_ref['id']) + + self.flags(instance_name_template='instance-%(uuid)s') + instance_id = self._create_instance() + i_ref = db.instance_get(self.context, instance_id) + self.assertEqual(i_ref['name'], 'instance-%s' % i_ref['uuid']) + db.instance_destroy(self.context, i_ref['id']) + + self.flags(instance_name_template='%(id)d-%(uuid)s') + instance_id = self._create_instance() + i_ref = db.instance_get(self.context, instance_id) + self.assertEqual(i_ref['name'], '%d-%s' % + (i_ref['id'], i_ref['uuid'])) + db.instance_destroy(self.context, i_ref['id']) + + # not allowed.. default is uuid + self.flags(instance_name_template='%(name)s') + instance_id = self._create_instance() + i_ref = db.instance_get(self.context, instance_id) + self.assertEqual(i_ref['name'], i_ref['uuid']) + db.instance_destroy(self.context, i_ref['id']) + class ComputeTestMinRamMinDisk(test.TestCase): def setUp(self):