summaryrefslogtreecommitdiff
path: root/tests/integration_tests/clouds.py
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2021-04-19 11:31:28 -0500
committerGitHub <noreply@github.com>2021-04-19 12:31:28 -0400
commitd132356cc361abef2d90d4073438f3ab759d5964 (patch)
treebe17b95ad72951ada102204d7f52f62ccc430395 /tests/integration_tests/clouds.py
parent45db197cfc7e3488baae7dc1053c45da070248f6 (diff)
downloadvyos-cloud-init-d132356cc361abef2d90d4073438f3ab759d5964.tar.gz
vyos-cloud-init-d132356cc361abef2d90d4073438f3ab759d5964.zip
fix error on upgrade caused by new vendordata2 attributes (#869)
In #777, we added 'vendordata2' and 'vendordata2_raw' attributes to the DataSource class, but didn't use the upgrade framework to deal with an unpickle after upgrade. This commit adds the necessary upgrade code. Additionally, added a smaller-scope upgrade test to our integration tests that will be run on every CI run so we catch these issues immediately in the future. LP: #1922739
Diffstat (limited to 'tests/integration_tests/clouds.py')
-rw-r--r--tests/integration_tests/clouds.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration_tests/clouds.py b/tests/integration_tests/clouds.py
index 11b57407..3bbccb44 100644
--- a/tests/integration_tests/clouds.py
+++ b/tests/integration_tests/clouds.py
@@ -111,14 +111,14 @@ class IntegrationCloud(ABC):
# Even if we're using the default key, it may still have a
# different name in the clouds, so we need to set it separately.
self.cloud_instance.key_pair.name = settings.KEYPAIR_NAME
- self._released_image_id = self._get_initial_image()
+ self.released_image_id = self._get_initial_image()
self.snapshot_id = None
@property
def image_id(self):
if self.snapshot_id:
return self.snapshot_id
- return self._released_image_id
+ return self.released_image_id
def emit_settings_to_log(self) -> None:
log.info(