From f3986ca10595bec2c5559c9bc6fb034be4cbd2d8 Mon Sep 17 00:00:00 2001
From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 5 Jun 2014 14:52:59 +0200
Subject: [PATCH] Rest: query get with platform prefix in the Query, Example
ple:resource
---
rest/__init__.py | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/rest/__init__.py b/rest/__init__.py
index 1ca37971..a8565963 100644
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -40,21 +40,33 @@ 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
+ #elif(self.type.startswith('local:')):
+ elif ':' in self.type:
table = self.type.split(':')
+ prefix = table[0]
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'];
+
+ if prefix is '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:
+ # If we use prefix, set the key without the prefix then add it again
+ self.type = table
+ self.setKey()
+ self.setLocalFields()
+ self.type = prefix + ':' + table
else :
self.setKey()
self.setLocalFields()
--
2.47.0