Ticket #1015: sfa-2.0-9-patch-4.2.diff
File sfa-2.0-9-patch-4.2.diff, 3.8 KB (added by , 11 years ago) |
---|
-
/usr/lib/python2.6/site-packages/sfa/managers/
old new class AggregateManagerMax (AggregateMana 350 350 #TODO: create real CreateSliver response rspec 351 351 ret = self.create_slice(api, slice_xrn, creds, rspec_string, users) 352 352 if ret: 353 return self.get_rspec(api, creds, slice_xrn) 353 # wait some time for circuit ID to show up in query 354 time.sleep(30) 355 ret = self.get_rspec(api, creds, slice_xrn) 356 gri = self.get_xml_by_tag(ret, 'globalId') 357 rest_of_ret = ret 358 while gri: 359 tokens = gri.split('<') 360 gri = tokens[1].split('>')[1] 361 creatorUrn = Credential(string=creds[0]).gidCaller.get_urn() 362 creatorEmail = Credential(string=creds[0]).gidCaller.get_email() 363 sliceEmail = Credential(string=creds[0]).gidObject.get_email() 364 logger.info("NOCReport{CreateSliver: CircuitID='%s',SliceURN='%s',CreatorUrn='%s',CreatorEmail='%s',SliceEmail='%s'}" % (gri, slice_xrn, creatorUrn, creatorEmail, sliceEmail)) 365 rest_of_ret = rest_of_ret[rest_of_ret.find('<globalId>'+gri)+(10+len(gri)):] 366 gri = self.get_xml_by_tag(rest_of_ret, 'globalId') 367 return ret 354 368 else: 355 369 return "<?xml version=\"1.0\" ?> <rspec type=\"manifest\"> Error! </rspec>" 356 -- /usr/lib/python2.6/site-packages/sfa/trust/gid_old.py 2013-01-30 11:41:11.992754886 -0500370 ++ /usr/lib/python2.6/site-packages/sfa/trust/gid.py 2013-04-16 14:06:56.687159553 -0400 … … class GID(Certificate): 69 69 uuid = None 70 70 hrn = None 71 71 urn = None 72 email = None # for adding to the SubjectAltName 72 73 73 74 ## 74 75 # Create a new GID object … … class GID(Certificate): 121 122 self.decode() 122 123 return self.urn 123 124 125 # Will be stuffed into subjectAltName 126 def set_email(self, email): 127 self.email = email 128 129 def get_email(self): 130 if not self.email: 131 self.decode() 132 return self.email 133 124 134 def get_type(self): 125 135 if not self.urn: 126 136 self.decode() … … class GID(Certificate): 143 153 if self.uuid: 144 154 str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn 145 155 156 if self.email: 157 str += ", " + "email:" + self.email 158 146 159 self.set_data(str, 'subjectAltName') 147 160 148 161 … … class GID(Certificate): 166 179 dict['uuid'] = uuid.UUID(val[4:]).int 167 180 elif val.lower().startswith('uri:urn:publicid:idn+'): 168 181 dict['urn'] = val[4:] 182 elif val.lower().startswith('email:'): 183 # FIXME: Ensure there isn't cruft in that address... 184 # EG look for email:copy,.... 185 dict['email'] = val[6:] 169 186 170 187 self.uuid = dict.get("uuid", None) 171 188 self.urn = dict.get("urn", None) 172 self.hrn = dict.get("hrn", None) 189 self.hrn = dict.get("hrn", None) 190 self.email = dict.get("email", None) 173 191 if self.urn: 174 192 self.hrn = urn_to_hrn(self.urn)[0] 175 193 … … class GID(Certificate): 187 205 result += " "*indent + "hrn:" + str(self.get_hrn()) +"\n" 188 206 result += " "*indent + "urn:" + str(self.get_urn()) +"\n" 189 207 result += " "*indent + "uuid:" + str(self.get_uuid()) + "\n" 208 if self.get_email() is not None: 209 result += " "*indent + "email:" + str(self.get_email()) + "\n" 190 210 filename=self.get_filename() 191 211 if filename: result += "Filename %s\n"%filename 192 212