Merge "Cleanup after Policy update"

2 files changed, 7 insertions, 27 deletions

diff --git a/cdap/demo_blueprints/cdap_hello_world.yaml b/cdap/demo_blueprints/cdap_hello_world.yaml
index 197603f..f150cb0 100644
--- a/cdap/demo_blueprints/cdap_hello_world.yaml
+++ b/cdap/demo_blueprints/cdap_hello_world.yaml
@@ -2,9 +2,8 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  #- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.0.2/cdap_types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.0/cdap_types.yaml
-  #TODO: IMPORT ALEX'S TYPE FILE
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.1/cdap_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dcaepolicy/0.0.1/node-type.yaml
 
 inputs:
   hello_world_jar_url:
@@ -13,25 +12,6 @@ inputs:
     type: string
     default : "cdap_broker"
 
-#TODO: THIS WILL GO AWAY ONCE TYPE FILE IS IMP[ORTED
-node_types:
-    dcae.nodes.policy:
-        derived_from: cloudify.nodes.Root
-        properties:
-            policy_id:
-                description: PK to policy
-                type: string
-                default: DCAE_alex.Config_empty-policy
-            policy_apply_mode:
-                description: choice of how to apply the policy update - none or script
-                type: string
-                default: none
-        interfaces:
-            cloudify.interfaces.lifecycle:
-                create:
-                    implementation: cdap_deploy.cdapcloudify.cdap_plugin.policy_get
-#TODO: THIS WILL GO AWAY ONCE TYPE FILE IS IMP[ORTED
-
 node_templates:
   hw_app_policy_test:
     type: dcae.nodes.policy
@@ -53,8 +33,8 @@ node_templates:
         'who'
       service_endpoints:
         [{"service_name" : "Greeting", "service_endpoint" : "greet", "endpoint_method" : "GET"}]
-      app_config: {"foo" : "foo-test"}
-      app_preferences: {"foo_updated" : "foo-pref-test"}
+      app_config: {"foo" : "you should never see this; it should be overwritten by policy"}
+      app_preferences: {"foo_updated" : "you should never see this; it should be overwritten by policy"}
       
     interfaces:
       cloudify.interfaces.lifecycle:
diff --git a/cdap/demo_blueprints/cdap_hello_world_reconfigure.sh b/cdap/demo_blueprints/cdap_hello_world_reconfigure.sh
index c5df2f5..95efe60 100755
--- a/cdap/demo_blueprints/cdap_hello_world_reconfigure.sh
+++ b/cdap/demo_blueprints/cdap_hello_world_reconfigure.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-cfy executions start -d cdap-hello-world -w execute_operation -p '{"operation" : "reconfiguration.app_config_reconfigure", "node_ids" : ["hw_cdap_app"], "operation_kwargs" : {"new_config_template" : {"foo":"bar"}}, "allow_kwargs_override": true}'
-cfy executions start -d cdap-hello-world -w execute_operation -p '{"operation" : "reconfiguration.app_preferences_reconfigure", "node_ids" : ["hw_cdap_app"], "operation_kwargs" : {"new_config_template" : {"fooprefs":"barprefs"}}, "allow_kwargs_override": true}'
-cfy executions start -d cdap-hello-world -w execute_operation -p '{"operation" : "reconfiguration.app_smart_reconfigure", "node_ids" : ["hw_cdap_app"], "operation_kwargs" : {"new_config_template" : {"fooprefs":"SO SMARTTTTTT", "foo":"SO SMART AGAINNNNN"}}, "allow_kwargs_override": true}'
+cfy executions start -d cdap_hello_world -w execute_operation -p '{"operation" : "reconfiguration.app_config_reconfigure", "node_ids" : ["hw_cdap_app"], "operation_kwargs" : {"new_config_template" : {"foo":"bar-manual-update"}}, "allow_kwargs_override": true}'
+cfy executions start -d cdap_hello_world -w execute_operation -p '{"operation" : "reconfiguration.app_preferences_reconfigure", "node_ids" : ["hw_cdap_app"], "operation_kwargs" : {"new_config_template" : {"foo_updated":"foo-pref-manual-update"}}, "allow_kwargs_override": true}'
+cfy executions start -d cdap_hello_world -w execute_operation -p '{"operation" : "reconfiguration.app_smart_reconfigure", "node_ids" : ["hw_cdap_app"], "operation_kwargs" : {"new_config_template" : {"foo_updated":"SO SMARTTTTTT", "foo":"SO SMART AGAINNNNN"}}, "allow_kwargs_override": true}'