Updated yaml configuration for tasks

Change-Id: I0e7befd33c582a82bfeedc721da216a550241867
Closes-Bug: #1497294

examples/v2/calculator/calculator.yaml

@@ -67,8 +67,8 @@ workflows:
           ssh_username: <% $.ssh_username %>
           ssh_password: <% $.ssh_password %>
         publish:
-          vm_id: <% $.create_vm.id %>
-          vm_ip: <% $.create_vm.ip %>
+          vm_id: <% task(create_vm).result.id %>
+          vm_ip: <% task(create_vm).result.ip %>
         on-success:
           - run_server
 
@@ -85,7 +85,7 @@ workflows:
           count: 10
           delay: 1
         publish:
-          result: <% $.calc_summ.summ_result %>
+          result: <% task(calc_summ).result.summ_result %>
         on-complete:
           - send_result_email
 

examples/v2/capabilities/join/create_vm_with_volume.yaml

@@ -26,7 +26,7 @@ create_vm_with_volume:
         ssh_username: <% $.ssh_username %>
         ssh_password: <% $.ssh_password %>
       publish:
-        vm_id: <% $.create_vm.id %>
+        vm_id: <% task(create_vm).result.id %>
       on-complete:
         - attach_volume
 
@@ -34,7 +34,7 @@ create_vm_with_volume:
       description: Creates a volume of 2GB size with a given name.
       action: cinder.volumes_create size=2 display_name=<% $.volume_name %>
       publish:
-        volume_id: <% $.create_volume.id %>
+        volume_id: <% task(create_volume).result.id %>
       on-complete:
         - attach_volume
 

examples/v2/openstack/glance_actions.yaml

@@ -16,11 +16,11 @@ workflows:
       get_image_id:
         action: glance.images_list
         publish:
-          image_id: <% $.get_image_id[0].id %>
+          image_id: <% task(get_image_id).result[0].id %>
         on-success:
           - get_image_name
 
       get_image_name:
         action: glance.images_get image_id=<% $.image_id %>
         publish:
-          image_name: <% $.get_image_name.name %>
+          image_name: <% task(get_image_name).result.name %>

examples/v2/openstack/keystone_actions.yaml

@@ -16,11 +16,11 @@ workflows:
       get_project_id:
         action: keystone.projects_list
         publish:
-          project_id: <% $.get_project_id[0].id %>
+          project_id: <% task(get_project_id).result[0].id %>
         on-success:
           - get_project_name
 
       get_project_name:
         action: keystone.projects_get project=<% $.project_id %>
         publish:
-          project_name: <% $.get_project_name.name %>
+          project_name: <% task(get_project_name).result.name %>

examples/v2/openstack/nova_actions.yaml

@@ -17,7 +17,7 @@ workflows:
       create_server:
         action: nova.servers_create name=<% $.vm_name %> image=<% $.image_ref %> flavor=<% $.flavor_ref %>
         publish:
-          vm_id: <% $.create_server.id %>
+          vm_id: <% task(create_server).result.id %>
         on-success:
           - check_server_exists
 

examples/v2/services_registration/multiple_services_registration.yaml

@@ -35,7 +35,7 @@ workflows:
           ssh_username: <% $.ssh_username %>
           ssh_password: <% $.ssh_password %>
         publish:
-          vm_ip: <% $.create_vm.ip %>
+          vm_ip: <% task(create_vm).result.ip %>
         on-success:
           - register_in_zabbix
 

examples/v2/services_registration/vyatta/vyatta_firewall.yaml

@@ -33,7 +33,7 @@ workflows:
       get_conf_id_url:
         action: vyatta_auth host=<% $.vyatta_host %> username=<% $.vyatta_username %> password=<% $.vyatta_password %>
         publish:
-          conf_url: <% $.get_conf_id_url.conf_url %>
+          conf_url: <% task(get_conf_id_url).result.conf_url %>
         on-success:
           - create_accept_rule
 

examples/v2/services_registration/zabbix/zabbix_machine_registration.yaml

@@ -61,7 +61,7 @@ workflows:
       get_zabbix_auth:
         action: zabbix_auth host=<% $.zabbix_host %> username=<% $.zabbix_username %> password=<% $.zabbix_password %>
         publish:
-          zabbix_auth: <% $.get_zabbix_auth.auth %>
+          zabbix_auth: <% task(get_zabbix_auth).result.auth %>
         on-success:
           - zabbix_host_group_create
 
@@ -71,7 +71,7 @@ workflows:
           params:
             - name: Mistral demo group
         publish:
-          hostgroup_id: <% $.zabbix_host_group_create.result.result.groupids[0] %>
+          hostgroup_id: <% task(zabbix_host_group_create).result.result.result.groupids[0] %>
         on-success:
           - zabbix_host_create
 
@@ -100,4 +100,4 @@ workflows:
             key_: 'icmpping'
             hostid: <% $.host_id %>
         publish:
-          item_id: <% $.zabbix_item_create.result.result.itemids[0] %>
+          item_id: <% task(zabbix_item_create).result.result.result.itemids[0] %>

examples/v2/tenant_statistics/tenant_statistics.yaml

@@ -49,15 +49,15 @@ workflows:
       get_vm_count:
         action: nova.servers_list
         publish:
-          vm_count: <% $.get_vm_count.len() %>
-          active_vm_count: <% $.get_vm_count.where($.status = 'ACTIVE').len() %>
+          vm_count: <% task(get_vm_count).result.len() %>
+          active_vm_count: <% task(get_vm_count).result.where($.status = 'ACTIVE').len() %>
         on-complete:
           - get_net_count
 
       get_net_count:
         action: neutron.list_networks
         publish:
-          net_count: <% $.get_net_count.len() %>
+          net_count: <% task(get_net_count).result.len() %>
         on-complete:
           - send_stat
 
@@ -93,15 +93,15 @@ workflows:
       get_vm_count:
         action: nova.servers_list
         publish:
-          vm_count: <% $.get_vm_count.len() %>
-          active_vm_count: <% $.get_vm_count.where($.status = 'ACTIVE').len() %>
+          vm_count: <% task(get_vm_count).result.len() %>
+          active_vm_count: <% task(get_vm_count).result.where($.status = 'ACTIVE').len() %>
         on-complete:
           - send_stat
 
       get_net_count:
         action: neutron.list_networks
         publish:
-          net_count: <% $.get_net_count.len() %>
+          net_count: <% task(get_net_count).result.len() %>
         on-complete:
           - send_stat