merge from master at 17.2-30-gf7deaf15

1 files changed, 20 insertions, 2 deletions

diff --git a/tests/cloud_tests/platforms/__init__.py b/tests/cloud_tests/platforms/__init__.py
index 3490fe87..a01e51ac 100644
--- a/tests/cloud_tests/platforms/__init__.py
+++ b/tests/cloud_tests/platforms/__init__.py
@@ -2,15 +2,27 @@
 
 """Main init."""
 
-from tests.cloud_tests.platforms import lxd
-from tests.cloud_tests.platforms import nocloudkvm
+from .ec2 import platform as ec2
+from .lxd import platform as lxd
+from .nocloudkvm import platform as nocloudkvm
 
 PLATFORMS = {
+    'ec2': ec2.EC2Platform,
     'nocloud-kvm': nocloudkvm.NoCloudKVMPlatform,
     'lxd': lxd.LXDPlatform,
 }
 
 
+def get_image(platform, config):
+    """Get image from platform object using os_name."""
+    return platform.get_image(config)
+
+
+def get_instance(snapshot, *args, **kwargs):
+    """Get instance from snapshot."""
+    return snapshot.launch(*args, **kwargs)
+
+
 def get_platform(platform_name, config):
     """Get the platform object for 'platform_name' and init."""
     platform_cls = PLATFORMS.get(platform_name)
@@ -18,4 +30,10 @@ def get_platform(platform_name, config):
         raise ValueError('invalid platform name: {}'.format(platform_name))
     return platform_cls(config)
 
+
+def get_snapshot(image):
+    """Get snapshot from image."""
+    return image.snapshot()
+
+
 # vi: ts=4 expandtab