import os
+import pickle
import sys
import time
output = self.process.readAllStandardOutput()
self.output = self.output + output
if config.debug:
- print output
+ try:
+ print output
+ except IOError, e:
+ if (e.errno == 4):
+ # XXX why is this happening??
+ print "*** caught EINTR"
+ else:
+ raise
+
def processStandardError(self):
print self.process.readAllStandardError()
def getAuthorityRecord(self):
self.getRecord(config.getAuthority(), config.getAuthorityRecordFile())
- def applyRSpec(self, rspec):
+ def applyRSpec(self, rspec, aggAddr=None, aggPort=None, saveObtained=True):
# that's what we pass, like in what we'd like to get
requested = config.getSliceRSpecFile() + "_new"
# that's what we actually receive
obtained = config.getSliceRSpecFile()
rspec.save(requested)
args = ["-u", config.getUser(), "-a", config.getAuthority(),
- "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create",
- "-o", obtained,
- config.getSlice(), requested]
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create"]
+
+ if saveObtained:
+ args = args + ["-o", obtained]
+
+ if aggAddr:
+ args = args + ["-a", aggAddr, "-p", str(aggPort)]
+
+ args = args + [config.getSlice(), requested]
+
+ self.__init_command(args)
+ self.start()
+
+ def deleteSlivers(self, slice=None, aggAddr=None, aggPort=None):
+ if not slice:
+ slice = config.getSlice()
+
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "delete"]
+
+ if aggAddr:
+ args = args + ["-a", aggAddr, "-p", str(aggPort)]
+
+ args = args + [slice]
+
self.__init_command(args)
self.start()
self.__init_command(args)
self.start()
- def renewSlivers(self, expiration):
+ def removeRecord(self, hrn):
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "remove", hrn]
+ self.__init_command(args)
+ self.start()
+
+ def renewSlivers(self, expiration, slice=None):
+ if not slice:
+ slice = config.getSlice()
+
args = ["-u", config.getUser(), "-a", config.getAuthority(),
"-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew",
- config.getSlice(), expiration]
+ slice, expiration]
+ self.__init_command(args)
+ self.start()
+
+ def sliverStatus(self, slice=None, filename=None):
+ if not slice:
+ slice = config.getSlice()
+
+ if not filename:
+ filename = config.fullpath(slice+".sliverstatus")
+
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "status",
+ "-o", filename, "-F", "pickled", slice]
+ self.__init_command(args)
+ self.start()
+
+ def getSliceMgrVersion(self, filename=None):
+ if not filename:
+ filename = config.fullpath("slicemgr.version")
+
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "version",
+ "-o", filename, "-F", "pickled",]
self.__init_command(args)
self.start()