← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to industrial_test.py

  • Committer: Aaron Bentley
  • Date: 2016-05-25 16:12:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1447.
  • Revision ID: aaron.bentley@canonical.com-20160525161207-h5z5uev3jkyewvxt
Update tests to use applications, not services.

Show diffs side-by-side

added added

removed removed

Lines of Context:
industrial_test.py
721
721
        yield results
722
722
        results = {'test_id': 'deploy-many'}
723
723
        yield results
724
 
        service_names = []
 
724
        application_names = []
725
725
        machine_names = sorted(new_machines, key=int)
726
726
        machine_type = client.preferred_container()
727
727
        for machine_name in machine_names:
728
728
            target = '{}:{}'.format(machine_type, machine_name)
729
729
            for container in range(self.container_count):
730
 
                service = 'ubuntu{}x{}'.format(machine_name, container)
 
730
                application = 'ubuntu{}x{}'.format(machine_name, container)
731
731
                # Work around bug #1540900: juju deploy ignores model
732
732
                # default-series
733
733
                series = client.env.config['default-series']
734
 
                client.deploy('ubuntu', service=service, to=target,
 
734
                client.deploy('ubuntu', service=application, to=target,
735
735
                              series=series)
736
 
                service_names.append(service)
 
736
                application_names.append(application)
737
737
        timeout_start = datetime.now()
738
738
        yield results
739
739
        status = client.wait_for_started(start=timeout_start)
741
741
        yield results
742
742
        results = {'test_id': 'remove-machine-many-container'}
743
743
        yield results
744
 
        services = [status.status['services'][key] for key in service_names]
 
744
        applications = [status.get_applications()[key]
 
745
                        for key in application_names]
745
746
        container_machines = set()
746
 
        for service in services:
747
 
            for unit in service['units'].values():
 
747
        for application in applications:
 
748
            for unit in application['units'].values():
748
749
                container_machines.add(unit['machine'])
749
750
                client.juju('remove-machine', ('--force', unit['machine']))
750
751
        remove_timeout = {