Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target into lp:snappy-ecosystem-tests

[Heber Parrucci]

Adding cloud target for virtual machines provisioning using juju.

The change is for adding cloud as a new target.
The idea is to provision virtual machines using juju.
The new setup using cloud target will deploy a charm and by default install snapd and snapcraft in different virtual machines pointing to staging.
The corresponding driver was implemented using subprocess because python juju clients have several bugs and limitations. I tested these clients:
- jujuclient
- juju

For now it assumes that the juju controller/model is already bootstrapped in the machine where the setup is executed. But it will be also automated soon.

@run_tests: snappy_ecosystem_tests/tests/test_snapd.py

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:48
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/303/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2175/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/303/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

49. By Heber Parrucci on 2017-03-23

Adding missing requirement: pyyaml

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:49
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/306/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2195/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/306/rebuild

review: Approve (continuous-integration)

[Sergio Cazzolato (sergio-j-cazzolato)]

Some comments inline.
Also you should check the juju version and stops execution in case it is not >v2

review: Needs Fixing

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

50. By Heber Parrucci on 2017-03-23

Addressing review comments

[Heber Parrucci (heber013)]

Comments addressed. Added checking of juju >= 2

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:50
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/307/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2199/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/307/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

51. By Heber Parrucci on 2017-03-27

Adding cloud setup instructions on README.rst

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:51
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/308/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2203/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/308/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

52. By Heber Parrucci on 2017-03-28

merge from trunk

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:52
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/310/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2223/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/310/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

53. By Heber Parrucci on 2017-03-29

* Removing specific revision to the charm url.
* Changing back default target to lxd.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:53
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/314/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2233/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/314/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

54. By Heber Parrucci on 2017-03-30

merge from trunk

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:54
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/319/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2248/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/319/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

55. By Heber Parrucci on 2017-04-04

merge from trunk

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:55
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/348/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/174
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2328/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/348/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

56. By Heber Parrucci on 2017-04-10

increasing retries for juju deploy

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:56
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/351/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/183
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2340/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/351/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:56
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/351/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/183
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2340
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2341/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/351/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:56
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/352/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/184
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2342/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/352/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:56
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/352/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/184
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2342
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2343/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/352/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:56
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/353/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/185
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2344/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/353/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:56
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/353/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/185
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2344
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2345/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/353/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-cloud-target]

57. By Heber Parrucci on 2017-04-10

adding proxy variable to juju deploy

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:57
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/354/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/186
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2346/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/354/rebuild

review: Approve (continuous-integration)

=== modified file 'README.rst'
--- README.rst	2017-02-24 19:27:01 +0000
+++ README.rst	2017-04-10 15:34:13 +0000
@@ -125,3 +125,37 @@
 $ bzr branch lp:snappy-ecosystem-tests
 $ cd snappy-ecosystem-tests/
 $ python3 -m snappy_ecosystem_tests.snapd.staging_builder my_new_container_name 16.10
+
+
+How run the tests in openstack
+==============================
+
+1- If you do not have a cloud/controller bootstrapped in your host, you can do it with a script in qakit:
+
+$ bzr branch lp:qakit; cd qakit
+$ ./qakit/juju/juju_bootstrap --cloud_name ^THE_NAME_YOU_LIKE^ --nova_file ^NOVA_CREDENTIALS_FILE^
+For example if you have canonistack credentials in $HOME/.canonistack/novarc:
+$ ./qakit/juju/juju_bootstrap --cloud_name canonistack --nova_file "$HOME/.canonistack/novarc"
+Enter the sudo password if asked (Some commands are executed as root and others do not).
+Note: You need to provide the full path for the nova file. You can use $HOME but not ~.
+It will install the needed packages and bootstrap the cloud.
+The controller name will be the same of the cloud.
+
+Important note: You need to run the bootstrap only once per machine per cloud.
+
+2- Once the bootstrap finishes properly, you need to setup the snappy-ecosystem environment in the cloud,
+For doing it, you should execute:
+./run_setup --model ^controller_name:admin/default^ --target cloud
+Note that if you do not pass the model, the default is: canonistack:admin/default
+It will create by default 2 machines with applications and needed dependencies:
+- snapcraft
+- snapd
+Both pointing to staging by default.
+If you would like to specify the charm when running the setup, you can do it with --charm ^CHARM-URL^.
+If not provided, it takes the default one.
+
+3- After setup finished properly. You should be able to run the tests:
+./run_system_tests ^YOUR_TESTS^ --target cloud
+
+Note that the step 1 (juju bootstrap) needs to be executed only once per machine per cloud.
+Then only will need to repeat the steps 2 and 3 when needed.

