diff options
| author | Joshua Powers <josh.powers@canonical.com> | 2018-01-08 10:00:35 -0800 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2018-01-09 10:05:04 -0500 |
| commit | 72270e8c311efc8b9ba8bb92492d8728d84bd9f2 (patch) | |
| tree | 5b93a2986e2388e5fa6ec4610f74a3c68da71564 | |
| parent | f794708fabba690677e0e81bd929871c83af3409 (diff) | |
| download | vyos-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.
| -rw-r--r-- | tests/cloud_tests/platforms/ec2/image.py | 10 | ||||
| -rw-r--r-- | tests/cloud_tests/platforms/images.py | 3 | ||||
| -rw-r--r-- | tests/cloud_tests/platforms/nocloudkvm/image.py | 10 | ||||
| -rw-r--r-- | tests/cloud_tests/releases.yaml | 10 |
4 files changed, 7 insertions, 26 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: diff --git a/tests/cloud_tests/platforms/images.py b/tests/cloud_tests/platforms/images.py index d503108a..557a5cf6 100644 --- a/tests/cloud_tests/platforms/images.py +++ b/tests/cloud_tests/platforms/images.py @@ -26,7 +26,8 @@ class Image(TargetBase): @property def properties(self): """{} containing: 'arch', 'os', 'version', 'release'.""" - raise NotImplementedError + return {k: self.config[k] + for k in ('arch', 'os', 'release', 'version')} @property def features(self): diff --git a/tests/cloud_tests/platforms/nocloudkvm/image.py b/tests/cloud_tests/platforms/nocloudkvm/image.py index 09ff2a3b..bc2b6e75 100644 --- a/tests/cloud_tests/platforms/nocloudkvm/image.py +++ b/tests/cloud_tests/platforms/nocloudkvm/image.py @@ -35,16 +35,6 @@ class NoCloudKVMImage(Image): super(NoCloudKVMImage, self).__init__(platform, config) - @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 _execute(self, command, stdin=None, env=None): """Execute command in image, modifying image.""" return self.mount_image_callback(command, stdin=stdin, env=env) diff --git a/tests/cloud_tests/releases.yaml b/tests/cloud_tests/releases.yaml index 48f903b8..0a9fa602 100644 --- a/tests/cloud_tests/releases.yaml +++ b/tests/cloud_tests/releases.yaml @@ -132,7 +132,7 @@ releases: enabled: true release: bionic version: 18.04 - family: ubuntu + os: ubuntu feature_groups: - base - debian_base @@ -148,7 +148,7 @@ releases: enabled: true release: artful version: 17.10 - family: ubuntu + os: ubuntu feature_groups: - base - debian_base @@ -164,7 +164,7 @@ releases: enabled: true release: zesty version: 17.04 - family: ubuntu + os: ubuntu feature_groups: - base - debian_base @@ -180,7 +180,7 @@ releases: enabled: true release: xenial version: 16.04 - family: ubuntu + os: ubuntu feature_groups: - base - debian_base @@ -196,7 +196,7 @@ releases: enabled: true release: trusty version: 14.04 - family: ubuntu + os: ubuntu feature_groups: - base - debian_base |