HyperlinkedModelSerializer doesn't include the id by default

[plstackapi.git] / plstackapi / openstack / driver.py

diff --git a/plstackapi/openstack/driver.py b/plstackapi/openstack/driver.py
index bdb08a9..f6817cf 100644 (file)
--- a/plstackapi/openstack/driver.py
+++ b/plstackapi/openstack/driver.py
@@ -1,44 +1,123 @@
 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()
 
-    def create_tenant(self, **kwds):
-        """Create keystone tenant. Suggested fields: name, description, enabled"""  
-        required_fields = ['tenant_name', 'enabled', 'description']
-        for field in required_fields:
-            if field not in kwds:
-                raise Exception, "Must specify %s" % field
+        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
 
-        tenants = self.shell.keystone.tenants.findall(name=kwds['tenant_name'])
+    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:
-            tenant = self.shell.keystone.tenants.create(**kwds)
+            fields = {'tenant_name': tenant_name, 'enabled': enabled, 
+                      'description': description}  
+            tenant = self.shell.keystone.tenants.create(**fields)
         else:
             tenant = tenants[0]
         return tenant
 
     def update_tenant(self, id, **kwds):
-        return self.shell.keystone.tenants.update(self.id, **kwds)
+        return self.shell.keystone.tenants.update(id, **kwds)
 
     def delete_tenant(self, id):
         tenant = self.shell.keystone.tenants.find(id=id)
         return self.shell.keystone.tenants.delete(tenant)
 
-    def create_router(self, name):
+    def create_user(self, name, email, password, enabled):
+        users = self.shell.keystone.users.findall(email=email)
+        if not users:
+            fields = {'name': name, 'email': email, 'password': password,
+                      'enabled': enabled}
+            user = self.shell.keystone.create(**fields)
+        else: 
+            user = users[0]
+        return user
+
+    def add_user_role(self, user_id, tenant_id, role_name):
+        user = self.shell.keystone.users.find(id=user_id)
+        tenant = self.shell.keystone.tenants.find(id=tenant_id)
+        role = self.shell.keystone.roles.find(role_name)
+        return tenant.add_user(user, role)
+
+    def delete_user_role(self, user_id, tenant_id, role_name):
+        user = self.shell.keystone.users.find(id=user_id)
+        tenant = self.shell.keystone.tenants.find(id=tenant_id)
+        role = self.shell.keystone.roles.find(role_name)
+        return tenant.delete_user(user, role)
+
+    def update_user(self, id, **kwds):
+        return self.shell.keystone.users.update(id, **kwds)
+
+    def delete_user(self, id):
+        user = self.shell.keystone.users.find(id=id)
+        return self.shell.keystone.users.delete(user)  
+
+    def create_router(self, name, set_gateway=True):
         router = self.shell.quantum.create_router(name=name)
-        # TODO: add router to external network
+        if set_gateway:
+            nets = self.shell.quantum.list_networks()
+            for net in nets:
+                if net['router:external'] == True: 
+                    self.shell.quantum.add_gateway_router(router, net)
+        
         return router
 
     def delete_router(self, name):
         return self.shell.quantum.delete_router(name=name)
-    
+
+    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
+
+        if router and subnet:
+            self.shell.quantum.router_add_interface(router, subnet)
+
+    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
+
+        if router and subnet:
+            self.shell.quantum.router_remove_interface(router, subnet)            
+ 
     def create_network(self, name):
         return self.shell.quantum.create_network(name=name, admin_state_up=True)
     
@@ -62,7 +141,7 @@ class OpenStackDriver:
         subnet = self.shell.quantum.create_subnet(network_id=net['id'],
                                                 ip_version=ip_version,
                                                 cidr=cidr_ip,
-                                                dns_nameservers=['8.8.8.8'],         
+                                                dns_nameservers=['8.8.8.8', '8.8.8.4'],         
                                                 allocation_pools=allocation_pools)
 
         # TODO: Add route to external network