from plstackapi.planetstack.config import Config
-from plstackapi.openstack.shell import OpenStackShell
+from plstackapi.openstack.client import OpenStackClient
class OpenStackDriver:
- def __init__(self, config = None):
+ def __init__(self, config = None, client=None):
if config:
self.config = Config(config)
else:
self.config = Config()
- self.shell = OpenStackShell()
+
+ if client:
+ self.shell = client
+ else:
+ self.shell = OpenStackClient()
+
+ def create_role(self, name):
+ roles = self.shell.keystone.roles.findall(name=name)
+ if not roles:
+ role = self.shell.keystone.roles.create(name)
+ else:
+ role = roles[0]
+ return role
+
+ def delete_role(self, filter):
+ roles = self.shell.keystone.roles.findall(**filter)
+ for role in roles:
+ self.shell.keystone.roles.delete(role)
+ return 1
def create_tenant(self, tenant_name, enabled, description):
"""Create keystone tenant. Suggested fields: name, description, enabled"""
tenants = self.shell.keystone.tenants.findall(name=tenant_name)
if not tenants:
fields = {'tenant_name': tenant_name, 'enabled': enabled,
- 'description', description}
+ 'description': description}
tenant = self.shell.keystone.tenants.create(**fields)
else:
tenant = tenants[0]
if not users:
fields = {'name': name, 'email': email, 'password': password,
'enabled': enabled}
- user = self.shell.keystone.create(**fields)
+ user = self.shell.keystone.users.create(**fields)
else:
user = users[0]
return user
return self.shell.keystone.users.delete(user)
def create_router(self, name, set_gateway=True):
- router = self.shell.quantum.create_router(name=name)
+ routers = self.shell.quantum.list_routers(name=name)['routers']
+ if routers:
+ router = routers[0]
+ else:
+ router = self.shell.quantum.create_router({'router': {'name': name}})
if set_gateway:
- nets = self.shell.quantum.list_networks()
+ nets = self.shell.quantum.list_networks()['networks']
for net in nets:
if net['router:external'] == True:
- self.shell.quantum.add_gateway_router(router, net)
+ self.shell.quantum.add_gateway_router(router['id'],
+ {'network_id': net['id']})
return router
def delete_router(self, name):
- return self.shell.quantum.delete_router(name=name)
+ routers = self.shell.quantum.list_routers(name=name)['routers']
+ for router in routers:
+ self.shell.quantum.delete_router(router['id'])
def add_router_interface(self, router_id, subnet_id):
- router = None
- subnet = None
- for r in self.shell.quantum.list_routers():
- if r['id'] == router_id:
- router = r
- break
- for s in self.shell.quantum.list_subnets():
- if s['id'] == subnet_id:
- subnet = s
- break
-
+ router = self.shell.quantum.show_router(router_id)['router']
+ subnet = self.shell.quantum.show_subnet(subnet_id)['subnet']
if router and subnet:
- self.shell.quantum.router_add_interface(router, subnet)
+ self.shell.quantum.add_interface_router(router_id, {'subnet_id': subnet_id})
def delete_router_interface(self, router_id, subnet_id):
- router = None
- subnet = None
- for r in self.shell.quantum.list_routers():
- if r['id'] == router_id:
- router = r
- break
- for s in self.shell.quantum.list_subnets():
- if s['id'] == subnet_id:
- subnet = s
- break
-
+ router = self.shell.quantum.show_router(router_id)
+ subnet = self.shell.quantum.show_subnet(subnet_id)
if router and subnet:
- self.shell.quantum.router_remove_interface(router, subnet)
+ self.shell.quantum.remove_interface_router(router_id, {'subnet_id': subnet_id})
def create_network(self, name):
- return self.shell.quantum.create_network(name=name, admin_state_up=True)
-
+ nets = self.shell.quantum.list_networks(name=name)['networks']
+ if nets:
+ net = nets[0]
+ else:
+ net = self.shell.quantum.create_network({'network': {'name': name}})
+ return net
+
def delete_network(self, name):
- nets = self.shell.quantum.list_networks(name=name)
+ nets = self.shell.quantum.list_networks(name=name)['networks']
for net in nets:
# delete all subnets:
#subnets = self.api.client_shell.quantum.list_subnets(network_id=net['network_id'])['subnets']
self.delete_subnet(subnet_id)
self.shell.quantum.delete_network(net['id'])
- def create_subnet(self, network_name, cidr_ip, ip_version, start, end):
- nets = self.shell.quantum.list_networks(name=network_name)
- if not nets:
- raise Exception, "No such network: %s" % network_name
- nets = nets[0]
-
- subnets = self.shell.quantum.list_subnets(name=self.name)
- allocation_pools = [{'start': start, 'end': end}]
- subnet = self.shell.quantum.create_subnet(network_id=net['id'],
- ip_version=ip_version,
- cidr=cidr_ip,
- dns_nameservers=['8.8.8.8', '8.8.8.4'],
- allocation_pools=allocation_pools)
+ def create_subnet(self, name, network_id, cidr_ip, ip_version, start, end):
+ #nets = self.shell.quantum.list_networks(name=network_name)['networks']
+ #if not nets:
+ # raise Exception, "No such network: %s" % network_name
+ #net = nets[0]
+
+ subnet = None
+ subnets = self.shell.quantum.list_subnets()['subnets']
+ for snet in subnets:
+ if snet['cidr'] == cidr_ip and snet['network_id'] == network_id:
+ subnet = snet
+
+ if not subnet:
+ allocation_pools = [{'start': start, 'end': end}]
+ subnet = {'subnet': {'name': name,
+ 'network_id': network_id,
+ 'ip_version': ip_version,
+ 'cidr': cidr_ip,
+ 'dns_nameservers': ['8.8.8.8', '8.8.8.4'],
+ 'allocation_pools': allocation_pools}}
+ subnet = self.shell.quantum.create_subnet(subnet)['subnet']
# TODO: Add route to external network
# e.g. # route add -net 10.0.3.0/24 dev br-ex gw 10.100.0.5
return subnet
+ def update_subnet(self, id, fields):
+ return self.shell.quantum.update_subnet(id, fields)
+
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):
- keys = self.client.nova.keypairs.findall(name=name)
+ keys = self.shell.nova.keypairs.findall(name=name)
if keys:
- raise Exception, "Key name already exists: %s" % name
- return self.client.nova.keypairs.create(name=name, public_key=key)
+ key = keys[0]
+ else:
+ key = self.shell.nova.keypairs.create(name=name, public_key=key)
+ 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:
- 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:
image_id = images[0]['id']
hints = {}
if hostname:
- hints['force_hosts']= hostname
+ #hints['force_hosts']= hostname
+ hints['availability-zone'] = 'nova:%s' % hostname
server = self.shell.nova.servers.create(
name=name,
key_name = key_name,
git://git.onelab.eu / plstackapi.git / blobdiff