else:
self.config = Config()
+ self.admin_client = OpenStackClient()
+ self.admin_user = self.admin_client.keystone.users.find(name=self.admin_client.keystone.username)
+
if client:
self.shell = client
else:
tenant = self.shell.keystone.tenants.create(**fields)
else:
tenant = tenants[0]
+
+ # always give the admin user the admin role to any tenant created
+ # by the driver.
+ self.add_user_role(self.admin_user.id, tenant.id, 'admin')
return tenant
def update_tenant(self, id, **kwds):
router = routers[0]
else:
router = self.shell.quantum.create_router({'router': {'name': name}})['router']
+ # add router to external network
if set_gateway:
nets = self.shell.quantum.list_networks()['networks']
for net in nets:
routers = self.shell.quantum.list_routers(id=id)['routers']
for router in routers:
self.shell.quantum.delete_router(router['id'])
+ # remove router form external network
+ #nets = self.shell.quantum.list_networks()['networks']
+ #for net in nets:
+ # if net['router:external'] == True:
+ # self.shell.quantum.remove_gateway_router(router['id'])
def add_router_interface(self, router_id, subnet_id):
router = self.shell.quantum.show_router(router_id)['router']
def delete_network_ports(self, network_id):
ports = self.shell.quantum.list_ports()['ports']
for port in ports:
- if port['network_id'] == 'network_id':
+ if port['network_id'] == network_id:
self.shell.quantum.delete_port(port['id'])
return 1
self.shell.nova.keypairs.delete(key)
return 1
- def spawn_instance(self, name, key_name=None, hostname=None, flavor_id=None, image_id=None, security_group=None, pubkeys=[]):
- #if not flavor_id:
- # flavor = self.config.nova_default_flavor
+ def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[]):
+ flavor_name = self.config.nova_default_flavor
+ flavor = self.shell.nova.flavors.find(name=flavor_name)
#if not image:
# image = self.config.nova_default_imave
if not security_group:
security_group = self.config.nova_default_security_group
- authorized_keys = "\n".join(pubkeys)
- files = {'/root/.ssh/authorized_keys': authorized_keys}
+ #authorized_keys = "\n".join(pubkeys)
+ #files = {'/root/.ssh/authorized_keys': authorized_keys}
+ files = {}
hints = {}
availability_zone = None
server = self.shell.nova.servers.create(
name=name,
key_name = key_name,
- flavor=flavor_id,
+ flavor=flavor.id,
image=image_id,
security_group = security_group,
files=files,
servers = self.shell.nova.servers.findall(id=id)
for server in servers:
self.shell.nova.servers.delete(server)
+
+ def update_instance_metadata(self, id, metadata):
+ servers = self.shell.nova.servers.findall(id=id)
+ for server in servers:
+ self.shell.nova.servers.set_meta(server, metadata)
+ # note: set_meta() returns a broken Server() object. Don't try to
+ # print it in the shell or it will fail in __repr__.
+
+ def delete_instance_metadata(self, id, metadata):
+ # note: metadata is a dict. Only the keys matter, not the values.
+ servers = self.shell.nova.servers.findall(id=id)
+ for server in servers:
+ self.shell.nova.servers.delete_meta(server, metadata)
+