[Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-ec2-metadata-change into cloud-init:master

2018-10-10 Thread Chad Smith
Chad Smith has proposed merging 
~chad.smith/cloud-init:tests/cii-ec2-metadata-change into cloud-init:master.

Commit message:
tests: meta_data key changed to meta-data in ec2 instance-data.json

LP: #1797231

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356432
-- 
Your team cloud-init commiters is requested to review the proposed merge of 
~chad.smith/cloud-init:tests/cii-ec2-metadata-change into cloud-init:master.
diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py
index bbd80ae..fd12d87 100644
--- a/tests/cloud_tests/testcases/base.py
+++ b/tests/cloud_tests/testcases/base.py
@@ -177,7 +177,7 @@ class CloudTestCase(unittest2.TestCase):
 instance_data['base64_encoded_keys'])
 ds = instance_data.get('ds', {})
 v1_data = instance_data.get('v1', {})
-metadata = ds.get('meta_data', {})
+metadata = ds.get('meta-data', {})
 macs = metadata.get(
 'network', {}).get('interfaces', {}).get('macs', {})
 if not macs:
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp


[Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-ec2-metadata-change into cloud-init:master

2018-10-10 Thread Chad Smith
The proposal to merge ~chad.smith/cloud-init:tests/cii-ec2-metadata-change into 
cloud-init:master has been updated.

Commit message changed to:

tests: meta_data key changed to meta-data in ec2 instance-data.json

LP: #1797231

For more details, see:
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356432
-- 
Your team cloud-init commiters is requested to review the proposed merge of 
~chad.smith/cloud-init:tests/cii-ec2-metadata-change into cloud-init:master.

___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp