← Back to branch summary

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

« back to all changes in this revision

Viewing changes to deploy_stack.py

  • Committer: Curtis Hovey
  • Date: 2016-06-03 13:41:47 UTC
  • mfrom: (1449.2.7 list-models-show-all)
  • Revision ID: curtis@canonical.com-20160603134147-82r925yqfxgqq4pt
Fix list-models and show the state of the env.

Show diffs side-by-side

added added

removed removed

Lines of Context:
deploy_stack.py
660
660
            safe_print_status(self.client)
661
661
            raise
662
662
        else:
663
 
            self.client.show_status()
 
663
            self.client.list_controllers()
 
664
            self.client.list_models()
 
665
            for m_client in self.client.iter_model_clients():
 
666
                m_client.show_status()
664
667
        finally:
665
668
            try:
666
669
                self.dump_all_logs()
740
743
                    self.client.bootstrap(
741
744
                        upload_tools, bootstrap_series=self.series)
742
745
                with self.runtime_context(machines):
 
746
                    self.client.list_controllers()
 
747
                    self.client.list_models()
 
748
                    for m_client in self.client.iter_model_clients():
 
749
                        m_client.show_status()
743
750
                    yield machines
744
751
        except LoggedException:
745
752
            sys.exit(1)
807
814
            # The win and osx client tests only verify the client
808
815
            # can bootstrap and call the state-server.
809
816
            return
810
 
        client.show_status()
811
817
        if args.with_chaos > 0:
812
818
            manager = background_chaos(args.temp_env_name, client,
813
819
                                       args.logs, args.with_chaos)
832
838
def safe_print_status(client):
833
839
    """Show the output of juju status without raising exceptions."""
834
840
    try:
835
 
        client.show_status()
 
841
        for m_client in client.iter_model_clients():
 
842
            m_client.show_status()
836
843
    except Exception as e:
837
844
        logging.exception(e)
838
845