X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=faef22e1795f41369f4813e3dd77f82c87cc5552;hb=3886c4b8a044e867f5dad3cadcc0f149717790c1;hp=8b78fa3efd21f9ee5b787620f37a1d29f2be02f8;hpb=f0901b1ae81e3d692a443506dcd64cfdbbb70356;p=myslice.git

diff --git a/rest/__init__.py b/rest/__init__.py
index 8b78fa3e..faef22e1 100644
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -27,7 +27,7 @@ class ObjectRequest(object):
         self.type = object_type
         self.name = object_name
         self.fields = []
-        self.params = {}
+        self.params = []
         self.filters = {}
         self.options = None
 
@@ -40,10 +40,24 @@ class ObjectRequest(object):
             self.filters['disabled'] = '0'
             self.filters['gateway_type'] = 'sfa'
             self.filters['platform'] = '!myslice'
+        elif(self.type.startswith('local:')):
+            # XXX TODO: find a generic Query to get the fields like 
+            # select column.name from local:object where table == local:user
+            table = self.type.split(':')
+            table = table[1]
+            if table == "user":
+                self.id = table + '_id'
+                self.fields = ['user_id', 'email', 'password', 'config','status'];
+            elif table == "account":
+                # XXX TODO: Multiple key for account = (platform_id, user_id)
+                self.id = "platform_id, user_id"
+                self.fields = ['platform_id', 'user_id', 'auth_type', 'config'];
+            elif table == "platform":
+                self.id = 'platform'
+                self.fields = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type'];
         else :
             self.setKey()
             self.setLocalFields()
-        
     
     def setKey(self):
         # What about key formed of multiple fields???
@@ -94,7 +108,7 @@ class ObjectRequest(object):
     
     def get(self):
         query = Query.get(self.type)
-        if (self.id not in self.fields) :
+        if (self.id is not None) and (self.id not in self.fields) :
             query.select(self.fields + [self.id])
         else :
             query.select(self.fields)
@@ -106,7 +120,11 @@ class ObjectRequest(object):
         query = Query.create(self.type)
         # No filters for create
         if self.params :
-            query.set(self.params)
+            for p in self.params :
+                for k,v in p.iteritems() :
+                    print "param: %s : %s" % (k,v)
+                    query.set({k : v})
+            print "query = ",query
         else:
             raise Exception, "Params are required for create"
         return execute_query(self.request, query)
@@ -116,10 +134,17 @@ class ObjectRequest(object):
         query = self.applyFilters(query, True)
 
         if self.params :
-            query.set(self.params)
+            for p in self.params :
+                for k,v in p.iteritems() :
+                    print "param: %s : %s" % (k,v)
+                    query.set({k : v})
+            print "query = ",query
         else:
             raise Exception, "Params are required for update"
-        
+
+        if self.id is not None:
+           query.select(self.id)
+       
         return execute_query(self.request, query)
     
     def delete(self):