setup nova connection in __init__

[plcapi.git] / PLC / Roles.py

diff --git a/PLC/Roles.py b/PLC/Roles.py
index 42b2622..65ab289 100644 (file)
--- a/PLC/Roles.py
+++ b/PLC/Roles.py
@@ -1,72 +1,42 @@
-#
-# Functions for interacting with the roles table in the database
-#
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2006 The Trustees of Princeton University
-#
-# $Id: Roles.py,v 1.7 2006/11/08 23:02:01 mlhuang Exp $
-#
-
 from types import StringTypes
 from PLC.Faults import *
 from PLC.Parameter import Parameter
-from PLC.Filter import Filter
-from PLC.Table import Row, Table
+from PLC.NovaTable import NovaObject, NovaTable
 
-class Role(Row):
+class Role(NovaObject):
     """
     Representation of a row in the roles table. To use,
     instantiate with a dict of values.
     """
 
-    table_name = 'roles'
-    primary_key = 'role_id'
-    join_tables = ['person_role', ('slice_attribute_types', 'min_role_id')]
     fields = {
-        'role_id': Parameter(int, "Role identifier"),
+        'id': Parameter(str, "Role identifier"),
         'name': Parameter(str, "Role", max = 100),
         }
 
-    def validate_role_id(self, role_id):
-       # Make sure role does not already exist
-       conflicts = Roles(self.api, [role_id])
-        if conflicts:
-            raise PLCInvalidArgument, "Role ID already in use"
-
-        return role_id
-
-    def validate_name(self, name):
-       # Make sure name is not blank
-        if not len(name):
-            raise PLCInvalidArgument, "Role must be specified"
-       
-       # Make sure role does not already exist
-       conflicts = Roles(self.api, [name])
-        if conflicts:
-            raise PLCInvalidArgument, "Role name already in use"
-
-       return name
-
-class Roles(Table):
-    """
-    Representation of the roles table in the database.
-    """
-
-    def __init__(self, api, role_filter = None):
-        Table.__init__(self, api, Role)
-
-        sql = "SELECT %s FROM roles WHERE True" % \
-              ", ".join(Role.fields)
-        
-        if role_filter is not None:
-            if isinstance(role_filter, (list, tuple, set)):
-                # Separate the list into integers and strings
-                ints = filter(lambda x: isinstance(x, (int, long)), role_filter)
-                strs = filter(lambda x: isinstance(x, StringTypes), role_filter)
-                role_filter = Filter(Role.fields, {'role_id': ints, 'name': strs})
-                sql += " AND (%s) %s" % role_filter.sql(api, "OR")
-            elif isinstance(role_filter, dict):
-                role_filter = Filter(Role.fields, role_filter)
-                sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+    def sync(self, insert=False, validate=True):
+        NovaObject.sync(self, insert, validate) 
+        if insert == True or id not in self:
+            self.object = self.api.client_shell.keystone.roles.create(**self)
+          
+
+class Roles(NovaTable):
+    def __init__(self, api, role_filter={}):
+        self.api  = api
+        if not role_filter:
+            roles = self.api.client_shell.keystone.roles.findall()
+        elif isinstance(role_filter, StringTypes):
+            roles = [self.api.client_shell.keystone.roles.find(id=role_filter)] 
+        elif isinstance(role_filter, (list, tuple, set)):
+            roles = self.api.client_shell.keystone.roles.findall()
+            roles = [role for role in roles if role.id in role_filter]
+        else:
+            raise PLCInvalidArgument, "Wrong role filter %r"%role_filter
+
+            #self.append(NovaObject.object_to_dict(role, Role.fields)) 
+        for role in roles:
+            role = Role(self.api, object=role)
+            self.append(role)
+
+    
 
-        self.selectall(sql)