From: Determe, Sebastien (sd378r) Date: Mon, 14 May 2018 15:35:42 +0000 (+0200) Subject: Config Changes X-Git-Tag: v2.0.0~3^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=clamp.git;a=commitdiff_plain;h=aa8d13e4fb8ea099c85969de91eff2d89190c366 Config Changes Changes done to the Clamp Config file globalProperties.json for the operational policies Issue-ID: CLAMP-153 Change-Id: Id512fcdab0687495cbfb741097fc19dfc5545093 Signed-off-by: Determe, Sebastien (sd378r) --- diff --git a/src/main/resources/clds/templates/globalProperties.json b/src/main/resources/clds/templates/globalProperties.json index c9bbbf72..06230428 100644 --- a/src/main/resources/clds/templates/globalProperties.json +++ b/src/main/resources/clds/templates/globalProperties.json @@ -4,13 +4,12 @@ "tcaInt": "1", "tcaVio": "1", "eventName": { - "vCPEvGMUXPacketLoss": "vCPEvGMUXPacketLoss", "vLoadBalancer": "vLoadBalancer", - "vFirewallBroadcastPackets": "vFirewallBroadcastPackets" + "vFirewallBroadcastPackets": "vFirewallBroadcastPackets", + "Measurement_vGMUX":"Measurement_vGMUX" }, "fieldPathM": { - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated": "receivedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta": "receivedDiscardedPacketsDelta" + "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value": "Packet-loss-rate" }, "operator": { ">": "GREATER", @@ -52,7 +51,9 @@ "restart": "Restart", "rebuild": "Rebuild", "migrate": "Migrate", - "healthCheck": "Health Check" + "healthCheck": "Health Check", + "modifyConfig": "ModifyConfig", + "vfModuleCreate":"VF Module Create" }, "maxRetries": "3", "retryTimeLimit": 180, diff --git a/src/test/resources/clds/templates/globalProperties.json b/src/test/resources/clds/templates/globalProperties.json index c9bbbf72..06230428 100644 --- a/src/test/resources/clds/templates/globalProperties.json +++ b/src/test/resources/clds/templates/globalProperties.json @@ -4,13 +4,12 @@ "tcaInt": "1", "tcaVio": "1", "eventName": { - "vCPEvGMUXPacketLoss": "vCPEvGMUXPacketLoss", "vLoadBalancer": "vLoadBalancer", - "vFirewallBroadcastPackets": "vFirewallBroadcastPackets" + "vFirewallBroadcastPackets": "vFirewallBroadcastPackets", + "Measurement_vGMUX":"Measurement_vGMUX" }, "fieldPathM": { - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated": "receivedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta": "receivedDiscardedPacketsDelta" + "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value": "Packet-loss-rate" }, "operator": { ">": "GREATER", @@ -52,7 +51,9 @@ "restart": "Restart", "rebuild": "Rebuild", "migrate": "Migrate", - "healthCheck": "Health Check" + "healthCheck": "Health Check", + "modifyConfig": "ModifyConfig", + "vfModuleCreate":"VF Module Create" }, "maxRetries": "3", "retryTimeLimit": 180, diff --git a/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json b/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json index 5e0ba72a..f1f67fe1 100644 --- a/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json +++ b/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json @@ -4,13 +4,12 @@ "tcaInt": "1", "tcaVio": "1", "eventName": { - "vCPEvGMUXPacketLoss": "vCPEvGMUXPacketLoss", "vLoadBalancer": "vLoadBalancer", - "vFirewallBroadcastPackets": "vFirewallBroadcastPackets" + "vFirewallBroadcastPackets": "vFirewallBroadcastPackets", + "Measurement_vGMUX":"Measurement_vGMUX" }, "fieldPathM": { - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated": "receivedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta": "receivedDiscardedPacketsDelta" + "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value": "Packet-loss-rate" }, "operator": { ">": "GREATER", @@ -52,7 +51,9 @@ "restart": "Restart", "rebuild": "Rebuild", "migrate": "Migrate", - "healthCheck": "Health Check" + "healthCheck": "Health Check", + "modifyConfig": "ModifyConfig", + "vfModuleCreate":"VF Module Create" }, "maxRetries": "3", "retryTimeLimit": 180,