X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2FSenslabImportUsers.py;h=8109f343d63e5d542c9104a8a89d46872f5e9409;hb=8727730a6ca0b289d1d67cc887a6459781201e52;hp=9a0c39bcf3b178f70adc54f7d9ae0c0f36e20fa9;hpb=4fbc1c51ef8033e5305156ded6b8a3f6c9d921bf;p=sfa.git diff --git a/sfa/senslab/SenslabImportUsers.py b/sfa/senslab/SenslabImportUsers.py index 9a0c39bc..8109f343 100644 --- a/sfa/senslab/SenslabImportUsers.py +++ b/sfa/senslab/SenslabImportUsers.py @@ -19,70 +19,70 @@ class SenslabImportUsers: self.keys_list = [] self.slices_list= [] #self.resources_fulldict['keys'] = [] - self.InitPersons() - self.InitKeys() - self.InitSlices() + #self.InitPersons() + #self.InitKeys() + #self.InitSlices() - def InitSlices(self): - slices_per_site = {} - dflt_slice = { 'instantiation': None, 'description': "Senslab Slice Test", 'node_ids': [], 'url': "http://localhost.localdomain/", 'max_nodes': 256, 'site_id': 3,'peer_slice_id': None, 'slice_tag_ids': [], 'peer_id': None, 'hrn' :None} - for person in self.person_list: - if 'user' or 'pi' in person['roles']: - def_slice = {} - #print>>sys.stderr, "\r\n \rn \t\t _____-----------************def_slice person %s \r\n \rn " %(person['person_id']) - def_slice['person_ids'] = [] - def_slice['person_ids'].append(person['person_id']) - def_slice['slice_id'] = person['person_id'] - def_slice['creator_person_id'] = person['person_id'] - extime = datetime.datetime.utcnow() - def_slice['created'] = int(time.mktime(extime.timetuple())) - extime = extime + datetime.timedelta(days=365) - def_slice['expires'] = int(time.mktime(extime.timetuple())) - #print>>sys.stderr, "\r\n \rn \t\t _____-----------************def_slice expires %s \r\n \r\n "%(def_slice['expires']) - def_slice['name'] = person['email'].replace('@','_',1) - #print>>sys.stderr, "\r\n \rn \t\t _____-----------************def_slice %s \r\n \r\n " %(def_slice['name']) - def_slice.update(dflt_slice) - self.slices_list.append(def_slice) + #def InitSlices(self): + #slices_per_site = {} + #dflt_slice = { 'instantiation': None, 'description': "Senslab Slice Test", 'node_ids': [], 'url': "http://localhost.localdomain/", 'max_nodes': 256, 'site_id': 3,'peer_slice_id': None, 'slice_tag_ids': [], 'peer_id': None, 'hrn' :None} + #for person in self.person_list: + #if 'user' or 'pi' in person['roles']: + #def_slice = {} + ##print>>sys.stderr, "\r\n \rn \t\t _____-----------************def_slice person %s \r\n \rn " %(person['person_id']) + #def_slice['person_ids'] = [] + #def_slice['person_ids'].append(person['person_id']) + #def_slice['slice_id'] = person['person_id'] + #def_slice['creator_person_id'] = person['person_id'] + #extime = datetime.datetime.utcnow() + #def_slice['created'] = int(time.mktime(extime.timetuple())) + #extime = extime + datetime.timedelta(days=365) + #def_slice['expires'] = int(time.mktime(extime.timetuple())) + ##print>>sys.stderr, "\r\n \rn \t\t _____-----------************def_slice expires %s \r\n \r\n "%(def_slice['expires']) + #def_slice['name'] = person['email'].replace('@','_',1) + ##print>>sys.stderr, "\r\n \rn \t\t _____-----------************def_slice %s \r\n \r\n " %(def_slice['name']) + #def_slice.update(dflt_slice) + #self.slices_list.append(def_slice) - print>>sys.stderr, "InitSlices SliceLIST", self.slices_list + ##print>>sys.stderr, "InitSlices SliceLIST", self.slices_list - def InitPersons(self): - persons_per_site = {} - person_id = 7 - persons_per_site[person_id] = {'person_id': person_id,'site_ids': [3],'email': 'a_rioot@senslab.fr', 'key_ids':[1], 'roles': ['pi'], 'role_ids':[20],'first_name':'A','last_name':'rioot'} - person_id = 8 - persons_per_site[person_id] = {'person_id': person_id,'site_ids': [3],'email': 'lost@senslab.fr','key_ids':[1],'roles': ['pi'], 'role_ids':[20],'first_name':'L','last_name':'lost'} - person_id = 9 - persons_per_site[person_id] = {'person_id': person_id,'site_ids': [3],'email': 'user@senslab.fr','key_ids':[1],'roles': ['user'], 'role_ids':[1],'first_name':'U','last_name':'senslab'} - for person_id in persons_per_site.keys(): - person = persons_per_site[person_id] - if person['person_id'] not in self.person_list: - self.person_list.append(person) - #print>>sys.stderr, "InitPersons PERSON DICLIST", self.person_list + #def InitPersons(self): + #persons_per_site = {} + #person_id = 7 + #persons_per_site[person_id] = {'person_id': person_id,'site_ids': [3],'email': 'a_rioot@senslab.fr', 'key_ids':[1], 'roles': ['pi'], 'role_ids':[20],'first_name':'A','last_name':'rioot'} + #person_id = 8 + #persons_per_site[person_id] = {'person_id': person_id,'site_ids': [3],'email': 'lost@senslab.fr','key_ids':[1],'roles': ['pi'], 'role_ids':[20],'first_name':'L','last_name':'lost'} + #person_id = 9 + #persons_per_site[person_id] = {'person_id': person_id,'site_ids': [3],'email': 'user@senslab.fr','key_ids':[1],'roles': ['user'], 'role_ids':[1],'first_name':'U','last_name':'senslab'} + #for person_id in persons_per_site.keys(): + #person = persons_per_site[person_id] + #if person['person_id'] not in self.person_list: + #self.person_list.append(person) + ##print>>sys.stderr, "InitPersons PERSON DICLIST", self.person_list - def InitKeys(self): - #print>>sys.stderr, " InitKeys HEYYYYYYY\r\n" + #def InitKeys(self): + ##print>>sys.stderr, " InitKeys HEYYYYYYY\r\n" - self.keys_list = [{'peer_key_id': None, 'key_type': 'ssh', 'key' :"ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArcdW0X2la754SoFE+URbDsYP07AZJjrspMlvUc6u+4o6JpGRkqiv7XdkgOMIn6w3DF3cYCcA1Mc6XSG7gSD7eQx614cjlLmXzHpxSeidSs/LgZaAQpq9aQ0KhEiFxg0gp8TPeB5Z37YOPUumvcJr1ArwL/8tAOx3ClwgRhccr2HOe10YtZbMEboCarTlzNHiGolo7RYIJjGuG2RBSeAg6SMZrtnn0OdKBwp3iUlOfkS98eirVtWUp+G5+SZggip3fS3k5Oj7OPr1qauva8Rizt02Shz30DN9ikFNqV2KuPg54nC27/DQsQ6gtycARRVY91VvchmOk0HxFiW/9kS2GQ== root@FlabFedora2",'person_id': 7, 'key_id':1, 'peer_id':None }, - {'peer_key_id': None, 'key_type': 'ssh', 'key' :"ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArcdW0X2la754SoFE+URbDsYP07AZJjrspMlvUc6u+4o6JpGRkqiv7XdkgOMIn6w3DF3cYCcA1Mc6XSG7gSD7eQx614cjlLmXzHpxSeidSs/LgZaAQpq9aQ0KhEiFxg0gp8TPeB5Z37YOPUumvcJr1ArwL/8tAOx3ClwgRhccr2HOe10YtZbMEboCarTlzNHiGolo7RYIJjGuG2RBSeAg6SMZrtnn0OdKBwp3iUlOfkS98eirVtWUp+G5+SZggip3fS3k5Oj7OPr1qauva8Rizt02Shz30DN9ikFNqV2KuPg54nC27/DQsQ6gtycARRVY91VvchmOk0HxFiW/9kS2GQ== root@FlabFedora2",'person_id': 8, 'key_id':1, 'peer_id':None }, - {'peer_key_id': None, 'key_type': 'ssh', 'key' :"ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArcdW0X2la754SoFE+URbDsYP07AZJjrspMlvUc6u+4o6JpGRkqiv7XdkgOMIn6w3DF3cYCcA1Mc6XSG7gSD7eQx614cjlLmXzHpxSeidSs/LgZaAQpq9aQ0KhEiFxg0gp8TPeB5Z37YOPUumvcJr1ArwL/8tAOx3ClwgRhccr2HOe10YtZbMEboCarTlzNHiGolo7RYIJjGuG2RBSeAg6SMZrtnn0OdKBwp3iUlOfkS98eirVtWUp+G5+SZggip3fS3k5Oj7OPr1qauva8Rizt02Shz30DN9ikFNqV2KuPg54nC27/DQsQ6gtycARRVY91VvchmOk0HxFiW/9kS2GQ== root@FlabFedora2",'person_id': 9, 'key_id':1, 'peer_id':None }] + #self.keys_list = [{'peer_key_id': None, 'key_type': 'ssh', 'key' :"ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArcdW0X2la754SoFE+URbDsYP07AZJjrspMlvUc6u+4o6JpGRkqiv7XdkgOMIn6w3DF3cYCcA1Mc6XSG7gSD7eQx614cjlLmXzHpxSeidSs/LgZaAQpq9aQ0KhEiFxg0gp8TPeB5Z37YOPUumvcJr1ArwL/8tAOx3ClwgRhccr2HOe10YtZbMEboCarTlzNHiGolo7RYIJjGuG2RBSeAg6SMZrtnn0OdKBwp3iUlOfkS98eirVtWUp+G5+SZggip3fS3k5Oj7OPr1qauva8Rizt02Shz30DN9ikFNqV2KuPg54nC27/DQsQ6gtycARRVY91VvchmOk0HxFiW/9kS2GQ== root@FlabFedora2",'person_id': 7, 'key_id':1, 'peer_id':None }, + #{'peer_key_id': None, 'key_type': 'ssh', 'key' :"ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArcdW0X2la754SoFE+URbDsYP07AZJjrspMlvUc6u+4o6JpGRkqiv7XdkgOMIn6w3DF3cYCcA1Mc6XSG7gSD7eQx614cjlLmXzHpxSeidSs/LgZaAQpq9aQ0KhEiFxg0gp8TPeB5Z37YOPUumvcJr1ArwL/8tAOx3ClwgRhccr2HOe10YtZbMEboCarTlzNHiGolo7RYIJjGuG2RBSeAg6SMZrtnn0OdKBwp3iUlOfkS98eirVtWUp+G5+SZggip3fS3k5Oj7OPr1qauva8Rizt02Shz30DN9ikFNqV2KuPg54nC27/DQsQ6gtycARRVY91VvchmOk0HxFiW/9kS2GQ== root@FlabFedora2",'person_id': 8, 'key_id':1, 'peer_id':None }, + #{'peer_key_id': None, 'key_type': 'ssh', 'key' :"ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArcdW0X2la754SoFE+URbDsYP07AZJjrspMlvUc6u+4o6JpGRkqiv7XdkgOMIn6w3DF3cYCcA1Mc6XSG7gSD7eQx614cjlLmXzHpxSeidSs/LgZaAQpq9aQ0KhEiFxg0gp8TPeB5Z37YOPUumvcJr1ArwL/8tAOx3ClwgRhccr2HOe10YtZbMEboCarTlzNHiGolo7RYIJjGuG2RBSeAg6SMZrtnn0OdKBwp3iUlOfkS98eirVtWUp+G5+SZggip3fS3k5Oj7OPr1qauva8Rizt02Shz30DN9ikFNqV2KuPg54nC27/DQsQ6gtycARRVY91VvchmOk0HxFiW/9kS2GQ== root@FlabFedora2",'person_id': 9, 'key_id':1, 'peer_id':None }] - def GetPersons(self, person_filter=None, return_fields=None): - #print>>sys.stderr, " \r\n GetPersons person_filter %s return_fields %s list: %s" %(person_filter,return_fields, self.person_list) - if not self.person_list : - print>>sys.stderr, " \r\n ========>GetPersons NO PERSON LIST DAMMIT<========== \r\n" + #def GetPersons(self, person_filter=None, return_fields=None): + ##print>>sys.stderr, " \r\n GetPersons person_filter %s return_fields %s list: %s" %(person_filter,return_fields, self.person_list) + #if not self.person_list : + #print>>sys.stderr, " \r\n ========>GetPersons NO PERSON LIST DAMMIT<========== \r\n" - if not (person_filter or return_fields): - return self.person_list + #if not (person_filter or return_fields): + #return self.person_list - return_person_list= [] - return_person_list = parse_filter(self.person_list,person_filter ,'persons', return_fields) - return return_person_list + #return_person_list= [] + #return_person_list = parse_filter(self.person_list,person_filter ,'persons', return_fields) + #return return_person_list def GetPIs(self,site_id): @@ -127,13 +127,7 @@ class SenslabImportUsers: #print>>sys.stderr," \r\n End GetKeys with filter ", return_key_list #return return_key_list - def GetSlices( self,slice_filter=None, return_fields=None): - return_slice_list= [] - print>>sys.stderr, "\r\n\r\n\t =======================GetSlices " - if not (slice_filter or return_fields): - return self.slices_list - return_slice_list= parse_filter(self.slices_list, slice_filter,'slice', return_fields) - return return_slice_list + def AddSlice(self, slice_fields):