summaryrefslogtreecommitdiff
path: root/tests/cloud_tests/platforms/ec2
diff options
context:
space:
mode:
authorJoshua Powers <josh.powers@canonical.com>2018-01-08 10:00:35 -0800
committerScott Moser <smoser@ubuntu.com>2018-01-09 10:05:04 -0500
commit72270e8c311efc8b9ba8bb92492d8728d84bd9f2 (patch)
tree5b93a2986e2388e5fa6ec4610f74a3c68da71564 /tests/cloud_tests/platforms/ec2
parentf794708fabba690677e0e81bd929871c83af3409 (diff)
downloadvyos-cloud-init-72270e8c311efc8b9ba8bb92492d8728d84bd9f2.tar.gz
vyos-cloud-init-72270e8c311efc8b9ba8bb92492d8728d84bd9f2.zip
tests: clean up image properties
This fixes the incorrectly named 'family' value for images as 'os'. Families are already defined in util.py:OS_FAMILY_MAPPING and a family is a collection of OSes. This makes the properties function part of the super class of image as it is only overrided by the lxd backend.
Diffstat (limited to 'tests/cloud_tests/platforms/ec2')
-rw-r--r--tests/cloud_tests/platforms/ec2/image.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/cloud_tests/platforms/ec2/image.py b/tests/cloud_tests/platforms/ec2/image.py
index 53706b1d..7bedf59d 100644
--- a/tests/cloud_tests/platforms/ec2/image.py
+++ b/tests/cloud_tests/platforms/ec2/image.py
@@ -33,16 +33,6 @@ class EC2Image(Image):
self._img_instance.start(wait=True, wait_for_cloud_init=True)
return self._img_instance
- @property
- def properties(self):
- """Dictionary containing: 'arch', 'os', 'version', 'release'."""
- return {
- 'arch': self.config['arch'],
- 'os': self.config['family'],
- 'release': self.config['release'],
- 'version': self.config['version'],
- }
-
def destroy(self):
"""Delete the instance used to create a custom image."""
if self._img_instance: