Follow conventions.

79937f1a · Cédric de Saint Martin · 3751597e · 79937f1a
Commit 79937f1a authored Mar 05, 2013 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

slapos/recipe/request.py slapos/recipe/request.py +2 -1

No files found.
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -127,7 +127,8 @@ class Recipe(object):
      return_parameter_dict = self._getReturnParameterDict(self.instance,
          return_parameters)
      if not slave:
-        # XXX: convention: should be instance-guid
+        options['instance-guid'] = self.instance.getInstanceGuid()
+        # XXX: deprecated, to be removed
        options['instance_guid'] = self.instance.getInstanceGuid()
    except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
      self._raise_request_exception = exc