From 0abe329b143d3f1c84888b10370261fac5e2c324 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Wed, 16 Jan 2013 16:01:39 +0100 Subject: [PATCH] Dummy driver bug fixing --- sfa/dummy/dummy_testbed_api.py | 5 ++++- sfa/dummy/dummydriver.py | 4 +++- sfa/dummy/dummyxrn.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sfa/dummy/dummy_testbed_api.py b/sfa/dummy/dummy_testbed_api.py index f40a853c..350b4887 100644 --- a/sfa/dummy/dummy_testbed_api.py +++ b/sfa/dummy/dummy_testbed_api.py @@ -132,7 +132,10 @@ def AddUserKey(param): try: for user in DB['users_list']: if param['user_id'] == user['user_id']: - user['keys'].append(param['key']) + if 'keys' in user.keys(): + user['keys'].append(param['key']) + else: + user['keys'] = [param['key']] return True return False except: diff --git a/sfa/dummy/dummydriver.py b/sfa/dummy/dummydriver.py index 1fd08434..2ac2b73a 100644 --- a/sfa/dummy/dummydriver.py +++ b/sfa/dummy/dummydriver.py @@ -359,7 +359,9 @@ class DummyDriver (Driver): def update_relation (self, subject_type, target_type, relation_name, subject_id, target_ids): # hard-wire the code for slice/user for now, could be smarter if needed if subject_type =='slice' and target_type == 'user' and relation_name == 'researcher': - subject=self.shell.GetSlices (subject_id)[0] + subject=self.shell.GetSlices ({'slice_id': subject_id})[0] + if 'user_ids' not in subject.keys(): + subject['user_ids'] = [] current_target_ids = subject['user_ids'] add_target_ids = list ( set (target_ids).difference(current_target_ids)) del_target_ids = list ( set (current_target_ids).difference(target_ids)) diff --git a/sfa/dummy/dummyxrn.py b/sfa/dummy/dummyxrn.py index 6c06b8b8..d4101356 100644 --- a/sfa/dummy/dummyxrn.py +++ b/sfa/dummy/dummyxrn.py @@ -60,7 +60,7 @@ class DummyXrn (Xrn): sliver_id_parts = leaf.split(':') name = sliver_id_parts[0] name = re.sub('[^a-zA-Z0-9_]', '', name) - return self.pl_login_base() + '_' + name + return name #def hrn_to_pl_authname(hrn): def dummy_authname (self): -- 2.47.0