← Back to branch summary

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

« back to all changes in this revision

Viewing changes to industrial_test.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:
industrial_test.py
22
22
    Charm,
23
23
    local_charm_path,
24
24
)
25
 
from jujupy import (
 
25
from jujupy import ModelClient
 
26
from jujupy.client import (
26
27
    AgentsNotStarted,
27
28
    AGENTS_READY,
28
29
    coalesce_agent_status,
29
 
    EnvJujuClient,
30
30
    get_machine_dns_name,
31
31
    LXC_MACHINE,
32
32
    LXD_MACHINE,
151
151
 
152
152
    def make_industrial_test(self):
153
153
        """Create an IndustrialTest for this MultiIndustrialTest."""
154
 
        stable_path = EnvJujuClient.get_full_path()
 
154
        stable_path = ModelClient.get_full_path()
155
155
        paths = [self.really_old_path, stable_path, self.new_juju_path]
156
156
        upgrade_sequence = [p for p in paths if p is not None]
157
157
        stage_attempts = [self.stages.factory(upgrade_sequence,
217
217
    def __init__(self, old_client, new_client, stage_attempts):
218
218
        """Constructor.
219
219
 
220
 
        :param old_client: An EnvJ/maujuClient for the old juju.
221
 
        :param new_client: An EnvJujuClient for the new juju.
 
220
        :param old_client: An ModelClient for the old juju.
 
221
        :param new_client: A ModelClient for the new juju.
222
222
        :param stage_attemps: List of stages to attempt.
223
223
        """
224
224
        self.old_client = old_client