prettyfied - spaces

diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index 7f1732a..5d7fe9d 100644 (file)
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -47,7 +47,7 @@ class PlImporter:
 
     def __init__ (self, auth_hierarchy, logger):
         self.auth_hierarchy = auth_hierarchy
 
     def __init__ (self, auth_hierarchy, logger):
         self.auth_hierarchy = auth_hierarchy

-        self.logger=logger
+        self.logger = logger

 
     def add_options (self, parser):
         # we don't have any options for now
 
     def add_options (self, parser):
         # we don't have any options for now


@@ -141,7 +141,8 @@ class PlImporter:
                      if record.pointer != -1] )
 
         # initialize record.stale to True by default, then mark stale=False on the ones that are in use
                      if record.pointer != -1] )
 
         # initialize record.stale to True by default, then mark stale=False on the ones that are in use

-        for record in all_records: record.stale=True
+        for record in all_records:
+            record.stale = True

 
         ######## retrieve PLC data
         # Get all plc sites
 
         ######## retrieve PLC data
         # Get all plc sites


@@ -235,7 +236,7 @@ class PlImporter:
                 # xxx update the record ...
                 site_record.name = site['name']
                 pass
                 # xxx update the record ...
                 site_record.name = site['name']
                 pass

-            site_record.stale=False
+            site_record.stale = False

              
             # import node records
             for node_id in site['node_ids']:
              
             # import node records
             for node_id in site['node_ids']:


@@ -270,15 +271,15 @@ class PlImporter:
                 else:
                     # xxx update the record ...
                     pass
                 else:
                     # xxx update the record ...
                     pass

-                node_record.stale=False
+                node_record.stale = False

 
 

-            site_pis=[]
+            site_pis = []

             # import persons
             for person_id in site['person_ids']:
             # import persons
             for person_id in site['person_ids']:

-                proceed=False
+                proceed = False

                 if person_id in persons_by_id:
                 if person_id in persons_by_id:

-                    person=persons_by_id[person_id]
-                    proceed=True
+                    person = persons_by_id[person_id]
+                    proceed = True

                 elif person_id in disabled_person_ids:
                     pass
                 else:
                 elif person_id in disabled_person_ids:
                     pass
                 else:


@@ -301,7 +302,7 @@ class PlImporter:
 
                 # return a tuple pubkey (a plc key object) and pkey (a Keypair object)
                 def init_person_key (person, plc_keys):
 
                 # return a tuple pubkey (a plc key object) and pkey (a Keypair object)
                 def init_person_key (person, plc_keys):

-                    pubkey=None
+                    pubkey = None

                     if  person['key_ids']:
                         # randomly pick first key in set
                         pubkey = plc_keys[0]
                     if  person['key_ids']:
                         # randomly pick first key in set
                         pubkey = plc_keys[0]


@@ -323,7 +324,8 @@ class PlImporter:
                     plc_keys = keys_by_person_id.get(person['person_id'],[])
                     if not user_record:
                         (pubkey, pkey) = init_person_key (person, plc_keys )
                     plc_keys = keys_by_person_id.get(person['person_id'],[])
                     if not user_record:
                         (pubkey, pkey) = init_person_key (person, plc_keys )

