← Back to branch summary

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

« back to all changes in this revision

Viewing changes to jujupy.py

  • Committer: Martin Packman
  • Date: 2016-09-07 20:38:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1585.
  • Revision ID: martin.packman@canonical.com-20160907203830-c0v854jlxhteni26
Make assess_ssh_keys 1.25 compatible and update for landed fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
jujupy.py
2577
2577
        args = []
2578
2578
        if full:
2579
2579
            args.append('--full')
2580
 
        return self.get_juju_output('authorized-keys', 'list', *args)
 
2580
        return self.get_juju_output('authorized-keys list', *args)
2581
2581
 
2582
2582
    def add_ssh_key(self, *keys):
2583
2583
        """Add one or more ssh keys to the current model."""
2584
 
        return self.get_juju_output('authorized-keys', 'add', *keys,
 
2584
        return self.get_juju_output('authorized-keys add', *keys,
2585
2585
                                    merge_stderr=True)
2586
2586
 
2587
2587
    def remove_ssh_key(self, *keys):
2588
2588
        """Remove one or more ssh keys from the current model."""
2589
 
        return self.get_juju_output('authorized-keys', 'delete', *keys,
 
2589
        return self.get_juju_output('authorized-keys delete', *keys,
2590
2590
                                    merge_stderr=True)
2591
2591
 
2592
2592
    def import_ssh_key(self, *keys):
2593
2593
        """Import ssh keys from one or more identities to the current model."""
2594
 
        return self.get_juju_output('authorized-keys', 'import', *keys,
 
2594
        return self.get_juju_output('authorized-keys import', *keys,
2595
2595
                                    merge_stderr=True)
2596
2596
 
2597
2597