diff options
| author |   Sébastien Determe <sd378r@intl.att.com> | 2018-05-14 15:46:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-14 15:46:10 +0000 |
| commit | a5807baecee98351bc162c9827dd279ecf5bf807 (patch) | |
| tree | 7527373d22a44c46074ee2a0e5bacab75c16f968 | |
| parent | 7ade3f7ad3223dee8b31df1d5dd1a59a1deecdca (diff) | |
| parent | aa8d13e4fb8ea099c85969de91eff2d89190c366 (diff) | |
Merge "Config Changes"
3 files changed, 18 insertions, 15 deletions
diff --git a/src/main/resources/clds/templates/globalProperties.json b/src/main/resources/clds/templates/globalProperties.json index c9bbbf72b..062304280 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 c9bbbf72b..062304280 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 5e0ba72ab..f1f67fe1b 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, |