diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2015-07-06 15:33:33 +0100 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2015-07-06 15:33:33 +0100 |
| commit | afb5421ee717174b989bfed61333f2073b3f3f50 (patch) | |
| tree | a3af684ab26c038ce9cb2cb758aafa873072d7f1 | |
| parent | 33e1f251aa2ff75475fe0f02f1e344dbe949d89d (diff) | |
| download | vyos-cloud-init-afb5421ee717174b989bfed61333f2073b3f3f50.tar.gz vyos-cloud-init-afb5421ee717174b989bfed61333f2073b3f3f50.zip | |
Return a sensible value for DataSourceGCE.availability_zone.
| -rw-r--r-- | cloudinit/sources/DataSourceGCE.py | 4 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index f4ed915d..1b28a68c 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -116,6 +116,10 @@ class DataSourceGCE(sources.DataSource): lines = self.metadata['public-keys'].splitlines() self.metadata['public-keys'] = [self._trim_key(k) for k in lines] + if self.metadata['availability-zone']: + self.metadata['availability-zone'] = self.metadata[ + 'availability-zone'].split('/')[-1] + encoding = self.metadata.get('user-data-encoding') if encoding: if encoding == 'base64': diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index 98b68f09..fa714070 100644 --- a/tests/unittests/test_datasource/test_gce.py +++ b/tests/unittests/test_datasource/test_gce.py @@ -159,3 +159,8 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): self.ds.get_data() self.assertEqual([key_content], self.ds.get_public_ssh_keys()) + + def test_only_last_part_of_zone_used_for_availability_zone(self): + _set_mock_metadata() + self.ds.get_data() + self.assertEqual('bar', self.ds.availability_zone) |