=== modified file 'requirements-setup.txt'
--- requirements-setup.txt	2017-03-06 18:06:27 +0000
+++ requirements-setup.txt	2017-04-10 15:34:13 +0000
@@ -1,2 +1,3 @@
 pylxd
 retrying
+pyyaml

=== modified file 'requirements.txt'
--- requirements.txt	2017-04-03 16:05:21 +0000
+++ requirements.txt	2017-04-10 15:34:13 +0000
@@ -18,4 +18,3 @@
 pyyaml
 retrying
 paramiko
-#chromedriver_installer

=== modified file 'run_setup'
--- run_setup	2017-03-15 17:11:23 +0000
+++ run_setup	2017-04-10 15:34:13 +0000
@@ -28,41 +28,74 @@
     proxy="$2"
     shift # past argument
     ;;
-    -m|--mode)
-    mode="$2"
+    --target)
+    target="$2"
+    shift # past argument
+    ;;
+    --charm)
+    charm="$2"
+    shift # past argument
+    ;;
+    --model)
+    model="$2"
     shift # past argument
     ;;
     --profile)
     profile="$2"
     shift # past argument
     ;;
+    --series)
+    series="$2"
+    shift # past argument
+    ;;
+    --constraints)
+    constraints="$2"
+    shift # past argument
+    ;;
 esac
 shift # past argument or value
 done
 
 . ./mk-venv -r requirements-setup.txt --proxy ${proxy}
 
-if [ -z "$mode" ]; then
-    mode=lxd
-fi
-
-if [ -z "$profile" ]; then
-    profile=staging
-fi
-
-if [ -z "$proxy" ]; then
-    ve/bin/python3 -m snappy_ecosystem_tests.environment.setup --mode ${mode} --profile ${profile}
-else
-    ve/bin/python3 -m snappy_ecosystem_tests.environment.setup --mode ${mode} --profile ${profile} --proxy ${proxy}
-fi
-
+parameters='snappy_ecosystem_tests.environment.setup'
+
+if [ ! -z ${target+x} ]; then
+    parameters="$parameters --target $target"
+fi
+
+if [ ! -z ${proxy+x} ]; then
+    parameters="$parameters --proxy $proxy"
+fi
+
+if [ ! -z ${charm+x} ]; then
+    parameters="$parameters --charm $charm"
+fi
+
+if [ ! -z ${model+x} ]; then
+    parameters="$parameters --model $model"
+fi
+
+if [ ! -z ${profile+x} ]; then
+    parameters="$parameters --profile $profile"
+fi
+
+if [ ! -z ${series+x} ]; then
+    parameters="$parameters --series $series"
+fi
+
+if [ ! -z ${constraints+x} ]; then
+    parameters="$parameters --constraints $constraints"
+fi
+
+ve/bin/python3 -m ${parameters}
 
 result=$?
 deactivate
 
 if [ $result != 0 ]; then
     echo -e -n "Environment setup FAILED.\n"
-    exit 1;
+    exit 1
 else
     echo -e -n "Environment setup PASSED.\n"
 fi

