Merge branch 'master' into senslab2
Sandrine Avakian [Wed, 29 Feb 2012 12:33:11 +0000 (13:33 +0100)]
Conflicts:
sfa/server/sfa-start.py

1  2 
setup.py
sfa/client/sfi.py
sfa/methods/CreateSliver.py
sfa/server/sfa-start.py
sfa/trust/credential.py
sfa/util/sfatablesRuntime.py
sfa/util/xrn.py

diff --cc setup.py
Simple merge
@@@ -905,10 -905,9 +905,10 @@@ or with an slice hrn, shows currently p
                  rspec.filter({'component_manager_id': server_version['urn']})
                  rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request')
              else:
 +                print >>sys.stderr, "\r\n \r\n \r\n WOOOOOO"
                  users = sfa_users_arg(user_records, slice_record)
-         
-         # do not append users, keys, or slice tags. Anything 
+         # do not append users, keys, or slice tags. Anything
          # not contained in this request will be removed from the slice
  
          # CreateSliver has supported the options argument for a while now so it should
Simple merge
@@@ -103,25 -99,17 +102,16 @@@ def install_peer_certs(server_key_file
              if 'sfa' not in server_version:
                  logger.info("get_trusted_certs: skipping non sfa aggregate: %s" % new_hrn)
                  continue
 -      
              trusted_gids = ReturnValue.get_value(interface.get_trusted_certs())
-             #trusted_gids = interface.get_trusted_certs()
-             print>>sys.stderr, " \r\n \r\n \t=============================================== install_peer_certs  TRUSTED_GIDS %s   " %(trusted_gids)
              if trusted_gids:
-                  #and not isinstance(trusted_gids,list):
                  # the gid we want should be the first one in the list,
                  # but lets make sure
                      # default message
                      message = "interface: %s\t" % (api.interface)
                      message += "unable to install trusted gid for %s" % \
-                                (new_hrn) 
-                     print>>sys.stderr, " \r\n \r\n \t=============================================== install_peer_certs   message %s   " %(message)
-                     #gid = GID(string=trusted_gids[0])
+                                (new_hrn)
                      gid = GID(string=trusted_gid)
 +                    print>>sys.stderr, " \r\n \r\n \t=============================================== install_peer_certs   gid %s   " %(gid)
                      peer_gids.append(gid)
                      if gid.get_hrn() == new_hrn:
                          gid_filename = os.path.join(trusted_certs_dir, '%s.gid' % new_hrn)
Simple merge
Simple merge
diff --cc sfa/util/xrn.py
Simple merge