From 0f30b5b0aad2bfed9f30ff28fb5312b7838825de Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Mon, 28 Feb 2022 15:09:00 +0000 Subject: Rename ControlLoop to AutomationComposition This commit is to keep ControlLoop nomenclature in SDC aligned to changes in https://jira.onap.org/browse/POLICY-3938 where "Control Loop" is renamed as "Automation Composition" Issue-ID: SDC-3891 Signed-off-by: Sirisha_Manchikanti Change-Id: I8be013e564b780e9196c116d31b5c4c4d4b72662 --- .../templates/default/configuration.yaml.erb | 4 +- .../src/main/resources/config/configuration.yaml | 6 +- .../templates/default/BE-configuration.yaml.erb | 8 +- .../src/main/resources/config/configuration.yaml | 4 +- .../import/tosca/categories/categoryTypes.yml | 10 +- .../import/tosca/models/init/acm/imports/acm.yaml | 650 +++++++++++++++++++++ .../import/tosca/models/init/acm/payload.json | 4 + .../acm/tosca/capability-types/capabilityTypes.yml | 5 + .../models/init/acm/tosca/data-types/dataTypes.yml | 432 ++++++++++++++ .../interfaceLifecycleTypes.yml | 34 ++ .../models/init/acm/tosca/node-types/metadata.json | 188 ++++++ .../init/acm/tosca/node-types/nodeTypes.yaml | 198 +++++++ .../init/acm/tosca/policy-types/policyTypes.json | 26 + .../init/acm/tosca/policy-types/policyTypes.yml | 82 +++ .../tosca/relationship-types/relationshipTypes.yml | 22 + .../init/controlloop/imports/controlloop.yaml | 650 --------------------- .../tosca/models/init/controlloop/payload.json | 4 - .../controlloop/tosca/data-types/dataTypes.yml | 432 -------------- .../controlloop/tosca/node-types/metadata.json | 188 ------ .../controlloop/tosca/node-types/nodeTypes.yaml | 198 ------- .../tosca/policy-types/policyTypes.json | 26 - .../controlloop/tosca/policy-types/policyTypes.yml | 82 --- .../resources/config/catalog-be/configuration.yaml | 4 +- .../config/catalog-model/configuration.yaml | 4 +- .../src/test/resources/config/configuration.yaml | 4 +- .../service-metadata-update-response.json | 18 +- .../fixtures/service-proxy-tabs/service-proxy.json | 16 +- docs/configuration.rst | 4 +- .../enums/MandatoryServiceArtifactTypeEnum.java | 2 +- .../ci/tests/datatypes/DataTestIdEnum.java | 2 +- .../src/main/resources/configuration.yaml | 4 +- .../src/test/resources/configuration.yaml | 4 +- 32 files changed, 1688 insertions(+), 1627 deletions(-) create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/payload.json create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/capability-types/capabilityTypes.yml create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/metadata.json create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.json create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml create mode 100644 catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/relationship-types/relationshipTypes.yml delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/imports/controlloop.yaml delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/payload.json delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/data-types/dataTypes.yml delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/metadata.json delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/nodeTypes.yaml delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.json delete mode 100644 catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.yml diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb index 0f11a3e6f1..070db787ed 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb @@ -171,8 +171,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index 4e0e4128b4..871289c220 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -209,8 +209,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info @@ -415,4 +415,4 @@ dmaapProducerConfiguration: timeLimitForNotificationHandleMs: 120000 credential: username: m09875@sdc.att.com - password: hmXYcznAljMSisdy8zgcag== \ No newline at end of file + password: hmXYcznAljMSisdy8zgcag== diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 0ec99e74c7..325cba022e 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -856,8 +856,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info @@ -1028,7 +1028,7 @@ serviceBaseNodeTypes: required: true baseTypes: - tosca.nodes.nfv.NS - ControlLoop: + AutomationComposition: required: false workloadContext: Production @@ -1257,7 +1257,7 @@ cadiFilterParams: # This configuration entry lists all node type names prefix that shall be allowed on SDC. definedResourceNamespace: - org.openecomp.resource. - - org.onap.policy.clamp.controlloop. + - org.onap.policy.clamp.acm. # This configuration entry lists all Directives values that shall be allowed on SDC. directives: diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 4042b0192b..20014dc7cb 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -237,8 +237,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml index b2be823efb..969ce27ded 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml @@ -55,11 +55,11 @@ services: "ETSI SOL001 v2.5.1", "SDC AID" ] - ControlLoop: - name: "ControlLoop" + AutomationComposition: + name: "AutomationComposition" icons: ['network_l_1-3'] models: [ - "CONTROL LOOP" + "AUTOMATION COMPOSITION" ] resources: NetworkLayer23: @@ -134,8 +134,8 @@ resources: NetworkService: name: "Network Service" icons: ['network'] - ControlLoopElement: - name: "ControlLoop Element" + AutomationCompositionElement: + name: "AutomationComposition Element" icons: ['network'] Participant: name: "Participant" diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml b/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml new file mode 100644 index 0000000000..54300cc731 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml @@ -0,0 +1,650 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +description: AutomationComposition types definitions version 1.0.0 + +data_types: + onap.datatypes.ToscaConceptIdentifier: + derived_from: tosca.datatypes.Root + properties: + name: + type: string + required: true + version: + type: string + required: true + onap.datatype.acm.Target: + derived_from: tosca.datatypes.Root + description: Definition for a entity in A&AI to perform a acm 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 + metadata: + clamp_possible_values: 'ClampExecution:CSAR_RESOURCES' + entry_schema: + type: string + onap.datatype.acm.Actor: + derived_from: tosca.datatypes.Root + description: An actor/operation/target definition + properties: + actor: + type: string + description: The actor performing the operation. + required: true + metadata: + clamp_possible_values: 'Dictionary:DefaultActors,ClampExecution:CDS/actor' + operation: + type: string + description: The operation the actor is performing. + metadata: + clamp_possible_values: 'Dictionary:DefaultOperations,ClampExecution:CDS/operation' + required: true + target: + type: onap.datatype.acm.Target + description: The resource the operation should be performed on. + required: true + payload: + type: map + description: Name/value pairs of payload information passed by Policy to the actor + required: false + metadata: + clamp_possible_values: 'ClampExecution:CDS/payload' + entry_schema: + type: string + onap.datatype.acm.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.acm.Actor + description: The definition of the operation to be performed. + required: true + 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 + onap.datatypes.monitoring.managedObjectDNsBasic: + constraints: [] + properties: + DN: + name: DN + type: string + typeVersion: 0.0.0 + description: Managed object distinguished name + required: true + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.managedObjectDNsBasic + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.managedObjectDNsBasics: + constraints: [] + properties: + managedObjectDNsBasic: + name: managedObjectDNsBasic + type: map + typeVersion: 0.0.0 + description: Managed object distinguished name object + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.managedObjectDNsBasic + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.managedObjectDNsBasics + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.measurementGroup: + constraints: [] + properties: + measurementTypes: + name: measurementTypes + type: list + typeVersion: 0.0.0 + description: List of measurement types + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementTypes + typeVersion: 0.0.0 + constraints: [] + metadata: {} + managedObjectDNsBasic: + name: managedObjectDNsBasic + type: list + typeVersion: 0.0.0 + description: List of managed object distinguished names + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.managedObjectDNsBasics + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementGroup + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.measurementGroups: + constraints: [] + properties: + measurementGroup: + name: measurementGroup + type: map + typeVersion: 0.0.0 + description: Measurement Group + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementGroup + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementGroups + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.measurementType: + constraints: [] + properties: + measurementType: + name: measurementType + type: string + typeVersion: 0.0.0 + description: Measurement type + required: true + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementType + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.measurementTypes: + constraints: [] + properties: + measurementType: + name: measurementType + type: map + typeVersion: 0.0.0 + description: Measurement type object + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementType + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementTypes + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.nfFilter: + constraints: [] + properties: + modelNames: + name: modelNames + type: list + typeVersion: 0.0.0 + description: List of model names + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + modelInvariantIDs: + name: modelInvariantIDs + type: list + typeVersion: 0.0.0 + description: List of model invariant IDs + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + modelVersionIDs: + name: modelVersionIDs + type: list + typeVersion: 0.0.0 + description: List of model version IDs + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + nfNames: + name: nfNames + type: list + typeVersion: 0.0.0 + description: List of network functions + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.nfFilter + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + onap.datatypes.monitoring.subscription: + constraints: [] + properties: + measurementGroups: + name: measurementGroups + type: list + typeVersion: 0.0.0 + description: Measurement Groups + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementGroups + typeVersion: 0.0.0 + constraints: [] + metadata: {} + fileBasedGP: + name: fileBasedGP + type: integer + typeVersion: 0.0.0 + description: File based granularity period + required: true + constraints: [] + metadata: {} + fileLocation: + name: fileLocation + type: string + typeVersion: 0.0.0 + description: ROP file location + required: true + constraints: [] + metadata: {} + subscriptionName: + name: subscriptionName + type: string + typeVersion: 0.0.0 + description: Name of the subscription + required: true + constraints: [] + metadata: {} + administrativeState: + name: administrativeState + type: string + typeVersion: 0.0.0 + description: State of the subscription + required: true + constraints: + - valid_values: + - LOCKED + - UNLOCKED + metadata: {} + nfFilter: + name: nfFilter + type: map + typeVersion: 0.0.0 + description: Network function filter + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.nfFilter + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.subscription + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} + org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest: + version: 1.0.0 + derived_from: tosca.datatypes.Root + properties: + restRequestId: + type: onap.datatypes.ToscaConceptIdentifier + typeVersion: 1.0.0 + required: true + description: The name and version of a REST request to be sent to a REST endpoint + httpMethod: + type: string + required: true + constraints: + - valid_values: + - POST + - PUT + - GET + - DELETE + description: The REST method to use + path: + type: string + required: true + description: The path of the REST request relative to the base URL + body: + type: string + required: false + description: The body of the REST request for PUT and POST requests + expectedResponse: + type: integer + required: true + constraints: [] + description: THe expected HTTP status code for the REST request + org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity: + version: 1.0.0 + derived_from: tosca.datatypes.Root + properties: + configurationEntityId: + type: onap.datatypes.ToscaConceptIdentifier + typeVersion: 1.0.0 + required: true + description: The name and version of a Configuration Entity to be handled by the + HTTP Automation Composition Element + restSequence: + type: list + entry_schema: + type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest + typeVersion: 1.0.0 + description: A sequence of REST commands to send to the REST endpoint +policy_types: + onap.policies.Monitoring: + derived_from: tosca.policies.Root + description: a base policy type for all policies that govern monitoring provisioning + version: 1.0.0 + name: onap.policies.Monitoring + onap.policies.monitoring.dcae-pm-subscription-handler: + properties: + pmsh_policy: + name: pmsh_policy + type: onap.datatypes.monitoring.subscription + typeVersion: 0.0.0 + description: PMSH Policy JSON + required: false + constraints: [] + metadata: {} + name: onap.policies.monitoring.dcae-pm-subscription-handler + version: 1.0.0 + derived_from: onap.policies.Monitoring + metadata: {} + onap.policies.acm.operational.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + name: onap.policies.acm.operational.Common + description: Operational Policy for Automation Composition execution. Originated in Frankfurt to + support TOSCA Compliant Policy Types. This does NOT support the legacy Policy YAML policy type. + properties: + id: + type: string + description: The unique acm 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 automation + composition from DCAE. + required: true + default: false + trigger: + type: string + description: Initial operation to execute upon receiving an Onset event message for + the Automation Composition. + required: true + operations: + type: list + description: List of operations to be performed when Automation Composition is triggered. + required: true + entry_schema: + type: onap.datatype.acm.Operation + onap.policies.acm.operational.common.Apex: + derived_from: onap.policies.acm.operational.Common + type_version: 1.0.0 + version: 1.0.0 + name: onap.policies.acm.operational.common.Apex + description: Operational policies for Apex PDP + properties: + engineServiceParameters: + type: string + description: The engine parameters like name, instanceCount, policy implementation, + parameters etc. + required: true + eventInputParameters: + type: string + description: The event input parameters. + required: true + eventOutputParameters: + type: string + description: The event output parameters. + required: true + javaProperties: + type: string + description: Name/value pairs of properties to be set for APEX if needed. + required: false +node_types: + org.onap.policy.clamp.acm.Participant: + version: 1.0.1 + derived_from: tosca.nodetypes.Root + properties: + provider: + type: string + required: false + org.onap.policy.clamp.acm.AutomationCompositionElement: + version: 1.0.1 + derived_from: tosca.nodetypes.Root + properties: + provider: + type: string + required: false + metadata: + common: true + description: Specifies the organization that provides the acm element + participant_id: + type: onap.datatypes.ToscaConceptIdentifier + required: true + metadata: + common: true + participantType: + type: onap.datatypes.ToscaConceptIdentifier + required: true + metadata: + common: true + description: The identity of the participant type that hosts this type of Automation + Composition Element + startPhase: + type: integer + required: false + constraints: + - greater_or_equal: 0 + metadata: + common: true + description: A value indicating the start phase in which this acm element + will be started, the first start phase is zero. Automation Composition Elements + are started in their start_phase order and stopped in reverse start + phase order. Automation Composition Elements with the same start phase are + started and stopped simultaneously + uninitializedToPassiveTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from + uninitialized to passive + passiveToRunningTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from passive to + running + runningToPassiveTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from running to + passive + passiveToUninitializedTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from passive to + uninitialized + org.onap.policy.clamp.acm.AutomationComposition: + version: 1.0.1 + derived_from: tosca.nodetypes.Root + properties: + provider: + type: string + required: false + metadata: + common: true + description: Specifies the organization that provides the acm element + elements: + type: list + required: true + metadata: + common: true + entry_schema: + type: onap.datatypes.ToscaConceptIdentifier + description: Specifies a list of acm element definitions that make up this + acm definition + org.onap.policy.clamp.acm.PolicyAutomationCompositionElement: + version: 1.0.1 + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + policy_type_id: + type: onap.datatypes.ToscaConceptIdentifier + required: true + policy_id: + type: onap.datatypes.ToscaConceptIdentifier + required: false + org.onap.policy.clamp.acm.CDSAutomationCompositionElement: + version: 1.0.1 + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + cds_blueprint_id: + type: onap.datatypes.ToscaConceptIdentifier + required: true + org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement: + version: 1.0.1 + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + chart: + type: string + required: true + configs: + type: list + required: false + requirements: + type: string + required: false + templates: + type: list + required: false + entry_schema: null + values: + type: string + required: true + org.onap.policy.clamp.acm.HttpAutomationCompositionElement: + version: 1.0.1 + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + baseUrl: + type: string + required: true + description: The base URL to be prepended to each path, identifies the host for the + REST endpoints. + httpHeaders: + type: map + required: false + entry_schema: + type: string + description: HTTP headers to send on REST requests + configurationEntities: + type: map + required: true + entry_schema: + type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity + typeVersion: 1.0.0 + description: The connfiguration entities the Automation Composition Element is managing and + their associated REST requests diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/payload.json b/catalog-be/src/main/resources/import/tosca/models/init/acm/payload.json new file mode 100644 index 0000000000..90e15ccc21 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/payload.json @@ -0,0 +1,4 @@ +{ + "name": "AUTOMATION COMPOSITION", + "modelType": "NORMATIVE" +} diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/capability-types/capabilityTypes.yml new file mode 100644 index 0000000000..1ddc878dfd --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/capability-types/capabilityTypes.yml @@ -0,0 +1,5 @@ +tosca.capabilities.Root: + description: The TOSCA root Capability Type all other TOSCA base Capability Types derive from + +tosca.capabilities.Node: + derived_from: tosca.capabilities.Root diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml new file mode 100644 index 0000000000..bb010fd4cb --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml @@ -0,0 +1,432 @@ +tosca.datatypes.Root: + description: The TOSCA root Data Type all other TOSCA base Data Types derive from +integer: + derived_from: tosca.datatypes.Root +string: + derived_from: tosca.datatypes.Root +boolean: + derived_from: tosca.datatypes.Root +float: + derived_from: tosca.datatypes.Root +list: + derived_from: tosca.datatypes.Root +map: + derived_from: tosca.datatypes.Root +json: + derived_from: tosca.datatypes.Root +scalar-unit: + derived_from: tosca.datatypes.Root +scalar-unit.size: + derived_from: scalar-unit +scalar-unit.time: + derived_from: scalar-unit +scalar-unit.frequency: + derived_from: scalar-unit +onap.datatypes.ToscaConceptIdentifier: + derived_from: tosca.datatypes.Root + properties: + name: + type: string + required: true + version: + type: string + required: true +onap.datatype.acm.Target: + derived_from: tosca.datatypes.Root + description: Definition for a entity in A&AI to perform a automation composition 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 + metadata: + clamp_possible_values: 'ClampExecution:CSAR_RESOURCES' + entry_schema: + type: string +onap.datatype.acm.Actor: + derived_from: tosca.datatypes.Root + description: An actor/operation/target definition + properties: + actor: + type: string + description: The actor performing the operation. + required: true + metadata: + clamp_possible_values: 'Dictionary:DefaultActors,ClampExecution:CDS/actor' + operation: + type: string + description: The operation the actor is performing. + metadata: + clamp_possible_values: 'Dictionary:DefaultOperations,ClampExecution:CDS/operation' + required: true + target: + type: onap.datatype.acm.Target + description: The resource the operation should be performed on. + required: true + payload: + type: map + description: Name/value pairs of payload information passed by Policy to the actor + required: false + metadata: + clamp_possible_values: 'ClampExecution:CDS/payload' + entry_schema: + type: string +onap.datatype.acm.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.acm.Actor + description: The definition of the operation to be performed. + required: true + 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 +onap.datatypes.monitoring.managedObjectDNsBasic: + constraints: [] + properties: + DN: + name: DN + type: string + typeVersion: 0.0.0 + description: Managed object distinguished name + required: true + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.managedObjectDNsBasic + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.managedObjectDNsBasics: + constraints: [] + properties: + managedObjectDNsBasic: + name: managedObjectDNsBasic + type: map + typeVersion: 0.0.0 + description: Managed object distinguished name object + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.managedObjectDNsBasic + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.managedObjectDNsBasics + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.measurementGroup: + constraints: [] + properties: + measurementTypes: + name: measurementTypes + type: list + typeVersion: 0.0.0 + description: List of measurement types + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementTypes + typeVersion: 0.0.0 + constraints: [] + metadata: {} + managedObjectDNsBasic: + name: managedObjectDNsBasic + type: list + typeVersion: 0.0.0 + description: List of managed object distinguished names + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.managedObjectDNsBasics + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementGroup + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.measurementGroups: + constraints: [] + properties: + measurementGroup: + name: measurementGroup + type: map + typeVersion: 0.0.0 + description: Measurement Group + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementGroup + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementGroups + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.measurementType: + constraints: [] + properties: + measurementType: + name: measurementType + type: string + typeVersion: 0.0.0 + description: Measurement type + required: true + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementType + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.measurementTypes: + constraints: [] + properties: + measurementType: + name: measurementType + type: map + typeVersion: 0.0.0 + description: Measurement type object + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementType + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.measurementTypes + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.nfFilter: + constraints: [] + properties: + modelNames: + name: modelNames + type: list + typeVersion: 0.0.0 + description: List of model names + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + modelInvariantIDs: + name: modelInvariantIDs + type: list + typeVersion: 0.0.0 + description: List of model invariant IDs + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + modelVersionIDs: + name: modelVersionIDs + type: list + typeVersion: 0.0.0 + description: List of model version IDs + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + nfNames: + name: nfNames + type: list + typeVersion: 0.0.0 + description: List of network functions + required: true + constraints: [] + entry_schema: + type: string + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.nfFilter + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +onap.datatypes.monitoring.subscription: + constraints: [] + properties: + measurementGroups: + name: measurementGroups + type: list + typeVersion: 0.0.0 + description: Measurement Groups + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.measurementGroups + typeVersion: 0.0.0 + constraints: [] + metadata: {} + fileBasedGP: + name: fileBasedGP + type: integer + typeVersion: 0.0.0 + description: File based granularity period + required: true + constraints: [] + metadata: {} + fileLocation: + name: fileLocation + type: string + typeVersion: 0.0.0 + description: ROP file location + required: true + constraints: [] + metadata: {} + subscriptionName: + name: subscriptionName + type: string + typeVersion: 0.0.0 + description: Name of the subscription + required: true + constraints: [] + metadata: {} + administrativeState: + name: administrativeState + type: string + typeVersion: 0.0.0 + description: State of the subscription + required: true + constraints: + - valid_values: + - LOCKED + - UNLOCKED + metadata: {} + nfFilter: + name: nfFilter + type: map + typeVersion: 0.0.0 + description: Network function filter + required: true + constraints: [] + entry_schema: + type: onap.datatypes.monitoring.nfFilter + typeVersion: 0.0.0 + constraints: [] + metadata: {} + name: onap.datatypes.monitoring.subscription + version: 0.0.0 + derived_from: tosca.datatypes.Root + metadata: {} +org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest: + version: 1.0.0 + derived_from: tosca.datatypes.Root + properties: + restRequestId: + type: onap.datatypes.ToscaConceptIdentifier + typeVersion: 1.0.0 + required: true + description: The name and version of a REST request to be sent to a REST endpoint + httpMethod: + type: string + required: true + constraints: + - valid_values: + - POST + - PUT + - GET + - DELETE + description: The REST method to use + path: + type: string + required: true + description: The path of the REST request relative to the base URL + body: + type: string + required: false + description: The body of the REST request for PUT and POST requests + expectedResponse: + type: integer + required: true + constraints: [] + description: THe expected HTTP status code for the REST request +org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity: + version: 1.0.0 + derived_from: tosca.datatypes.Root + properties: + configurationEntityId: + type: onap.datatypes.ToscaConceptIdentifier + typeVersion: 1.0.0 + required: true + description: The name and version of a Configuration Entity to be handled by the HTTP + Automation Composition Element + restSequence: + type: list + entry_schema: + type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest + typeVersion: 1.0.0 + constraints: [] + description: A sequence of REST commands to send to the REST endpoint diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml new file mode 100644 index 0000000000..66cad00da7 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/interface-lifecycle-types/interfaceLifecycleTypes.yml @@ -0,0 +1,34 @@ +tosca.interfaces.Root: + description: The TOSCA root Interface Type all other TOSCA Interface Types derive from + +tosca.interfaces.node.lifecycle.Standard: + derived_from: tosca.interfaces.Root + create: + description: Standard lifecycle create operation. + configure: + description: Standard lifecycle configure operation. + start: + description: Standard lifecycle start operation. + stop: + description: Standard lifecycle stop operation. + delete: + description: Standard lifecycle delete operation. + +tosca.interfaces.relationship.Configure: + derived_from: tosca.interfaces.Root + pre_configure_source: + description: Operation to pre-configure the source endpoint. + pre_configure_target: + description: Operation to pre-configure the target endpoint. + post_configure_source: + description: Operation to post-configure the source endpoint. + post_configure_target: + description: Operation to post-configure the target endpoint. + add_target: + description: Operation to notify the source node of a target node being added via a relationship. + add_source: + description: Operation to notify the target node of a source node which is now available via a relationship. + target_changed: + description: Operation to notify source some property or attribute of the target changed + remove_target: + description: Operation to remove a target node. diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/metadata.json b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/metadata.json new file mode 100644 index 0000000000..3e0c5ed224 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/metadata.json @@ -0,0 +1,188 @@ +{ + "nodeMetadataList": [ + { + "contactId": "jh0003", + "toscaName": "tosca.nodes.Root", + "name": "Root", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA Node Type all other TOSCA base Node Types derive from", + "resourceIconPath": "defaulticon", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Abstract" + } + ] + } + ], + "tags": [ + "Root", + "tosca.nodes.Root" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.Participant", + "name": "Participant", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the Participant", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "Participant", + "org.onap.policy.clamp.acm.Participant" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.AutomationCompositionElement", + "name": "AutomationCompositionElement", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the AutomationCompositionElement", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "AutomationCompositionElement", + "org.onap.policy.clamp.acm.AutomationCompositionElement" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.AutomationComposition", + "name": "AutomationComposition", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the AutomationComposition", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "AutomationComposition", + "org.onap.policy.clamp.acm.AutomationComposition" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement", + "name": "PolicyAutomationCompositionElement", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the PolicyAutomationCompositionElement", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "PolicyAutomationCompositionElement", + "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.CDSAutomationCompositionElement", + "name": "CDSAutomationCompositionElement", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the CDSAutomationCompositionElement", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "CDSAutomationCompositionElement", + "org.onap.policy.clamp.acm.CDSAutomationCompositionElement" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement", + "name": "K8SMicroserviceAutomationCompositionElement", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the K8SMicroserviceAutomationCompositionElement", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "K8SMicroserviceAutomationCompositionElement", + "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement" + ] + }, + { + "contactId": "jh0003", + "toscaName": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement", + "name": "HttpAutomationCompositionElement", + "model": "AUTOMATION COMPOSITION", + "description": "The TOSCA service template representing the HttpAutomationCompositionElement", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Infrastructure" + } + ] + } + ], + "tags": [ + "HttpAutomationCompositionElement", + "org.onap.policy.clamp.acm.HttpAutomationCompositionElement" + ] + } + ] +} + diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml new file mode 100644 index 0000000000..dd0abee722 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/nodeTypes.yaml @@ -0,0 +1,198 @@ +tosca_definitions_version: tosca_simple_yaml_1_2 +description: ETSI NFV SOL 001 Root node type definitions version 2.5.1 + +node_types: + tosca.nodes.Root: + description: The TOSCA Node Type all other TOSCA base Node Types derive from + attributes: + tosca_id: + type: string + tosca_name: + type: string + state: + type: string + capabilities: + feature: + type: tosca.capabilities.Node + requirements: + - dependency: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: [ 0, UNBOUNDED ] + interfaces: + Standard: + type: tosca.interfaces.node.lifecycle.Standard + org.onap.policy.clamp.acm.Participant: + derived_from: tosca.nodes.Root + properties: + provider: + type: string + description: Provider of the participant + required: false + version: + type: string + description: Identifies the version of the participant. + required: true + org.onap.policy.clamp.acm.AutomationCompositionElement: + derived_from: tosca.nodes.Root + properties: + provider: + type: string + required: false + metadata: + common: true + description: Specifies the organization that provides the automation composition element + version: + type: string + description: Identifies the version of the AutomationCompositionElement. + required: true + participant_id: + type: string + required: true + metadata: + common: true + participantType: + type: string + required: true + metadata: + common: true + description: The identity of the participant type that hosts this type of Automation Composition Element + startPhase: + type: integer + required: false + constraints: + - greater_or_equal: 0 + metadata: + common: true + description: A value indicating the start phase in which this automation composition element will be started, the + first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped + in reverse start phase order. Automation Composition Elements with the same start phase are started and + stopped simultaneously + uninitializedToPassiveTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from uninitialized to passive + passiveToRunningTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from passive to running + runningToPassiveTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from running to passive + passiveToUninitializedTimeout: + type: integer + required: false + constraints: + - greater_or_equal: 0 + default: 60 + metadata: + common: true + description: The maximum time in seconds to wait for a state chage from passive to uninitialized + org.onap.policy.clamp.acm.AutomationComposition: + derived_from: tosca.nodes.Root + properties: + provider: + type: string + required: false + metadata: + common: true + description: Specifies the organization that provides the automation composition element + version: + type: string + description: Identifies the version of the participant. + required: true + elements: + type: list + required: true + metadata: + common: true + entry_schema: + type: string + description: Specifies a list of automation composition element definitions that make up this automation composition definition + org.onap.policy.clamp.acm.PolicyAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + policy_type_id: + type: string + required: true + policy_id: + type: string + required: false + version: + type: string + description: Identifies the version of the participant. + required: true + org.onap.policy.clamp.acm.CDSAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + cds_blueprint_id: + type: string + required: true + version: + type: string + description: Identifies the version of the participant. + required: true + org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + chart: + type: string + required: true + configs: + type: list + required: false + requirements: + type: string + required: false + templates: + type: list + required: false + entry_schema: + values: + type: string + required: true + version: + type: string + description: Identifies the version of the participant. + required: true + org.onap.policy.clamp.acm.HttpAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement + properties: + baseUrl: + type: string + required: true + description: The base URL to be prepended to each path, identifies the host for the REST endpoints. + httpHeaders: + type: map + required: false + entry_schema: + type: string + description: HTTP headers to send on REST requests + configurationEntities: + type: map + required: true + entry_schema: + type: string + typeVersion: 1.0.0 + description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests + version: + type: string + description: Identifies the version of the participant. + required: true diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.json b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.json new file mode 100644 index 0000000000..22994598a5 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.json @@ -0,0 +1,26 @@ +{ + "tosca.policies.Root": { + "displayName": "Root", + "icon": "policy-root" + }, + "tosca.policies.Placement": { + "displayName": "Placement", + "icon": "policy-placement" + }, + "onap.policies.Monitoring": { + "displayName": "Monotiring", + "icon": "policy-monotiring" + }, + "onap.policies.monitoring.dcae-pm-subscription-handler": { + "displayName": "DCAE-PM-Subscription-Handler", + "icon": "policy-placement" + }, + "onap.policies.acm.operational.Common": { + "displayName": "AutomationCompositionperationalCommon", + "icon": "policy-placement" + }, + "onap.policies.acm.operational.common.Apex": { + "displayName": "AutomationCompositionOperationalCommonApex", + "icon": "policy-placement" + } +} diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml new file mode 100644 index 0000000000..a4b9c340e9 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/policy-types/policyTypes.yml @@ -0,0 +1,82 @@ +tosca.policies.Root: + description: The TOSCA Policy Type all other TOSCA Policy Types derive from +tosca.policies.Placement: + derived_from: tosca.policies.Root + description: The TOSCA Policy Type definition that is used to govern placement of TOSCA + nodes or groups of nodes. +onap.policies.Monitoring: + derived_from: tosca.policies.Root + description: a base policy type for all policies that govern monitoring provisioning + version: 1.0.0 + name: onap.policies.Monitoring +onap.policies.monitoring.dcae-pm-subscription-handler: + properties: + pmsh_policy: + name: pmsh_policy + type: onap.datatypes.monitoring.subscription + typeVersion: 0.0.0 + description: PMSH Policy JSON + required: false + constraints: [] + metadata: {} + name: onap.policies.monitoring.dcae-pm-subscription-handler + version: 1.0.0 + derived_from: onap.policies.Monitoring + metadata: {} +onap.policies.acm.operational.Common: + derived_from: tosca.policies.Root + version: 1.0.0 + name: onap.policies.acm.operational.Common + description: Operational Policy for Automation Composition execution. Originated in Frankfurt to + support TOSCA Compliant Policy Types. This does NOT support the legacy Policy YAML policy type. + properties: + id: + type: string + description: The unique automation composition 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 automation composition + from DCAE. + required: true + default: false + trigger: + type: string + description: Initial operation to execute upon receiving an Onset event message for + the Automation Composition. + required: true + operations: + type: list + description: List of operations to be performed when Automation Composition is triggered. + required: true + entry_schema: + type: onap.datatype.acm.Operation +onap.policies.acm.operational.common.Apex: + derived_from: onap.policies.acm.operational.Common + type_version: 1.0.0 + version: 1.0.0 + name: onap.policies.acm.operational.common.Apex + description: Operational policies for Apex PDP + properties: + engineServiceParameters: + type: string + description: The engine parameters like name, instanceCount, policy implementation, + parameters etc. + required: true + eventInputParameters: + type: string + description: The event input parameters. + required: true + eventOutputParameters: + type: string + description: The event output parameters. + required: true + javaProperties: + type: string + description: Name/value pairs of properties to be set for APEX if needed. + required: false diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/relationship-types/relationshipTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/relationship-types/relationshipTypes.yml new file mode 100644 index 0000000000..4111ccb2ef --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/relationship-types/relationshipTypes.yml @@ -0,0 +1,22 @@ +tosca.relationships.Root: + description: This is the default (root) TOSCA Relationship Type definition that all other TOSCA Relationship Types derive from. + attributes: + tosca_id: + description: A unique identifier of the realized instance of a Relationship Template that derives from any TOSCA normative type. + type: string + tosca_name: + description: This attribute reflects the name of the Relationship Template as defined in the TOSCA service template. This name is not unique to the realized instance model of corresponding deployed application as each template in the model can result in one or more instances (e.g., scaled) when orchestrated to a provider environment. + type: string + state: + description: The state of the relationship instance. + type: string + default: initial + interfaces: + Configure: + type: tosca.interfaces.relationship.Configure + +tosca.relationships.DependsOn: + derived_from: tosca.relationships.Root + description: This type represents a general dependency relationship between two nodes. + valid_target_types: + - tosca.capabilities.Node diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/imports/controlloop.yaml b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/imports/controlloop.yaml deleted file mode 100644 index 49fd063a0b..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/imports/controlloop.yaml +++ /dev/null @@ -1,650 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_3 -description: ControlLoop types definitions version 1.0.0 - -data_types: - onap.datatypes.ToscaConceptIdentifier: - derived_from: tosca.datatypes.Root - properties: - name: - type: string - required: true - version: - type: string - required: true - 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 - metadata: - clamp_possible_values: 'ClampExecution:CSAR_RESOURCES' - 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 - metadata: - clamp_possible_values: 'Dictionary:DefaultActors,ClampExecution:CDS/actor' - operation: - type: string - description: The operation the actor is performing. - metadata: - clamp_possible_values: 'Dictionary:DefaultOperations,ClampExecution:CDS/operation' - required: true - target: - type: onap.datatype.controlloop.Target - description: The resource the operation should be performed on. - required: true - payload: - type: map - description: Name/value pairs of payload information passed by Policy to the actor - required: false - metadata: - clamp_possible_values: 'ClampExecution:CDS/payload' - 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 - 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 - onap.datatypes.monitoring.managedObjectDNsBasic: - constraints: [] - properties: - DN: - name: DN - type: string - typeVersion: 0.0.0 - description: Managed object distinguished name - required: true - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.managedObjectDNsBasic - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.managedObjectDNsBasics: - constraints: [] - properties: - managedObjectDNsBasic: - name: managedObjectDNsBasic - type: map - typeVersion: 0.0.0 - description: Managed object distinguished name object - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.managedObjectDNsBasic - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.managedObjectDNsBasics - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.measurementGroup: - constraints: [] - properties: - measurementTypes: - name: measurementTypes - type: list - typeVersion: 0.0.0 - description: List of measurement types - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementTypes - typeVersion: 0.0.0 - constraints: [] - metadata: {} - managedObjectDNsBasic: - name: managedObjectDNsBasic - type: list - typeVersion: 0.0.0 - description: List of managed object distinguished names - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.managedObjectDNsBasics - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementGroup - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.measurementGroups: - constraints: [] - properties: - measurementGroup: - name: measurementGroup - type: map - typeVersion: 0.0.0 - description: Measurement Group - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementGroup - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementGroups - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.measurementType: - constraints: [] - properties: - measurementType: - name: measurementType - type: string - typeVersion: 0.0.0 - description: Measurement type - required: true - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementType - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.measurementTypes: - constraints: [] - properties: - measurementType: - name: measurementType - type: map - typeVersion: 0.0.0 - description: Measurement type object - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementType - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementTypes - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.nfFilter: - constraints: [] - properties: - modelNames: - name: modelNames - type: list - typeVersion: 0.0.0 - description: List of model names - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - modelInvariantIDs: - name: modelInvariantIDs - type: list - typeVersion: 0.0.0 - description: List of model invariant IDs - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - modelVersionIDs: - name: modelVersionIDs - type: list - typeVersion: 0.0.0 - description: List of model version IDs - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - nfNames: - name: nfNames - type: list - typeVersion: 0.0.0 - description: List of network functions - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.nfFilter - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - onap.datatypes.monitoring.subscription: - constraints: [] - properties: - measurementGroups: - name: measurementGroups - type: list - typeVersion: 0.0.0 - description: Measurement Groups - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementGroups - typeVersion: 0.0.0 - constraints: [] - metadata: {} - fileBasedGP: - name: fileBasedGP - type: integer - typeVersion: 0.0.0 - description: File based granularity period - required: true - constraints: [] - metadata: {} - fileLocation: - name: fileLocation - type: string - typeVersion: 0.0.0 - description: ROP file location - required: true - constraints: [] - metadata: {} - subscriptionName: - name: subscriptionName - type: string - typeVersion: 0.0.0 - description: Name of the subscription - required: true - constraints: [] - metadata: {} - administrativeState: - name: administrativeState - type: string - typeVersion: 0.0.0 - description: State of the subscription - required: true - constraints: - - valid_values: - - LOCKED - - UNLOCKED - metadata: {} - nfFilter: - name: nfFilter - type: map - typeVersion: 0.0.0 - description: Network function filter - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.nfFilter - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.subscription - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} - org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest: - version: 1.0.0 - derived_from: tosca.datatypes.Root - properties: - restRequestId: - type: onap.datatypes.ToscaConceptIdentifier - typeVersion: 1.0.0 - required: true - description: The name and version of a REST request to be sent to a REST endpoint - httpMethod: - type: string - required: true - constraints: - - valid_values: - - POST - - PUT - - GET - - DELETE - description: The REST method to use - path: - type: string - required: true - description: The path of the REST request relative to the base URL - body: - type: string - required: false - description: The body of the REST request for PUT and POST requests - expectedResponse: - type: integer - required: true - constraints: [] - description: THe expected HTTP status code for the REST request - org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity: - version: 1.0.0 - derived_from: tosca.datatypes.Root - properties: - configurationEntityId: - type: onap.datatypes.ToscaConceptIdentifier - typeVersion: 1.0.0 - required: true - description: The name and version of a Configuration Entity to be handled by the - HTTP Control Loop Element - restSequence: - type: list - entry_schema: - type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest - typeVersion: 1.0.0 - description: A sequence of REST commands to send to the REST endpoint -policy_types: - onap.policies.Monitoring: - derived_from: tosca.policies.Root - description: a base policy type for all policies that govern monitoring provisioning - version: 1.0.0 - name: onap.policies.Monitoring - onap.policies.monitoring.dcae-pm-subscription-handler: - properties: - pmsh_policy: - name: pmsh_policy - type: onap.datatypes.monitoring.subscription - typeVersion: 0.0.0 - description: PMSH Policy JSON - required: false - constraints: [] - metadata: {} - name: onap.policies.monitoring.dcae-pm-subscription-handler - version: 1.0.0 - derived_from: onap.policies.Monitoring - metadata: {} - onap.policies.controlloop.operational.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - name: onap.policies.controlloop.operational.Common - description: Operational Policy for Control Loop execution. Originated in Frankfurt to - support TOSCA Compliant Policy Types. This does NOT support the legacy Policy YAML policy type. - 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.Apex: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - name: onap.policies.controlloop.operational.common.Apex - description: Operational policies for Apex PDP - properties: - engineServiceParameters: - type: string - description: The engine parameters like name, instanceCount, policy implementation, - parameters etc. - required: true - eventInputParameters: - type: string - description: The event input parameters. - required: true - eventOutputParameters: - type: string - description: The event output parameters. - required: true - javaProperties: - type: string - description: Name/value pairs of properties to be set for APEX if needed. - required: false -node_types: - org.onap.policy.clamp.controlloop.Participant: - version: 1.0.1 - derived_from: tosca.nodetypes.Root - properties: - provider: - type: string - required: false - org.onap.policy.clamp.controlloop.ControlLoopElement: - version: 1.0.1 - derived_from: tosca.nodetypes.Root - properties: - provider: - type: string - required: false - metadata: - common: true - description: Specifies the organization that provides the control loop element - participant_id: - type: onap.datatypes.ToscaConceptIdentifier - required: true - metadata: - common: true - participantType: - type: onap.datatypes.ToscaConceptIdentifier - required: true - metadata: - common: true - description: The identity of the participant type that hosts this type of Control - Loop Element - startPhase: - type: integer - required: false - constraints: - - greater_or_equal: 0 - metadata: - common: true - description: A value indicating the start phase in which this control loop element - will be started, the first start phase is zero. Control Loop Elements - are started in their start_phase order and stopped in reverse start - phase order. Control Loop Elements with the same start phase are - started and stopped simultaneously - uninitializedToPassiveTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from - uninitialized to passive - passiveToRunningTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from passive to - running - runningToPassiveTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from running to - passive - passiveToUninitializedTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from passive to - uninitialized - org.onap.policy.clamp.controlloop.ControlLoop: - version: 1.0.1 - derived_from: tosca.nodetypes.Root - properties: - provider: - type: string - required: false - metadata: - common: true - description: Specifies the organization that provides the control loop element - elements: - type: list - required: true - metadata: - common: true - entry_schema: - type: onap.datatypes.ToscaConceptIdentifier - description: Specifies a list of control loop element definitions that make up this - control loop definition - org.onap.policy.clamp.controlloop.PolicyControlLoopElement: - version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - policy_type_id: - type: onap.datatypes.ToscaConceptIdentifier - required: true - policy_id: - type: onap.datatypes.ToscaConceptIdentifier - required: false - org.onap.policy.clamp.controlloop.CDSControlLoopElement: - version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - cds_blueprint_id: - type: onap.datatypes.ToscaConceptIdentifier - required: true - org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement: - version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - chart: - type: string - required: true - configs: - type: list - required: false - requirements: - type: string - required: false - templates: - type: list - required: false - entry_schema: null - values: - type: string - required: true - org.onap.policy.clamp.controlloop.HttpControlLoopElement: - version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - baseUrl: - type: string - required: true - description: The base URL to be prepended to each path, identifies the host for the - REST endpoints. - httpHeaders: - type: map - required: false - entry_schema: - type: string - description: HTTP headers to send on REST requests - configurationEntities: - type: map - required: true - entry_schema: - type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity - typeVersion: 1.0.0 - description: The connfiguration entities the Control Loop Element is managing and - their associated REST requests diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/payload.json b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/payload.json deleted file mode 100644 index 041cffc391..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/payload.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "CONTROL LOOP", - "modelType": "NORMATIVE" -} diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/data-types/dataTypes.yml deleted file mode 100644 index 436c6c960e..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/data-types/dataTypes.yml +++ /dev/null @@ -1,432 +0,0 @@ -tosca.datatypes.Root: - description: The TOSCA root Data Type all other TOSCA base Data Types derive from -integer: - derived_from: tosca.datatypes.Root -string: - derived_from: tosca.datatypes.Root -boolean: - derived_from: tosca.datatypes.Root -float: - derived_from: tosca.datatypes.Root -list: - derived_from: tosca.datatypes.Root -map: - derived_from: tosca.datatypes.Root -json: - derived_from: tosca.datatypes.Root -scalar-unit: - derived_from: tosca.datatypes.Root -scalar-unit.size: - derived_from: scalar-unit -scalar-unit.time: - derived_from: scalar-unit -scalar-unit.frequency: - derived_from: scalar-unit -onap.datatypes.ToscaConceptIdentifier: - derived_from: tosca.datatypes.Root - properties: - name: - type: string - required: true - version: - type: string - required: true -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 - metadata: - clamp_possible_values: 'ClampExecution:CSAR_RESOURCES' - 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 - metadata: - clamp_possible_values: 'Dictionary:DefaultActors,ClampExecution:CDS/actor' - operation: - type: string - description: The operation the actor is performing. - metadata: - clamp_possible_values: 'Dictionary:DefaultOperations,ClampExecution:CDS/operation' - required: true - target: - type: onap.datatype.controlloop.Target - description: The resource the operation should be performed on. - required: true - payload: - type: map - description: Name/value pairs of payload information passed by Policy to the actor - required: false - metadata: - clamp_possible_values: 'ClampExecution:CDS/payload' - 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 - 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 -onap.datatypes.monitoring.managedObjectDNsBasic: - constraints: [] - properties: - DN: - name: DN - type: string - typeVersion: 0.0.0 - description: Managed object distinguished name - required: true - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.managedObjectDNsBasic - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.managedObjectDNsBasics: - constraints: [] - properties: - managedObjectDNsBasic: - name: managedObjectDNsBasic - type: map - typeVersion: 0.0.0 - description: Managed object distinguished name object - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.managedObjectDNsBasic - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.managedObjectDNsBasics - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.measurementGroup: - constraints: [] - properties: - measurementTypes: - name: measurementTypes - type: list - typeVersion: 0.0.0 - description: List of measurement types - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementTypes - typeVersion: 0.0.0 - constraints: [] - metadata: {} - managedObjectDNsBasic: - name: managedObjectDNsBasic - type: list - typeVersion: 0.0.0 - description: List of managed object distinguished names - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.managedObjectDNsBasics - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementGroup - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.measurementGroups: - constraints: [] - properties: - measurementGroup: - name: measurementGroup - type: map - typeVersion: 0.0.0 - description: Measurement Group - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementGroup - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementGroups - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.measurementType: - constraints: [] - properties: - measurementType: - name: measurementType - type: string - typeVersion: 0.0.0 - description: Measurement type - required: true - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementType - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.measurementTypes: - constraints: [] - properties: - measurementType: - name: measurementType - type: map - typeVersion: 0.0.0 - description: Measurement type object - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementType - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.measurementTypes - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.nfFilter: - constraints: [] - properties: - modelNames: - name: modelNames - type: list - typeVersion: 0.0.0 - description: List of model names - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - modelInvariantIDs: - name: modelInvariantIDs - type: list - typeVersion: 0.0.0 - description: List of model invariant IDs - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - modelVersionIDs: - name: modelVersionIDs - type: list - typeVersion: 0.0.0 - description: List of model version IDs - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - nfNames: - name: nfNames - type: list - typeVersion: 0.0.0 - description: List of network functions - required: true - constraints: [] - entry_schema: - type: string - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.nfFilter - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -onap.datatypes.monitoring.subscription: - constraints: [] - properties: - measurementGroups: - name: measurementGroups - type: list - typeVersion: 0.0.0 - description: Measurement Groups - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.measurementGroups - typeVersion: 0.0.0 - constraints: [] - metadata: {} - fileBasedGP: - name: fileBasedGP - type: integer - typeVersion: 0.0.0 - description: File based granularity period - required: true - constraints: [] - metadata: {} - fileLocation: - name: fileLocation - type: string - typeVersion: 0.0.0 - description: ROP file location - required: true - constraints: [] - metadata: {} - subscriptionName: - name: subscriptionName - type: string - typeVersion: 0.0.0 - description: Name of the subscription - required: true - constraints: [] - metadata: {} - administrativeState: - name: administrativeState - type: string - typeVersion: 0.0.0 - description: State of the subscription - required: true - constraints: - - valid_values: - - LOCKED - - UNLOCKED - metadata: {} - nfFilter: - name: nfFilter - type: map - typeVersion: 0.0.0 - description: Network function filter - required: true - constraints: [] - entry_schema: - type: onap.datatypes.monitoring.nfFilter - typeVersion: 0.0.0 - constraints: [] - metadata: {} - name: onap.datatypes.monitoring.subscription - version: 0.0.0 - derived_from: tosca.datatypes.Root - metadata: {} -org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest: - version: 1.0.0 - derived_from: tosca.datatypes.Root - properties: - restRequestId: - type: onap.datatypes.ToscaConceptIdentifier - typeVersion: 1.0.0 - required: true - description: The name and version of a REST request to be sent to a REST endpoint - httpMethod: - type: string - required: true - constraints: - - valid_values: - - POST - - PUT - - GET - - DELETE - description: The REST method to use - path: - type: string - required: true - description: The path of the REST request relative to the base URL - body: - type: string - required: false - description: The body of the REST request for PUT and POST requests - expectedResponse: - type: integer - required: true - constraints: [] - description: THe expected HTTP status code for the REST request -org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity: - version: 1.0.0 - derived_from: tosca.datatypes.Root - properties: - configurationEntityId: - type: onap.datatypes.ToscaConceptIdentifier - typeVersion: 1.0.0 - required: true - description: The name and version of a Configuration Entity to be handled by the HTTP - Control Loop Element - restSequence: - type: list - entry_schema: - type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest - typeVersion: 1.0.0 - constraints: [] - description: A sequence of REST commands to send to the REST endpoint diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/metadata.json b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/metadata.json deleted file mode 100644 index e3e1f8c326..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/metadata.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "nodeMetadataList": [ - { - "contactId": "jh0003", - "toscaName": "tosca.nodes.Root", - "name": "Root", - "model": "CONTROL LOOP", - "description": "The TOSCA Node Type all other TOSCA base Node Types derive from", - "resourceIconPath": "defaulticon", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Abstract" - } - ] - } - ], - "tags": [ - "Root", - "tosca.nodes.Root" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.Participant", - "name": "Participant", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the Participant", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "Participant", - "org.onap.policy.clamp.controlloop.Participant" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.ControlLoopElement", - "name": "ControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the ControlLoopElement", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "ControlLoopElement", - "org.onap.policy.clamp.controlloop.ControlLoopElement" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.ControlLoop", - "name": "ControlLoop", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the ControlLoop", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "ControlLoop", - "org.onap.policy.clamp.controlloop.ControlLoop" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement", - "name": "PolicyControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the PolicyControlLoopElement", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "PolicyControlLoopElement", - "org.onap.policy.clamp.controlloop.PolicyControlLoopElement" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.CDSControlLoopElement", - "name": "CDSControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the CDSControlLoopElement", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "CDSControlLoopElement", - "org.onap.policy.clamp.controlloop.CDSControlLoopElement" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement", - "name": "K8SMicroserviceControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the K8SMicroserviceControlLoopElement", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "K8SMicroserviceControlLoopElement", - "org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement" - ] - }, - { - "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.HttpControlLoopElement", - "name": "HttpControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the HttpControlLoopElement", - "resourceIconPath": "defaulticon", - "resourceType": "VFC", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Infrastructure" - } - ] - } - ], - "tags": [ - "HttpControlLoopElement", - "org.onap.policy.clamp.controlloop.HttpControlLoopElement" - ] - } - ] -} - diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/nodeTypes.yaml b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/nodeTypes.yaml deleted file mode 100644 index e68d1e578d..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/node-types/nodeTypes.yaml +++ /dev/null @@ -1,198 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_2 -description: ETSI NFV SOL 001 Root node type definitions version 2.5.1 - -node_types: - tosca.nodes.Root: - description: The TOSCA Node Type all other TOSCA base Node Types derive from - attributes: - tosca_id: - type: string - tosca_name: - type: string - state: - type: string - capabilities: - feature: - type: tosca.capabilities.Node - requirements: - - dependency: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: [ 0, UNBOUNDED ] - interfaces: - Standard: - type: tosca.interfaces.node.lifecycle.Standard - org.onap.policy.clamp.controlloop.Participant: - derived_from: tosca.nodes.Root - properties: - provider: - type: string - description: Provider of the participant - required: false - version: - type: string - description: Identifies the version of the participant. - required: true - org.onap.policy.clamp.controlloop.ControlLoopElement: - derived_from: tosca.nodes.Root - properties: - provider: - type: string - required: false - metadata: - common: true - description: Specifies the organization that provides the control loop element - version: - type: string - description: Identifies the version of the ControlLoopElement. - required: true - participant_id: - type: string - required: true - metadata: - common: true - participantType: - type: string - required: true - metadata: - common: true - description: The identity of the participant type that hosts this type of Control Loop Element - startPhase: - type: integer - required: false - constraints: - - greater_or_equal: 0 - metadata: - common: true - description: A value indicating the start phase in which this control loop element will be started, the - first start phase is zero. Control Loop Elements are started in their start_phase order and stopped - in reverse start phase order. Control Loop Elements with the same start phase are started and - stopped simultaneously - uninitializedToPassiveTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from uninitialized to passive - passiveToRunningTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from passive to running - runningToPassiveTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from running to passive - passiveToUninitializedTimeout: - type: integer - required: false - constraints: - - greater_or_equal: 0 - default: 60 - metadata: - common: true - description: The maximum time in seconds to wait for a state chage from passive to uninitialized - org.onap.policy.clamp.controlloop.ControlLoop: - derived_from: tosca.nodes.Root - properties: - provider: - type: string - required: false - metadata: - common: true - description: Specifies the organization that provides the control loop element - version: - type: string - description: Identifies the version of the participant. - required: true - elements: - type: list - required: true - metadata: - common: true - entry_schema: - type: string - description: Specifies a list of control loop element definitions that make up this control loop definition - org.onap.policy.clamp.controlloop.PolicyControlLoopElement: - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - policy_type_id: - type: string - required: true - policy_id: - type: string - required: false - version: - type: string - description: Identifies the version of the participant. - required: true - org.onap.policy.clamp.controlloop.CDSControlLoopElement: - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - cds_blueprint_id: - type: string - required: true - version: - type: string - description: Identifies the version of the participant. - required: true - org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement: - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - chart: - type: string - required: true - configs: - type: list - required: false - requirements: - type: string - required: false - templates: - type: list - required: false - entry_schema: - values: - type: string - required: true - version: - type: string - description: Identifies the version of the participant. - required: true - org.onap.policy.clamp.controlloop.HttpControlLoopElement: - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement - properties: - baseUrl: - type: string - required: true - description: The base URL to be prepended to each path, identifies the host for the REST endpoints. - httpHeaders: - type: map - required: false - entry_schema: - type: string - description: HTTP headers to send on REST requests - configurationEntities: - type: map - required: true - entry_schema: - type: string - typeVersion: 1.0.0 - description: The connfiguration entities the Control Loop Element is managing and their associated REST requests - version: - type: string - description: Identifies the version of the participant. - required: true diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.json b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.json deleted file mode 100644 index f22d1c3b1a..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "tosca.policies.Root": { - "displayName": "Root", - "icon": "policy-root" - }, - "tosca.policies.Placement": { - "displayName": "Placement", - "icon": "policy-placement" - }, - "onap.policies.Monitoring": { - "displayName": "Monotiring", - "icon": "policy-monotiring" - }, - "onap.policies.monitoring.dcae-pm-subscription-handler": { - "displayName": "DCAE-PM-Subscription-Handler", - "icon": "policy-placement" - }, - "onap.policies.controlloop.operational.Common": { - "displayName": "ControLoopOperationalCommon", - "icon": "policy-placement" - }, - "onap.policies.controlloop.operational.common.Apex": { - "displayName": "ControlLoopOperationalCommonApex", - "icon": "policy-placement" - } -} diff --git a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.yml deleted file mode 100644 index f3f14cbebe..0000000000 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/tosca/policy-types/policyTypes.yml +++ /dev/null @@ -1,82 +0,0 @@ -tosca.policies.Root: - description: The TOSCA Policy Type all other TOSCA Policy Types derive from -tosca.policies.Placement: - derived_from: tosca.policies.Root - description: The TOSCA Policy Type definition that is used to govern placement of TOSCA - nodes or groups of nodes. -onap.policies.Monitoring: - derived_from: tosca.policies.Root - description: a base policy type for all policies that govern monitoring provisioning - version: 1.0.0 - name: onap.policies.Monitoring -onap.policies.monitoring.dcae-pm-subscription-handler: - properties: - pmsh_policy: - name: pmsh_policy - type: onap.datatypes.monitoring.subscription - typeVersion: 0.0.0 - description: PMSH Policy JSON - required: false - constraints: [] - metadata: {} - name: onap.policies.monitoring.dcae-pm-subscription-handler - version: 1.0.0 - derived_from: onap.policies.Monitoring - metadata: {} -onap.policies.controlloop.operational.Common: - derived_from: tosca.policies.Root - version: 1.0.0 - name: onap.policies.controlloop.operational.Common - description: Operational Policy for Control Loop execution. Originated in Frankfurt to - support TOSCA Compliant Policy Types. This does NOT support the legacy Policy YAML policy type. - 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.Apex: - derived_from: onap.policies.controlloop.operational.Common - type_version: 1.0.0 - version: 1.0.0 - name: onap.policies.controlloop.operational.common.Apex - description: Operational policies for Apex PDP - properties: - engineServiceParameters: - type: string - description: The engine parameters like name, instanceCount, policy implementation, - parameters etc. - required: true - eventInputParameters: - type: string - description: The event input parameters. - required: true - eventOutputParameters: - type: string - description: The event output parameters. - required: true - javaProperties: - type: string - description: Name/value pairs of properties to be set for APEX if needed. - required: false diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml index f33259903b..94e5dd5761 100644 --- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml +++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml @@ -262,8 +262,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml index 3bb87991b2..3d026622e7 100644 --- a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml +++ b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml @@ -182,8 +182,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Compistion Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/catalog-model/src/test/resources/config/configuration.yaml b/catalog-model/src/test/resources/config/configuration.yaml index a3ab97ab60..b2a44aa78f 100644 --- a/catalog-model/src/test/resources/config/configuration.yaml +++ b/catalog-model/src/test/resources/config/configuration.yaml @@ -243,8 +243,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/catalog-ui/cypress/fixtures/general-page/service-metadata-update-response.json b/catalog-ui/cypress/fixtures/general-page/service-metadata-update-response.json index fe326b7a48..286487c7cc 100644 --- a/catalog-ui/cypress/fixtures/general-page/service-metadata-update-response.json +++ b/catalog-ui/cypress/fixtures/general-page/service-metadata-update-response.json @@ -44,15 +44,15 @@ "isFromCsar": false, "empty": false }, - "controlloopfunctions": { + "automationcompositionfunctions": { "heatParamUpdated": false, "timeout": 0, "creatorFullName": "Carlos Santana", "creationDate": 1574671218342, - "uniqueId": "94629a8a-604e-4e91-b825-33b7001cb98b.controlloopfunctions", + "uniqueId": "94629a8a-604e-4e91-b825-33b7001cb98b.automationcompositionfunctions", "generated": false, - "artifactDisplayName": "Control Loop Functions", - "artifactLabel": "controlloopfunctions", + "artifactDisplayName": "Automation Composition Functions", + "artifactLabel": "automationcompositionfunctions", "artifactGroupType": "INFORMATIONAL", "userIdCreator": "m08740", "updaterFullName": "Carlos Santana", @@ -548,15 +548,15 @@ "archiveTime": 1574695514690, "systemName": "Service1", "allArtifacts": { - "controlloopfunctions": { + "automationcompositionfunctions": { "heatParamUpdated": false, "timeout": 0, "creatorFullName": "Carlos Santana", "creationDate": 1574671218342, - "uniqueId": "94629a8a-604e-4e91-b825-33b7001cb98b.controlloopfunctions", + "uniqueId": "94629a8a-604e-4e91-b825-33b7001cb98b.automationcompositionfunctions", "generated": false, - "artifactDisplayName": "Control Loop Functions", - "artifactLabel": "controlloopfunctions", + "artifactDisplayName": "Automation Composition Functions", + "artifactLabel": "automationcompositionfunctions", "artifactGroupType": "INFORMATIONAL", "userIdCreator": "m08740", "updaterFullName": "Carlos Santana", @@ -837,4 +837,4 @@ }, "icon": "defaulticon", "name": "Service1" -} \ No newline at end of file +} diff --git a/catalog-ui/cypress/fixtures/service-proxy-tabs/service-proxy.json b/catalog-ui/cypress/fixtures/service-proxy-tabs/service-proxy.json index 988ed75a05..c230e9bdf9 100644 --- a/catalog-ui/cypress/fixtures/service-proxy-tabs/service-proxy.json +++ b/catalog-ui/cypress/fixtures/service-proxy-tabs/service-proxy.json @@ -42,7 +42,7 @@ "artifactVersion": "0", "empty": false }, - "controlloopfunctions": { + "automationcompositionfunctions": { "duplicated": false, "creationDate": 1564291546187, "timeout": 0, @@ -52,11 +52,11 @@ "updaterFullName": "Carlos Santana", "lastUpdateDate": 1564291546187, "generated": false, - "uniqueId": "241a0305-4f6b-4796-ba27-bbb12558753f.controlloopfunctions", + "uniqueId": "241a0305-4f6b-4796-ba27-bbb12558753f.automationcompositionfunctions", "artifactType": "OTHER", "creatorFullName": "Carlos Santana", - "artifactDisplayName": "Control Loop Functions", - "artifactLabel": "controlloopfunctions", + "artifactDisplayName": "Automation Composition Functions", + "artifactLabel": "automationcompositionfunctions", "artifactGroupType": "INFORMATIONAL", "mandatory": true, "isFromCsar": false, @@ -2944,7 +2944,7 @@ "conformanceLevel": "9.0", "lastUpdateDate": 1564567405383, "allArtifacts": { - "controlloopfunctions": { + "automationcompositionfunctions": { "duplicated": false, "creationDate": 1564291546187, "timeout": 0, @@ -2954,11 +2954,11 @@ "updaterFullName": "Carlos Santana", "lastUpdateDate": 1564291546187, "generated": false, - "uniqueId": "241a0305-4f6b-4796-ba27-bbb12558753f.controlloopfunctions", + "uniqueId": "241a0305-4f6b-4796-ba27-bbb12558753f.automationcompositionfunctions", "artifactType": "OTHER", "creatorFullName": "Carlos Santana", - "artifactDisplayName": "Control Loop Functions", - "artifactLabel": "controlloopfunctions", + "artifactDisplayName": "Automation Composition Functions", + "artifactLabel": "automationcompositionfunctions", "artifactGroupType": "INFORMATIONAL", "mandatory": true, "isFromCsar": false, diff --git a/docs/configuration.rst b/docs/configuration.rst index 2438504d92..54c1760d8f 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -406,8 +406,8 @@ BE-configuration.yaml summaryOfImpactsToECOMPElements: displayName: Summary of impacts to ECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java index ee3e3db17b..ee3f19fdd1 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java @@ -26,7 +26,7 @@ public enum MandatoryServiceArtifactTypeEnum { INSTANT_FLOWS(null, "instantiationflows".toLowerCase(), "Management Flows"), SERVICE_ART_PLAN(null, "serviceartifactplan".toLowerCase(), "Service Artifact Plan"), SUM_OF_ELEMENTS(null, "summaryofimpactstoecompelements".toLowerCase(), "Summary of impacts to ECOMP elements,OSSs, BSSs"), - CONTROL_LOOP_FUN(null, "controlloopfunctions".toLowerCase(), "Control Loop Functions"), + AUTOMATION_COMPOSITION_FUN(null, "automationcompositionfunctions".toLowerCase(), "Automation Composition Functions"), DIMENSIONNING_INFO(null, "dimensioninginfo".toLowerCase(), "Dimensioning Info"), AFFINITY_RULES(null, "affinityrules".toLowerCase(), "Affinity Rules"), OPERATIONAL_POLICIES(null, "operationalpolicies".toLowerCase(), "Operational Policies"), diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/datatypes/DataTestIdEnum.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/datatypes/DataTestIdEnum.java index d03896689f..1fe4fd10b1 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/datatypes/DataTestIdEnum.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/datatypes/DataTestIdEnum.java @@ -572,7 +572,7 @@ public final class DataTestIdEnum { @Getter public enum InformationalArtifactsService { AFFINITY_RULES("artifact_Display_Name-Affinity Rules"), - CONTROL_LOOP_FUNCTIONS("artifact_Display_Name-Control Loop Functions"), + AUTOMATION_COMPOSITION_FUNCTIONS("artifact_Display_Name-Automation Composition Functions"), DEPLOYMENT_VOTING_RECORD("artifact_Display_Name-Deployment Voting Record"), DIMENSIONING_INFO("artifact_Display_Name-Dimensioning Info"), DISTRIBUTION_INSTRUCTION("artifact_Display_Name-Distribution Instructions"), diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml index 628ca43261..fd84ccd0c6 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/resources/configuration.yaml @@ -139,8 +139,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to OPENECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info diff --git a/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml b/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml index 22aac102b6..6121b10120 100644 --- a/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml +++ b/openecomp-be/tools/zusammen-tools/src/test/resources/configuration.yaml @@ -140,8 +140,8 @@ informationalServiceArtifacts: summaryOfImpactsToECOMPElements: displayName: Summary of impacts to OPENECOMP elements,OSSs, BSSs type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions + automationCompositionFunctions: + displayName: Automation Composition Functions type: OTHER dimensioningInfo: displayName: Dimensioning Info -- cgit 1.2.3-korg