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 --- .../resources/tosca/new-converter/constraints.yaml | 60 --- .../new-converter/sampleOperationalPolicies.yaml | 160 ------ .../sampleOperationalPoliciesEXTENTED.yaml | 174 ------- .../tosca/new-converter/tca-with-metadata.json | 224 -------- .../new-converter/tosca_apex_with_metadata.json | 577 --------------------- .../tosca_metadata_clamp_possible_values.yaml | 184 ------- 6 files changed, 1379 deletions(-) delete mode 100644 src/test/resources/tosca/new-converter/constraints.yaml delete mode 100644 src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml delete mode 100644 src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml delete mode 100644 src/test/resources/tosca/new-converter/tca-with-metadata.json delete mode 100644 src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json delete mode 100644 src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml (limited to 'src/test/resources/tosca/new-converter') diff --git a/src/test/resources/tosca/new-converter/constraints.yaml b/src/test/resources/tosca/new-converter/constraints.yaml deleted file mode 100644 index 7a94ca965..000000000 --- a/src/test/resources/tosca/new-converter/constraints.yaml +++ /dev/null @@ -1,60 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -policy_types: - onap.policies.controlloop.operational.common.Drools: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - description: Operational policies for Drools PDP - properties: - controllerName: - type: String - description: Drools controller properties - required: true -data_types: - onap.datatype.controlloop.Operation: - derived_from: tosca.datatypes.Root - description: An operation supported by an actor - properties: - id: - type: String - description: Unique identifier for the operation - required: true - constraints: - - length: 8 - description: - type: Array - description: A user-friendly description of the intent for the operation - required: false - constraints: - - min_length: 5 - - max_length: 7 - test: - type: Integer - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - constraints: - - greater_than: 7 - - greater_or_equal: 1 - - less_than: 7 - - less_or_equal: 1 - timeout: - type: Integer - description: The amount of time for the actor to perform the operation. - required: true - constraints: - - valid_values: [3,4,5.5,6,10] - retries: - type: Integer - description: The number of retries the actor should attempt to perform the operation. - required: true - default: 0 - constraints: - - equal: 5 - success: - type: String - description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. - required: false - constraints: - - valid_values: [VALID,TERMINATED] diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml deleted file mode 100644 index c2afeccdc..000000000 --- a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml +++ /dev/null @@ -1,160 +0,0 @@ - -tosca_definitions_version: tosca_simple_yaml_1_0_0 -policy_types: - onap.policies.controlloop.operational.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - description: Operational Policy for Control Loop execution - properties: - id: - type: String - description: The unique control loop id. - required: true - timeout: - type: Integer - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - abatement: - type: Boolean - description: Whether an abatement event message will be expected for the control loop from DCAE. - required: true - default: false - trigger: - type: String - description: Initial operation to execute upon receiving an Onset event message for the Control Loop. - required: true - operations: - type: List - description: List of operations to be performed when Control Loop is triggered. - required: true - entry_schema: - type: onap.datatype.controlloop.Operation - onap.policies.controlloop.operational.common.Drools: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - description: Operational policies for Drools PDP - properties: - controllerName: - type: String - description: Drools controller properties - required: false -data_types: - # TBD if this is needed - onap.datatype.controlloop.operation.Failure: - derived_from: tosca.datatypes.Root - description: Captures information of an operational failure performed for control loop - properties: - messages: - type: String - description: error message - required: true - category: - type: String - description: | - The category the error occurred in. Whether this is a general error from the actor, or the operation - timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the - operation from occuring, or an exception in the system caused the failure. - constraints: - - valid_values: [error, timeout, retries, guard, exception] - onap.datatype.controlloop.Target: - derived_from: tosca.datatypes.Root - description: Definition for a entity in A&AI to perform a control loop operation on - properties: - targetType: - type: String - description: Category for the target type - required: true - constraints: - - valid_values: [VNF, VM, VFMODULE, PNF] - entityIds: - type: Map - description: | - Map of values that identify the resource. If none are provided, it is assumed that the - entity that generated the ONSET event will be the target. - required: false - entry_schema: - type: String - onap.datatype.controlloop.Actor: - derived_from: tosca.datatypes.Root - description: An actor/operation/target definition - properties: - actor: - type: String - description: The actor performing the operation. - required: true - operation: - type: String - description: The operation the actor is performing. - required: true - target: - type: String - description: The resource the operation should be performed on. - required: true - metadata: - clamp_possible_values: - payload: - type: Map - description: Name/value pairs of payload information passed by Policy to the actor - required: false - entry_schema: - type: String - onap.datatype.controlloop.Operation: - derived_from: tosca.datatypes.Root - description: An operation supported by an actor - properties: - id: - type: String - description: Unique identifier for the operation - required: true - description: - type: String - description: A user-friendly description of the intent for the operation - required: false - operation: - type: onap.datatype.controlloop.Actor - description: The definition of the operation to be performed. - required: true - metadata: - clamp_possible_values: - timeout: - type: Integer - description: The amount of time for the actor to perform the operation. - required: true - retries: - type: Integer - description: The number of retries the actor should attempt to perform the operation. - required: true - default: 0 - success: - type: String - description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. - required: false - default: final_success - failure: - type: String - description: Points to the operation to invoke on Actor operation failure. - required: false - default: final_failure - failure_timeout: - type: String - description: Points to the operation to invoke when the time out for the operation occurs. - required: false - default: final_failure_timeout - failure_retries: - type: String - description: Points to the operation to invoke when the current operation has exceeded its max retries. - required: false - default: final_failure_retries - failure_exception: - type: String - description: Points to the operation to invoke when the current operation causes an exception. - required: false - default: final_failure_exception - failure_guard: - type: String - description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement. - required: false - default: final_failure_guard diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml deleted file mode 100644 index 780acadc2..000000000 --- a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml +++ /dev/null @@ -1,174 +0,0 @@ - -tosca_definitions_version: tosca_simple_yaml_1_0_0 -policy_types: - onap.policies.controlloop.operational.Common: - derived_from: onap.datatype.controlloop.operation.Failure - version: 1.0.0 - description: Operational Policy for Control Loop execution - properties: - id: - type: String - description: The unique control loop id. - required: true - timeout: - type: Integer - description: | - Overall timeout for executing all the operations. This timeout should equal or exceed the total - timeout for each operation listed. - required: true - constraints: - - valid_values: [1, 2, 5] - - equal: 5 - - greater_than: 7 - - greater_or_equal: 1 - - less_than: 7 - - less_or_equal: 1 - abatement: - type: Boolean - description: Whether an abatement event message will be expected for the control loop from DCAE. - required: true - default: false - trigger: - type: String - description: Initial operation to execute upon receiving an Onset event message for the Control Loop. - required: true - operations: - type: List - description: List of operations to be performed when Control Loop is triggered. - required: true - entry_schema: - type: onap.datatype.controlloop.Operation - onap.policies.controlloop.operational.common.Drools: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - description: Operational policies for Drools PDP - properties: - controllerName: - type: String - description: Drools controller properties - required: true -data_types: - # TBD if this is needed - onap.datatype.controlloop.operation.Failure: - derived_from: onap.datatype.controlloop.Target - description: Captures information of an operational failure performed for control loop - properties: - messages: - type: String - description: error message - required: true - category: - type: String - description: | - The category the error occurred in. Whether this is a general error from the actor, or the operation - timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the - operation from occuring, or an exception in the system caused the failure. - constraints: - - valid_values: [error, timeout, retries, guard, exception] - onap.datatype.controlloop.Target: - derived_from: tosca.datatypes.Root - description: Definition for a entity in A&AI to perform a control loop operation on - properties: - targetType: - type: String - description: Category for the target type - required: true - constraints: - - valid_values: [VNF, VM, VFMODULE, PNF] - entityIds: - type: Map - description: | - Map of values that identify the resource. If none are provided, it is assumed that the - entity that generated the ONSET event will be the target. - required: false - entry_schema: - type: String - onap.datatype.controlloop.Actor: - derived_from: tosca.datatypes.Root - description: An actor/operation/target definition - properties: - actor: - type: String - description: The actor performing the operation. - required: true - default: [1,"String",5.5,true] - operation: - type: String - description: The operation the actor is performing. - required: true - target: - type: String - description: The resource the operation should be performed on. - required: true - metadata: - clamp_possible_values: - payload: - type: Map - description: Name/value pairs of payload information passed by Policy to the actor - required: false - entry_schema: - type: String - onap.datatype.controlloop.Operation: - derived_from: tosca.datatypes.Root - description: An operation supported by an actor - properties: - id: - type: String - description: Unique identifier for the operation - required: true - description: - type: Array - description: A user-friendly description of the intent for the operation - required: false - constraints: - - min_length: 5 - - max_length: 7 - - length: 1 - operation: - type: onap.datatype.controlloop.Actor - description: The definition of the operation to be performed. - required: true - metadata: - clamp_possible_values: - timeout: - type: Integer - description: The amount of time for the actor to perform the operation. - required: true - constraints: - - valid_values: [3, 4, 5.5, 6, 10] - retries: - type: Integer - description: The number of retries the actor should attempt to perform the operation. - required: true - default: 0 - success: - type: String - description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation. - required: false - default: final_success - failure: - type: String - description: Points to the operation to invoke on Actor operation failure. - required: false - default: final_failure - failure_timeout: - type: String - description: Points to the operation to invoke when the time out for the operation occurs. - required: false - default: final_failure_timeout - failure_retries: - type: String - description: Points to the operation to invoke when the current operation has exceeded its max retries. - required: false - default: final_failure_retries - failure_exception: - type: String - description: Points to the operation to invoke when the current operation causes an exception. - required: false - default: final_failure_exception - failure_guard: - type: String - description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement. - required: false - default: final_failure_guard diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.json b/src/test/resources/tosca/new-converter/tca-with-metadata.json deleted file mode 100644 index 3a700c8ee..000000000 --- a/src/test/resources/tosca/new-converter/tca-with-metadata.json +++ /dev/null @@ -1,224 +0,0 @@ -{ - "title": "onap.policies.monitoring.cdap.tca.hi.lo.app", - "type": "object", - "required": [], - "properties": { - "tca_policy": { - "type": "object", - "description": "TCA Policy JSON", - "properties": { - "onap.datatypes.monitoring.tca_policy": { - "title": "onap.datatypes.monitoring.tca_policy", - "type": "object", - "required": [ - "domain", - "metricsPerEventName" - ], - "properties": { - "domain": { - "type": "string", - "description": "Domain name to which TCA needs to be applied", - "default": "measurementsForVfScaling", - "const": "measurementsForVfScaling" - }, - "metricsPerEventName": { - "type": "array", - "description": "Contains eventName and threshold details that need to be applied to given eventName", - "items": { - "title": "onap.datatypes.monitoring.metricsPerEventName", - "type": "object", - "required": [ - "controlLoopSchemaType", - "eventName", - "policyName", - "policyScope", - "policyVersion", - "thresholds", - "context", - "signature" - ], - "properties": { - "controlLoopSchemaType": { - "type": "string", - "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM", - "enum": [ - "VM", - "VNF" - ] - }, - "eventName": { - "type": "string", - "description": "Event name to which thresholds need to be applied" - }, - "policyName": { - "type": "string", - "description": "TCA Policy Scope Name" - }, - "policyScope": { - "type": "string", - "description": "TCA Policy Scope" - }, - "policyVersion": { - "type": "string", - "description": "TCA Policy Scope Version" - }, - "thresholds": { - "type": "array", - "description": "Thresholds associated with eventName", - "items": { - "title": "onap.datatypes.monitoring.thresholds", - "type": "object", - "required": [ - "closedLoopControlName", - "closedLoopEventStatus", - "direction", - "fieldPath", - "severity", - "thresholdValue", - "version" - ], - "properties": { - "closedLoopControlName": { - "type": "string", - "description": "Closed Loop Control Name associated with the threshold" - }, - "closedLoopEventStatus": { - "type": "string", - "description": "Closed Loop Event Status of the threshold", - "enum": [ - "ONSET", - "ABATED" - ] - }, - "direction": { - "type": "string", - "description": "Direction of the threshold", - "enum": [ - "LESS", - "LESS_OR_EQUAL", - "GREATER", - "GREATER_OR_EQUAL", - "EQUAL" - ] - }, - "fieldPath": { - "type": "string", - "description": "Json field Path as per CEF message which needs to be analyzed for TCA", - "enum": [ - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage", - "$.event.measurementsForVfScalingFields.meanRequestLatency", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed", - "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value" - ] - }, - "severity": { - "type": "string", - "description": "Threshold Event Severity", - "enum": [ - "CRITICAL", - "MAJOR", - "MINOR", - "WARNING", - "NORMAL" - ] - }, - "thresholdValue": { - "type": "integer", - "description": "Threshold value for the field Path inside CEF message" - }, - "version": { - "type": "string", - "description": "Version number associated with the threshold" - } - } - }, - "format": "tabs-top" - }, - "context": { - "type": "string", - "description": "TCA Policy Dummy Context", - "enum": [ - "PROD" - ], - "options": { - "enum_titles": [ - "PROD" - ] - } - }, - "signature": { - "title": "onap.datatypes.monitoring.Dummy_Signature", - "type": "object", - "required": [ - "filter_clause" - ], - "properties": { - "filter_clause": { - "type": "qbldr", - "description": "Filter Clause", - "minLength": 1, - "qschema": { - "filters": [ - { - "type": "string", - "minLength": 1, - "id": "alarmCondition", - "label": "alarmCondition", - "operators": [ - "equals" - ] - } - ] - } - } - } - } - } - }, - "format": "tabs-top" - } - } - } - } - } - } -} \ No newline at end of file diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json deleted file mode 100644 index 4519d5c9f..000000000 --- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json +++ /dev/null @@ -1,577 +0,0 @@ -{ - "title": "onap.policies.controlloop.operational.common.Apex", - "type": "object", - "description": "Operational policies for Apex PDP", - "required": [ - "abatement", - "operations", - "trigger", - "timeout", - "id", - "engineServiceParameters", - "eventOutputParameters", - "eventInputParameters" - ], - "properties": { - "abatement": { - "type": "boolean", - "description": "Whether an abatement event message will be expected for the control loop from DCAE.", - "default": "false" - }, - "operations": { - "type": "array", - "description": "List of operations to be performed when Control Loop is triggered.", - "items": { - "title": "onap.datatype.controlloop.Operation", - "type": "object", - "description": "An operation supported by an actor", - "required": [ - "id", - "operation", - "retries", - "timeout" - ], - "properties": { - "failure_retries": { - "type": "string", - "description": "Points to the operation to invoke when the current operation has exceeded its max retries.", - "default": "final_failure_retries" - }, - "id": { - "type": "string", - "description": "Unique identifier for the operation" - }, - "failure_timeout": { - "type": "string", - "description": "Points to the operation to invoke when the time out for the operation occurs.", - "default": "final_failure_timeout" - }, - "failure": { - "type": "string", - "description": "Points to the operation to invoke on Actor operation failure.", - "default": "final_failure" - }, - "operation": { - "title": "onap.datatype.controlloop.Actor", - "type": "object", - "description": "An actor/operation/target definition", - "required": [ - "target", - "actor", - "operation" - ], - "properties": { - "payload": { - "type": "object", - "description": "Name/value pairs of payload information passed by Policy to the actor", - "anyOf": [ - { - "title": "User defined", - "properties": {} - }, - { - "title": "resource-assignment", - "properties": { - "artifact_name": { - "title": "artifact name", - "type": "string", - "default": "baseconfiguration", - "readOnly": true - }, - "artifact_version": { - "title": "artifact version", - "type": "string", - "default": "1.0.0", - "readOnly": true - }, - "mode": { - "title": "mode", - "type": "string", - "default": "async", - "readOnly": false - }, - "data": { - "title": "data", - "type": "string", - "format": "textarea", - "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}" - } - } - }, - { - "title": "activate", - "properties": { - "artifact_name": { - "title": "artifact name", - "type": "string", - "default": "baseconfiguration", - "readOnly": true - }, - "artifact_version": { - "title": "artifact version", - "type": "string", - "default": "1.0.0", - "readOnly": true - }, - "mode": { - "title": "mode", - "type": "string", - "default": "async", - "readOnly": false - }, - "data": { - "title": "data", - "type": "string", - "format": "textarea", - "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}" - } - } - }, - { - "title": "activate-restconf", - "properties": { - "artifact_name": { - "title": "artifact name", - "type": "string", - "default": "baseconfiguration", - "readOnly": true - }, - "artifact_version": { - "title": "artifact version", - "type": "string", - "default": "1.0.0", - "readOnly": true - }, - "mode": { - "title": "mode", - "type": "string", - "default": "async", - "readOnly": false - }, - "data": { - "title": "data", - "type": "string", - "format": "textarea", - "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}" - } - } - }, - { - "title": "activate-cli", - "properties": { - "artifact_name": { - "title": "artifact name", - "type": "string", - "default": "baseconfiguration", - "readOnly": true - }, - "artifact_version": { - "title": "artifact version", - "type": "string", - "default": "1.0.0", - "readOnly": true - }, - "mode": { - "title": "mode", - "type": "string", - "default": "async", - "readOnly": false - }, - "data": { - "title": "data", - "type": "string", - "format": "textarea", - "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}" - } - } - }, - { - "title": "assign-activate", - "properties": { - "artifact_name": { - "title": "artifact name", - "type": "string", - "default": "baseconfiguration", - "readOnly": true - }, - "artifact_version": { - "title": "artifact version", - "type": "string", - "default": "1.0.0", - "readOnly": true - }, - "mode": { - "title": "mode", - "type": "string", - "default": "async", - "readOnly": false - }, - "data": { - "title": "data", - "type": "string", - "format": "textarea", - "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}" - } - } - }, - { - "title": "imperative-test-wf", - "properties": { - "artifact_name": { - "title": "artifact name", - "type": "string", - "default": "baseconfiguration", - "readOnly": true - }, - "artifact_version": { - "title": "artifact version", - "type": "string", - "default": "1.0.0", - "readOnly": true - }, - "mode": { - "title": "mode", - "type": "string", - "default": "async", - "readOnly": false - }, - "data": { - "title": "data", - "type": "string", - "format": "textarea", - "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}" - } - } - } - ] - }, - "target": { - "title": "onap.datatype.controlloop.Target", - "type": "object", - "description": "Definition for a entity in A&AI to perform a control loop operation on", - "required": [ - "targetType" - ], - "properties": { - "entityIds": { - "type": "object", - "description": "Map of values that identify the resource. If none are provided, it is assumed that the\nentity that generated the ONSET event will be the target.\n", - "anyOf": [ - { - "title": "User defined", - "properties": {} - }, - { - "title": "VNF-vLoadBalancerMS 0", - "properties": { - "resourceID": { - "title": "Resource ID", - "type": "string", - "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506", - "readOnly": "True" - } - } - }, - { - "title": "VFMODULE-Vloadbalancerms..vpkg..module-1", - "properties": { - "resourceID": { - "title": "Resource ID", - "type": "string", - "default": "Vloadbalancerms..vpkg..module-1", - "readOnly": "True" - }, - "modelInvariantId": { - "title": "Model Invariant Id (ModelInvariantUUID)", - "type": "string", - "default": "ca052563-eb92-4b5b-ad41-9111768ce043", - "readOnly": "True" - }, - "modelVersionId": { - "title": "Model Version Id (ModelUUID)", - "type": "string", - "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc", - "readOnly": "True" - }, - "modelName": { - "title": "Model Name", - "type": "string", - "default": "Vloadbalancerms..vpkg..module-1", - "readOnly": "True" - }, - "modelVersion": { - "title": "Model Version", - "type": "string", - "default": "1", - "readOnly": "True" - }, - "modelCustomizationId": { - "title": "Customization ID", - "type": "string", - "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52", - "readOnly": "True" - } - } - }, - { - "title": "VFMODULE-Vloadbalancerms..vdns..module-3", - "properties": { - "resourceID": { - "title": "Resource ID", - "type": "string", - "default": "Vloadbalancerms..vdns..module-3", - "readOnly": "True" - }, - "modelInvariantId": { - "title": "Model Invariant Id (ModelInvariantUUID)", - "type": "string", - "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa", - "readOnly": "True" - }, - "modelVersionId": { - "title": "Model Version Id (ModelUUID)", - "type": "string", - "default": "4fa73b49-8a6c-493e-816b-eb401567b720", - "readOnly": "True" - }, - "modelName": { - "title": "Model Name", - "type": "string", - "default": "Vloadbalancerms..vdns..module-3", - "readOnly": "True" - }, - "modelVersion": { - "title": "Model Version", - "type": "string", - "default": "1", - "readOnly": "True" - }, - "modelCustomizationId": { - "title": "Customization ID", - "type": "string", - "default": "bafcdab0-801d-4d81-9ead-f464640a38b1", - "readOnly": "True" - } - } - }, - { - "title": "VFMODULE-Vloadbalancerms..base_template..module-0", - "properties": { - "resourceID": { - "title": "Resource ID", - "type": "string", - "default": "Vloadbalancerms..base_template..module-0", - "readOnly": "True" - }, - "modelInvariantId": { - "title": "Model Invariant Id (ModelInvariantUUID)", - "type": "string", - "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3", - "readOnly": "True" - }, - "modelVersionId": { - "title": "Model Version Id (ModelUUID)", - "type": "string", - "default": "63734409-f745-4e4d-a38b-131638a0edce", - "readOnly": "True" - }, - "modelName": { - "title": "Model Name", - "type": "string", - "default": "Vloadbalancerms..base_template..module-0", - "readOnly": "True" - }, - "modelVersion": { - "title": "Model Version", - "type": "string", - "default": "1", - "readOnly": "True" - }, - "modelCustomizationId": { - "title": "Customization ID", - "type": "string", - "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27", - "readOnly": "True" - } - } - }, - { - "title": "VFMODULE-Vloadbalancerms..vlb..module-2", - "properties": { - "resourceID": { - "title": "Resource ID", - "type": "string", - "default": "Vloadbalancerms..vlb..module-2", - "readOnly": "True" - }, - "modelInvariantId": { - "title": "Model Invariant Id (ModelInvariantUUID)", - "type": "string", - "default": "a772a1f4-0064-412c-833d-4749b15828dd", - "readOnly": "True" - }, - "modelVersionId": { - "title": "Model Version Id (ModelUUID)", - "type": "string", - "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a", - "readOnly": "True" - }, - "modelName": { - "title": "Model Name", - "type": "string", - "default": "Vloadbalancerms..vlb..module-2", - "readOnly": "True" - }, - "modelVersion": { - "title": "Model Version", - "type": "string", - "default": "1", - "readOnly": "True" - }, - "modelCustomizationId": { - "title": "Customization ID", - "type": "string", - "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806", - "readOnly": "True" - } - } - } - ] - }, - "targetType": { - "type": "string", - "description": "Category for the target type", - "enum": [ - "VNF", - "VM", - "VFMODULE", - "PNF" - ] - } - } - }, - "actor": { - "type": "string", - "description": "The actor performing the operation.", - "enum": [ - "SDNR", - "SDNC", - "VFC", - "SO", - "APPC", - "CDS" - ], - "options": { - "enum_titles": [ - "SDNR", - "SDNC", - "VFC", - "SO", - "APPC" - ] - } - }, - "operation": { - "type": "string", - "description": "The operation the actor is performing.", - "enum": [ - "BandwidthOnDemand", - "VF Module Delete", - "Reroute", - "VF Module Create", - "ModifyConfig", - "Rebuild", - "Restart", - "Migrate", - "Health-Check", - "resource-assignment", - "activate", - "activate-restconf", - "activate-cli", - "assign-activate", - "imperative-test-wf" - ], - "options": { - "enum_titles": [ - "BandwidthOnDemand (SDNC operation)", - "VF Module Delete (SO operation)", - "Reroute (SDNC operation)", - "VF Module Create (SO operation)", - "ModifyConfig (APPC/VFC operation)", - "Rebuild (APPC operation)", - "Restart (APPC operation)", - "Migrate (APPC operation)", - "Health-Check (APPC operation)", - "resource-assignment (CDS operation)", - "activate (CDS operation)", - "activate-restconf (CDS operation)", - "activate-cli (CDS operation)", - "assign-activate (CDS operation)", - "imperative-test-wf (CDS operation)" - ] - } - } - } - }, - "failure_guard": { - "type": "string", - "description": "Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.", - "default": "final_failure_guard" - }, - "retries": { - "type": "integer", - "description": "The number of retries the actor should attempt to perform the operation.", - "default": "0" - }, - "timeout": { - "type": "integer", - "description": "The amount of time for the actor to perform the operation." - }, - "failure_exception": { - "type": "string", - "description": "Points to the operation to invoke when the current operation causes an exception.", - "default": "final_failure_exception" - }, - "description": { - "type": "string", - "description": "A user-friendly description of the intent for the operation" - }, - "success": { - "type": "string", - "description": "Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.", - "default": "final_success" - } - } - }, - "format": "tabs-top" - }, - "trigger": { - "type": "string", - "description": "Initial operation to execute upon receiving an Onset event message for the Control Loop." - }, - "timeout": { - "type": "integer", - "description": "Overall timeout for executing all the operations. This timeout should equal or exceed the total\ntimeout for each operation listed.\n" - }, - "id": { - "type": "string", - "description": "The unique control loop id." - }, - "engineServiceParameters": { - "type": "string", - "description": "The engine parameters like name, instanceCount, policy implementation, parameters etc." - }, - "eventOutputParameters": { - "type": "string", - "description": "The event output parameters." - }, - "javaProperties": { - "type": "string", - "description": "Name/value pairs of properties to be set for APEX if needed." - }, - "eventInputParameters": { - "type": "string", - "description": "The event input parameters." - } - } -} \ No newline at end of file diff --git a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml b/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml deleted file mode 100644 index 7fe9d5398..000000000 --- a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml +++ /dev/null @@ -1,184 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -policy_types: - onap.policies.Monitoring: - derived_from: tosca.policies.Root - description: a base policy type for all policies that governs monitoring provisioning - onap.policies.monitoring.cdap.tca.hi.lo.app: - derived_from: onap.policies.Monitoring - version: 1.0.0 - properties: - tca_policy: - type: map - description: TCA Policy JSON - entry_schema: - type: onap.datatypes.monitoring.tca_policy - metadata: - policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app - acronym: tca - -data_types: - onap.datatypes.monitoring.metricsPerEventName: - derived_from: tosca.datatypes.Root - properties: - controlLoopSchemaType: - type: string - required: true - description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM - constraints: - - valid_values: - - VM - - VNF - eventName: - type: string - required: true - description: Event name to which thresholds need to be applied - policyName: - type: string - required: true - description: TCA Policy Scope Name - policyScope: - type: string - required: true - description: TCA Policy Scope - policyVersion: - type: string - required: true - description: TCA Policy Scope Version - thresholds: - type: list - required: true - description: Thresholds associated with eventName - entry_schema: - type: onap.datatypes.monitoring.thresholds - context: - type: string - required: true - description: TCA Policy Dummy Context - metadata: - clamp_possible_values: Dictionary:Context - - signature: - type: onap.datatypes.monitoring.Dummy_Signature - description: Signature - required: true - - onap.datatypes.monitoring.Dummy_Signature: - derived_from: tosca.datatypes.Root - properties: - filter_clause: - type: string - description: Filter Clause - required: true - metadata: - clamp_possible_values: Dictionary:EventDictionary#Operators - - onap.datatypes.monitoring.tca_policy: - derived_from: tosca.datatypes.Root - properties: - domain: - type: string - required: true - description: Domain name to which TCA needs to be applied - default: measurementsForVfScaling - constraints: - - equal: measurementsForVfScaling - metricsPerEventName: - type: list - required: true - description: Contains eventName and threshold details that need to be applied to given eventName - entry_schema: - type: onap.datatypes.monitoring.metricsPerEventName - onap.datatypes.monitoring.thresholds: - derived_from: tosca.datatypes.Root - properties: - closedLoopControlName: - type: string - required: true - description: Closed Loop Control Name associated with the threshold - closedLoopEventStatus: - type: string - required: true - description: Closed Loop Event Status of the threshold - constraints: - - valid_values: - - ONSET - - ABATED - direction: - type: string - required: true - description: Direction of the threshold - constraints: - - valid_values: - - LESS - - LESS_OR_EQUAL - - GREATER - - GREATER_OR_EQUAL - - EQUAL - fieldPath: - type: string - required: true - description: Json field Path as per CEF message which needs to be analyzed for TCA - constraints: - - valid_values: - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated - - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait - - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage - - $.event.measurementsForVfScalingFields.meanRequestLatency - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree - - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed - - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value - severity: - type: string - required: true - description: Threshold Event Severity - constraints: - - valid_values: - - CRITICAL - - MAJOR - - MINOR - - WARNING - - NORMAL - thresholdValue: - type: integer - required: true - description: Threshold value for the field Path inside CEF message - version: - type: string - required: true - description: Version number associated with the threshold -- cgit 1.2.3-korg