diff options
7 files changed, 307 insertions, 1 deletions
diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java index b8f2ed6cb..14d6585ea 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfConceptContainer.java @@ -62,7 +62,6 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult; */ //@formatter:on @MappedSuperclass -@Entity @Table(name = "PfConceptContainer") @Data @EqualsAndHashCode(callSuper = false) diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml new file mode 100644 index 000000000..af23cbe5d --- /dev/null +++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml @@ -0,0 +1,49 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.Monitoring: + derived_from: tosca.policies.Root + version: 1.0.0 + name: onap.policies.Monitoring + description: a base policy type for all policies that govern monitoring provisioning + 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 +data_types: + 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
\ No newline at end of file diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml new file mode 100644 index 000000000..2db257d83 --- /dev/null +++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml @@ -0,0 +1,131 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.Monitoring: + derived_from: tosca.policies.Root + version: 1.0.0 + name: onap.policies.Monitoring + description: a base policy type for all policies that govern monitoring provisioning + 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 +data_types: + 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
\ No newline at end of file diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml new file mode 100644 index 000000000..c7547214a --- /dev/null +++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml @@ -0,0 +1,127 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.Monitoring: + derived_from: tosca.policies.Root + version: 1.0.0 + name: onap.policies.Monitoring + description: a base policy type for all policies that govern monitoring provisioning + 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 +data_types: + 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
\ No newline at end of file diff --git a/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore b/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore Binary files differindex 389df5fe5..6ba25335d 100644 --- a/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore +++ b/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore diff --git a/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore b/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore Binary files differindex 389df5fe5..6ba25335d 100644 --- a/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore +++ b/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore diff --git a/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore b/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore Binary files differindex 389df5fe5..6ba25335d 100644 --- a/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore +++ b/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore |