tests: consolidate platforms into specific dirs

This groups up each test platform into its own directory rather
than having files spread between four different directories for
one platform. Platforms tend to be worked on one at a time and
so having the platforms together makes more sense than apart.

4 files changed, 0 insertions, 187 deletions

diff --git a/tests/cloud_tests/snapshots/__init__.py b/tests/cloud_tests/snapshots/__init__.py
deleted file mode 100644
index 93a54f5e..00000000
--- a/tests/cloud_tests/snapshots/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Main init."""
-
-
-def get_snapshot(image):
-    """Get snapshot from image."""
-    return image.snapshot()
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/snapshots/base.py b/tests/cloud_tests/snapshots/base.py
deleted file mode 100644
index 94328982..00000000
--- a/tests/cloud_tests/snapshots/base.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Base snapshot."""
-
-
-class Snapshot(object):
-    """Base class for snapshots."""
-
-    platform_name = None
-
-    def __init__(self, platform, properties, config, features):
-        """Set up snapshot.
-
-        @param platform: platform object
-        @param properties: image properties
-        @param config: image config
-        @param features: supported feature flags
-        """
-        self.platform = platform
-        self.properties = properties
-        self.config = config
-        self.features = features
-
-    def __str__(self):
-        """A brief description of the snapshot."""
-        return '-'.join((self.properties['os'], self.properties['release']))
-
-    def launch(self, user_data, meta_data=None, block=True, start=True,
-               use_desc=None):
-        """Launch instance.
-
-        @param user_data: user-data for the instance
-        @param instance_id: instance-id for the instance
-        @param block: wait until instance is created
-        @param start: start instance and wait until fully started
-        @param use_desc: description of snapshot instance use
-        @return_value: an Instance
-        """
-        raise NotImplementedError
-
-    def destroy(self):
-        """Clean up snapshot data."""
-        pass
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/snapshots/lxd.py b/tests/cloud_tests/snapshots/lxd.py
deleted file mode 100644
index 39c55c5e..00000000
--- a/tests/cloud_tests/snapshots/lxd.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Base LXD snapshot."""
-
-from tests.cloud_tests.snapshots import base
-
-
-class LXDSnapshot(base.Snapshot):
-    """LXD image copy backed snapshot."""
-
-    platform_name = "lxd"
-
-    def __init__(self, platform, properties, config, features,
-                 pylxd_frozen_instance):
-        """Set up snapshot.
-
-        @param platform: platform object
-        @param properties: image properties
-        @param config: image config
-        @param features: supported feature flags
-        """
-        self.pylxd_frozen_instance = pylxd_frozen_instance
-        super(LXDSnapshot, self).__init__(
-            platform, properties, config, features)
-
-    def launch(self, user_data, meta_data=None, block=True, start=True,
-               use_desc=None):
-        """Launch instance.
-
-        @param user_data: user-data for the instance
-        @param instance_id: instance-id for the instance
-        @param block: wait until instance is created
-        @param start: start instance and wait until fully started
-        @param use_desc: description of snapshot instance use
-        @return_value: an Instance
-        """
-        inst_config = {'user.user-data': user_data}
-        if meta_data:
-            inst_config['user.meta-data'] = meta_data
-        instance = self.platform.launch_container(
-            self.properties, self.config, self.features, block=block,
-            image_desc=str(self), container=self.pylxd_frozen_instance.name,
-            use_desc=use_desc, container_config=inst_config)
-        if start:
-            instance.start()
-        return instance
-
-    def destroy(self):
-        """Clean up snapshot data."""
-        self.pylxd_frozen_instance.destroy()
-        super(LXDSnapshot, self).destroy()
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/snapshots/nocloudkvm.py b/tests/cloud_tests/snapshots/nocloudkvm.py
deleted file mode 100644
index 21e908da..00000000
--- a/tests/cloud_tests/snapshots/nocloudkvm.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Base NoCloud KVM snapshot."""
-import os
-import shutil
-import tempfile
-
-from tests.cloud_tests.snapshots import base
-
-
-class NoCloudKVMSnapshot(base.Snapshot):
-    """NoCloud KVM image copy backed snapshot."""
-
-    platform_name = "nocloud-kvm"
-
-    def __init__(self, platform, properties, config, features, image_path):
-        """Set up snapshot.
-
-        @param platform: platform object
-        @param properties: image properties
-        @param config: image config
-        @param features: supported feature flags
-        @param image_path: image file to snapshot.
-        """
-        self._workd = tempfile.mkdtemp(prefix='NoCloudKVMSnapshot')
-        snapshot = os.path.join(self._workd, 'snapshot')
-        shutil.copyfile(image_path, snapshot)
-        self._image_path = snapshot
-
-        super(NoCloudKVMSnapshot, self).__init__(
-            platform, properties, config, features)
-
-    def launch(self, user_data, meta_data=None, block=True, start=True,
-               use_desc=None):
-        """Launch instance.
-
-        @param user_data: user-data for the instance
-        @param instance_id: instance-id for the instance
-        @param block: wait until instance is created
-        @param start: start instance and wait until fully started
-        @param use_desc: description of snapshot instance use
-        @return_value: an Instance
-        """
-        key_file = os.path.join(self.platform.config['data_dir'],
-                                self.platform.config['public_key'])
-        user_data = self.inject_ssh_key(user_data, key_file)
-
-        instance = self.platform.create_instance(
-            self.properties, self.config, self.features,
-            self._image_path, image_desc=str(self), use_desc=use_desc,
-            user_data=user_data, meta_data=meta_data)
-
-        if start:
-            instance.start()
-
-        return instance
-
-    def inject_ssh_key(self, user_data, key_file):
-        """Inject the authorized key into the user_data."""
-        with open(key_file) as f:
-            value = f.read()
-
-        key = 'ssh_authorized_keys:'
-        value = '  - %s' % value.strip()
-        user_data = user_data.split('\n')
-        if key in user_data:
-            user_data.insert(user_data.index(key) + 1, '%s' % value)
-        else:
-            user_data.insert(-1, '%s' % key)
-            user_data.insert(-1, '%s' % value)
-
-        return '\n'.join(user_data)
-
-    def destroy(self):
-        """Clean up snapshot data."""
-        shutil.rmtree(self._workd)
-        super(NoCloudKVMSnapshot, self).destroy()
-
-# vi: ts=4 expandtab