Changeset c7141dc for fedd/federation/emulab_segment.py

Timestamp:

Jan 9, 2012 4:52:54 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

d2e86f6

Parents:

06c1dba

Message:

Single access works

File:

• fedd/federation/emulab_segment.py (modified) (6 diffs)

fedd/federation/emulab_segment.py

@@ -18 +18 @@
 class start_segment(ssh_emulab_segment, xmlrpc_emulab_segment):
     def __init__(self, log=None, keyfile=None, debug=False, boss=None,
-            cert=None):
+            ops=None, cert=None):
         ssh_emulab_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
-        xmlrpc_emulab_segment.__init__(self, boss=boss, cert=cert)
+        xmlrpc_emulab_segment.__init__(self, boss=boss, ops=ops, cert=cert)
 
     def set_up_experiment_filespace(self, user, host, pid, eid, tmpdir):
@@ -100 +100 @@
             return False
 
-        if not self.set_up_experiment_filespace(pid, eid, tmpdir):
+        if not self.set_up_experiment_filespace(user, self.ops, 
+                pid, eid, tmpdir):
             return False
 
@@ -122 +123 @@
         return True
 
-class stop_segment(local_segment, emulab_segment):
+class stop_segment(ssh_emulab_segment, xmlrpc_emulab_segment):
     def __init__(self, log=None, keyfile=None, debug=False, boss=None, 
-            cert=None):
-        local_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
-        emulab_segment.__init__(self, boss=boss, cert=cert)
+            ops=None, cert=None):
+        ssh_emulab_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
+        xmlrpc_emulab_segment.__init__(self, boss=boss, ops=ops, cert=cert)
 
     def __call__(self, parent, user, pid, eid, gid=None, terminate=False):
@@ -137 +138 @@
         try:
             # Clean out tar files: we've gone over quota in the past
-            self.ssh_cmd("rm -rf /proj/%s/software/%s" % (pid, eid))
+            self.ssh_cmd(user, self.ops, 
+                    "rm -rf /proj/%s/software/%s" % (pid, eid))
             rv = self.swap_exp(pid, eid, 'out')
             if terminate:
@@ -145 +147 @@
         return rv
 
-class info_segment(local_segment, emulab_segment):
+class info_segment(ssh_emulab_segment, xmlrpc_emulab_segment):
     def __init__(self, log=None, keyfile=None, debug=False, boss=None, 
-            cert=None):
-        local_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
-        emulab_segment.__init__(self, boss=boss, cert=cert)
+            ops=None, cert=None):
+        ssh_emulab_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
+        xmlrpc_emulab_segment.__init__(self, boss=boss, ops=ops, cert=cert)
 
     def __call__(self, parent, user, pid, eid):
@@ -156 +158 @@
         return True
 
-class operation_segment(local_segment, emulab_segment):
+class operation_segment(ssh_emulab_segment, xmlrpc_emulab_segment):
     def __init__(self, log=None, keyfile=None, debug=False, boss=None, 
-            cert=None):
-        local_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
-        emulab_segment.__init__(self, boss=boss, cert=cert)
+            ops=None, cert=None):
+        ssh_emulab_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
+        xmlrpc_emulab_segment.__init__(self, boss=boss, ops=ops, cert=cert)
 
     def __call__(self, parent, op, targets, param, top):