← Back to branch summary

~juju-qa/juju-ci-tools/trunk

« back to all changes in this revision

Viewing changes to assess_spaces_subnets.py

  • Committer: Curtis Hovey
  • Date: 2017-01-25 02:32:29 UTC
  • mfrom: (1855 trunk)
  • mto: This revision was merged to the branch mainline in revision 1865.
  • Revision ID: curtis@canonical.com-20170125023229-g7c6bzt0cqe1j8g3
Merged trunk and resolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
assess_spaces_subnets.py
50
50
 
51
51
def assess_spaces_subnets(client):
52
52
    """Check that space and subnet functionality works as expected
53
 
    :param client: EnvJujuClient
 
53
    :param client: ModelClient
54
54
    """
55
55
    network_config = {
56
56
        'default': ['subnet-0fb97566', 'subnet-d27d91a9'],
75
75
 
76
76
def _assess_spaces_subnets(client, network_config, charms_to_space):
77
77
    """Check that space and subnet functionality works as expected
78
 
    :param client: EnvJujuClient
 
78
    :param client: ModelClient
79
79
    :param network_config: Map of 'space name' to ['subnet', 'list']
80
80
    :param charms_to_space: Map of 'unit name' to
81
81
           {'space': 'space name', 'charm': 'charm name (if not same as unit)}