diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-12-20 08:47:21 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-01-15 13:34:56 -0500 |
| commit | a0ae2e2fa0ba3c52f8eed4bbb97c5de20c2106cb (patch) | |
| tree | 4deb1b91b95bd8cc8b21879b78ba4d028edecc3a | |
| parent | 1db4b13d86d748d9619ea9ce37bb4663285468b5 (diff) | |
| download | nova-a0ae2e2fa0ba3c52f8eed4bbb97c5de20c2106cb.tar.gz nova-a0ae2e2fa0ba3c52f8eed4bbb97c5de20c2106cb.tar.xz nova-a0ae2e2fa0ba3c52f8eed4bbb97c5de20c2106cb.zip | |
minor improvements to nova/tests/test_metadata.py
There are 2 changes here:
a.) previously we checked for existance of 'user-data' in
a response, when it clearly would not have been there as
the key name is 'user_data'.
b.) Insist that top level keys in the openstack metadata do not have '-'.
This is just a consistency thing. Its very easy for someone to
unintentionally add a key named 'my-field'. We want to enforce
keys to be named consistently using '_' rather than -.
For reference, current keys are:
files uuid availability_zone hostname meta public_keys name
Change-Id: Ia73050c5313b3524dd1d341528cc5f916e603c64
| -rw-r--r-- | nova/tests/test_metadata.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 25c26ca9c..21243b20a 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -342,7 +342,7 @@ class OpenStackMetadataTestCase(test.TestCase): mdinst = fake_InstanceMetadata(self.stubs, inst) # since this instance had no user-data it should not be there. - self.assertFalse('user-data' in mdinst.lookup("/openstack/2012-08-10")) + self.assertFalse('user_data' in mdinst.lookup("/openstack/2012-08-10")) self.assertRaises(base.InvalidMetadataPath, mdinst.lookup, "/openstack/2012-08-10/user_data") @@ -362,6 +362,14 @@ class OpenStackMetadataTestCase(test.TestCase): mdjson = mdinst.lookup("/openstack/2012-08-10/meta_data.json") self.assertFalse("random_seed" in json.loads(mdjson)) + def test_no_dashes_in_metadata(self): + # top level entries in meta_data should not contain '-' in their name + inst = copy(self.instance) + mdinst = fake_InstanceMetadata(self.stubs, inst) + mdjson = json.loads(mdinst.lookup("/openstack/latest/meta_data.json")) + + self.assertEqual([], [k for k in mdjson.keys() if k.find("-") != -1]) + class MetadataHandlerTestCase(test.TestCase): """Test that metadata is returning proper values.""" |