projects
/
osm
/
N2VC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fd7be88
)
Fix exception messages and lint error
author
Cory Johns
<johnsca@gmail.com>
Fri, 14 Apr 2017 16:09:57 +0000
(12:09 -0400)
committer
Cory Johns
<johnsca@gmail.com>
Fri, 14 Apr 2017 16:09:57 +0000
(12:09 -0400)
juju/model.py
patch
|
blob
|
history
diff --git
a/juju/model.py
b/juju/model.py
index
6e236bf
..
c15d07c
100644
(file)
--- a/
juju/model.py
+++ b/
juju/model.py
@@
-802,7
+802,7
@@
class Model(object):
results = await client_facade.AddMachines([params])
error = results.machines[0].error
if error:
results = await client_facade.AddMachines([params])
error = results.machines[0].error
if error:
- raise ValueError("Error adding machine: %s"
,
error.message)
+ raise ValueError("Error adding machine: %s"
%
error.message)
machine_id = results.machines[0].machine
log.debug('Added new machine %s', machine_id)
return await self._wait_for_new('machine', machine_id)
machine_id = results.machines[0].machine
log.debug('Added new machine %s', machine_id)
return await self._wait_for_new('machine', machine_id)
@@
-1252,7
+1252,8
@@
class Model(object):
async def get_ssh_key(self, raw_ssh=False):
"""Return known SSH keys for this model.
async def get_ssh_key(self, raw_ssh=False):
"""Return known SSH keys for this model.
- :param bool raw_ssh: if True, returns the raw ssh key, else it's fingerprint
+ :param bool raw_ssh: if True, returns the raw ssh key,
+ else it's fingerprint
"""
key_facade = client.KeyManagerFacade()
"""
key_facade = client.KeyManagerFacade()
@@
-1711,7
+1712,7
@@
class BundleHandler(object):
results = await self.client_facade.AddMachines([params])
error = results.machines[0].error
if error:
results = await self.client_facade.AddMachines([params])
error = results.machines[0].error
if error:
- raise ValueError("Error adding machine: %s"
,
error.message)
+ raise ValueError("Error adding machine: %s"
%
error.message)
machine = results.machines[0].machine
log.debug('Added new machine %s', machine)
return machine
machine = results.machines[0].machine
log.debug('Added new machine %s', machine)
return machine