← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to assess_jes_deploy.py

  • Committer: Curtis Hovey
  • Date: 2016-04-10 15:23:18 UTC
  • Revision ID: curtis@canonical.com-20160410152318-ntfymsv9eiw63vt2
Addedd daily streams to get_amy.py get_ami.py tests/test_get_ami.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
assess_jes_deploy.py
4
4
from contextlib import contextmanager
5
5
import logging
6
6
import sys
 
7
from tempfile import NamedTemporaryFile
7
8
import os
8
9
 
 
10
import yaml
 
11
 
9
12
from deploy_stack import (
10
13
    boot_context,
11
14
    check_token,
16
19
    safe_print_status,
17
20
    )
18
21
from jujupy import (
19
 
    client_from_config,
 
22
    EnvJujuClient,
 
23
    make_safe_config,
 
24
    SimpleEnvironment,
20
25
    )
21
26
from utility import (
22
27
    add_basic_testing_arguments,
25
30
)
26
31
 
27
32
 
28
 
def test_jes_deploy(client, charm_series, log_dir, base_env):
 
33
def make_hosted_env_client(client, suffix):
 
34
    env_name = '{}-{}'.format(client.env.environment, suffix)
 
35
    hosted_environment = SimpleEnvironment(env_name, dict(client.env.config),
 
36
                                           client.env.juju_home)
 
37
    hosted_env_client = client.clone(hosted_environment)
 
38
    return hosted_env_client
 
39
 
 
40
 
 
41
def test_jes_deploy(client, charm_prefix, log_dir, base_env):
29
42
    """Deploy the dummy stack in two hosted environments."""
30
43
    # deploy into system env
31
 
    deploy_dummy_stack(client, charm_series)
 
44
    deploy_dummy_stack(client, charm_prefix)
32
45
 
33
46
    # deploy into hosted envs
34
47
    with hosted_environment(client, log_dir, 'env1') as env1_client:
35
 
        deploy_dummy_stack(env1_client, charm_series)
 
48
        deploy_dummy_stack(env1_client, charm_prefix)
36
49
        with hosted_environment(client, log_dir, 'env2') as env2_client:
37
 
            deploy_dummy_stack(env2_client, charm_series)
 
50
            deploy_dummy_stack(env2_client, charm_prefix)
38
51
            # check all the services can talk
39
52
            check_services(client)
40
53
            check_services(env1_client)
54
67
    series = args.series
55
68
    if series is None:
56
69
        series = 'precise'
57
 
    charm_series = series
58
 
    client = client_from_config(base_env, args.juju_bin, args.debug,
59
 
                                soft_deadline=args.deadline)
 
70
    charm_prefix = 'local:{}/'.format(series)
 
71
    client = EnvJujuClient.by_version(
 
72
        SimpleEnvironment.from_config(base_env), args.juju_bin, args.debug,
 
73
    )
60
74
    if not client.is_jes_enabled():
61
75
        client.enable_jes()
62
76
    with boot_context(
71
85
            upload_tools=False,
72
86
            region=args.region,
73
87
            ):
74
 
        yield client, charm_series, base_env
 
88
        yield client, charm_prefix, base_env
75
89
 
76
90
 
77
91
def env_token(env_name):
80
94
 
81
95
@contextmanager
82
96
def hosted_environment(system_client, log_dir, suffix):
83
 
    env_name = '{}-{}'.format(system_client.env.environment, suffix)
84
 
    client = system_client.add_model(system_client.env.clone(env_name))
 
97
    client = make_hosted_env_client(system_client, suffix)
85
98
    try:
 
99
        with NamedTemporaryFile() as config_file:
 
100
            config = make_safe_config(client)
 
101
            yaml.dump(config, config_file)
 
102
            config_file.flush()
 
103
            client.create_environment(system_client, config_file.name)
86
104
        yield client
87
105
    except:
88
106
        logging.exception(
106
124
 
107
125
def main():
108
126
    parser = ArgumentParser()
109
 
    add_basic_testing_arguments(parser, using_jes=True, deadline=True)
 
127
    add_basic_testing_arguments(parser, using_jes=True)
110
128
    args = parser.parse_args()
111
 
    with jes_setup(args) as (client, charm_series, base_env):
112
 
        test_jes_deploy(client, charm_series, args.logs, base_env)
 
129
    with jes_setup(args) as (client, charm_prefix, base_env):
 
130
        test_jes_deploy(client, charm_prefix, args.logs, base_env)
113
131
 
114
132
 
115
133
if __name__ == '__main__':