diff options
3 files changed, 0 insertions, 486 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index 1aa562af21..6c1228927f 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -2741,422 +2741,6 @@ tosca.datatypes.nfv.NsProfile: description: Identifies the applicable network service DF within the scope of the NSD. required: true -### Data types used by Policy PM Mapper for closed loop ### - -onap.datatypes.monitoring.pm-mapper-filter: - derived_from: tosca.datatypes.Root - properties: - filters: - type: list - description: Filter configuration - default: [] - required: true - entry_schema: - type: onap.datatypes.monitoring.filters - -onap.datatypes.monitoring.filters: - derived_from: tosca.datatypes.Root - properties: - pmDefVsn: - type: string - description: PM Dictionary version - required: true - nfType: - type: string - description: NF type - required: true - vendor: - type: string - description: Vendor name - required: true - measTypes: - type: list - description: Measurement types to collect - default: [] - required: true - entry_schema: - type: string - -### Data types used by Policy PM Subscription Handler for closed loop ### - -onap.datatypes.monitoring.subscription: - derived_from: tosca.datatypes.Root - properties: - subscriptionName: - type: string - description: Name of the subscription - required: true - administrativeState: - type: string - description: State of the subscription - required: true - constraints: - - valid_values: - - LOCKED - - UNLOCKED - fileBasedGP: - type: integer - description: File based granularity period - required: true - fileLocation: - type: string - description: ROP file location - required: true - nfTypeModelInvariantId: - type: string - description: Network function invariant ID - required: true - nfFilter: - type: map - description: Network function filter - required: true - entry_schema: - type: onap.datatypes.monitoring.nfFilter - measurementGroups: - type: list - description: Measurement Groups - required: true - entry_schema: - type: onap.datatypes.monitoring.measurementGroups - -onap.datatypes.monitoring.nfFilter: - derived_from: tosca.datatypes.Root - properties: - nfNames: - type: list - description: List of network functions - required: true - default: [] - entry_schema: - type: string - swVersions: - type: list - description: List of software versions - required: true - default: [] - entry_schema: - type: string - -onap.datatypes.monitoring.measurementGroups: - derived_from: tosca.datatypes.Root - properties: - measurementGroup: - type: map - description: Measurement Group - required: true - entry_schema: - type: onap.datatypes.monitoring.measurementGroup - -onap.datatypes.monitoring.measurementGroup: - derived_from: tosca.datatypes.Root - properties: - measurementTypes: - type: list - description: List of measurement types - required: true - default: [] - entry_schema: - type: onap.datatypes.monitoring.measurementTypes - managedObjectDNsBasic: - type: list - description: List of managed object distinguished names - required: true - default: [] - entry_schema: - type: onap.datatypes.monitoring.managedObjectDNsBasics - -onap.datatypes.monitoring.measurementTypes: - derived_from: tosca.datatypes.Root - properties: - measurementType: - type: map - description: Measurement type object - required: true - entry_schema: - type: onap.datatypes.monitoring.measurementType - -onap.datatypes.monitoring.measurementType: - derived_from: tosca.datatypes.Root - properties: - measurementType: - type: string - description: Measurement type - required: true - -onap.datatypes.monitoring.managedObjectDNsBasics: - derived_from: tosca.datatypes.Root - properties: - managedObjectDNsBasic: - type: map - description: Managed object distinguished name object - required: true - entry_schema: - type: onap.datatypes.monitoring.managedObjectDNsBasic - -onap.datatypes.monitoring.managedObjectDNsBasic: - derived_from: tosca.datatypes.Root - properties: - DN: - type: string - description: Managed object distinguished name - required: true - -### Data types used by Policy TCA model for closed loop ### - -onap.datatypes.monitoring.metricsPerEventName: - derived_from: tosca.datatypes.Root - properties: - controlLoopSchemaType: - constraints: - - valid_values: - - VM - - VNF - description: "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM" - required: true - type: string - eventName: - description: "Event name to which thresholds need to be applied" - required: true - type: string - policyName: - description: "TCA Policy Scope Name" - required: true - type: string - policyScope: - description: "TCA Policy Scope" - required: true - type: string - policyVersion: - description: "TCA Policy Scope Version" - required: true - type: string - thresholds: - description: "Thresholds associated with eventName" - entry_schema: - type: onap.datatypes.monitoring.thresholds - required: true - type: list - -onap.datatypes.monitoring.tca_policy: - derived_from: tosca.datatypes.Root - properties: - domain: - constraints: - - equal: measurementsForVfScaling - default: measurementsForVfScaling - description: "Domain name to which TCA needs to be applied" - required: true - type: string - metricsPerEventName: - description: "Contains eventName and threshold details that need to be applied to given eventName" - entry_schema: - type: onap.datatypes.monitoring.metricsPerEventName - required: true - type: list - -onap.datatypes.monitoring.thresholds: - derived_from: tosca.datatypes.Root - properties: - closedLoopControlName: - description: "Closed Loop Control Name associated with the threshold" - required: true - type: string - closedLoopEventStatus: - constraints: - - valid_values: - - ONSET - - ABATED - description: "Closed Loop Event Status of the threshold" - required: true - type: string - direction: - constraints: - - valid_values: - - LESS - - LESS_OR_EQUAL - - GREATER - - GREATER_OR_EQUAL - - EQUAL - description: "Direction of the threshold" - required: true - type: string - fieldPath: - 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" - description: "Json field Path as per CEF message which needs to be analyzed for TCA" - required: true - type: string - severity: - constraints: - - valid_values: - - CRITICAL - - MAJOR - - MINOR - - WARNING - - NORMAL - description: "Threshold Event Severity" - required: true - type: string - thresholdValue: - description: "Threshold value for the field Path inside CEF message" - required: true - type: integer - version: - description: "Version number associated with the threshold" - required: true - type: string - -### Data types used by Policy Restconf Collector ### - -onap.datatypes.monitoring.rcc_policy: - derived_from: tosca.datatypes.Root - properties: - controller_name: - type: string - description: Name of controller - required: true - controller_restapiUrl: - type: string - description: Controller's ip and port - required: true - controller_restapiUser: - type: string - description: Controller's username - required: true - controller_restapiPassword: - type: string - description: Controller's password - required: true - controller_accessTokenUrl: - type: string - description: URL to get access token - required: true - controller_accessTokenFile: - type: string - description: Access token file path - required: true - controller_accessTokenMethod: - type: string - description: Access token method POST/GET/PUT etc - required: true - constraints: - - valid_values: [ post, get, put] - controller_subsMethod: - type: string - description: Subscription method POST/GET/PUT etc - required: true - default: post - constraints: - - valid_values: [ post, get, put] - controller_subscriptionUrl: - type: string - description: URL to establish subscription - required: true - controller_disableSsl: - type: boolean - description: Option to disable ssl - required: true - default: true - event_details: - type: list - description: event details - required: true - entry_schema: - type : onap.datatypes.monitoring.rcc_event_details - -onap.datatypes.monitoring.rcc_event_details: - derived_from: tosca.datatypes.Root - properties: - event_name: - type: string - description: event name - required: true - event_description: - type: string - description: description of event - required: false - event_sseventUrlEmbed: - type: boolean - description: Whether SSE url is embedded in subscription response - required: true - default: true - event_sseventsField: - type: string - description: Field name to access SSE url in subscription response - required: true - event_sseventsUrl: - type: string - description: Explicit SSE url - required: true - event_subscriptionTemplate: - type: string - description: Subscription template file path - required: true - event_unSubscriptionTemplate: - type: string - description: Unsubscription template file path - required: false - event_ruleId: - type: integer - description: Rule Id - required: false - modifyData: - type: boolean - description: Whether to modify the received SSE event - required: true - default: false - modifyMethod: - type: string - description: The java method name to modify data - required: false - userData: - type: string - description: The user specific data - required: false - ##### Partner service domain datatypes ###### onap.datatypes.partner.access_details: diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json index fea0f2fa55..a7934e9385 100644 --- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json +++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json @@ -47,26 +47,6 @@ "displayName": "External", "icon": "policy-external" }, - "onap.policies.Monitoring": { - "displayName": "Monitoring", - "icon": "policy-monitoring" - }, - "onap.policies.monitoring.cdap.tca.hi.lo.app": { - "displayName": "TCA", - "icon": "policy-tca" - }, - "onap.policies.monitoring.dcae-pm-mapper": { - "displayName": "PM Mapper", - "icon": "policy-dcae-pm-mapper" - }, - "onap.policies.monitoring.dcae-pm-subscription-handler": { - "displayName": "PM Subscription Handler", - "icon": "policy-dcae-pm-subscription-handler" - }, - "onap.policies.monitoring.dcae-restconfcollector": { - "displayName": "Restconf Collector", - "icon": "policy-dcae-restconfcollector" - }, "tosca.policies.nfv.InstantiationLevels": { "displayName": "NFV InstantiationLevels", "icon": "policy-nfv-instantiationlevels" diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml index c896e3aa63..724df7b5f8 100644 --- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml @@ -116,56 +116,6 @@ org.openecomp.policies.External: description: The name of the policy, that related to specific type, same as it is defined in the source. required: false -### Policy types for closed loop ### -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 - -## PM Mapper policies for closed loop ## - -onap.policies.monitoring.dcae-pm-mapper: - derived_from: onap.policies.Monitoring - version : 1.0.0 - properties: - pm-mapper-filter: - type: map - description: PM mapper filter on measInfo, measInfoId, measType, instanceId - entry_schema: - type: onap.datatypes.monitoring.pm-mapper-filter - -## PM Subscription Handler policy for closed loop ## - -onap.policies.monitoring.dcae-pm-subscription-handler: - derived_from: onap.policies.Monitoring - version : 1.0.0 - properties: - subscription: - type: map - description: PM Subscription Handler Subscription - entry_schema: - type: onap.datatypes.monitoring.subscription - -## Restconf collector policy for closed loop ## - -onap.policies.monitoring.dcae-restconfcollector: - derived_from: onap.policies.Monitoring - version: 1.0.0 - properties: - rcc_policy: - type: list - description: RCC Policy JSON - entry_schema: - type: onap.datatypes.monitoring.rcc_policy - ## NFV policies ## tosca.policies.nfv.InstantiationLevels: derived_from: tosca.policies.Root |