Merge pull request cloudify-cosmo#4 from cloudify-cosmo/feature/CFY-900-containing-host-ip

Containing host ip

Author: dankilman

puppet_plugin/manager.py

@@ -12,7 +12,7 @@
 import urlparse
 
 import requests
-
+from cloudify.exceptions import NonRecoverableError
 
 PUPPET_CONF_TPL = """# This file was generated by Cloudify
 [main]
@@ -76,28 +76,41 @@ class PuppetParamsError(PuppetError):
 
 
 def _context_to_struct(ctx):
-    ret = {
+    return {
         'node_id': ctx.node_id,
         'node_name': ctx.node_name,
         'blueprint_id': ctx.blueprint_id,
         'deployment_id': ctx.deployment_id,
         'properties': ctx.properties,
         'runtime_properties': ctx.runtime_properties,
-        'capabilities': {},
+        'capabilities': _try_extract_capabilities(ctx),
+        'host_ip': _try_extract_host_ip(ctx)
     }
-    if hasattr(ctx, 'capabilities'):
-        ret['capabilities'] = ctx.capabilities.get_all()
-    return ret
 
 
 def _related_to_struct(related):
     return {
         'node_id': related.node_id,
         'properties': related.properties,
-        'runtime_properties': related.runtime_properties
+        'runtime_properties': related.runtime_properties,
+        'host_ip': _try_extract_host_ip(related)
     }
 
 
+def _try_extract_capabilities(ctx):
+    try:
+        return ctx.capabilities.get_all()
+    except AttributeError:
+        return {}
+
+
+def _try_extract_host_ip(ctx_or_related):
+    try:
+        return ctx_or_related.host_ip
+    except NonRecoverableError:
+        return None
+
+
 class PuppetManager(object):
 
     # Copy+paste from Chef plugin - start