Update vDNS config policy

We will need to update all the policies but this will specifically address
the vDNS configuration policy for the DCAE micro services.

Change-Id: I178b16b5c5266e8ada834f34406bfeaf77379dd1
Issue-ID: INT-445
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

2 files changed, 40 insertions, 35 deletions

diff --git a/robot/assets/templates/policy/closedloop_configpolicy.template b/robot/assets/templates/policy/closedloop_configpolicy.template
index e14b615d..a77a0caa 100644
--- a/robot/assets/templates/policy/closedloop_configpolicy.template
+++ b/robot/assets/templates/policy/closedloop_configpolicy.template
@@ -1,31 +1,36 @@
 {
-                "service": "TcaMetrics",
-                "location": "SampleServiceLocation",
-                "uuid": "/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFireWall",
-                "policyName": "${policy_name}",
-                "description": "vFirewall configuration Policy@CreatedBy:demo@CreatedBy:@ModifiedBy:demo@ModifiedBy:",
-                "configName": "SampleConfigName",
-                "templateVersion": "OpenSource.version.1",
-                "version": "1.0.0.5",
-                "priority": "1",
-                "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
-                "content": {
-                                "thresholds": [{
-                                                "severity": "MAJOR",
-                                                "fieldPath": "$$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn",
-                                                "thresholdValue": "300",
-                                                "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8",
-                                                "version": "1.0.2",
-                                                "direction": "LESS_OR_EQUAL"
-                                }, {
-                                                "severity": "CRITICAL",
-                                                "fieldPath": "$$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn",
-                                                "thresholdValue": "800",
-                                                "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8",
-                                                "version": "1.0.2",
-                                                "direction": "GREATER_OR_EQUAL"
-                                }],
-                                "functionalRole": "vFirewall",
-                                "name": "0"
-                }
+	"service": "tca_policy",
+	"location": "SampleServiceLocation",
+	"uuid": "test",
+	"policyName": "MicroServicevDNS",
+	"description": "MicroService vDNS Policy",
+	"configName": "SampleConfigName",
+	"templateVersion": "OpenSource.version.1",
+	"version": "1.1.0",
+	"priority": "1",
+	"policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+	"riskType": "SampleRiskType",
+	"riskLevel": "1",
+	"guard": "False",
+	"content": {
+		"tca_policy": {
+			"domain": "measurementsForVfScaling",
+			"metricsPerEventName": [{
+				"eventName": "vLoadBalancer",
+				"controlLoopSchemaType": "VM",
+				"policyScope": "DCAE",
+				"policyName": "DCAE.Config_tca-hi-lo",
+				"policyVersion": "v0.0.1",
+				"thresholds": [{
+					"closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+					"version": "1.0.2",
+					"fieldPath": "$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta",
+					"thresholdValue": 300,
+					"direction": "GREATER_OR_EQUAL",
+					"severity": "CRITICAL",
+					"closedLoopEventStatus": "ONSET"
+				}]
+			}]
+		}
+	}
 }
diff --git a/robot/resources/test_templates/closedloop_test_template.robot b/robot/resources/test_templates/closedloop_test_template.robot
index 1a136130..dadff3a5 100644
--- a/robot/resources/test_templates/closedloop_test_template.robot
+++ b/robot/resources/test_templates/closedloop_test_template.robot
@@ -102,7 +102,7 @@ Get Configs VFW Policy
 
 Get Configs VDNS Policy
     [Documentation]    Get Config Policy for VDNS
-    ${getconfigpolicy}=    Catenate    .*vLoadBalancer*
+    ${getconfigpolicy}=    Catenate    .*com.MicroServicevDNS*
     ${configpolicy_name}=    Create Dictionary    config_policy_name=${getconfigpolicy}
     ${output} =     Fill JSON Template File     ${GECONFIG_VFW_TEMPLATE}    ${configpolicy_name}
     ${get_resp} =    Run Policy Get Configs Request    ${RESOURCE_PATH_GET_CONFIG}   ${output}
@@ -111,11 +111,11 @@ Get Configs VDNS Policy
     ${config}=    Parse Json    ${json[0]["config"]}
 
     # Extract object1 from Array
-    ${severity}=    Get Variable Value      ${config["content"]["thresholds"][0]["severity"]}
-    Should Be Equal    ${severity}    ${Expected_Severity_3}
-    ${Thresold_Value}=    Get Variable Value      ${config["content"]["thresholds"][0]["thresholdValue"]}
-    Should Be Equal   ${Thresold_Value}    ${Expected_Threshold_3}
-    ${direction}=    Get Variable Value      ${config["content"]["thresholds"][0]["direction"]}
+    ${severity}=    Get Variable Value      ${config["content"]["tca_policy"]["metricsPerEventName"][0]["thresholds"][0]["severity"]}
+    Should Be Equal    ${severity}    ${Expected_Severity_2}
+    ${Thresold_Value}=    Get Variable Value      ${config["content"]["tca_policy"]["metricsPerEventName"][0]["thresholds"][0]["thresholdValue"]}
+    Should Be Equal   ${Thresold_Value}    ${Expected_Threshold_1}
+${direction}=    Get Variable Value      ${config["content"]["tca_policy"]["metricsPerEventName"][0]["thresholds"][0]["direction"]}
     Should Be Equal   ${direction}    ${Expected_Direction_3}
 
 Teardown Closed Loop