Rework the submit operation

Rework the logic to create/delete ms config policies.

Issue-ID: CLAMP-303
Change-Id: I317e262ab68280a7518a6e31e82e5fcb0a7f94ed
Signed-off-by: xg353y <xg353y@intl.att.com>

3 files changed, 11 insertions, 0 deletions

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index e15b8737a..99d5da8b3 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -141,6 +141,9 @@ clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-
 #

 #

 # Configuration Settings for Policy Engine Components

+clamp.config.policy.url=http://localhost:${docker.http-cache.port.host}

+clamp.config.policy.userName=test

+clamp.config.policy.password=test

 clamp.config.policy.pdpUrl1=http://localhost:${docker.http-cache.port.host}/pdp/ , testpdp, alpha123

 clamp.config.policy.pdpUrl2=http://localhost:${docker.http-cache.port.host}/pdp/ , testpdp, alpha123

 clamp.config.policy.papUrl=http://localhost:${docker.http-cache.port.host}/pap/ , testpap, alpha123

diff --git a/src/test/resources/clds/blueprint-with-microservice-chain.yaml b/src/test/resources/clds/blueprint-with-microservice-chain.yaml
index 7b7148d54..4a7e5d7aa 100644
--- a/src/test/resources/clds/blueprint-with-microservice-chain.yaml
+++ b/src/test/resources/clds/blueprint-with-microservice-chain.yaml
@@ -30,6 +30,8 @@ node_templates:
       service_component_type: dcaegen2-analytics-tca
       service_component_name_override: second_app
       image: { get_input: second_app_docker_image }
+      policy_id:
+        policy_type_id: type2
     interfaces:
       cloudify.interfaces.lifecycle:
         start:
@@ -53,6 +55,8 @@ node_templates:
       dns_name: "first_app"
       image: { get_input: first_app_docker_image }
       container_port: 6565
+      policy_id:
+        policy_type_id: type1
     interfaces:
       cloudify.interfaces.lifecycle:
         start:
@@ -76,6 +80,8 @@ node_templates:
       dns_name: "third_app"
       image: { get_input: third_app_docker_image }
       container_port: 443
+      policy_id:
+        policy_type_id: type3
     interfaces:
       cloudify.interfaces.lifecycle:
         start:
diff --git a/src/test/resources/clds/single-microservice-fragment-valid.yaml b/src/test/resources/clds/single-microservice-fragment-valid.yaml
index abaae20b3..269ee5062 100644
--- a/src/test/resources/clds/single-microservice-fragment-valid.yaml
+++ b/src/test/resources/clds/single-microservice-fragment-valid.yaml
@@ -5,6 +5,8 @@ second_app:
     service_component_name_override: second_app
     image: { get_input: second_app_docker_image }
     name: second_app
+    policy_id:
+        policy_type_id: type1
   interfaces:
     cloudify.interfaces.lifecycle:
       start: