summaryrefslogtreecommitdiff
path: root/tests/integration_tests/conftest.py
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2020-11-23 12:12:52 -0600
committerGitHub <noreply@github.com>2020-11-23 13:12:52 -0500
commit8a493bf08d8b09d4f3a35dae725756d157844201 (patch)
treeac74240caa0206393ca875c997b7a9f23c262f90 /tests/integration_tests/conftest.py
parente454dea5855019a5acdd6acafdef2ae07d069235 (diff)
downloadvyos-cloud-init-8a493bf08d8b09d4f3a35dae725756d157844201.tar.gz
vyos-cloud-init-8a493bf08d8b09d4f3a35dae725756d157844201.zip
LXD VM support in integration tests (#678)
Diffstat (limited to 'tests/integration_tests/conftest.py')
-rw-r--r--tests/integration_tests/conftest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
index 54867096..73b44bfc 100644
--- a/tests/integration_tests/conftest.py
+++ b/tests/integration_tests/conftest.py
@@ -12,6 +12,7 @@ from tests.integration_tests.clouds import (
AzureCloud,
OciCloud,
LxdContainerCloud,
+ LxdVmCloud,
)
@@ -25,6 +26,7 @@ platforms = {
'azure': AzureCloud,
'oci': OciCloud,
'lxd_container': LxdContainerCloud,
+ 'lxd_vm': LxdVmCloud,
}
@@ -87,7 +89,7 @@ def setup_image(session_cloud):
if integration_settings.CLOUD_INIT_SOURCE == 'NONE':
pass # that was easy
elif integration_settings.CLOUD_INIT_SOURCE == 'IN_PLACE':
- if session_cloud.datasource != 'lxd_container':
+ if session_cloud.datasource not in ['lxd_container', 'lxd_vm']:
raise ValueError(
'IN_PLACE as CLOUD_INIT_SOURCE only works for LXD')
# The mount needs to happen after the instance is created, so