Changeset 9d40cc9 for fedd/federation
- Timestamp:
- Aug 26, 2012 1:04:57 PM (12 years ago)
- Branches:
- master
- Children:
- 2f45140
- Parents:
- d070d9f (diff), eb117fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- fedd/federation
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/federation/emulab_access.py
rd070d9f r9d40cc9 1052 1052 raise service_error(service_error.internal, 1053 1053 "Can't find experiment name for %s" % aid) 1054 1054 1055 stopper = self.stop_segment(keyfile=self.ssh_privkey_file, 1055 1056 debug=self.create_debug, boss=self.boss, ops=self.ops, … … 1058 1059 self.log.info("TerminateSegment succeeded for %s %s %s" % \ 1059 1060 (fid, proj, ename)) 1061 self.state_lock.acquire() 1062 # Remove the started flag/info - the segment is no longer started 1063 if aid in self.allocation: 1064 del self.allocation[aid]['started'] 1065 self.write_state() 1066 self.state_lock.release() 1060 1067 return { 'allocID': req['allocID'], 'proof': proof.to_dict() } 1061 1068 -
fedd/federation/emulab_segment.py
-
Property
mode
changed from
100644
to100755
rd070d9f r9d40cc9 30 30 # Configuration directories on the remote machine 31 31 proj_dir = "/proj/%s/exp/%s/tmp" % (pid, eid) 32 softdir = "/proj/%s/software/%s" % (pid, eid) 32 softdir_root = "/proj/%s/software/" % pid 33 softdir = "%s/%s" % (softdir_root, eid) 33 34 # Local software dir 34 35 lsoftdir = "%s/software" % tmpdir … … 46 47 47 48 # Script the filesystem changes 49 50 # Set umask to 007. Since we are operating 51 # within /proj, we want to permit all proj users 52 # read and write. This is especially necessary 53 # since creating directory hierarchy (mkdir -p). 54 print >>scriptfile, "umask 007" 48 55 print >>scriptfile, "/bin/rm -rf %s" % proj_dir 49 56 # Clear and create the software directory 50 57 print >>scriptfile, "/bin/rm -rf %s/*" % softdir 51 print >>scriptfile, 'mkdir -p %s' % proj_dir 58 print >>scriptfile, 'mkdir %s' % proj_dir 59 print >>scriptfile, 'chmod 0770 %s' % proj_dir 52 60 if os.path.isdir(lsoftdir): 53 print >>scriptfile, 'mkdir -p %s' % softdir 61 print >>scriptfile, 'mkdir %s' % softdir_root 62 print >>scriptfile, 'chmod 0770 %s' % softdir_root 63 print >>scriptfile, 'mkdir %s' % softdir 54 64 print >>scriptfile, 'chmod 0770 %s' % softdir 55 65 print >>scriptfile, "rm -f %s" % scriptbase -
Property
mode
changed from
-
fedd/federation/experiment_partition.py
rd070d9f r9d40cc9 453 453 new_portal = True 454 454 portal_type = "experiment" 455 myname = "%s tunnel%d" % (dname.lower(),455 myname = "%s%stunnel%d" % (sname.lower(), dname.lower(), 456 456 len(portals[st][dt])) 457 desthost = "%s tunnel%d" % (sname.lower(),458 len(portals[st][dt]))457 desthost = "%s%stunnel%d" % (dname.lower(), 458 sname.lower(), len(portals[st][dt])) 459 459 else: 460 460 new_i = topdl.Interface( … … 472 472 new_portal = True 473 473 portals[st][dt] = [ ] 474 myname = "%s tunnel%d" % (dname.lower(),474 myname = "%s%stunnel%d" % (sname.lower(), dname.lower(), 475 475 len(portals[st][dt])) 476 desthost = "%s tunnel%d" % (sname.lower(),476 desthost = "%s%stunnel%d" % (dname.lower(), sname.lower(), 477 477 len(portals[st][dt])) 478 478 … … 500 500 tsubstrate, segment_element = \ 501 501 self.new_portal_substrate(st, dt, eid, tbparams, expid) 502 myname = "%s tunnel" % dt503 desthost = "%s tunnel" % st502 myname = "%s%stunnel" % (st, dt) 503 desthost = "%s%stunnel" % (dt, st) 504 504 505 505 portal, info = self.new_portal_node(st, dt, tbparams, masters, … … 518 518 substrate, tbparams, expid, tb_name): 519 519 # Add to the master testbed 520 if testbed_suffix(dt): myname = "%stunnel" % "-".join(split_testbed(dt)) 521 else: myname = "%stunnel" % dt 520 if testbed_suffix(dt): myname = "%s%stunnel" % \ 521 ("-".join(split_testbed(dt)), st) 522 else: myname = "%s%stunnel" % (dt, st) 522 523 523 524 desthost = "%s" % ip_addr(dip)
Note: See TracChangeset
for help on using the changeset viewer.