Remove globalClds.properties

Remove the globalClds.properties and merge that to
application.properties

Issue-ID: CLAMP-136
Change-Id: I9c5bc8745b576ca8fad0cca3bff4c136329515d8
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 105 insertions, 24 deletions

diff --git a/src/main/resources/clds/globalClds.properties b/src/main/resources/clds/globalClds.properties
deleted file mode 100644
index e83fa6ca7..000000000
--- a/src/main/resources/clds/globalClds.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###

-# ============LICENSE_START=======================================================

-# ONAP CLAMP

-# ================================================================================

-# Copyright (C) 2017 AT&T Intellectual Property. All rights

-#                             reserved.

-# ================================================================================

-# Licensed under the Apache License, Version 2.0 (the "License"); 

-# you may not use this file except in compliance with the License. 

-# You may obtain a copy of the License at

-# 

-# http://www.apache.org/licenses/LICENSE-2.0

-# 

-# Unless required by applicable law or agreed to in writing, software 

-# distributed under the License is distributed on an "AS IS" BASIS, 

-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

-# See the License for the specific language governing permissions and 

-# limitations under the License.

-# ============LICENSE_END============================================

-# ===================================================================

-# ECOMP is a trademark and service mark of AT&T Intellectual Property.

-###

-

-globalCldsProps ={"tca":{"tname":"New_Set","tcaInt":"1","tcaVio":"1","eventName":{"vCPEvGMUXPacketLoss":"vCPEvGMUXPacketLoss","vLoadBalancer":"vLoadBalancer","vFirewallBroadcastPackets":"vFirewallBroadcastPackets"},"fieldPathM":{"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated":"receivedBroadcastPacketsAccumulated","$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta":"receivedDiscardedPacketsDelta"},"operator":{">":"GREATER",">=":"GREATER_OR_EQUAL","=":"EQUAL","<=":"LESS_OR_EQUAL","<":"LESS"},"opsPolicy":{"POLICY_test_X":"POLICY_test_X","POLICY_test_Y":"POLICY_test_Y"},"controlLoopSchemaType":{"":"","VM":"VM","VNF":"VNF"},"closedLoopEventStatus":{"":"","ONSET":"ONSET","ABATED":"ABATED"}},"global":{"actionSet":{"vnfRecipe":"VNF", "enbRecipe":"eNodeB"},"location":{"DC1":"Data Center 1","DC2":"Data Center 2","DC3":"Data Center 3"}},"policy":{"pname":"0","timeout":345,"vnfRecipe":{"":"","restart":"Restart","rebuild":"Rebuild","migrate":"Migrate","healthCheck":"Health Check"},"enbRecipe":{"":"","reset":"Reset"},"maxRetries":"3","retryTimeLimit":180,"resource":{"vCTS":"vCTS","v3CDB":"v3CDB","vUDR":"vUDR","vCOM":"vCOM","vRAR":"vRAR","vLCS":"vLCS","vUDR-BE":"vUDR-BE","vDBE":"vDBE"},"parentPolicyConditions":{"Failure_Retries":"Failure: Max Retries Exceeded","Failure_Timeout":"Failure: Time Limit Exceeded","Failure_Guard":"Failure: Guard","Failure_Exception":"Failure: Exception","Failure":"Failure: Other","Success":"Success"}},"shared":{"byService":{"":{"vf":{"":""},"location":{"":""},"alarmCondition":{"":""}}},"byVf":{"":{"vfc":{"":""}}}}}
diff --git a/src/main/resources/clds/templates/globalProperties.json b/src/main/resources/clds/templates/globalProperties.json
new file mode 100644
index 000000000..9ac9d9443
--- /dev/null
+++ b/src/main/resources/clds/templates/globalProperties.json
@@ -0,0 +1,105 @@
+{
+	"tca": {
+		"tname": "New_Set",
+		"tcaInt": "1",
+		"tcaVio": "1",
+		"eventName": {
+			"vCPEvGMUXPacketLoss": "vCPEvGMUXPacketLoss",
+			"vLoadBalancer": "vLoadBalancer",
+			"vFirewallBroadcastPackets": "vFirewallBroadcastPackets"
+		},
+		"fieldPathM": {
+			"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated": "receivedBroadcastPacketsAccumulated",
+			"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta": "receivedDiscardedPacketsDelta"
+		},
+		"operator": {
+			">": "GREATER",
+			">=": "GREATER_OR_EQUAL",
+			"=": "EQUAL",
+			"<=": "LESS_OR_EQUAL",
+			"<": "LESS"
+		},
+		"opsPolicy": {
+			"POLICY_test_X": "POLICY_test_X",
+			"POLICY_test_Y": "POLICY_test_Y"
+		},
+		"controlLoopSchemaType": {
+			"": "",
+			"VM": "VM",
+			"VNF": "VNF"
+		},
+		"closedLoopEventStatus": {
+			"": "",
+			"ONSET": "ONSET",
+			"ABATED": "ABATED"
+		}
+	},
+	"global": {
+		"actionSet": {
+			"vnfRecipe": "VNF",
+			"enbRecipe": "eNodeB"
+		},
+		"location": {
+			"DC1": "Data Center 1",
+			"DC2": "Data Center 2",
+			"DC3": "Data Center 3"
+		}
+	},
+	"policy": {
+		"pname": "0",
+		"timeout": 345,
+		"vnfRecipe": {
+			"": "",
+			"restart": "Restart",
+			"rebuild": "Rebuild",
+			"migrate": "Migrate",
+			"healthCheck": "Health Check"
+		},
+		"enbRecipe": {
+			"": "",
+			"reset": "Reset"
+		},
+		"maxRetries": "3",
+		"retryTimeLimit": 180,
+		"resource": {
+			"vCTS": "vCTS",
+			"v3CDB": "v3CDB",
+			"vUDR": "vUDR",
+			"vCOM": "vCOM",
+			"vRAR": "vRAR",
+			"vLCS": "vLCS",
+			"vUDR-BE": "vUDR-BE",
+			"vDBE": "vDBE"
+		},
+		"parentPolicyConditions": {
+			"Failure_Retries": "Failure: Max Retries Exceeded",
+			"Failure_Timeout": "Failure: Time Limit Exceeded",
+			"Failure_Guard": "Failure: Guard",
+			"Failure_Exception": "Failure: Exception",
+			"Failure": "Failure: Other",
+			"Success": "Success"
+		}
+	},
+	"shared": {
+		"byService": {
+			"": {
+				"vf": {
+					"": ""
+				},
+				"location": {
+					"": ""
+				},
+				"alarmCondition": {
+					"": ""
+				}
+			}
+		},
+		"byVf": {
+			"": {
+				"vfc": {
+					"": ""
+				}
+			}
+		}
+	}
+}