From f83411a86e2277adae69e780e8511913d61a0f17 Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Fri, 7 May 2021 15:17:52 +0100 Subject: Modular structure of clamp including controlloop This commit is the first commit that puts in multi module structure while changing the existing CLAMP code as little as possible. It adds a structure where common, models, participant and runtime are direct children under clamp, and current clamp code is moved under runtime. This runtime directory will host controlloop runtime code in later commits. Issue-ID: POLICY-3215 Signed-off-by: Sirisha_Manchikanti Change-Id: I15bc8be92ed020343bff4024c4718fec462c40d7 Signed-off-by: liamfallon --- .../clds/templates/dcae-deployment-template.json | 9 -- .../resources/clds/templates/dcae-template.json | 26 ------ .../resources/clds/templates/globalProperties.json | 104 --------------------- .../clds/templates/sdc-decode-service_ids.json | 1 - .../resources/clds/templates/sdc-template.json | 1 - .../clds/templates/tca-policy-template.json | 19 ---- .../resources/clds/templates/tca-template.json | 14 --- .../clds/templates/tca-thresholds-template.json | 9 -- .../clds/templates/ui-location-default.json | 5 - 9 files changed, 188 deletions(-) delete mode 100644 src/test/resources/clds/templates/dcae-deployment-template.json delete mode 100644 src/test/resources/clds/templates/dcae-template.json delete mode 100644 src/test/resources/clds/templates/globalProperties.json delete mode 100644 src/test/resources/clds/templates/sdc-decode-service_ids.json delete mode 100644 src/test/resources/clds/templates/sdc-template.json delete mode 100644 src/test/resources/clds/templates/tca-policy-template.json delete mode 100644 src/test/resources/clds/templates/tca-template.json delete mode 100644 src/test/resources/clds/templates/tca-thresholds-template.json delete mode 100644 src/test/resources/clds/templates/ui-location-default.json (limited to 'src/test/resources/clds/templates') diff --git a/src/test/resources/clds/templates/dcae-deployment-template.json b/src/test/resources/clds/templates/dcae-deployment-template.json deleted file mode 100644 index d4891747e..000000000 --- a/src/test/resources/clds/templates/dcae-deployment-template.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "serviceTypeId": "???", - "inputs": { - "aaiEnrichmentHost": "10.0.1.1", - "enableAAIEnrichment": "true", - "subscriberHostName": "10.0.11.1", - "publisherHostName": "10.0.11.1" - } -} diff --git a/src/test/resources/clds/templates/dcae-template.json b/src/test/resources/clds/templates/dcae-template.json deleted file mode 100644 index b76baf2d4..000000000 --- a/src/test/resources/clds/templates/dcae-template.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "properties": { - "service_name": "", - "service_ids": [ - ], - "vnf_ids": [ - ], - "location_ids": [ - ] - }, - "template": { - "tca": { - "dcae": { - "inputTopic": "", - "outputTopic": "", - "closedLoopControlName": "", - "closedLoopEventClient": "configuration.dcae.microservice.tca.xml", - "policyName": "", - "policyScope": "DCAE", - "policyVersion": "v0.0.1", - "serviceConfigurations": { - } - } - } - } -} diff --git a/src/test/resources/clds/templates/globalProperties.json b/src/test/resources/clds/templates/globalProperties.json deleted file mode 100644 index 067063ea2..000000000 --- a/src/test/resources/clds/templates/globalProperties.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "tca": { - "tname": "New_Set", - "tcaInt": "1", - "tcaVio": "1", - "eventName": { - "vLoadBalancer": "vLoadBalancer", - "vFirewallBroadcastPackets": "vFirewallBroadcastPackets", - "Measurement_vGMUX":"Measurement_vGMUX" - }, - "fieldPathM": { - "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value": "packetLossRate", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta":"receivedTotalPacketsDelta" - }, - "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" - }, - "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", - "ModifyConfig": "Modify Config", - "VF Module Create":"VF Module Create", - "VF Module Delete":"VF Module Delete", - "Reroute":"Reroute" - }, - "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/test/resources/clds/templates/sdc-decode-service_ids.json b/src/test/resources/clds/templates/sdc-decode-service_ids.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/src/test/resources/clds/templates/sdc-decode-service_ids.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/test/resources/clds/templates/sdc-template.json b/src/test/resources/clds/templates/sdc-template.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/src/test/resources/clds/templates/sdc-template.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/src/test/resources/clds/templates/tca-policy-template.json deleted file mode 100644 index 559aacb29..000000000 --- a/src/test/resources/clds/templates/tca-policy-template.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "service": "tca_policy", - "version": "1.1.0", - "location": "SampleServiceLocation", - "configName": "SampleConfigName", - "uuid": "test", - "policyScope": "CLAMP", - "templateVersion": "OpenSource.version.1", - "policyName": "MicroService", - "description": "MicroService Policy", - "priority": "1", - "riskType": "SampleRiskType", - "riskLevel": "1", - "guard": "False", - "content": { - "tca_policy": { - } - } -} diff --git a/src/test/resources/clds/templates/tca-template.json b/src/test/resources/clds/templates/tca-template.json deleted file mode 100644 index 892fc0d62..000000000 --- a/src/test/resources/clds/templates/tca-template.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "domain": "measurementsForVfScaling", - "metricsPerEventName": [ - { - "eventName": "???", - "controlLoopSchemaType": "VNF", - "policyScope": "DCAE", - "policyName": "???", - "policyVersion": "v0.0.1", - "thresholds": [ - ] - } - ] -} diff --git a/src/test/resources/clds/templates/tca-thresholds-template.json b/src/test/resources/clds/templates/tca-thresholds-template.json deleted file mode 100644 index b67e96321..000000000 --- a/src/test/resources/clds/templates/tca-thresholds-template.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "closedLoopControlName": "???", - "version": "1.0.2", - "fieldPath": "?????", - "thresholdValue": 0, - "direction": "???", - "severity": "MAJOR", - "closedLoopEventStatus": "???" -} diff --git a/src/test/resources/clds/templates/ui-location-default.json b/src/test/resources/clds/templates/ui-location-default.json deleted file mode 100644 index c0043d988..000000000 --- a/src/test/resources/clds/templates/ui-location-default.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "DC1": "Data Center 1", - "DC2": "Data Center 2", - "DC3": "Data Center 3" -} -- cgit 1.2.3-korg