url += "node_id=%d"%tools.node_id()
else:
logger.log('%s -- WARNING, cannot add node_id to request'%dest)
- # pass slicefamily as well, as stored in /etc/planetlab/slicefamily on the node
- if tools.slicefamily():
- if url.find('?') >0: url += '&'
- else: url += '?'
- url += "slicefamily=%s"%tools.slicefamily()
try:
logger.verbose("retrieving URL=%s"%url)
contents = curlwrapper.retrieve(url, self.config.cacert)
if vref is None:
logger.log("creating %s : no vref attached, this is unexpected"%name)
vref='default'
- # used to look in /etc/planetlab/family, now relies on the 'family' extra attribute in GetSlivers()
+ # used to look in /etc/planetlab/family,
+ # now relies on the 'GetSliceFamily' extra attribute in GetSlivers()
# which for legacy is still exposed here as the 'vref' key
# check the template exists -- there's probably a better way..
if not os.path.isdir ("/vservers/.vref/%s"%vref):
- # find a resonable default
- if os.path.isfile ("/etc/planetlab/slicefamily"):
- default=file("/etc/planetlab/slicefamily").read().strip()
- else:
- default='default'
- logger.log("creating %s : /etc/planetlab/slicefamily not found, this is unexpected"%name)
- logger.log("creating %s - vref %s not found, using default %s"%(name,vref,default))
- vref=default
+ logger.log ("%s: ERROR Could not create sliver - vreference image %s not found"%(name,vref))
+ return
# guess arch
try:
_node_id=""
return _node_id
-# get slicefamily from /etc/planetlab/slicefamily and cache it
-# http://svn.planet-lab.org/wiki/SliceFamily
-_slicefamily=None
-def slicefamily():
- global _slicefamily
- if _slicefamily is None:
- try:
- _slicefamily=file("/etc/planetlab/slicefamily").read().strip()
- except:
- _slicefamily=""
- return _slicefamily
-
_root_context_arch=None
def root_context_arch():
global _root_context_arch