git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
509b318
)
fix AttributeError
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 9 Apr 2013 17:06:34 +0000
(13:06 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 9 Apr 2013 17:06:34 +0000
(13:06 -0400)
plstackapi/openstack/driver.py
patch
|
blob
|
history
diff --git
a/plstackapi/openstack/driver.py
b/plstackapi/openstack/driver.py
index
81273b3
..
ef7662a
100644
(file)
--- a/
plstackapi/openstack/driver.py
+++ b/
plstackapi/openstack/driver.py
@@
-149,21
+149,21
@@
class OpenStackDriver:
return subnet
def delete_subnet(self, id):
return subnet
def delete_subnet(self, id):
- return self.
client
.quantum.delete_subnet(id=id)
+ return self.
shell
.quantum.delete_subnet(id=id)
def create_keypair(self, name, key):
def create_keypair(self, name, key):
- keys = self.
client
.nova.keypairs.findall(name=name)
+ keys = self.
shell
.nova.keypairs.findall(name=name)
if keys:
key = keys[0]
else:
if keys:
key = keys[0]
else:
- key = self.
client
.nova.keypairs.create(name=name, public_key=key)
+ key = self.
shell
.nova.keypairs.create(name=name, public_key=key)
return key
def delete_keypair(self, name):
return key
def delete_keypair(self, name):
- keys = self.
client
.nova.keypairs.findall(name=name)
+ keys = self.
shell
.nova.keypairs.findall(name=name)
for key in keys:
for key in keys:
- self.
client
.nova.keypairs.delete(key)
+ self.
shell
.nova.keypairs.delete(key)
def spawn_instance(self, name, key_name=None, hostname=None, flavor=None, image=None, security_group=None, pubkeys=[]):
if not flavor:
def spawn_instance(self, name, key_name=None, hostname=None, flavor=None, image=None, security_group=None, pubkeys=[]):
if not flavor: