← Back to branch summary

~andrewjbeach/juju-ci-tools/get-juju-dict

« back to all changes in this revision

Viewing changes to deploy_stack.py

  • Committer: John George
  • Date: 2014-11-11 00:58:39 UTC
  • mto: This revision was merged to the branch mainline in revision 727.
  • Revision ID: john.george@canonical.com-20141111005839-cbp8wsuxgecpwwm0
Move libvirt_domain functions from jujupy to substrate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
deploy_stack.py
24
24
    bootstrap_from_env,
25
25
    Environment,
26
26
    get_local_root,
 
27
)
 
28
from substrate import (
27
29
    start_libvirt_domain,
28
30
    stop_libvirt_domain,
29
 
    verify_libvirt_domain_running,
 
31
    verify_libvirt_domain,
30
32
)
31
33
from utility import (
32
34
    PortTimeoutError,
395
397
                name, URI = machine.split('@')
396
398
                # Record already running domains, so they can be left running,
397
399
                # when finished with the test.
398
 
                if verify_libvirt_domain_running(URI, name):
 
400
                if verify_libvirt_domain(URI, name, 'running'):
399
401
                    running_domains = {machine: True}
400
402
                    logging.info("%s is already running" % name)
401
403
                else: