from sfa.util.sfalogging import logger
+from keystoneclient.v2_0 import client as keystone_client
from glance import client as glance_client
-from novaclient.v1_1.client import Client
+from novaclient.v1_1 import client as nova_client
from sfa.util.config import Config
return opts
-class GlanceClient:
+class KeystoneClient:
def __init__(self, config=None):
if not config:
config = Config()
opts = parse_novarc(config.SFA_NOVA_NOVARC)
+ self.client = keystone_client.Client(username=opts.get('OS_USERNAME'),
+ password=opts.get('OS_PASSWORD'),
+ tenant_name=opts.get('OS_TENANT_NAME'),
+ auth_url=opts.get('OS_AUTH_URL'))
+
+ def __getattr__(self, name):
+ return getattr(self.client, name)
+
+class GlanceClient:
+ def __init__(self, config=None):
+ if not config:
+ config = Config()
+ opts = parse_novarc(config.SFA_NOVA_NOVARC)
self.client = glance_client.get_client(host='0.0.0.0',
username=opts.get('OS_USERNAME'),
password=opts.get('OS_PASSWORD'),
tenant=opts.get('OS_TENANT_NAME'),
auth_url=opts.get('OS_AUTH_URL'))
-
def __getattr__(self, 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='',
- )
+ self.client = nova_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)
-
-
+ return getattr(self.client, name)