request.py: Properly fetch instance_guid of instance

058a8628 · Cédric de Saint Martin · 327ea35e · 058a8628
Commit 058a8628 authored Feb 18, 2013 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

No files found.
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -135,8 +135,9 @@ class Recipe(object):
      self.instance = request(software_url, software_type,
          name, partition_parameter_kw=partition_parameter_kw,
          filter_kw=filter_kw, shared=isSlave)
-      # XXX what is the right way to get a global id?
+      if not isSlave:
-      options['instance_guid'] = self.instance.getId()
+        # XXX: convention: should be instance-guid
+        options['instance_guid'] = self.instance.getInstanceGuid()
    except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
      self._raise_request_exception = exc
      self._raise_request_exception_formatted = traceback.format_exc()