git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e3b53c
)
added NovaClient
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 26 Jun 2012 02:30:01 +0000
(22:30 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 26 Jun 2012 02:30:01 +0000
(22:30 -0400)
sfa/openstack/client.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/client.py
b/sfa/openstack/client.py
index
5900339
..
11d9221
100644
(file)
--- a/
sfa/openstack/client.py
+++ b/
sfa/openstack/client.py
@@
-1,5
+1,6
@@
from sfa.util.sfalogging import logger
from glance import client as glance_client
from sfa.util.sfalogging import logger
from glance import client as glance_client
+from novaclient.v1_1.client import Client
from sfa.util.config import Config
from sfa.util.config import Config
@@
-21,7
+22,7
@@
def parse_novarc(filename):
class GlanceClient:
class GlanceClient:
- def __init__(self, config):
+ def __init__(self, config
=None
):
if not config:
config = Config()
opts = parse_novarc(config.SFA_NOVA_NOVARC)
if not config:
config = Config()
opts = parse_novarc(config.SFA_NOVA_NOVARC)
@@
-36,5
+37,24
@@
class GlanceClient:
return getattr(self.client, name)
return getattr(self.client, name)
+class NovaClient:
+ def __init__(self, config=None):
+ if not config:
+ config = Config()
+ opts = parse_novarc(config.SFA_NOVA_NOVARC)
+
+ self.client = Client(username=opts.get('OS_USERNAME'),
+ api_key=opts.get('OS_PASSWORD'),
+ project_id=opts.get('OS_TENANT_NAME'),
+ auth_url=opts.get('OS_AUTH_URL'),
+ region_name='',
+ extensions=[],
+ service_type='compute',
+ service_name='',
+ )
+
+
+ def __getattr__(self, name):
+ return getattr(self.client, name)