=== added directory 'snappy_ecosystem_tests/environment/cloud'
=== added file 'snappy_ecosystem_tests/environment/cloud/__init__.py'
--- snappy_ecosystem_tests/environment/cloud/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/environment/cloud/__init__.py	2017-04-10 15:34:13 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== added directory 'snappy_ecosystem_tests/environment/cloud/data'
=== added file 'snappy_ecosystem_tests/environment/cloud/data/__init__.py'
--- snappy_ecosystem_tests/environment/cloud/data/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/environment/cloud/data/__init__.py	2017-04-10 15:34:13 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== added file 'snappy_ecosystem_tests/environment/cloud/data/deployment.py'
--- snappy_ecosystem_tests/environment/cloud/data/deployment.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/environment/cloud/data/deployment.py	2017-04-10 15:34:13 +0000
@@ -0,0 +1,25 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""Contain information for the applications to be deployed on the cloud"""
+
+APPLICATIONS = [
+    {'name': 'snapcraft', 'package': 'snapcraft', 'profile': 'staging'},
+    {'name': 'snapd', 'package': 'snapd', 'profile': 'staging'},
+]

=== added file 'snappy_ecosystem_tests/environment/cloud/driver.py'
--- snappy_ecosystem_tests/environment/cloud/driver.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/environment/cloud/driver.py	2017-04-10 15:34:13 +0000
@@ -0,0 +1,169 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""Module Drive virtual machines in the cloud using juju"""
+
+import subprocess
+import tempfile
+
+import time
+import yaml
+from packaging import version
+
+
+class CloudDriver:
+
+    """Class to Drive virtual machines in the cloud using juju"""
+
+    STATUSES_NOT_READY = ['maintenance', 'waiting']
+
+    def launch(self, charm, applications, profile, model, proxy=None, **kwargs):
+        """Call to Deploy all the applications and then wait until all of them
+        are deployed
+
+        :param charm: The charm to deploy
+        :param applications: the applications to deploy
+        :param profile: the profile of the application to deploy
+        :param model: juju model in which the apps will be deployed
+        :param proxy: the proxy URL.
+        """
+        assert self.get_version('juju') >= version.parse('2'), \
+            'Juju >= 2 is required.'
+        subprocess.check_call(['juju', 'switch', model])
+        for app in applications:
+            self.deploy(charm, app, profile=profile, proxy=proxy, **kwargs)
+        self.wait_until_deployed(applications)
+
+    @staticmethod
+    def get_version(app):
+        """Return the version of the given app"""
+        app_version = subprocess.check_output(
+            [app, 'version']).decode().split('-')[0]
+        return version.parse(app_version)
+
+    def deploy(self, charm, app=None, profile=None, series=None,
+               constraints=None, proxy=None):
+        """
+        Launch a machine deploying the given charm to the connected juju model.
+
+        :param charm: The charm to deploy
+        :param app: the application name to deploy
+        :param profile: the profile of the application to deploy
+        :param series: series of the machine in which the application
+         will be deployed.
+        :param constraints: constraints for an application are set at deploy
+        time.
+        They must be expressed as a string containing only spaces
+        and key value pairs joined by an '='. Example: mem=8G cores=4
+        :param proxy: the proxy URL.
+        """
+        assert charm, 'You need to specify the charm to deploy'
+        command = ['juju', 'deploy', charm]
+        if series:
+            command.extend(['--series', series])
+        if constraints:
+            command.extend(['--constraints', ' '.join(constraints)])
+        if app:
+            if self.get_application_status(app['name']):
+                self.remove_application(app['name'])
+            app_config = {app['name']: {'package': app['package'],
+                                        'profile': profile}}
+            if proxy:
+                app_config[app['name']]['proxy'] = proxy
+            tmp_file = tempfile.NamedTemporaryFile()
+            with open(tmp_file.name, 'w+') as temp:
+                temp.write(yaml.dump(app_config))
+            command.extend(['--config', tmp_file.name, app['name']])
+        subprocess.check_call(command, universal_newlines=True)
+
+    def wait_until_deployed(self, apps, max_attempts=240, wait_period=5):
+        """
+        Wait until the given application is deployed.
+
+        :param apps: The applications list to check
+        :param max_attempts: Amount of attempts to check before failing
+        :param wait_period: The period of time in second to wait between checks
+        :raise Exception: If the max attempts were reached
+        """
+        for app in apps:
+            attempt = 0
+            status = self.get_application_status(app['name'])
+            while status in self.STATUSES_NOT_READY and attempt < max_attempts:
+                time.sleep(wait_period)
+                attempt += 1
+                status = self.get_application_status(app['name'])
+            if attempt == max_attempts:
+                raise Exception(
+                    'Deploy for application %s has failed' % app['name'])
+
+    @staticmethod
+    def get_juju_status():
+        """
+        Get the status in dict format
+
+        :return: dict containing the juju status output
+        """
+        return yaml.load(subprocess.check_output(['juju', 'status',
+                                                  '--format', 'yaml'],
+                                                 universal_newlines=True))
+
+    def get_application_status(self, app_name):
+        """Get the application status or None if it cannot be found"""
+        status = self.get_juju_status()
+        try:
+            return status['applications'][app_name]['application-status'][
+                'current']
+        except (KeyError, TypeError):
+            return None
+
+    def remove_application(self, app_name, max_attempts=120, wait_period=5,
+                           wait=True):
+        """Remove the given application
+
+        :param app_name: The application to remove
+        :param max_attempts: Amount of attempts to check before failing
+        :param wait_period: The period of time in second to wait between checks
+        :param wait: whether to wait until the application is actually removed
+        """
+        try:
+            subprocess.check_output(['juju', 'remove-application', app_name],
+                                    universal_newlines=True,
+                                    stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError as _e:
+            if 'not found' in _e.output:
+                return
+            else:
+                raise
+        attempt = 0
+        if wait:
+            status = self.get_application_status(app_name)
+            while status and attempt < max_attempts:
+                time.sleep(wait_period)
+                attempt += 1
+                status = self.get_application_status(app_name)
+        if attempt == max_attempts:
+            raise Exception('Deploy for application %s has failed' % app_name)
+
+    def get_ip(self, app_name):
+        """Get the ip of the Machine in which the application is deployed"""
+        status = self.get_juju_status()
+        for key, value in status['applications'][app_name]['units'].items():
+            if key.startswith(app_name):
+                return value['public-address']

=== modified file 'snappy_ecosystem_tests/environment/managers.py'
--- snappy_ecosystem_tests/environment/managers.py	2017-03-27 20:21:15 +0000
+++ snappy_ecosystem_tests/environment/managers.py	2017-04-10 15:34:13 +0000
@@ -21,9 +21,15 @@
 
 import logging
 
+from snappy_ecosystem_tests.environment.cloud.driver import CloudDriver
+
 from snappy_ecosystem_tests.environment.constants import (
     PROFILES, DEPENDENCIES)
 from snappy_ecosystem_tests.environment.containers.lxd import LXDDriver
+from snappy_ecosystem_tests.environment.cloud.data.deployment import (
+    APPLICATIONS
+)
+
 
 CONTAINERS = {
     "snapd": {
@@ -65,3 +71,14 @@
                 packages=[PROFILES[profile][cont.name]["package_name"]],
                 channel=PROFILES[profile][cont.name]["channel"])
             self.driver.enable_ssh(cont)
+
+
+class CloudManager:
+    """Manage machines in the cloud"""
+    def __init__(self):
+        self.driver = CloudDriver()
+
+    def setup(self, profile, charm=None, model=None, proxy=None, **kwargs):
+        """Setup virtual machines based on the profile"""
+        self.driver.launch(charm, APPLICATIONS, profile, model,
+                           proxy=proxy, **kwargs)

=== modified file 'snappy_ecosystem_tests/environment/setup.py'
--- snappy_ecosystem_tests/environment/setup.py	2017-03-27 20:21:15 +0000
+++ snappy_ecosystem_tests/environment/setup.py	2017-04-10 15:34:13 +0000
@@ -22,35 +22,62 @@
 
 import argparse
 
-from snappy_ecosystem_tests.environment.managers import _LXDManager
+from snappy_ecosystem_tests.environment.managers import (
+    _LXDManager,
+    CloudManager
+)
 
 
 SUPPORTED_MODULES = {
-    "lxd": _LXDManager
+    "lxd": _LXDManager,
+    "cloud": CloudManager,
 }
 
 
-def get_manager(mode):
+def get_manager(target):
     """Get the manager for the given mode"""
     try:
-        return SUPPORTED_MODULES[mode]()
+        return SUPPORTED_MODULES[target]()
     except KeyError:
-        raise RuntimeError("Mode: {} is not supported".format(mode))
-
-
-def main(mode, profile, proxy):
+        raise RuntimeError("Target: {} is not supported".format(target))
+
+
+def main(target, profile, **kwargs):
     """Main script"""
-    manager = get_manager(mode)
-    manager.setup(profile, proxy)
+    manager = get_manager(target)
+    manager.setup(profile, **kwargs)
 
 
 if __name__ == '__main__':
     PARSER = argparse.ArgumentParser(description=
                                      'Setup a snappy ecosystem environment.')
-    PARSER.add_argument('--mode', default="lxd", help='lxd')
+    PARSER.add_argument('--target', default="lxd", help='lxd')
     PARSER.add_argument('--profile', default="staging",
                         help='Profile to configure the environment')
     PARSER.add_argument('--proxy', default=None,
                         help='Proxy to use in the target machine/s')
-    ARGS = PARSER.parse_args()
-    main(ARGS.mode, ARGS.profile, ARGS.proxy)
+    PARSER.add_argument('--constraints', default=None, nargs='+',
+                        help='constraints for creating machine/s')
+    ARGS, LEFT_OVER = PARSER.parse_known_args()
+    if ARGS.target == 'cloud':
+        CLOUD_PARSER = argparse.ArgumentParser(
+            description='Parse cloud specific arguments')
+        CLOUD_PARSER.add_argument('--charm',
+                                  default='cs:~heber013/snappy-ecosystem',
+                                  help='The juju charm to deploy')
+        CLOUD_PARSER.add_argument('--model',
+                                  default='canonistack:admin/default',
+                                  help='The juju model in which apps will'
+                                       ' be deployed')
+        CLOUD_PARSER.add_argument('--series',
+                                  help='The virtual machine series. '
+                                       'Example: xenial')
+        CLOUD_ARGS, LEFT_OVER = CLOUD_PARSER.parse_known_args()
+        main(ARGS.target, ARGS.profile,
+             charm=CLOUD_ARGS.charm,
+             model=CLOUD_ARGS.model,
+             series=CLOUD_ARGS.series,
+             constraints=ARGS.constraints,
+             proxy=ARGS.proxy)
+    else:
+        main(ARGS.target, ARGS.profile, proxy=ARGS.proxy)