← Back to branch summary

~ankatare/juju-ci-tools/juju-aws-add-credential

« back to all changes in this revision

Viewing changes to assess_cloud.py

  • Committer: ankatare at hotmail
  • Date: 2017-01-31 03:53:09 UTC
  • mfrom: (1837.1.30 trunk)
  • Revision ID: ankatare@hotmail.com-20170131035309-8dmn8d86opr9yorl
merge trunck

Show diffs side-by-side

added added

removed removed

Lines of Context:
assess_cloud.py
6
6
from deploy_stack import (
7
7
    BootstrapManager,
8
8
    )
9
 
from fakejuju import (
10
 
    FakeBackend,
11
 
    FakeControllerState,
12
 
    )
13
9
from jujuconfig import get_juju_home
14
10
from jujupy import (
15
11
    ConditionList,
16
 
    EnvJujuClient,
 
12
    ModelClient,
 
13
    FakeBackend,
 
14
    FakeControllerState,
17
15
    get_client_class,
18
16
    )
19
17
from utility import (
29
27
    client is determined based on the path and version.
30
28
    """
31
29
    if args.juju_bin == 'FAKE':
32
 
        client_class = EnvJujuClient
 
30
        client_class = ModelClient
33
31
        controller_state = FakeControllerState()
34
32
        version = '2.0.0'
35
33
        backend = FakeBackend(controller_state, full_path=args.juju_bin,
36
34
                              version=version)
37
35
    else:
38
 
        version = EnvJujuClient.get_version(args.juju_bin)
 
36
        version = ModelClient.get_version(args.juju_bin)
39
37
        client_class = get_client_class(version)
40
38
        backend = None
41
39
    juju_home = get_juju_home()
125
123
    return parser.parse_args(args)
126
124
 
127
125
 
128
 
def main():
129
 
    args = parse_args(None)
 
126
def main(argv=None):
 
127
    args = parse_args(argv)
130
128
    configure_logging(args.verbose)
131
129
    client = client_from_args(args)
132
130
    bs_manager = BootstrapManager.from_client(args, client)
133
131
    if args.test == 'combined':
134
132
        assess_cloud_combined(bs_manager)
135
 
    if args.test == 'provisioning':
 
133
    elif args.test == 'provisioning':
136
134
        assess_cloud_provisioning(bs_manager)
137
135
    else:
138
136
        assess_cloud_kill_controller(bs_manager)