Request recipe: Better error reporting

parent e66a813b
...@@ -36,6 +36,7 @@ class Recipe(object): ...@@ -36,6 +36,7 @@ class Recipe(object):
slap = slapmodule.slap() slap = slapmodule.slap()
self.software_release_url = options['software-url'] self.software_release_url = options['software-url']
self.name = options['name']
slap.initializeConnection(options['server-url'], slap.initializeConnection(options['server-url'],
options.get('key-file'), options.get('key-file'),
...@@ -73,7 +74,7 @@ class Recipe(object): ...@@ -73,7 +74,7 @@ class Recipe(object):
options['config-%s' % config_parameter] options['config-%s' % config_parameter]
self.instance = self.request(options['software-url'], software_type, self.instance = self.request(options['software-url'], software_type,
options['name'], partition_parameter_kw=partition_parameter_kw, self.name, partition_parameter_kw=partition_parameter_kw,
filter_kw=filter_kw, shared=self.isSlave) filter_kw=filter_kw, shared=self.isSlave)
self.failed = None self.failed = None
...@@ -93,12 +94,11 @@ class Recipe(object): ...@@ -93,12 +94,11 @@ class Recipe(object):
status = self.instance.getState() status = self.instance.getState()
except slapmodule.NotFoundError: except slapmodule.NotFoundError:
status = "not ready yet, please try again" status = "not ready yet, please try again"
# XXX-Cedric : currently raise an error. So swallow it...
except AttributeError: except AttributeError:
status = "unknown" status = "unknown"
self.logger.error("Connection parameter %s not found. " raise KeyError("Connection parameter %s not found when requesting "
"Status of requested instance is : %s." % (self.failed, status)) "instance named %s. Status of instance is: %s." % (self.failed,
raise KeyError("Connection parameter %s not found. " % self.failed) self.name, status))
return [] return []
update = install update = install
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment