Changeset 4e9719b for fedd/federation

Timestamp:

Mar 9, 2010 2:44:44 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

86a7bb8

Parents:

9b3627e

Message:

SEER stuff

Location:

fedd/federation

Files:

• emulab_access.py (modified) (4 diffs)
• proxy_protogeni_segment.py (modified) (4 diffs)

fedd/federation/emulab_access.py

@@ -1009 +1009 @@
             myname = e.name[0]
             type = e.get_attribute('portal_type')
+            testbed = e.get_attribute('testbed')
 
             info = conninfo_to_dict(myname, connInfo)
@@ -1042 +1043 @@
                 if tunnelconfig:
                     print >>f, "tunnelip: %s" % tunnelconfig
-                # XXX: send this an fedattr
-                #print >>f, "seercontrol: control.%s.%s%s" % \
-                        #(meid.lower(), mproj.lower(), mdomain)
                 print >>f, "peer: %s" % peer.lower()
                 print >>f, "ssh_pubkey: /proj/%s/exp/%s/tmp/%s" % \
@@ -1055 +1053 @@
                         "Can't write protal config %s: %s" % (cfn, e))
             
-            # XXX: This little seer config file needs to go away.
-            #if not seer_out:
-                #try:
-                    #seerfn = "%s/seer.conf" % tmpdir
-                    #f = open(seerfn, "w")
-                    #if not master:
-                        #print >>f, "ControlNode: control.%s.%s%s" % \
-                            #(meid.lower(), mproj.lower(), mdomain)
-                    #print >>f, "ExperimentID: %s" % mexp
-                    #f.close()
-                #except IOError, e:
-                    #raise service_error(service_error.internal, 
-                            #"Can't write seer.conf: %s" %e)
-                #seer_out = True
-
             if not client_out and type in ('control', 'both'):
                 try:
@@ -1080 +1063 @@
                                 s.get('visibility','') == 'import':
                             client_service_out[s['name']](f, s)
-                    # Seer uses this?
+                    # Seer uses this.
                     print >>f, "ExperimentID: %s/%s" % (mproj, meid)
+                    # Better way...
+                    if testbed == master:
+                        print >>f, "SEERBase: True"
                     f.close()
                 except IOError, e:

fedd/federation/proxy_protogeni_segment.py

@@ -216 +216 @@
             myname = e.name[0]
             type = e.get_attribute('portal_type')
+            testbed = e.get_attribute('testbed')
 
             info = conninfo_to_dict(myname, connInfo)
@@ -251 +252 @@
                 if tunnelconfig:
                     print >>f, "tunnelip: %s" % tunnelconfig
-                # XXX: send this an fedattr
-                #print >>f, "seercontrol: control.%s.%s%s" % \
-                        #(meid.lower(), mproj.lower(), mdomain)
                 print >>f, "peer: %s" % peer.lower()
                 print >>f, "ssh_pubkey: /usr/local/federation/etc/%s" % \
@@ -263 +261 @@
                 raise service_error(service_error.internal,
                         "Can't write protal config %s: %s" % (cfn, e))
-            
-            # XXX: This little seer config file needs to go away.
-            #if not seer_out:
-                #try:
-                    #seerfn = "%s/seer.conf" % tmpdir
-                    #f = open(seerfn, "w")
-                    #if not master:
-                        #print >>f, "ControlNode: control.%s.%s%s" % \
-                            #(meid.lower(), mproj.lower(), mdomain)
-                    #print >>f, "ExperimentID: %s" % mexp
-                    #f.close()
-                #except IOError, e:
-                    #raise service_error(service_error.internal, 
-                            #"Can't write seer.conf: %s" %e)
-                #seer_out = True
 
             if not client_out and type in ('control', 'both'):
@@ -290 +273 @@
                     # dir.
                     print >>f, "ExperimentID: %s/%s" % (mproj, meid)
+                    if testbed == master:
+                        print >>f, "SEERBase: True"
                     f.close()
                 except IOError, e: