diff options
26 files changed, 242 insertions, 181 deletions
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/controlloop/imports/controlloop.yaml b/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml index 49fd063a0b..54300cc731 100644 --- a/catalog-be/src/main/resources/import/tosca/models/init/controlloop/imports/controlloop.yaml +++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/imports/acm.yaml @@ -1,5 +1,5 @@ tosca_definitions_version: tosca_simple_yaml_1_3 -description: ControlLoop types definitions version 1.0.0 +description: AutomationComposition types definitions version 1.0.0 data_types: onap.datatypes.ToscaConceptIdentifier: @@ -11,9 +11,9 @@ data_types: version: type: string required: true - onap.datatype.controlloop.Target: + onap.datatype.acm.Target: derived_from: tosca.datatypes.Root - description: Definition for a entity in A&AI to perform a control loop operation on + description: Definition for a entity in A&AI to perform a acm operation on properties: targetType: type: string @@ -34,7 +34,7 @@ data_types: clamp_possible_values: 'ClampExecution:CSAR_RESOURCES' entry_schema: type: string - onap.datatype.controlloop.Actor: + onap.datatype.acm.Actor: derived_from: tosca.datatypes.Root description: An actor/operation/target definition properties: @@ -51,7 +51,7 @@ data_types: clamp_possible_values: 'Dictionary:DefaultOperations,ClampExecution:CDS/operation' required: true target: - type: onap.datatype.controlloop.Target + type: onap.datatype.acm.Target description: The resource the operation should be performed on. required: true payload: @@ -62,7 +62,7 @@ data_types: clamp_possible_values: 'ClampExecution:CDS/payload' entry_schema: type: string - onap.datatype.controlloop.Operation: + onap.datatype.acm.Operation: derived_from: tosca.datatypes.Root description: An operation supported by an actor properties: @@ -75,7 +75,7 @@ data_types: description: A user-friendly description of the intent for the operation required: false operation: - type: onap.datatype.controlloop.Actor + type: onap.datatype.acm.Actor description: The definition of the operation to be performed. required: true timeout: @@ -362,7 +362,7 @@ data_types: version: 0.0.0 derived_from: tosca.datatypes.Root metadata: {} - org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest: + org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest: version: 1.0.0 derived_from: tosca.datatypes.Root properties: @@ -394,7 +394,7 @@ data_types: required: true constraints: [] description: THe expected HTTP status code for the REST request - org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity: + org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity: version: 1.0.0 derived_from: tosca.datatypes.Root properties: @@ -403,11 +403,11 @@ data_types: typeVersion: 1.0.0 required: true description: The name and version of a Configuration Entity to be handled by the - HTTP Control Loop Element + HTTP Automation Composition Element restSequence: type: list entry_schema: - type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest + 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: @@ -430,16 +430,16 @@ policy_types: version: 1.0.0 derived_from: onap.policies.Monitoring metadata: {} - onap.policies.controlloop.operational.Common: + onap.policies.acm.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 + 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 control loop id. + description: The unique acm id. required: true timeout: type: integer @@ -448,26 +448,26 @@ policy_types: required: true abatement: type: boolean - description: Whether an abatement event message will be expected for the control - loop from DCAE. + 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 Control Loop. + the Automation Composition. required: true operations: type: list - description: List of operations to be performed when Control Loop is triggered. + description: List of operations to be performed when Automation Composition 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: 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.controlloop.operational.common.Apex + name: onap.policies.acm.operational.common.Apex description: Operational policies for Apex PDP properties: engineServiceParameters: @@ -488,14 +488,14 @@ policy_types: description: Name/value pairs of properties to be set for APEX if needed. required: false node_types: - org.onap.policy.clamp.controlloop.Participant: + 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.controlloop.ControlLoopElement: + org.onap.policy.clamp.acm.AutomationCompositionElement: version: 1.0.1 derived_from: tosca.nodetypes.Root properties: @@ -504,7 +504,7 @@ node_types: required: false metadata: common: true - description: Specifies the organization that provides the control loop element + description: Specifies the organization that provides the acm element participant_id: type: onap.datatypes.ToscaConceptIdentifier required: true @@ -515,8 +515,8 @@ node_types: required: true metadata: common: true - description: The identity of the participant type that hosts this type of Control - Loop Element + description: The identity of the participant type that hosts this type of Automation + Composition Element startPhase: type: integer required: false @@ -524,10 +524,10 @@ node_types: - 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 + 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. Control Loop Elements with the same start phase are + phase order. Automation Composition Elements with the same start phase are started and stopped simultaneously uninitializedToPassiveTimeout: type: integer @@ -569,7 +569,7 @@ node_types: common: true description: The maximum time in seconds to wait for a state chage from passive to uninitialized - org.onap.policy.clamp.controlloop.ControlLoop: + org.onap.policy.clamp.acm.AutomationComposition: version: 1.0.1 derived_from: tosca.nodetypes.Root properties: @@ -578,7 +578,7 @@ node_types: required: false metadata: common: true - description: Specifies the organization that provides the control loop element + description: Specifies the organization that provides the acm element elements: type: list required: true @@ -586,11 +586,11 @@ node_types: 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: + 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.controlloop.ControlLoopElement + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: policy_type_id: type: onap.datatypes.ToscaConceptIdentifier @@ -598,16 +598,16 @@ node_types: policy_id: type: onap.datatypes.ToscaConceptIdentifier required: false - org.onap.policy.clamp.controlloop.CDSControlLoopElement: + org.onap.policy.clamp.acm.CDSAutomationCompositionElement: version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: cds_blueprint_id: type: onap.datatypes.ToscaConceptIdentifier required: true - org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement: + org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement: version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: chart: type: string @@ -625,9 +625,9 @@ node_types: values: type: string required: true - org.onap.policy.clamp.controlloop.HttpControlLoopElement: + org.onap.policy.clamp.acm.HttpAutomationCompositionElement: version: 1.0.1 - derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: baseUrl: type: string @@ -644,7 +644,7 @@ node_types: type: map required: true entry_schema: - type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity + type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity typeVersion: 1.0.0 - description: The connfiguration entities the Control Loop Element is managing and + 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/controlloop/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml index 436c6c960e..bb010fd4cb 100644 --- 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/acm/tosca/data-types/dataTypes.yml @@ -31,9 +31,9 @@ onap.datatypes.ToscaConceptIdentifier: version: type: string required: true -onap.datatype.controlloop.Target: +onap.datatype.acm.Target: derived_from: tosca.datatypes.Root - description: Definition for a entity in A&AI to perform a control loop operation on + description: Definition for a entity in A&AI to perform a automation composition operation on properties: targetType: type: string @@ -54,7 +54,7 @@ onap.datatype.controlloop.Target: clamp_possible_values: 'ClampExecution:CSAR_RESOURCES' entry_schema: type: string -onap.datatype.controlloop.Actor: +onap.datatype.acm.Actor: derived_from: tosca.datatypes.Root description: An actor/operation/target definition properties: @@ -71,7 +71,7 @@ onap.datatype.controlloop.Actor: clamp_possible_values: 'Dictionary:DefaultOperations,ClampExecution:CDS/operation' required: true target: - type: onap.datatype.controlloop.Target + type: onap.datatype.acm.Target description: The resource the operation should be performed on. required: true payload: @@ -82,7 +82,7 @@ onap.datatype.controlloop.Actor: clamp_possible_values: 'ClampExecution:CDS/payload' entry_schema: type: string -onap.datatype.controlloop.Operation: +onap.datatype.acm.Operation: derived_from: tosca.datatypes.Root description: An operation supported by an actor properties: @@ -95,7 +95,7 @@ onap.datatype.controlloop.Operation: description: A user-friendly description of the intent for the operation required: false operation: - type: onap.datatype.controlloop.Actor + type: onap.datatype.acm.Actor description: The definition of the operation to be performed. required: true timeout: @@ -381,7 +381,7 @@ onap.datatypes.monitoring.subscription: version: 0.0.0 derived_from: tosca.datatypes.Root metadata: {} -org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest: +org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest: version: 1.0.0 derived_from: tosca.datatypes.Root properties: @@ -413,7 +413,7 @@ org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest: required: true constraints: [] description: THe expected HTTP status code for the REST request -org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity: +org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity: version: 1.0.0 derived_from: tosca.datatypes.Root properties: @@ -422,11 +422,11 @@ org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.Configuration typeVersion: 1.0.0 required: true description: The name and version of a Configuration Entity to be handled by the HTTP - Control Loop Element + Automation Composition Element restSequence: type: list entry_schema: - type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest + 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/controlloop/tosca/node-types/metadata.json b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/node-types/metadata.json index e3e1f8c326..3e0c5ed224 100644 --- 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/acm/tosca/node-types/metadata.json @@ -4,7 +4,7 @@ "contactId": "jh0003", "toscaName": "tosca.nodes.Root", "name": "Root", - "model": "CONTROL LOOP", + "model": "AUTOMATION COMPOSITION", "description": "The TOSCA Node Type all other TOSCA base Node Types derive from", "resourceIconPath": "defaulticon", "categories": [ @@ -24,9 +24,9 @@ }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.Participant", + "toscaName": "org.onap.policy.clamp.acm.Participant", "name": "Participant", - "model": "CONTROL LOOP", + "model": "AUTOMATION COMPOSITION", "description": "The TOSCA service template representing the Participant", "resourceIconPath": "defaulticon", "resourceType": "VFC", @@ -42,15 +42,15 @@ ], "tags": [ "Participant", - "org.onap.policy.clamp.controlloop.Participant" + "org.onap.policy.clamp.acm.Participant" ] }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.ControlLoopElement", - "name": "ControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the ControlLoopElement", + "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": [ @@ -64,16 +64,16 @@ } ], "tags": [ - "ControlLoopElement", - "org.onap.policy.clamp.controlloop.ControlLoopElement" + "AutomationCompositionElement", + "org.onap.policy.clamp.acm.AutomationCompositionElement" ] }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.ControlLoop", - "name": "ControlLoop", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the ControlLoop", + "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": [ @@ -87,16 +87,16 @@ } ], "tags": [ - "ControlLoop", - "org.onap.policy.clamp.controlloop.ControlLoop" + "AutomationComposition", + "org.onap.policy.clamp.acm.AutomationComposition" ] }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement", - "name": "PolicyControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the PolicyControlLoopElement", + "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": [ @@ -110,16 +110,16 @@ } ], "tags": [ - "PolicyControlLoopElement", - "org.onap.policy.clamp.controlloop.PolicyControlLoopElement" + "PolicyAutomationCompositionElement", + "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement" ] }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.CDSControlLoopElement", - "name": "CDSControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the CDSControlLoopElement", + "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": [ @@ -133,16 +133,16 @@ } ], "tags": [ - "CDSControlLoopElement", - "org.onap.policy.clamp.controlloop.CDSControlLoopElement" + "CDSAutomationCompositionElement", + "org.onap.policy.clamp.acm.CDSAutomationCompositionElement" ] }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement", - "name": "K8SMicroserviceControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the K8SMicroserviceControlLoopElement", + "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": [ @@ -156,16 +156,16 @@ } ], "tags": [ - "K8SMicroserviceControlLoopElement", - "org.onap.policy.clamp.controlloop.K8SMicroserviceControlLoopElement" + "K8SMicroserviceAutomationCompositionElement", + "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement" ] }, { "contactId": "jh0003", - "toscaName": "org.onap.policy.clamp.controlloop.HttpControlLoopElement", - "name": "HttpControlLoopElement", - "model": "CONTROL LOOP", - "description": "The TOSCA service template representing the HttpControlLoopElement", + "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": [ @@ -179,8 +179,8 @@ } ], "tags": [ - "HttpControlLoopElement", - "org.onap.policy.clamp.controlloop.HttpControlLoopElement" + "HttpAutomationCompositionElement", + "org.onap.policy.clamp.acm.HttpAutomationCompositionElement" ] } ] 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/acm/tosca/node-types/nodeTypes.yaml index e68d1e578d..dd0abee722 100644 --- 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/acm/tosca/node-types/nodeTypes.yaml @@ -23,7 +23,7 @@ node_types: interfaces: Standard: type: tosca.interfaces.node.lifecycle.Standard - org.onap.policy.clamp.controlloop.Participant: + org.onap.policy.clamp.acm.Participant: derived_from: tosca.nodes.Root properties: provider: @@ -34,7 +34,7 @@ node_types: type: string description: Identifies the version of the participant. required: true - org.onap.policy.clamp.controlloop.ControlLoopElement: + org.onap.policy.clamp.acm.AutomationCompositionElement: derived_from: tosca.nodes.Root properties: provider: @@ -42,10 +42,10 @@ node_types: required: false metadata: common: true - description: Specifies the organization that provides the control loop element + description: Specifies the organization that provides the automation composition element version: type: string - description: Identifies the version of the ControlLoopElement. + description: Identifies the version of the AutomationCompositionElement. required: true participant_id: type: string @@ -57,7 +57,7 @@ node_types: required: true metadata: common: true - description: The identity of the participant type that hosts this type of Control Loop Element + description: The identity of the participant type that hosts this type of Automation Composition Element startPhase: type: integer required: false @@ -65,9 +65,9 @@ node_types: - 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 + 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 @@ -105,7 +105,7 @@ node_types: 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: + org.onap.policy.clamp.acm.AutomationComposition: derived_from: tosca.nodes.Root properties: provider: @@ -113,7 +113,7 @@ node_types: required: false metadata: common: true - description: Specifies the organization that provides the control loop element + description: Specifies the organization that provides the automation composition element version: type: string description: Identifies the version of the participant. @@ -125,9 +125,9 @@ node_types: 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 + 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 @@ -139,8 +139,8 @@ node_types: 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 + org.onap.policy.clamp.acm.CDSAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: cds_blueprint_id: type: string @@ -149,8 +149,8 @@ node_types: 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 + org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: chart: type: string @@ -172,8 +172,8 @@ node_types: 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 + org.onap.policy.clamp.acm.HttpAutomationCompositionElement: + derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement properties: baseUrl: type: string @@ -191,7 +191,7 @@ node_types: entry_schema: type: string typeVersion: 1.0.0 - description: The connfiguration entities the Control Loop Element is managing and their associated REST requests + 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. 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/acm/tosca/policy-types/policyTypes.json index f22d1c3b1a..22994598a5 100644 --- 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/acm/tosca/policy-types/policyTypes.json @@ -15,12 +15,12 @@ "displayName": "DCAE-PM-Subscription-Handler", "icon": "policy-placement" }, - "onap.policies.controlloop.operational.Common": { - "displayName": "ControLoopOperationalCommon", + "onap.policies.acm.operational.Common": { + "displayName": "AutomationCompositionperationalCommon", "icon": "policy-placement" }, - "onap.policies.controlloop.operational.common.Apex": { - "displayName": "ControlLoopOperationalCommonApex", + "onap.policies.acm.operational.common.Apex": { + "displayName": "AutomationCompositionOperationalCommonApex", "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/acm/tosca/policy-types/policyTypes.yml index f3f14cbebe..a4b9c340e9 100644 --- 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/acm/tosca/policy-types/policyTypes.yml @@ -23,16 +23,16 @@ onap.policies.monitoring.dcae-pm-subscription-handler: version: 1.0.0 derived_from: onap.policies.Monitoring metadata: {} -onap.policies.controlloop.operational.Common: +onap.policies.acm.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 + 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 control loop id. + description: The unique automation composition id. required: true timeout: type: integer @@ -41,26 +41,26 @@ onap.policies.controlloop.operational.Common: required: true abatement: type: boolean - description: Whether an abatement event message will be expected for the control loop + 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 Control Loop. + the Automation Composition. required: true operations: type: list - description: List of operations to be performed when Control Loop is triggered. + description: List of operations to be performed when Automation Composition 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: 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.controlloop.operational.common.Apex + name: onap.policies.acm.operational.common.Apex description: Operational policies for Apex PDP properties: engineServiceParameters: 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/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/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 |