← Back to branch summary

~ajkavanagh/openstack-mojo-specs/remove-cinder-from-vrrp-ha

« back to all changes in this revision

Viewing changes to helper/utils/mojo_utils.py

Additional fixes re: juju status

Show diffs side-by-side

added added

removed removed

Lines of Context:
helper/utils/mojo_utils.py
554
554
 
555
555
 
556
556
def get_machine_agent_states(juju_status):
557
 
    return get_machine_state(juju_status, kiki.juju_state())
 
557
    return get_machine_state(juju_status, 'agent-state')
558
558
 
559
559
 
560
560
def get_machine_instance_states(juju_status):
569
569
            for unit in juju_status[kiki.applications()][service]['units']:
570
570
                unit_info = juju_status[
571
571
                    kiki.applications()][service]['units'][unit]
572
 
                service_state[unit_info[kiki.juju_state()]] += 1
 
572
                service_state[kiki.get_unit_info_state(unit_info)] += 1
573
573
                if 'subordinates' in unit_info:
574
574
                    for sub_unit in unit_info['subordinates']:
575
 
                        sub_sstate = (unit_info['subordinates'][sub_unit]
576
 
                                      [kiki.juju_state()])
 
575
                        sub_sstate = (kiki.get_unit_info_state(
 
576
                            unit_info['subordinates'][sub_unit]))
577
577
                        service_state[sub_sstate] += 1
578
578
    return service_state
579
579