-                        person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey, email=person['email'])
+                        person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey,
+                                                                    email=person['email'])

                         user_record = RegUser (hrn=person_hrn, gid=person_gid, 
                                                pointer=person['person_id'], 
                                                authority=get_authority(person_hrn),
                         user_record = RegUser (hrn=person_hrn, gid=person_gid, 
                                                pointer=person['person_id'], 
                                                authority=get_authority(person_hrn),


@@ -359,13 +361,13 @@ class PlImporter:
                         sfa_keys = user_record.reg_keys
                         def sfa_key_in_list (sfa_key,plc_keys):
                             for plc_key in plc_keys:
                         sfa_keys = user_record.reg_keys
                         def sfa_key_in_list (sfa_key,plc_keys):
                             for plc_key in plc_keys:

-                                if plc_key['key']==sfa_key.key:
+                                if plc_key['key'] == sfa_key.key:

                                     return True
                             return False
                         # are all the SFA keys known to PLC ?
                                     return True
                             return False
                         # are all the SFA keys known to PLC ?

-                        new_keys=False
+                        new_keys = False

                         if not sfa_keys and plc_keys:
                         if not sfa_keys and plc_keys:

-                            new_keys=True
+                            new_keys = True

                         else: 
                             for sfa_key in sfa_keys:
                                  if not sfa_key_in_list (sfa_key,plc_keys):
                         else: 
                             for sfa_key in sfa_keys:
                                  if not sfa_key_in_list (sfa_key,plc_keys):


@@ -375,18 +377,18 @@ class PlImporter:
                             person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
                             person_gid.set_email(person['email'])
                             if not pubkey:
                             person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
                             person_gid.set_email(person['email'])
                             if not pubkey:

-                                user_record.reg_keys=[]
+                                user_record.reg_keys = []

                             else:
                             else:

-                                user_record.reg_keys=[ RegKey (pubkey['key'], pubkey['key_id'])]
+                                user_record.reg_keys = [ RegKey (pubkey['key'], pubkey['key_id'])]

                             user_record.gid = person_gid
                             user_record.just_updated()
                             self.logger.info("PlImporter: updated person: {}".format(user_record))
                     user_record.email = person['email']
                     global_dbsession.commit()
                             user_record.gid = person_gid
                             user_record.just_updated()
                             self.logger.info("PlImporter: updated person: {}".format(user_record))
                     user_record.email = person['email']
                     global_dbsession.commit()

-                    user_record.stale=False
+                    user_record.stale = False

                     # accumulate PIs - PLCAPI has a limitation that when someone has PI role
                     # this is valid for all sites she is in..
                     # accumulate PIs - PLCAPI has a limitation that when someone has PI role
                     # this is valid for all sites she is in..

-                    # PI is coded with role_id==20
+                    # PI is coded with role_id == 20

                     if 20 in person['role_ids']:
                         site_pis.append (user_record)
 
                     if 20 in person['role_ids']:
                         site_pis.append (user_record)
 


@@ -449,7 +451,7 @@ class PlImporter:
                 slice_record.reg_researchers = \
                     [ self.locate_by_type_pointer ('user',user_id) for user_id in slice['person_ids'] ]
                 global_dbsession.commit()
                 slice_record.reg_researchers = \
                     [ self.locate_by_type_pointer ('user',user_id) for user_id in slice['person_ids'] ]
                 global_dbsession.commit()

-                slice_record.stale=False
+                slice_record.stale = False

 
         # Set PL Admins as PI's of the top authority
         if admins:
 
         # Set PL Admins as PI's of the top authority
         if admins:


@@ -463,17 +465,17 @@ class PlImporter:
         system_hrns = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
         for record in all_records: 
             if record.hrn in system_hrns: 
         system_hrns = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
         for record in all_records: 
             if record.hrn in system_hrns: 

-                record.stale=False
+                record.stale = False

             if record.peer_authority:
             if record.peer_authority:

-                record.stale=False
+                record.stale = False

             if ".vini" in interface_hrn and interface_hrn.endswith('vini') and \
                 record.hrn.endswith("internet2"):
             if ".vini" in interface_hrn and interface_hrn.endswith('vini') and \
                 record.hrn.endswith("internet2"):

-                record.stale=False
+                record.stale = False

 
         for record in all_records:
 
         for record in all_records:

-            try:        stale=record.stale
+            try:        stale = record.stale

             except:     
             except:     

-                stale=True
+                stale = True

                 self.logger.warning("stale not found with {}".format(record))
             if stale:
                 self.logger.info("PlImporter: deleting stale record: {}".format(record))
                 self.logger.warning("stale not found with {}".format(record))
             if stale:
                 self.logger.info("PlImporter: deleting stale record: {}".format(record))

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 5a1abe1..8473ee4 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -121,14 +121,14 @@ class PlDriver (Driver):
             if not sites:
                 # xxx when a site gets registered through SFA we need to set its max_slices
                 if 'max_slices' not in pl_record:
             if not sites:
                 # xxx when a site gets registered through SFA we need to set its max_slices
                 if 'max_slices' not in pl_record:

-                    pl_record['max_slices']=2
+                    pl_record['max_slices'] = 2

                 pointer = self.shell.AddSite(pl_record)
                 self.shell.SetSiteHrn(int(pointer), hrn)
             else:
                 pointer = sites[0]['site_id']
 
         elif type == 'slice':
                 pointer = self.shell.AddSite(pl_record)
                 self.shell.SetSiteHrn(int(pointer), hrn)
             else:
                 pointer = sites[0]['site_id']
 
         elif type == 'slice':

-            acceptable_fields=['url', 'instantiation', 'name', 'description']
+            acceptable_fields = ['url', 'instantiation', 'name', 'description']

             for key in pl_record.keys():
                 if key not in acceptable_fields:
                     pl_record.pop(key)
             for key in pl_record.keys():
                 if key not in acceptable_fields:
                     pl_record.pop(key)


@@ -147,7 +147,8 @@ class PlDriver (Driver):
             persons = self.shell.GetPersons({'peer_id': None, 'email': sfa_record['email']})
             if not persons:
                 for key in ['first_name','last_name']:
             persons = self.shell.GetPersons({'peer_id': None, 'email': sfa_record['email']})
             if not persons:
                 for key in ['first_name','last_name']:

-                    if key not in sfa_record: sfa_record[key]='*from*sfa*'
+                    if key not in sfa_record:
+                        sfa_record[key] = '*from*sfa*'

                 # AddPerson does not allow everything to be set
                 can_add = ['first_name', 'last_name', 'title','email', 'password', 'phone', 'url', 'bio']
                 add_person_dict = { k : sfa_record[k] for k in sfa_record if k in can_add }
                 # AddPerson does not allow everything to be set
                 can_add = ['first_name', 'last_name', 'title','email', 'password', 'phone', 'url', 'bio']
                 add_person_dict = { k : sfa_record[k] for k in sfa_record if k in can_add }


@@ -163,13 +164,13 @@ class PlDriver (Driver):
             self.shell.AddPersonToSite(pointer, login_base)
     
             # What roles should this user have?
             self.shell.AddPersonToSite(pointer, login_base)
     
             # What roles should this user have?

-            roles=[]
+            roles = []

             if 'roles' in sfa_record: 
                 # if specified in xml, but only low-level roles
                 roles = [ role for role in sfa_record['roles'] if role in ['user','tech'] ]
             # at least user if no other cluse could be found
             if not roles:
             if 'roles' in sfa_record: 
                 # if specified in xml, but only low-level roles
                 roles = [ role for role in sfa_record['roles'] if role in ['user','tech'] ]
             # at least user if no other cluse could be found
             if not roles:

-                roles=['user']
+                roles = ['user']

             for role in roles:
                 self.shell.AddRoleToPerson(role, pointer)
             # Add the user's key
             for role in roles:
                 self.shell.AddRoleToPerson(role, pointer)
             # Add the user's key


@@ -204,7 +205,7 @@ class PlDriver (Driver):
             self.shell.SetSiteHrn(pointer, hrn)
     
         elif type == "slice":
             self.shell.SetSiteHrn(pointer, hrn)
     
         elif type == "slice":

-            pl_record=self.sfa_fields_to_pl_fields(type, hrn, new_sfa_record)
+            pl_record = self.sfa_fields_to_pl_fields(type, hrn, new_sfa_record)

             if 'name' in pl_record:
                 pl_record.pop('name')
                 self.shell.UpdateSlice(pointer, pl_record)
             if 'name' in pl_record:
                 pl_record.pop('name')
                 self.shell.UpdateSlice(pointer, pl_record)


@@ -252,8 +253,8 @@ class PlDriver (Driver):
 
     ##########
     def remove (self, sfa_record):
 
     ##########
     def remove (self, sfa_record):

-        type=sfa_record['type']
-        pointer=sfa_record['pointer']
+        type = sfa_record['type']
+        pointer = sfa_record['pointer']

         if type == 'user':
             persons = self.shell.GetPersons({'peer_id': None, 'person_id': pointer})
             # only delete this person if he has site ids. if he doesnt, it probably means
         if type == 'user':
             persons = self.shell.GetPersons({'peer_id': None, 'person_id': pointer})
             # only delete this person if he has site ids. if he doesnt, it probably means


@@ -285,7 +286,7 @@ class PlDriver (Driver):
         if type == "slice":
             pl_record["name"] = hrn_to_pl_slicename(hrn)
             if "instantiation" in sfa_record:
         if type == "slice":
             pl_record["name"] = hrn_to_pl_slicename(hrn)
             if "instantiation" in sfa_record:

-                pl_record['instantiation']=sfa_record['instantiation']
+                pl_record['instantiation'] = sfa_record['instantiation']

             else:
                 pl_record["instantiation"] = "plc-instantiated"
            if "url" in sfa_record:
             else:
                 pl_record["instantiation"] = "plc-instantiated"
            if "url" in sfa_record:


@@ -592,8 +593,8 @@ class PlDriver (Driver):
     # plcapi works by changes, compute what needs to be added/deleted
     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
     # plcapi works by changes, compute what needs to be added/deleted
     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]
+        if subject_type == 'slice' and target_type == 'user' and relation_name == 'researcher':
+            subject = self.shell.GetSlices (subject_id)[0]

             current_target_ids = subject['person_ids']
             add_target_ids = list ( set (target_ids).difference(current_target_ids))
             del_target_ids = list ( set (current_target_ids).difference(target_ids))
             current_target_ids = subject['person_ids']
             add_target_ids = list ( set (target_ids).difference(current_target_ids))
             del_target_ids = list ( set (current_target_ids).difference(target_ids))


@@ -725,7 +726,7 @@ class PlDriver (Driver):
             persons = slices.verify_persons(slice['hrn'], slice, users, sfa_peer, options=options)
             # update sliver allocation states and set them to geni_provisioned
             sliver_ids = [sliver['sliver_id'] for sliver in slivers]
             persons = slices.verify_persons(slice['hrn'], slice, users, sfa_peer, options=options)
             # update sliver allocation states and set them to geni_provisioned
             sliver_ids = [sliver['sliver_id'] for sliver in slivers]

-            dbsession=self.api.dbsession()
+            dbsession = self.api.dbsession()

             SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession)
 
         version_manager = VersionManager()
             SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession)
 
         version_manager = VersionManager()

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index f1e88bc..68681ca 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -448,7 +448,7 @@ class PlSlices:
         except:
             logger.log_exc("caught during first attempt at AddPerson")
             # and if that fails we start again with the email based on the hrn, which this time is unique..
         except:
             logger.log_exc("caught during first attempt at AddPerson")
             # and if that fails we start again with the email based on the hrn, which this time is unique..

-            person_record['email']=default_email
+            person_record['email'] = default_email

             logger.debug ("second chance with email={}".format(person_record['email']))
             person_id = int (self.driver.shell.AddPerson(person_record))
         self.driver.shell.AddRoleToPerson('user', person_id)
             logger.debug ("second chance with email={}".format(person_record['email']))
             person_id = int (self.driver.shell.AddPerson(person_record))
         self.driver.shell.AddRoleToPerson('user', person_id)


@@ -609,7 +609,7 @@ class PlSlices:
                 for existing_attribute in existing_slice_tags:
                     if requested_attribute['name'] == existing_attribute['tagname'] and \
                        requested_attribute['value'] == existing_attribute['value']:
                 for existing_attribute in existing_slice_tags:
                     if requested_attribute['name'] == existing_attribute['tagname'] and \
                        requested_attribute['value'] == existing_attribute['value']:

-                        tag_found=True
+                        tag_found = True

                         break
                 if not tag_found:
                     slice_attributes_to_add.append(requested_attribute)
                         break
                 if not tag_found:
                     slice_attributes_to_add.append(requested_attribute)