cloud-init

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

  1. Git
  2. lp:~chad.smith/cloud-init
  3. tests/cii-ec2-metadata-change
  4. Merge into master
Proposed by Chad Smith
Status: Merged
Approved by: Joshua Powers
Approved revision: 7c3f1b6af1ce723b876a2800bf4b046932b76449
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~chad.smith/cloud-init:tests/cii-ec2-metadata-change
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
tests/cloud_tests/testcases/base.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Joshua Powers (community) Approve
Review via email: mp+356432@code.launchpad.net

Commit message

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

LP: #1797231

To post a comment you must log in.
Revision history for this message
Joshua Powers (powersj) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py
2index bbd80ae..fd12d87 100644
3--- a/tests/cloud_tests/testcases/base.py
4+++ b/tests/cloud_tests/testcases/base.py
5@@ -177,7 +177,7 @@ class CloudTestCase(unittest2.TestCase):
6 instance_data['base64_encoded_keys'])
7 ds = instance_data.get('ds', {})
8 v1_data = instance_data.get('v1', {})
9- metadata = ds.get('meta_data', {})
10+ metadata = ds.get('meta-data', {})
11 macs = metadata.get(
12 'network', {}).get('interfaces', {}).get('macs', {})
13 if not macs:

Subscribers

People subscribed via source and target branches