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, 106 insertions, 1 deletions

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index a676e105..e81e0936 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -108,7 +108,7 @@ async.queue.capacity=500
 

 org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties

 org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json

-org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties

+clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json

 org.onap.clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json

 

 # Properties for Clamp

diff --git a/src/test/resources/clds/templates/globalProperties.json b/src/test/resources/clds/templates/globalProperties.json
new file mode 100644
index 00000000..9ac9d944
--- /dev/null
+++ b/src/test/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": {
+					"": ""
+				}
+			}
+		}
+	}
+}