diff options
121 files changed, 6729 insertions, 1678 deletions
diff --git a/common/pom.xml b/common/pom.xml index 1c2645342..c60ed6c8f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,13 +27,21 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-common</artifactId> <name>${project.artifactId}</name> <description>Common utilities and code for the TOSCA Control Loop system</description> + <dependencies> + <dependency> + <groupId>org.onap.policy.clamp</groupId> + <artifactId>policy-clamp-models</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> <plugins> <!-- Builds examples jar --> diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/CoderHttpMesageConverter.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/rest/CoderHttpMesageConverter.java index cdd6ea73b..9eb43fd6f 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/CoderHttpMesageConverter.java +++ b/common/src/main/java/org/onap/policy/clamp/controlloop/common/rest/CoderHttpMesageConverter.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.clamp.controlloop.runtime.config; +package org.onap.policy.clamp.controlloop.common.rest; import java.io.IOException; import java.io.InputStreamReader; diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/web/RequestResponseLoggingFilter.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/rest/RequestResponseLoggingFilter.java index 0dd00e766..915cdf0b2 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/web/RequestResponseLoggingFilter.java +++ b/common/src/main/java/org/onap/policy/clamp/controlloop/common/rest/RequestResponseLoggingFilter.java @@ -20,7 +20,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.clamp.controlloop.runtime.main.web; +package org.onap.policy.clamp.controlloop.common.rest; import java.io.IOException; import java.util.UUID; diff --git a/common/src/main/java/org/onap/policy/clamp/controlloop/common/utils/CommonUtils.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/utils/CommonUtils.java new file mode 100644 index 000000000..4b0e41f23 --- /dev/null +++ b/common/src/main/java/org/onap/policy/clamp/controlloop/common/utils/CommonUtils.java @@ -0,0 +1,150 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.controlloop.common.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUpdates; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; +import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType; +import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; +import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; + +/** + * Utility functions used in controlloop-runtime and participants. + * + */ +public class CommonUtils { + private static final String POLICY_TYPE_ID = "policy_type_id"; + private static final String POLICY_ID = "policy_id"; + + /** + * Prepare participant updates map. + * + * @param clElement controlloop element + * @param participantUpdates list of participantUpdates + */ + public static void prepareParticipantUpdate(ControlLoopElement clElement, + List<ParticipantUpdates> participantUpdates) { + if (participantUpdates.isEmpty()) { + participantUpdates.add(getControlLoopElementList(clElement)); + return; + } + + var participantExists = false; + for (ParticipantUpdates participantUpdate : participantUpdates) { + if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) { + participantUpdate.setControlLoopElementList(List.of(clElement)); + participantExists = true; + } + } + if (!participantExists) { + participantUpdates.add(getControlLoopElementList(clElement)); + } + } + + private static ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) { + var participantUpdate = new ParticipantUpdates(); + participantUpdate.setParticipantId(clElement.getParticipantId()); + participantUpdate.setControlLoopElementList(List.of(clElement)); + return participantUpdate; + } + + /** + * Set the Policy information in the service template for the controlloopelement. + * + * @param clElement controlloop element + * @param toscaServiceTemplate ToscaServiceTemplate + */ + public static void setServiceTemplatePolicyInfo(ControlLoopElement clElement, + ToscaServiceTemplate toscaServiceTemplate) { + // Pass respective PolicyTypes or Policies as part of toscaServiceTemplateFragment + if (toscaServiceTemplate.getPolicyTypes() == null + && toscaServiceTemplate.getToscaTopologyTemplate().getPolicies() == null) { + return; + } + ToscaServiceTemplate toscaServiceTemplateFragment = new ToscaServiceTemplate(); + toscaServiceTemplateFragment.setPolicyTypes(toscaServiceTemplate.getPolicyTypes()); + ToscaTopologyTemplate toscaTopologyTemplate = new ToscaTopologyTemplate(); + toscaTopologyTemplate.setPolicies(toscaServiceTemplate.getToscaTopologyTemplate().getPolicies()); + toscaServiceTemplateFragment.setToscaTopologyTemplate(toscaTopologyTemplate); + toscaServiceTemplateFragment.setDataTypes(toscaServiceTemplate.getDataTypes()); + clElement.setToscaServiceTemplateFragment(toscaServiceTemplateFragment); + } + + /** + * Prepare ParticipantDefinitionUpdate to set in the message. + * + * @param clParticipantType controlloop element + * @param entryKey key for the entry + * @param entryValue value relates to toscaNodeTemplate + * @param participantDefinitionUpdates list of participantDefinitionUpdates + * @param commonPropertiesMap common properties map + */ + public static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantType, String entryKey, + ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates, + Map<String, ToscaNodeType> commonPropertiesMap) { + + var clDefinition = new ControlLoopElementDefinition(); + clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(entryKey, entryValue.getVersion())); + clDefinition.setControlLoopElementToscaNodeTemplate(entryValue); + if (commonPropertiesMap != null) { + ToscaNodeType nodeType = commonPropertiesMap.get(entryValue.getType()); + if (nodeType != null) { + clDefinition.setCommonPropertiesMap(nodeType.getProperties()); + } + } + + List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>(); + + if (participantDefinitionUpdates.isEmpty()) { + participantDefinitionUpdates + .add(getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); + } else { + var participantExists = false; + for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) { + if (participantDefinitionUpdate.getParticipantType().equals(clParticipantType)) { + participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition); + participantExists = true; + } + } + if (!participantExists) { + participantDefinitionUpdates.add( + getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); + } + } + } + + private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition, + ToscaConceptIdentifier clParticipantType, + List<ControlLoopElementDefinition> controlLoopElementDefinitionList) { + var participantDefinition = new ParticipantDefinition(); + participantDefinition.setParticipantType(clParticipantType); + controlLoopElementDefinitionList.add(clDefinition); + participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList); + return participantDefinition; + } +} diff --git a/common/src/main/resources/tosca/ApplicationServiceDescriptorTypes.yaml b/common/src/main/resources/tosca/ApplicationServiceDescriptorTypes.yaml new file mode 100644 index 000000000..ad16173b9 --- /dev/null +++ b/common/src/main/resources/tosca/ApplicationServiceDescriptorTypes.yaml @@ -0,0 +1,74 @@ +# ============LICENSE_START======================================================= +# Copyright (C) 2021 Nordix Foundation. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +tosca_definitions_version: tosca_simple_yaml_1_3 +node_types: + org.oran.asd.DeploymentItem: + version: 1.0.1 + derived_from: org.onap.policy.clamp.controlloop.KubernetesControlLoopElement + properties: + deployemntItemId: + type: onap.datatypes.ToscaConceptIdentifier + required: true + description: The identifier of this deployment item + artifactId: + type: onap.datatypes.ToscaConceptIdentifier + required: true + description: Reference to a DeploymentArtifact + lifecycleParameters: + type: string + required: false + description: List of parameters that can be overridden at deployment time + (e.g. values for values.yaml in the chart this item references) + org.oran.asd.ASD: + version: 1.0.1 + derived_from: org.onap.policy.clamp.controlloop.ControlLoop + properties: + asdId: + type: onap.datatypes.ToscaConceptIdentifier + required: true + description: The identifier of this deployment item + asdSchemaVersion: + type: onap.datatypes.ToscaConceptIdentifier + required: true + description: Reference to a DeploymentArtifact + asdApplication: + type: onap.datatypes.ToscaConceptIdentifier + required: true + description: Reference to a DeploymentArtifact + asdApplicationInfoName: + type: string + required: false + description: Human readable name for the Application service. Can change during the AS lifetime. + asdExtCpd: + type: string + required: false + description: Describes external interface(s) exposed by this AS enabling connection with a VL. + (Similar to VnfExtCpd on VNF-D, but only describing L3 and above interfaces, since + K8S can’t do <L3) + enhancedClusterCapabilities: + type: string + required: false + description: Describes expected capabilities of the target Kubernetes cluster to aid placement of the + application service on a suitable cluster. Examples of capabilities are; required networking + characteristics, Kubernetes API extensions or quantifiable node specific resources. This attribute + can contain information complementing information provided in the referenced DeploymentArtifacts. + Note; Modeling of enhancedClusterCapabilities is subject to standardization but is ffs. Alignment + between O2-IMS and O2-DMS of these values is required. + + + diff --git a/common/src/test/resources/asd/MyDomainASDDefintion.yaml b/common/src/test/resources/asd/MyDomainASDDefintion.yaml new file mode 100644 index 000000000..f354ea075 --- /dev/null +++ b/common/src/test/resources/asd/MyDomainASDDefintion.yaml @@ -0,0 +1,131 @@ +# ============LICENSE_START======================================================= +# Copyright (C) 2021 Nordix Foundation. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +tosca_definitions_version: tosca_simple_yaml_1_3 +topology_template: + node_templates: + org.oran.asd.MyApplicationServiceDeploymentItem0: + version: 1.0.0 + type: org.oran.asd.DeploymentItem + type_version: 1.0.1 + description: The first Deployment Item in our Application Service + properties: + deployemntItemId: org.oran.asd.MyApplicationServiceDeploymentItem0:1.0.0 + artifactId: org.oran.asd.MyApplicationServiceDeploymentArtifact0:1.0.0 + lifecycleParameters: To be defined + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Kubernetes:1.0.0 + startPhase: 2 + uninitializedToPassiveTimeout: 180 + chart: + chartId: MyApplicationServiceDeploymentItem0Chart:1.0.0 + releaseName: SomeRelease + namespace: org.oran.asd.MyApplicationService + org.oran.asd.MyApplicationServiceDeploymentItem1: + version: 1.0.0 + type: org.oran.asd.DeploymentItem + type_version: 1.0.1 + description: The second Deployment Item in our Application Service + properties: + deployemntItemId: org.oran.asd.MyApplicationServiceDeploymentItem1:1.0.0 + artifactId: org.oran.asd.MyApplicationServiceDeploymentArtifact1:1.0.0 + lifecycleParameters: To be defined + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Kubernetes:1.0.0 + startPhase: 4 + uninitializedToPassiveTimeout: 10 + chart: + chartId: MyApplicationServiceDeploymentItem1Chart:1.0.0 + releaseName: SomeRelease + namespace: org.oran.asd.MyApplicationService + org.oran.asd.MyApplicationRestConfig: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.HttpControlLoopElement + type_version: 1.0.1 + description: The REST configuration for My Application + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Http:1.0.0 + startPhase: 1 + baseUrl: https://10.10.10.10:12345/MyApplicationServiceDeploymentItem0RestEndpoint + httpHeaders: + "Content-Type": "application/json" + "Accept": "application/json" + configurationEntities: + org.onap.policy.controlloop.gentleguidance.setDomainConfig:1.0.0: + configurationEntityId: org.onap.policy.controlloop.gentleguidance.setDomainConfig:1.0.0 + restSequence: + - restRequestId: org.oran.asd.myapplication.setDomainConfig.CreateConfig:1.0.0 + httpMethd: POST + path: "gentle/create" + body: + gentleLevel: veryGentle + gentleType: softAndFurry + expectedResponse: 200 + - restRequestId: org.oran.asd.myapplication.setDomainConfig.CreateConfig:1.0.0 + httpMethd: POST + path: "guidance/create" + body: + guidanceLevel: high + guidanceType: subtle + expectedResponse: 200 + org.oran.asd.myapplication.updateDomainConfig:1.0.0: + configurationEntityId: org.oran.asd.myapplication.updateDomainConfig:1.0.0 + restSequence: + - restRequestId: org.oran.asd.myapplication.updateDomainConfig.UpdateConfig:1.0.0 + httpMethd: PUT + path: "gentle/update]" + body: + gentleLevel: robust + gentleType: hardAndGritty + expectedResponse: 200 + - restRequestId: org.oran.asd.myapplication.updateDomainConfig.UpdateConfig:1.0.0 + httpMethd: PUT + path: "guidance/update" + body: + guidanceLevel: low + guidanceType: terse + expectedResponse: 200 + org.oran.asd.MyApplicationPolicy: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement + type_version: 1.0.1 + description: My Application Operational Policy + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Policy:1.0.0 + startPhase: 0 + policyType: onap.policies.controlloop.operational.common.Apex:1.0.0 + policyId: org.oran.asd.myapplication.ServiceControlPolicy:1.0.0 + org.org.oran.asd.MyApplicationService: + version: 1.0.0 + type: org.oran.asd.ASD + type_version: 1.0.1 + description: ASD Definition of the My Application Service + properties: + asdId: org.org.oran.asd.MyApplicationService:1.0.0 + asdSchemaVersion: 2.3.2 + provider: Ericsson + asdApplication: org.oran.asd.MyWonderfulApplicationService:1.2.1 + asdApplicationInfoName: The wonderful ASD service that does everything imaginable + asdExtCpd: To be defined + enhancedCludterCapabilities: To be defined + elements: + - org.oran.asd.MyApplicationServiceDeploymentItem0:1.0.0 + - org.oran.asd.MyApplicationServiceDeploymentItem1:1.0.0 + - org.oran.asd.MyApplicationRestConfig:1.0.0 + - org.oran.asd.MyApplicationPolicy:1.0.0 diff --git a/common/src/test/resources/gentleguidance/GentleGuidanceMultipleTopologyTemplates.yaml b/common/src/test/resources/gentleguidance/GentleGuidanceMultipleTopologyTemplates.yaml new file mode 100644 index 000000000..93b5ba5a5 --- /dev/null +++ b/common/src/test/resources/gentleguidance/GentleGuidanceMultipleTopologyTemplates.yaml @@ -0,0 +1,299 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +topology_template: + node_templates: + org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.KubernetesControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Kubernetes Microservice + org.onap.domain.gentleguidance.RestControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.HttpControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Microservice REST configuration + org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Operational Policy + org.onap.domain.gentleguidance.CdsControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.CDSControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance CDS blueprint + org.onap.domain.gentleguidance.ControlLoopDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.ControlLoop + type_version: 1.0.1 + description: Control loop definition for the Gentle Guidance domain + properties: + provider: Ericsson + elements: + - org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition:1.0.0 + - org.onap.domain.gentleguidance.RestControlLoopElementDefinition:1.0.0 + - org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition:1.0.0 + - org.onap.domain.gentleguidance.CdsControlLoopElementDefinition:1.0.0 + +After Commissioning: + +tosca_definitions_version: tosca_simple_yaml_1_3 +topology_template: + node_templates: + org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.KubernetesControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Kubernetes Microservice + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Kubernetes:1.0.0 + startPhase: 2 + uninitializedToPassiveTimeout: 180 + org.onap.domain.gentleguidance.RestControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.HttpControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Microservice REST configuration + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Http:1.0.0 + startPhase: 1 + baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice + org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Operational Policy + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Policy:1.0.0 + startPhase: 0 + org.onap.domain.gentleguidance.CdsControlLoopElementDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.CDSControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance CDS blueprint + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Cds:1.0.0 + startPhase: 0 + org.onap.domain.gentleguidance.ControlLoopDefinition: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.ControlLoop + type_version: 1.0.1 + description: Control loop definition for the Gentle Guidance domain + properties: + provider: Ericsson + elements: + - org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition:1.0.0 + - org.onap.domain.gentleguidance.RestControlLoopElementDefinition:1.0.0 + - org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition:1.0.0 + - org.onap.domain.gentleguidance.CdsControlLoopElementDefinition:1.0.0 + + +After Instantiation: + +(Instance 1) + +tosca_definitions_version: tosca_simple_yaml_1_3 +topology_template: + node_templates: + org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition_Instance1: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.KubernetesControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Kubernetes Microservice + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Kubernetes:1.0.0 + startPhase: 2 + uninitializedToPassiveTimeout: 180 + chart: + chartId: GentleGuidance:1.0.0 + releaseName: Istanbul + namespace: org.onap.policy.controlloop.gentleguidance + org.onap.domain.gentleguidance.RestControlLoopElementDefinition_Instance1: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.HttpControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Microservice REST configuration + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Http:1.0.0 + startPhase: 1 + baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice + httpHeaders: + "Content-Type": "application/json" + "Accept": "application/json" + configurationEntities: + org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig:1.0.0: + configurationEntityId: org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig:1.0.0 + restSequence: + - restRequestId: org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig.CreateGentle:1.0.0 + httpMethd: POST + path: "gentle/create" + body: + gentleLevel: veryGentle + gentleType: softAndFurry + expectedResponse: 200 + - restRequestId: org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig.CreateGuidance:1.0.0 + httpMethd: POST + path: "guidance/create" + body: + guidanceLevel: high + guidanceType: subtle + expectedResponse: 200 + org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig:1.0.0: + configurationEntityId: org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig:1.0.0 + restSequence: + - restRequestId: org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig.CreateGentle:1.0.0 + httpMethd: PUT + path: "gentle/update]" + body: + gentleLevel: robust + gentleType: hardAndGritty + expectedResponse: 200 + - restRequestId: org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig.CreateGuidance:1.0.0 + httpMethd: PUT + path: "guidance/update" + body: + guidanceLevel: low + guidanceType: terse + expectedResponse: 200 + org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition_Instance1: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Operational Policy + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Policy:1.0.0 + startPhase: 0 + policyType: onap.policies.controlloop.operational.common.Apex:1.0.0 + policyId: org.onap.domain.gentleguidance.policy.GentleGuidanceAssertive:1.0.0 + org.onap.domain.gentleguidance.CdsControlLoopElementDefinition_Instance1: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.CDSControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance CDS blueprint + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Cds:1.0.0 + startPhase: 0 + cdsBlueprint: "Placeholder for the CDS blueprint" + org.onap.domain.gentleguidance.ControlLoopDefinition_Instance1: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.ControlLoop + type_version: 1.0.1 + description: Control loop definition for the Gentle Guidance domain + properties: + provider: Ericsson + elements: + - org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition_Instance1:1.0.0 + - org.onap.domain.gentleguidance.RestControlLoopElementDefinition_Instance1:1.0.0 + - org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition_Instance1:1.0.0 + - org.onap.domain.gentleguidance.CdsControlLoopElementDefinition_Instance1:1.0.0 + + +(Instance 2) + +tosca_definitions_version: tosca_simple_yaml_1_3 +topology_template: + node_templates: + org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition_Instance2: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.KubernetesControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Kubernetes Microservice + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Kubernetes:1.0.0 + startPhase: 2 + uninitializedToPassiveTimeout: 180 + chart: + chartId: GentleGuidance:1.0.0 + releaseName: Istanbul + namespace: org.onap.policy.controlloop.gentleguidance + org.onap.domain.gentleguidance.RestControlLoopElementDefinition_Instance2: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.HttpControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Microservice REST configuration + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Http:1.0.0 + startPhase: 1 + baseUrl: https://10.10.10.10:12345/gentleguidancemicroservice + httpHeaders: + "Content-Type": "application/json" + "Accept": "application/json" + configurationEntities: + org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig:1.0.0: + configurationEntityId: org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig:1.0.0 + restSequence: + - restRequestId: org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig.CreateGentle:1.0.0 + httpMethd: POST + path: "gentle/create" + body: + gentleLevel: veryGentle + gentleType: softAndFurry + expectedResponse: 200 + - restRequestId: org.onap.policy.controlloop.gentleguidance.setGentleGuidanceConfig.CreateGuidance:1.0.0 + httpMethd: POST + path: "guidance/create" + body: + guidanceLevel: low + guidanceType: subtle + expectedResponse: 200 + org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig:1.0.0: + configurationEntityId: org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig:1.0.0 + restSequence: + - restRequestId: org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig.CreateGentle:1.0.0 + httpMethd: PUT + path: "gentle/update]" + body: + gentleLevel: robust + gentleType: SoftandRobust + expectedResponse: 200 + - restRequestId: org.onap.policy.controlloop.gentleguidance.updateGentleGuidanceConfig.CreateGuidance:1.0.0 + httpMethd: PUT + path: "guidance/update" + body: + guidanceLevel: low + guidanceType: terse + expectedResponse: 200 + org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition_Instance2: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance Operational Policy + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Policy:1.0.0 + startPhase: 0 + policyType: onap.policies.controlloop.operational.common.Apex:1.0.0 + policyId: org.onap.domain.gentleguidance.policy.GentleGuidanceAssertive:1.0.0 + org.onap.domain.gentleguidance.CdsControlLoopElementDefinition_Instance2: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.CDSControlLoopElement + type_version: 1.0.1 + description: Control loop element for the Gentle Guidance CDS blueprint + properties: + provider: Ericsson + participantType: org.onap.policy.controlloop.participant.Cds:1.0.0 + startPhase: 0 + cdsBlueprint: "Placeholder for the CDS blueprint" + org.onap.domain.gentleguidance.ControlLoopDefinition_Instance2: + version: 1.0.0 + type: org.onap.policy.clamp.controlloop.ControlLoop + type_version: 1.0.1 + description: Control loop definition for the Gentle Guidance domain + properties: + provider: Ericsson + elements: + - org.onap.domain.gentleguidance.KubernetesControlLoopElementDefinition_Instance2:1.0.0 + - org.onap.domain.gentleguidance.RestControlLoopElementDefinition_Instance2:1.0.0 + - org.onap.domain.gentleguidance.PolicyControlLoopElementDefinition_Instance2:1.0.0 + - org.onap.domain.gentleguidance.CdsControlLoopElementDefinition_Instance2:1.0.0 + + diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 43ca5b671..000000000 --- a/docs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.tox -/_build/* -/__pycache__/* diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css deleted file mode 100644 index 6008cb1a0..000000000 --- a/docs/_static/css/ribbon.css +++ /dev/null @@ -1,63 +0,0 @@ -.ribbon { - z-index: 1000; - background-color: #a00; - overflow: hidden; - white-space: nowrap; - position: fixed; - top: 25px; - right: -50px; - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-box-shadow: 0 0 10px #888; - -moz-box-shadow: 0 0 10px #888; - box-shadow: 0 0 10px #888; - -} - -.ribbon a { - border: 1px solid #faa; - color: #fff; - display: block; - font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; - margin: 1px 0; - padding: 10px 50px; - text-align: center; - text-decoration: none; - text-shadow: 0 0 5px #444; - transition: 0.5s; -} - -.ribbon a:hover { - background: #c11; - color: #fff; -} - - -/* override table width restrictions */ -@media screen and (min-width: 767px) { - - .wy-table-responsive table td, .wy-table-responsive table th { - /* !important prevents the common CSS stylesheets from overriding - this as on RTD they are loaded after this stylesheet */ - white-space: normal !important; - } - - .wy-table-responsive { - overflow: visible !important; - } -} - -@media screen and (max-width: 767px) { - .wy-table-responsive table td { - white-space: nowrap; - } -} - -/* fix width of the screen */ - -.wy-nav-content { - max-width: none; -} diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico Binary files differdeleted file mode 100644 index cb712ebd2..000000000 --- a/docs/_static/favicon.ico +++ /dev/null diff --git a/docs/_static/logo_onap_2017.png b/docs/_static/logo_onap_2017.png Binary files differdeleted file mode 100644 index 5d064f431..000000000 --- a/docs/_static/logo_onap_2017.png +++ /dev/null diff --git a/docs/architecture.rst b/docs/architecture.rst deleted file mode 100644 index b65eb1c1d..000000000 --- a/docs/architecture.rst +++ /dev/null @@ -1,48 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved. -.. _architecture: - -Policy/Clamp in ONAP Architecture ---------------------------------- - -CLAMP platform has been integrated into the Policy framework project, starting as a POC during -Honolulu release and as a official feature with Istanbul release. So CLAMP must be seen now -as a function provided by the Policy Framework project. - -CLAMP is a function for designing and managing control loops and a UI to manage Policies. - It is used to visualize a control loop, configure it with specific parameters for a particular network -service, then deploying and undeploying it. Once deployed, the user can also -update the loop with new parameters during runtime, as well as suspending and -restarting it. - -Starting with Istanbul release, CLAMP GUI can also be used to create/read/update/delete/list policies -outside of a control loop, and therefore CLAMP is also the front-end for Policies management in ONAP. - -CLAMP interacts with other systems to deploy and execute the control loop. For -example, it extracts the control loop blueprint from CSAR distributed by SDC. -CLAMP also calls the internal Policy framework API to get the Policy Models(Model Driven Control Loop) -It requests from DCAE the instantiation of microservices. -to manage the control loop flow. Furthermore, it creates and updates multiple -policies (for DCAE mS configuration and actual Control Operations) in the Policy Engine -that define the closed loop flow. - -|clamp-flow| - -The ONAP CLAMP function abstracts the details of these systems under the concept -of a control loop model. The design of a control loop and its management is -represented by a workflow in which all relevant system interactions take -place. This is essential for a self-service model of creating and managing -control loops, where no low-level user interaction with other components is -required. - -At a higher level, CLAMP is about supporting and managing the broad operational -life cycle of VNFs/VMs and ultimately ONAP components itself. It will offer the -ability to design, test, deploy and update control loop automation - both closed -and open. Automating these functions would represent a significant saving on -operational costs compared to traditional methods. - -|closed-loop| - -.. |clamp-flow| image:: images/architecture/distdepl.png -.. |closed-loop| image:: images/architecture/ONAP-closedloop.png diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index 5371015c6..000000000 --- a/docs/conf.py +++ /dev/null @@ -1,15 +0,0 @@ -from docs_conf.conf import * - -branch = 'latest' -master_doc = 'index' - -linkcheck_ignore = [ - 'http://localhost', -] - -intersphinx_mapping = {} - -html_last_updated_fmt = '%d-%b-%y %H:%M' - -def setup(app): - app.add_stylesheet("css/ribbon.css") diff --git a/docs/conf.yaml b/docs/conf.yaml deleted file mode 100644 index ab5928131..000000000 --- a/docs/conf.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -project_cfg: onap -project: onap - -# Change this to ReleaseBranchName to modify the header -default-version: latest -# diff --git a/docs/images/architecture/ONAP-closedloop.png b/docs/images/architecture/ONAP-closedloop.png Binary files differdeleted file mode 100644 index 7d3a2cac8..000000000 --- a/docs/images/architecture/ONAP-closedloop.png +++ /dev/null diff --git a/docs/images/architecture/distdepl.png b/docs/images/architecture/distdepl.png Binary files differdeleted file mode 100644 index 27a39302e..000000000 --- a/docs/images/architecture/distdepl.png +++ /dev/null diff --git a/docs/images/clamp-policy_archi.png b/docs/images/clamp-policy_archi.png Binary files differdeleted file mode 100644 index f384dddcd..000000000 --- a/docs/images/clamp-policy_archi.png +++ /dev/null diff --git a/docs/images/html.png b/docs/images/html.png Binary files differdeleted file mode 100644 index f1bda8835..000000000 --- a/docs/images/html.png +++ /dev/null diff --git a/docs/images/pdf.png b/docs/images/pdf.png Binary files differdeleted file mode 100644 index fed52f963..000000000 --- a/docs/images/pdf.png +++ /dev/null diff --git a/docs/images/swagger.png b/docs/images/swagger.png Binary files differdeleted file mode 100644 index f5a9e0c0c..000000000 --- a/docs/images/swagger.png +++ /dev/null diff --git a/docs/images/user-guide/add-operational-policies.png b/docs/images/user-guide/add-operational-policies.png Binary files differdeleted file mode 100644 index 3d5224aec..000000000 --- a/docs/images/user-guide/add-operational-policies.png +++ /dev/null diff --git a/docs/images/user-guide/blueprint_node_type.png b/docs/images/user-guide/blueprint_node_type.png Binary files differdeleted file mode 100644 index 1e5ef6a4a..000000000 --- a/docs/images/user-guide/blueprint_node_type.png +++ /dev/null diff --git a/docs/images/user-guide/clamp-cds-operation.png b/docs/images/user-guide/clamp-cds-operation.png Binary files differdeleted file mode 100644 index edc4c63aa..000000000 --- a/docs/images/user-guide/clamp-cds-operation.png +++ /dev/null diff --git a/docs/images/user-guide/config-policy-tca.png b/docs/images/user-guide/config-policy-tca.png Binary files differdeleted file mode 100644 index ce5f79bc8..000000000 --- a/docs/images/user-guide/config-policy-tca.png +++ /dev/null diff --git a/docs/images/user-guide/create-loop.png b/docs/images/user-guide/create-loop.png Binary files differdeleted file mode 100644 index 40cdb4c39..000000000 --- a/docs/images/user-guide/create-loop.png +++ /dev/null diff --git a/docs/images/user-guide/deploy-params.png b/docs/images/user-guide/deploy-params.png Binary files differdeleted file mode 100644 index 9d003258f..000000000 --- a/docs/images/user-guide/deploy-params.png +++ /dev/null diff --git a/docs/images/user-guide/loop-menu.png b/docs/images/user-guide/loop-menu.png Binary files differdeleted file mode 100644 index b6056349d..000000000 --- a/docs/images/user-guide/loop-menu.png +++ /dev/null diff --git a/docs/images/user-guide/loop-operation-menu.png b/docs/images/user-guide/loop-operation-menu.png Binary files differdeleted file mode 100644 index 2a2dbf899..000000000 --- a/docs/images/user-guide/loop-operation-menu.png +++ /dev/null diff --git a/docs/images/user-guide/loop-properties.png b/docs/images/user-guide/loop-properties.png Binary files differdeleted file mode 100644 index 5c266155d..000000000 --- a/docs/images/user-guide/loop-properties.png +++ /dev/null diff --git a/docs/images/user-guide/op-policy-box-policy.png b/docs/images/user-guide/op-policy-box-policy.png Binary files differdeleted file mode 100644 index 89c6265ba..000000000 --- a/docs/images/user-guide/op-policy-box-policy.png +++ /dev/null diff --git a/docs/images/user-guide/open-loop.png b/docs/images/user-guide/open-loop.png Binary files differdeleted file mode 100644 index a763ad133..000000000 --- a/docs/images/user-guide/open-loop.png +++ /dev/null diff --git a/docs/images/user-guide/open-menu-prop.png b/docs/images/user-guide/open-menu-prop.png Binary files differdeleted file mode 100644 index 046e2a3d3..000000000 --- a/docs/images/user-guide/open-menu-prop.png +++ /dev/null diff --git a/docs/images/user-guide/opened-loop.png b/docs/images/user-guide/opened-loop.png Binary files differdeleted file mode 100644 index c955deee8..000000000 --- a/docs/images/user-guide/opened-loop.png +++ /dev/null diff --git a/docs/images/user-guide/policy-model-menu.png b/docs/images/user-guide/policy-model-menu.png Binary files differdeleted file mode 100644 index 838fcf8d9..000000000 --- a/docs/images/user-guide/policy-model-menu.png +++ /dev/null diff --git a/docs/images/user-guide/policy-submitted.png b/docs/images/user-guide/policy-submitted.png Binary files differdeleted file mode 100644 index 04a9df358..000000000 --- a/docs/images/user-guide/policy-submitted.png +++ /dev/null diff --git a/docs/images/user-guide/remove-operational-policies.png b/docs/images/user-guide/remove-operational-policies.png Binary files differdeleted file mode 100644 index fbc680d04..000000000 --- a/docs/images/user-guide/remove-operational-policies.png +++ /dev/null diff --git a/docs/images/user-guide/template-menu.png b/docs/images/user-guide/template-menu.png Binary files differdeleted file mode 100644 index cc2cdf78b..000000000 --- a/docs/images/user-guide/template-menu.png +++ /dev/null diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 4fd4def67..000000000 --- a/docs/index.rst +++ /dev/null @@ -1,203 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved. -.. _master_index: - -Policy/CLAMP - Control Loop Automation Management Platform -========================================================== -.. High level architecture, design, and packaging information for release planning and delivery. - -.. include:: architecture.rst - - -Offered APIs ------------- -The list of APIs that Policy/CLAMP has offered could be find in the following table: - -.. |pdf-icon| image:: images/pdf.png - :width: 40px - -.. |swagger-icon| image:: images/swagger.png - :width: 40px - -.. |html-icon| image:: images/html.png - :width: 40px - -.. csv-table:: - :header: "|Swagger-icon|", "|html-icon|", "|pdf-icon|" - :widths: 60,60,60 - - "swagger json file", "html doc", "pdf doc" - ":download:`link <swagger/swagger.json>`", ":download:`link <swagger/swagger.html>`", ":download:`link <swagger/swagger.pdf>`" - - -Consumed APIs -------------- -Policy/CLAMP uses the API's exposed by the following ONAP components: - -- SDC : REST based interface exposed by the SDC, Distribution of service to DCAE -- DCAE: REST based interface exposed by DCAE, Common Controller Framework, DCAE microservices onboarded (TCA, Stringmatch, Holmes (optional)) -- Policy Core: REST based interface, Policy Core engine target both XACML and Drools PDP, Policy Engine trigger operations to App-C/VF-C/SDN-C -- CDS: REST based interface, to retrieve list of operations/actions with their corresponding payload at runtime for Operational Policies where the field 'actor' is 'CDS'. - -Delivery --------- -Policy/CLAMP component is composed of a UI layer and a backend layer, each layer having its own container. -Policy/CLAMP also requires a database instance with 1 DB, it uses MariaDB, which is the same DB as for the core Policy. - -.. |clamp-policy-archi| image:: images/clamp-policy_archi.png - -|clamp-policy-archi| - -Logging & Diagnostic Information --------------------------------- -CLAMP uses logback framework to generate logs. The logback.xml file can be found under the [src/main/resources/ folder](src/main/resources). - -With the default log settings, all logs will be generated into console and into root.log file under the CLAMP root folder. The root.log file is not allowed to be appended, thus restarting the CLAMP will result in cleaning of the old log files. - - -.. _index-clamp-installation: - -Installation ------------- -A [docker-compose example file](extra/docker/clamp/docker-compose.yml) can be found under the [extra/docker/clamp/ folder](extra/docker/). - -Once the image has been built and is available locally, you can use the `docker-compose up` command to deploy a pre-populated database and a CLAMP instance available on [https://localhost:3000](https://localhost:3000). - -Configuration -------------- -.. Where are they provided? -.. What are parameters and values? - - -Currently, the CLAMP docker images can be deployed with small configuration needs. Though, you might need to make small adjustments to the configuration. As CLAMP is spring based, you can use the SPRING_APPLICATION_JSON environment variable to update its parameters. - -.. TODO detail config parameters and the usage - - -There are one datasource for Clamp. By default, it will try to connect to the localhost server using the credentials available in the example SQL files. If you need to change the default database host and/or credentials, you can do it by using the following json as SPRING_APPLICATION_JSON environment variable : - -.. code-block:: json - - { - "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clampdb.{{ include "common.namespace" . }}:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3", - "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json", - "clamp.config.dcae.inventory.url": "https://inventory.{{ include "common.namespace" . }}:8080", - "clamp.config.dcae.dispatcher.url": "https://deployment-handler.{{ include "common.namespace" . }}:8443", - "clamp.config.dcae.deployment.url": "https://deployment-handler.{{ include "common.namespace" . }}:8443", - "clamp.config.dcae.deployment.userName": "none", - "clamp.config.dcae.deployment.password": "none", - "clamp.config.policy.api.url": "https://policy-api.{{ include "common.namespace" . }}:6969", - "clamp.config.policy.api.userName": "healthcheck", - "clamp.config.policy.api.password": "zb!XztG34", - "clamp.config.policy.pap.url": "https://policy-pap.{{ include "common.namespace" . }}:6969", - "clamp.config.policy.pap.userName": "healthcheck", - "clamp.config.policy.pap.password": "zb!XztG34", - "clamp.config.cadi.aafLocateUrl": "https://aaf-locate.{{ include "common.namespace" . }}:8095", - "com.att.eelf.logging.path": "/opt/clamp", - "com.att.eelf.logging.file": "logback.xml" - } - -SDC-Controllers config ----------------------- -This file is a JSON that must be specified to Spring config, here is an example: - -.. code-block:: json - - { - "sdc-connections":{ - "sdc-controller1":{ - "user": "clamp", - "consumerGroup": "consumerGroup1", - "consumerId": "consumerId1", - "environmentName": "AUTO", - "sdcAddress": "localhost:8443", - "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981", - "pollingInterval":30, - "pollingTimeout":30, - "activateServerTLSAuth":"false", - "keyStorePassword":"", - "keyStorePath":"", - "messageBusAddresses":["dmaaphost.com"] - }, - "sdc-controller2":{ - "user": "clamp", - "consumerGroup": "consumerGroup1", - "consumerId": "consumerId1", - "environmentName": "AUTO", - "sdcAddress": "localhost:8443", - "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981", - "pollingInterval":30, - "pollingTimeout":30, - "activateServerTLSAuth":"false", - "keyStorePassword":"", - "keyStorePath":"", - "messageBusAddresses":["dmaaphost.com"] - } - } - } - -Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers. -Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification. -The environmentName is normally the Dmaap Topic used by SDC. -If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) - -Administration --------------- - -A user can access Policy/CLAMP UI at the following URL : https://localhost:3000. -(in this URL 'localhost' must be replaced by the actual host where Policy/CLAMP has been installed if it is not your current localhost) -For OOM, the URL is https://<host-ip>:30258 - -.. code-block:: html - - - Without AAF, the credentials are - Default username : admin - Default password : password - - - With AAF enabled, the certificate p12 must be added to the browser - ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "China in the Spring" - Or get it from this page : https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca - -Human Interfaces ----------------- -.. Basic info on the interface type, ports/protocols provided over, etc. - -User Interface - serve to configure control loop -Policy/CLAMP UI is used to configure the Control Loop designed and distributed by SDC. From that UI it's possible to distribute the configuration policies and control the life-cycle of the DCAE Micro Services. -Policy/CLAMP UI is also used to manage Policies outside of a Control Loop. - -The following actions are done using the UI: - -* Design a control loop flow by selecting a predefined template from a list - (a template is an orchestration chain of Micro-services, so the template - defines how the micro-services of the control loop are chained together) - -* Give value to the configuration the parameters of each micro-service of - the control loop - -* Select the service and VNF(of that service) to which the control loop - will be attached - -* Configure the operational policy(the actual operation resulting from - the control loop) - -* Send the “TOSCA” blueprint parameters that will be used by DCAE to start the - control loop (The blueprint will be sent first to SDC and SDC will - publish it to DCAE) - -* Trigger the deployment of the Control loop in DCAE - -* Control (start/stop) the operation of the control loop in DCAE - -HealthCheck API - serve to verify CLAMP status (see offered API's section) -* https://<host-ip>:8443/restservices/clds/v1/healthcheck -This one does not require the certificate - -Walk-through can be found here: https://wiki.onap.org/display/DW/CLAMP+videos - -.. toctree:: - :maxdepth: 1 - :titlesonly: - - CLAMP User Guide <user-guide.rst>
\ No newline at end of file diff --git a/docs/release-notes.rst b/docs/release-notes.rst deleted file mode 100644 index 18c1aa6b9..000000000 --- a/docs/release-notes.rst +++ /dev/null @@ -1,504 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. -.. _release_notes: - -Release Notes -============= - -Version: 5.1.0 (Guilin) --------------------------- - -:Release Date: 2020-11-19 - -**New Features** - -The Guilin release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the Guilin release was to: - - - Complete integration to CDS for Actor/Action selection. - - SECCOM Perform Software Composition Analysis - Vulnerability tables (TSC must have). - - SECCOM Password removal from OOM HELM charts (TSC must have) - implementation of certinInitializer to get AAF certificates at oom deployment time. - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `CLAMP R7 - M1 release planning <https://wiki.onap.org/display/DW/CLAMP+R7+-+M1+Release+Planning>`_ - - The full list of issues(bugs) solved, is available on `CLAMP R7 - Guilin list of solved issues(bugs) <https://wiki.onap.org/pages/viewpage.action?pageId=93000705>`_ - -**Known Issues** - -**Security Notes** - -*Fixed Security Issues* - -*Known Security Issues* - -*Known Vulnerabilities in Used Modules* - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - -**Upgrade Notes** - - - The Upgrade strategy for Guilin can be found here:`<https://wiki.onap.org/display/DW/Frankfurt+CLAMP+Container+upgrade+strategy>`_ - - New Docker Containers are available. the list of containers composing this release are below: - - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.1.5 - - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.1.5 - - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.4 - - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.4 - - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.4 - - -Version: 5.0.7 (Frankfurt maintenance release tag 6.0.0) --------------------------------------------------------- - -:Release Date: 2020-08-17 - -**Bug Fixes** - - - `CLAMP-878 <https://jira.onap.org/browse/CLAMP-885>`_ Clamp backend pod fails with mariaDB server error - - `CLAMP-885 <https://jira.onap.org/browse/CLAMP-885>`_ CLAMP update documentation - -**Known Issues** - - `CLAMP-856 <https://jira.onap.org/browse/CLAMP-856>`_ CLAMP should not display all CDS workflow properties - - Other more minor issues are captured in the following page:`CLAMP known Frankfurt issues <https://wiki.onap.org/display/DW/CLAMP+R6+-+Frankfurt+known+issues%28bugs%29+-+to+be+solved+in+futur+Releases>`_ - -**Security Notes** - -N/A - -*Fixed Security Issues* - -*Known Security Issues* - -*Known Vulnerabilities in Used Modules* - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - -**Upgrade Notes** - - - The Upgrade strategy for Frankfurt can be found here:`<https://wiki.onap.org/display/DW/Frankfurt+CLAMP+Container+upgrade+strategy>`_ - - New Docker Containers are available. the list of containers composing this release are below: - - - clamp-backend-filebeat-onap: docker.elastic.co/beats/filebeat 5.5.0 - - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.0.7 - - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.0.7 - - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.3 - - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.3 - - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.3 - -Version: 5.0.1 (Frankfurt) --------------------------- - -:Release Date: 2020-05-12 - -**New Features** - -The Frankfurt release is the seventh release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the Frankfurt release was to: - - - implementing a new Control Loop creation flow: Self Serve Control Loop(partially done will be continued in next release). - - Add Tosca policy-model support for Operational Policies definitions. - - Add integration to CDS for Actor/Action selection. - - Move from SearchGuard to OpenDistro. - - Document(high level) current upgrade component strategy (TSC must have). - - SECCOM Perform Software Composition Analysis - Vulnerability tables (TSC must have). - - SECCOM Password removal from OOM HELM charts (TSC must have). - - SECCOM HTTPS communication vs. HTTP (TSC must have) - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `Frankfurt CLAMP M1 release planning <https://wiki.onap.org/display/DW/CLAMP+R6+-+M1+Release+Planning>`_ - - The full list of issues(bugs) solved, is available on `CLAMP R6 - Frankfurt list of solved issues(bugs) <https://wiki.onap.org/pages/viewpage.action?pageId=84648915>`_ - -**Known Issues** - - `CLAMP-856 <https://jira.onap.org/browse/CLAMP-856>`_ CLAMP should not display all CDS workflow properties - -**Security Notes** - -*Fixed Security Issues* - -*Known Security Issues* - -*Known Vulnerabilities in Used Modules* - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - -**Upgrade Notes** - - - The Upgrade strategy for Frankfurt can be found here:`<https://wiki.onap.org/display/DW/Frankfurt+CLAMP+Container+upgrade+strategy>`_ - - New Docker Containers are available. the list of containers composing this release are below: - - clamp-backend-filebeat-onap: docker.elastic.co/beats/filebeat 5.5.0 - - clamp-backend: nexus3.onap.org:10001/onap/clamp-backend 5.0.6 - - clamp-frontend: nexus3.onap.org:10001/onap/clamp-frontend 5.0.6 - - clamp-dash-es: nexus3.onap.org:10001/onap/clamp-dashboard-elasticsearch 5.0.3 - - clamp-dash-kibana: nexus3.onap.org:10001/onap/clamp-dashboard-kibana 5.0.3 - - clamp-dash-logstash: nexus3.onap.org:10001/onap/clamp-dashboard-logstash 5.0.3 - - -Version: 4.1.3 (El-Alto) ------------------------- - -:Release Date: 2019-10-11 - -**New Features** - -The El Alto release is the sixth release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the El Alto release was to: - - - _.Fix a maximum a security issues, especially the angular related issues by moving to React. - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `El Alto CLAMP user stories done <https://wiki.onap.org/display/DW/El+Alto+CLAMP+user+stories+done>`_ - This includes the list of bugs that were fixed during the course of this release. - -**Known Issues** - - - `CLAMP-506 <https://jira.onap.org/browse/CLAMP-506>`_ Elastic Search Clamp image cannot be built anymore(SearchGuard DMCA issue) - - Due to the uncertainties with the DMCA SearchGuard issue, the ELK stack has been removed from El Alto release, meaning the CLAMP "Control Loop Dashboard" is not part of the El Alto release. - - `CLAMP-519 <https://jira.onap.org/browse/CLAMP-519>`_ Clamp cannot authenticate to AAF(Local authentication as workaround) - - -**Security Notes** - -*Fixed Security Issues* - -*Known Security Issues* - -*Known Vulnerabilities in Used Modules* - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. -The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=68540334>`_. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - - - `Project Vulnerability Review Table for CLAMP <https://wiki.onap.org/pages/viewpage.action?pageId=68540334>`_ - -**Upgrade Notes** - - New Docker Containers are available. - - -Version: 4.1.0 (El-Alto Early Drop) ------------------------------------ - -:Release Date: 2019-08-19 - -**New Features** - -The El Alto-Early Drop release is the fifth release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the El Alto-Early Drop release was to: - - - _.Fix a maximum a security issues, especially the angular related issues by moving to React. - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `CLAMP R5 - Early Drop RELEASE <https://wiki.onap.org/display/DW/CLAMP+R5+-+Early+Drop>`_ - This includes the list of bugs that were fixed during the course of this release. - -**Known Issues** - - - `CLAMP-384 <https://jira.onap.org/browse/CLAMP-384>`_ Loop State in UI is not reflecting the current state - -**Security Notes** - -*Fixed Security Issues* - - - `OJSI-166 <https://jira.onap.org/browse/OJSI-166>`_ Port 30290 exposes unprotected service outside of cluster. - -*Known Security Issues* - -*Known Vulnerabilities in Used Modules* - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. -The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=68540334>`_. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - - - `Project Vulnerability Review Table for CLAMP <https://wiki.onap.org/pages/viewpage.action?pageId=68540334>`_ - -**Upgrade Notes** - - New Docker Containers are available. - - - -Version: 4.0.5 (Dublin) ------------------------ - -:Release Date: 2019-06-06 - -**New Features** - -The Dublin release is the fourth release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the Dublin release was to: - - - Stabilize Platform maturity by stabilizing CLAMP maturity matrix see `Wiki <https://wiki.onap.org/display/DW/Dublin+Release+Platform+Maturity>`_. - - CLAMP supports of Policy-model based Configuration Policy - - CLAMP supports new Policy Engine direct Rest API (no longer based on jar provided by Policy Engine) - - CLAMP main Core/UI have been reworked, removal of security issues reported by Nexus IQ. - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `DUBLIN RELEASE <https://jira.onap.org/projects/CLAMP/versions/10427>`_ - This includes the list of bugs that were fixed during the course of this release. - -**Known Issues** - - - `CLAMP-384 <https://jira.onap.org/browse/CLAMP-384>`_ Loop State in UI is not reflecting the current state - -**Security Notes** - -*Fixed Security Issues* - - - `OJSI-128 <https://jira.onap.org/browse/OJSI-128>`_ In default deployment CLAMP (clamp) exposes HTTP port 30258 outside of cluster. - - `OJSI-147 <https://jira.onap.org/browse/OJSI-147>`_ In default deployment CLAMP (cdash-kibana) exposes HTTP port 30290 outside of cluster. - - `OJSI-152 <https://jira.onap.org/browse/OJSI-152>`_ In default deployment CLAMP (clamp) exposes HTTP port 30295 outside of cluster. - -*Known Security Issues* - -*Known Vulnerabilities in Used Modules* - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. -The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=64003444>`_. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - - - `Project Vulnerability Review Table for CLAMP <https://wiki.onap.org/pages/viewpage.action?pageId=64003444>`_ - -**Upgrade Notes** - - New Docker Containers are available. - - -Version: 3.0.4 - maintenance release ------------------------------------- - -:Release Date: 2019-04-06 - -**New Features** -none - -**Bug Fixes** -none - -**Known Issues** -CLAMP certificates have been renewed to extend their expiry dates - - `CLAMP-335 <https://jira.onap.org/browse/CLAMP-335>`_ Update Certificates on Casablanca release. - - -Version: 3.0.3 - maintenance release ------------------------------------- - -:Release Date: 2019-02-06 - -**New Features** -none - -**Bug Fixes** -none - -**Known Issues** -one documentation issue was fixed, this issue does not require a new docker image: - - `CLAMP-257 <https://jira.onap.org/browse/CLAMP-257>`_ User Manual for CLAMP : nothing on readthedocs. - -Version: 3.0.3 (Casablanca) ---------------------------- - -:Release Date: 2018-11-30 - -**New Features** - -The Casablanca release is the third release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the Casablanca release was to: - - - Enhance Platform maturity by improving CLAMP maturity matrix see `Wiki <https://wiki.onap.org/display/DW/Casablanca+Release+Platform+Maturity>`_. - - CLAMP Dashboard improvements for the monitoring of active Closed Loops - - CLAMP logs alignment on the ONAP platform. - - CLAMP is now integrated with AAF for authentication and permissions retrieval (AAF server is pre-loaded by default with the required permissions) - - CLAMP improvement for configuring the policies (support of Scale Out use case) - - CLAMP main Core/UI have been reworked, removal of security issues reported by Nexus IQ on JAVA/JAVASCRIPT code (Libraries upgrade or removal/replacement when possible) - - As a POC, the javascript coverage can now be enabled in SONAR (Disabled for now) - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `CASABLANCA RELEASE <https://jira.onap.org/projects/CLAMP/versions/10408>`_ - This includes the list of bugs that were fixed during the course of this release. - -**Known Issues** - - - None - -**Security Notes** - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. -The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=42598587>`_. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - - - `Project Vulnerability Review Table for CLAMP <https://wiki.onap.org/pages/viewpage.action?pageId=42598587>`_ - -**Upgrade Notes** - - New Docker Containers are available, an ELK stack is also now part of CLAMP deployments. - -**Deprecation Notes** - - The CLAMP Designer Menu (in CLAMP UI) is deprecated since Beijing, the design time is being onboarded into SDC - DCAE D. - -**Other** - - CLAMP Dashboard is now implemented, allows to monitor Closed Loops that are running by retrieving CL events on DMAAP. - -**How to - Videos** - - https://wiki.onap.org/display/DW/CLAMP+videos - -Version: 2.0.2 (Beijing) ------------------------- - -:Release Date: 2018-06-07 - -**New Features** - -The Beijing release is the second release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the Beijing release was to: - - - Enhance Platform maturity by improving CLAMP maturity matrix see `Wiki <https://wiki.onap.org/display/DW/Beijing+Release+Platform+Maturity>`_. - - Focus CLAMP on Closed loop runtime operations and control - this is reflected by the move of the design part to DCAE-D. - - Introduce CLAMP Dashboard for monitoring of active Closed Loops. - - CLAMP is integrated with MSB. - - CLAMP has integrated SWAGGER. - - CLAMP main Core has been reworked for improved flexibility. - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `BEIJING RELEASE <https://jira.onap.org/projects/CLAMP/versions/10314>`_ - This includes the list of bugs that were fixed during the course of this release. - -**Known Issues** - - - `CLAMP-69 <https://jira.onap.org/browse/CLAMP-69>`_ Deploy action does not always work. - - The "Deploy" action does not work directly after submitting it. - - Workaround: - - You have to close the CL and reopen it again. In that case the Deploy action will do something. - -**Security Notes** - -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and determined to be false positive. The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=25440749>`_. - -Quick Links: - - `CLAMP project page <https://wiki.onap.org/display/DW/CLAMP+Project>`_ - - - `Passing Badge information for CLAMP <https://bestpractices.coreinfrastructure.org/en/projects/1197>`_ - - - `Project Vulnerability Review Table for CLAMP <https://wiki.onap.org/pages/viewpage.action?pageId=25440749>`_ - -**Upgrade Notes** - - New Docker Containers are avaialble, an ELK stack is also now part of CLAMP deployments. - -**Deprecation Notes** - - The CLAMP Designer UI is now deprecated and unavailable, the design time is being onboarded into SDC - DCAE D. - -**Other** - - CLAMP Dashboard is now implemented, allows to monitor Closed Loops that are running by retrieving CL events on DMAAP. - -Version: 1.1.0 (Amsterdam) --------------------------- - -:Release Date: 2017-11-16 - -**New Features** - -The Amsterdam release is the first release of the Control Loop Automation Management Platform (CLAMP). - -The main goal of the Amsterdam release was to: - - - Support the automation of provisionning for the Closed loops of the vFW, vDNW and vCPE through TCA. - - Support the automation of provisionning for the Closed loops of VVolte (Holmes) - - Demonstrate complete interaction with Policy, DCAE, SDC and Holmes. - -**Bug Fixes** - - - The full list of implemented user stories and epics is available on `AMSTERDAM RELEASE <https://jira.onap.org/projects/CLAMP/versions/10313>`_ - This is technically the first release of CLAMP, previous release was the seed code contribution. - As such, the defects fixed in this release were raised during the course of the release. - Anything not closed is captured below under Known Issues. If you want to review the defects fixed in the Amsterdam release, refer to Jira link above. - -**Known Issues** - - `CLAMP-68 <https://jira.onap.org/browse/CLAMP-68>`_ ResourceVF not always provisioned. - - In Closed Loop -> Properties CL: When opening the popup window, the first service in the list does not show Resource-VF even though in SDC there is a resource instance in the service. - - Workaround: - - If you have multiple service available (if not create a dummy one on SDC), just click on another one and then click back on the first one in the list. The ResourceVF should be provisioned now. - - - `CLAMP-69 <https://jira.onap.org/browse/CLAMP-69>`_ Deploy action does not always work. - - The "Deploy" action does not work directly after submitting it. - - Workaround: - - You have to close the CL and reopen it again. In that case the Deploy action will do something - - -**Security Issues** - CLAMP is following the CII Best Practices Badge Program, results including security assesment can be found on the - `project page <https://bestpractices.coreinfrastructure.org/projects/1197>`_ - - -**Upgrade Notes** - - N/A - -**Deprecation Notes** - - N/A - -**Other** - - - -=========== - -End of Release Notes diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt deleted file mode 100644 index b3188ddd3..000000000 --- a/docs/requirements-docs.txt +++ /dev/null @@ -1,15 +0,0 @@ -tox -Sphinx -doc8 -docutils -setuptools -six -sphinx_rtd_theme>=0.4.3 -sphinxcontrib-blockdiag -sphinxcontrib-needs>=0.2.3 -sphinxcontrib-nwdiag -sphinxcontrib-seqdiag -sphinxcontrib-swaggerdoc -sphinxcontrib-plantuml -sphinx_bootstrap_theme -lfdocs-conf diff --git a/docs/tox.ini b/docs/tox.ini deleted file mode 100644 index edac8c35f..000000000 --- a/docs/tox.ini +++ /dev/null @@ -1,22 +0,0 @@ -[tox] -minversion = 1.6 -envlist = docs, -skipsdist = true - -[testenv:docs] -basepython = python3 -deps = -r{toxinidir}/requirements-docs.txt -commands = - sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html - echo "Generated docs available in {toxinidir}/_build/html" -whitelist_externals = - echo - git - sh - -[testenv:docs-linkcheck] -basepython = python3 -#deps = -r{toxinidir}/requirements-docs.txt -commands = echo "Link Checking not enforced" -#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck -whitelist_externals = echo diff --git a/docs/user-guide.rst b/docs/user-guide.rst deleted file mode 100644 index 5cfcf1abd..000000000 --- a/docs/user-guide.rst +++ /dev/null @@ -1,157 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved. - -Control loop in Policy/CLAMP ----------------------------- -There are 2 control loop levels in Policy/CLAMP: - -- Control loop template: This is created from the DCAE blueprint (designed in the DCAE designer), and distributed by SDC to CLAMP. -- Control loop instance: Based on the template, it represents a physical control loop in the platform related to a service and a VNF. - -There is no way to design the microservice components of the control loop from scratch in CLAMP, you can only configure it and manage its life-cycle. -For more info on how to design the service in SDC, check this: https://wiki.onap.org/display/DW/CLAMP+videos#CLAMPvideos-DesignpartinSDC - - -There is a specific menu to view the available Control loop templates. - -|clamp-template-menu| - - -Each microservice policies and operational policies is related to a Policy Model. -Clamp either communicates with Policy Engine periodically to download the available Policy Models automatically or user can upload the Policy Model manually. -Policy Models related operations could be found under Policy Models menu. - -|clamp-policy-model-menu| - - -Under the menu *Loop Instance*, there's a list of actions to perform regarding to the loops. - -|clamp-loop-menu| - - -Option *Create* creates the loop from the templates distributed by SDC. - -|clamp-create-loop| - - -Option *Open* opens the saved loops. Once the distributed control loop has been chosen, the control loop is shown to the user. - -|clamp-open-loop| - - -Option *Close* will close the current opened loop. - - -Option *Modify* opens the window to add/remove different Operational Policies to the loop. -Tab *Add Operational Policies* lists all the available operational policies. -Click *Add* button to add the selected operational policies to the loop. - -|clamp-add-operational-policies| - -Tab *Remove Operational Policies* lists all the operational policies added to the loop. -Click *Remove* button to remove the selected operational policies from the loop. - -|clamp-remove-operational-policies| - - -Once opened, the user can start configure empty control loop using **Closed loop modeller**. - -|clamp-opened-loop| - - -Loop modeler has 3 main parts: - -#. Loop configuration view - Visualizes event flow in Control Loop. This view is auto-generated by Clamp. To generate it Clamp parses DCAE_INVENTORY_BLUEPRINT from CSAR distributed by SDC. - It Always consists of **VES -> <nodes from blueprint> -> OperationalPolicy**. Not all nodes are visualized. Only those with type **dcae.nodes.\*** - |blueprint-node| - -#. Loop status - Visualizes status of opened loop. -#. Loop logs - Table with log data of opened loop - - -Control Loop properties ------------------------ -In Dublin release this view shows what are deployment parameters or control Loop. -To open it from *Loop Instance* menu select *Properties* - -|clamp-menu-prop| - -This opens a box with JSON object. It contains deployment parameters extracted from DCAE_INVENTORY_BLUEPRINT. -It's not recommended to edit this JSON. Each of this parameters should be available in view shown to deploy analytic application. - -|clamp-prop-box| - - -Operational policy properties ---------------------------------------- -Operational policies are added by the user using *Modify* window. The configuration view is generated using Policy Type assigned to selected operational policy. - -To configure operational policies, user has to click the corresponding operational policy boxes. Example popup dialog for operational policy looks like: - -|clamp-op-policy-box-policy| - -Operations and payload for CDS actor is fetched from CDS. -Clamp receives CDS blueprint name and version information from sdnc_model_name and sdnc_model_version properties in CSAR distributed by SDC and queries CDS to get list of operations and payload for the corresponding CDS blueprint. - -|clamp-cds-operation| - -Micro-service policy properties -------------------------------- -Boxes between `VES` and `Operational Policies` are generated from blueprint. They can be one of ONAP predefined analytic microservices or custom analytics. -Each of the boxes is clickable. Microservice configuration view is generated using Policy Type assigned to selected microservice. -Clamp by default assumes that microservices have policy type **onap.policies.monitoring.cdap.tca.hi.lo.app**. - -After clicking microservice box Clamp opens popup dialog. Example popup dialog for microservice with default type looks like: - -|clamp-config-policy-tca| - - - -In the *Loop Operations* menu, lists the operations to be perform to the loop. - -|clamp-loop-operation-menu| - - -Submitting the Control loop to core policy ------------------------------------------- -The SUBMIT operation can be used to send the configuration to policy engine. -If everything is successful, the status to the policy will become *SENT*. Clamp should also show proper logs in logs view. - -|clamp-policy-submitted| - -After Policies are submitted they should be visible in Policy PAP component. -Please check `Policy GUI <https://docs.onap.org/en/dublin/submodules/policy/engine.git/docs/platform/policygui.html>`_ - - -Deploy/undeploy the Control Loop to DCAE ------------------------------------------ -Once sent to policy engine, Clamp can ask to DCAE to DEPLOY the micro service - -This opens a window where the parameters of the DCAE micro service can be configured/tuned. -The policy_id is automatically generated by Clamp in the previous steps. - -|clamp-deploy-params| - -Once deployed on DCAE the status of DCAE goes to *MICROSERVICE_INSTALLED_SUCCESSFULLY*, it can then be Undeployed/Stopped/Restart. - -.. |clamp-template-menu| image:: images/user-guide/template-menu.png -.. |clamp-policy-model-menu| image:: images/user-guide/policy-model-menu.png -.. |clamp-loop-menu| image:: images/user-guide/loop-menu.png -.. |clamp-create-loop| image:: images/user-guide/create-loop.png -.. |clamp-open-loop| image:: images/user-guide/open-loop.png -.. |clamp-add-operational-policies| image:: images/user-guide/add-operational-policies.png -.. |clamp-remove-operational-policies| image:: images/user-guide/remove-operational-policies.png -.. |clamp-opened-loop| image:: images/user-guide/opened-loop.png -.. |clamp-menu-prop| image:: images/user-guide/open-menu-prop.png -.. |clamp-prop-box| image:: images/user-guide/loop-properties.png -.. |clamp-op-policy-box-policy| image:: images/user-guide/op-policy-box-policy.png -.. |clamp-config-policy-tca| image:: images/user-guide/config-policy-tca.png -.. |clamp-loop-operation-menu| image:: images/user-guide/loop-operation-menu.png -.. |clamp-policy-submitted| image:: images/user-guide/policy-submitted.png -.. |clamp-deploy-params| image:: images/user-guide/deploy-params.png -.. |blueprint-node| image:: images/user-guide/blueprint_node_type.png -.. |clamp-cds-operation| image:: images/user-guide/clamp-cds-operation.png diff --git a/models/pom.xml b/models/pom.xml index c5eea9c73..c534a16f4 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-models</artifactId> diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java index 4d3d37236..cf22b7228 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java @@ -107,7 +107,7 @@ public class ControlLoop extends ToscaEntity implements Comparable<ControlLoop> */ public List<ClElementStatistics> getControlLoopElementStatisticsList(final ControlLoop controlLoop) { if (MapUtils.isEmpty(controlLoop.elements)) { - return null; + return List.of(); } return controlLoop.elements.values().stream().map(ControlLoopElement::getClElementStatistics) diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtils.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtils.java index 4c3dd4b06..c05311892 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtils.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtils.java @@ -57,6 +57,30 @@ public final class ParticipantUtils { } /** + * Get the First StartPhase + * it depend of the state of the Control Loop + * and also from the all startPhase defined into the ToscaServiceTemplate. + * @param controlLoop the ControlLoop + * @param toscaServiceTemplate the ToscaServiceTemplate + * @return the First StartPhase + */ + public static int getFirstStartPhase(ControlLoop controlLoop, ToscaServiceTemplate toscaServiceTemplate) { + var minStartPhase = 1000; + var maxStartPhase = 0; + for (var element : controlLoop.getElements().values()) { + ToscaNodeTemplate toscaNodeTemplate = toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates() + .get(element.getDefinition().getName()); + int startPhase = ParticipantUtils.findStartPhase(toscaNodeTemplate.getProperties()); + minStartPhase = Math.min(minStartPhase, startPhase); + maxStartPhase = Math.max(maxStartPhase, startPhase); + } + + return ControlLoopState.UNINITIALISED2PASSIVE.equals(controlLoop.getState()) + || ControlLoopState.PASSIVE2RUNNING.equals(controlLoop.getState()) ? minStartPhase + : maxStartPhase; + } + + /** * Finds startPhase from a map of properties. * * @param properties Map of properties diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/ControlLoopPrimedResponse.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/ControlLoopPrimedResponse.java index 993c6e592..4d2dfaf01 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/ControlLoopPrimedResponse.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/ControlLoopPrimedResponse.java @@ -24,8 +24,6 @@ import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; -import org.onap.policy.clamp.controlloop.models.messages.rest.GenericNameVersion; import org.onap.policy.clamp.controlloop.models.messages.rest.SimpleResponse; diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java new file mode 100644 index 000000000..6c12c2de7 --- /dev/null +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java @@ -0,0 +1,43 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.controlloop.models.rest; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.onap.policy.clamp.controlloop.models.messages.rest.SimpleResponse; +import org.onap.policy.models.errors.concepts.ErrorResponseInfo; +import org.springframework.http.ResponseEntity; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class RestUtils { + + /** + * Convert an ErrorResponseInfo to a ResponseEntity. + * + * @param ex the ErrorResponseInfo + * @return the ResponseEntity + */ + public static ResponseEntity<SimpleResponse> toSimpleResponse(ErrorResponseInfo ex) { + var resp = new SimpleResponse(); + resp.setErrorDetails(ex.getErrorResponse().getErrorMessage()); + return ResponseEntity.status(ex.getErrorResponse().getResponseCode().getStatusCode()).body(resp); + } +} diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java index 51a4fc7ae..d9c518b53 100644 --- a/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java +++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java @@ -107,7 +107,7 @@ class ControlLoopTest { void testControlLoopElementStatisticsList() { var cl = new ControlLoop(); List<ClElementStatistics> emptylist = cl.getControlLoopElementStatisticsList(cl); - assertNull(emptylist); + assertEquals(List.of(), emptylist); var cl1 = getControlLoopTest(); List<ClElementStatistics> list = cl1.getControlLoopElementStatisticsList(cl1); diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtilsTest.java new file mode 100644 index 000000000..3fb8b6d7f --- /dev/null +++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantUtilsTest.java @@ -0,0 +1,84 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.controlloop.models.controlloop.concepts; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.onap.policy.common.utils.coder.Coder; +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.common.utils.coder.StandardCoder; +import org.onap.policy.common.utils.coder.StandardYamlCoder; +import org.onap.policy.common.utils.resources.ResourceUtils; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; +import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; + +class ParticipantUtilsTest { + + private static final Coder CODER = new StandardCoder(); + private static final String TOSCA_TEMPLATE_YAML = "examples/controlloop/PMSubscriptionHandling.yaml"; + private static final String CONTROL_LOOP_JSON = "src/test/resources/providers/TestControlLoops.json"; + private static final String CONTROL_LOOP_ELEMENT = "org.onap.policy.clamp.controlloop.ControlLoopElement"; + private static final String POLICY_CONTROL_LOOP_ELEMENT = + "org.onap.policy.clamp.controlloop.PolicyControlLoopElement"; + private static final String PARTICIPANT_CONTROL_LOOP_ELEMENT = "org.onap.policy.clamp.controlloop.Participant"; + private static final StandardYamlCoder YAML_TRANSLATOR = new StandardYamlCoder(); + + @Test + void testFindParticipantType() throws CoderException { + var identifier = new ToscaConceptIdentifier("Identifier", "1.0.1"); + var result = ParticipantUtils.findParticipantType(Map.of("participantType", CODER.encode(identifier))); + assertThat(result).isEqualTo(identifier); + } + + @Test + void testFindStartPhase() { + var identifier = 13; + var result = ParticipantUtils.findStartPhase(Map.of("startPhase", identifier)); + assertThat(result).isEqualTo(identifier); + } + + @Test + void testGetFirstStartPhase() throws CoderException { + var serviceTemplate = YAML_TRANSLATOR.decode(ResourceUtils.getResourceAsStream(TOSCA_TEMPLATE_YAML), + ToscaServiceTemplate.class); + var controlLoops = CODER.decode(ResourceUtils.getResourceAsString(CONTROL_LOOP_JSON), ControlLoops.class); + var result = ParticipantUtils.getFirstStartPhase(controlLoops.getControlLoopList().get(0), serviceTemplate); + assertThat(result).isZero(); + } + + @Test + void testCheckIfNodeTemplateIsControlLoopElement() throws CoderException { + var serviceTemplate = YAML_TRANSLATOR.decode(ResourceUtils.getResourceAsStream(TOSCA_TEMPLATE_YAML), + ToscaServiceTemplate.class); + var nodeTemplate = new ToscaNodeTemplate(); + nodeTemplate.setType(CONTROL_LOOP_ELEMENT); + assertThat(ParticipantUtils.checkIfNodeTemplateIsControlLoopElement(nodeTemplate, serviceTemplate)).isTrue(); + + nodeTemplate.setType(POLICY_CONTROL_LOOP_ELEMENT); + assertThat(ParticipantUtils.checkIfNodeTemplateIsControlLoopElement(nodeTemplate, serviceTemplate)).isTrue(); + + nodeTemplate.setType(PARTICIPANT_CONTROL_LOOP_ELEMENT); + assertThat(ParticipantUtils.checkIfNodeTemplateIsControlLoopElement(nodeTemplate, serviceTemplate)).isFalse(); + } +} diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ServiceTemplateProviderTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ServiceTemplateProviderTest.java index a4cbbfb0b..7f2731abf 100644 --- a/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ServiceTemplateProviderTest.java +++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ServiceTemplateProviderTest.java @@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -78,7 +77,7 @@ class ServiceTemplateProviderTest { var serviceTemplateProvider = new ServiceTemplateProvider(modelsProvider); var serviceTemplate = new ToscaServiceTemplate(); - when(modelsProvider.createServiceTemplate(eq(serviceTemplate))).thenReturn(serviceTemplate); + when(modelsProvider.createServiceTemplate(serviceTemplate)).thenReturn(serviceTemplate); var result = serviceTemplateProvider.createServiceTemplate(serviceTemplate); @@ -91,7 +90,7 @@ class ServiceTemplateProviderTest { serviceTemplate.setName("Name"); serviceTemplate.setVersion("1.0.0"); var modelsProvider = mock(PolicyModelsProvider.class); - when(modelsProvider.deleteServiceTemplate(eq(serviceTemplate.getName()), eq(serviceTemplate.getVersion()))) + when(modelsProvider.deleteServiceTemplate(serviceTemplate.getName(), serviceTemplate.getVersion())) .thenReturn(serviceTemplate); var serviceTemplateProvider = new ServiceTemplateProvider(modelsProvider); @@ -117,7 +116,7 @@ class ServiceTemplateProviderTest { serviceTemplate.setName("Name"); serviceTemplate.setVersion("1.0.0"); var modelsProvider = mock(PolicyModelsProvider.class); - when(modelsProvider.getServiceTemplateList(eq(serviceTemplate.getName()), eq(serviceTemplate.getVersion()))) + when(modelsProvider.getServiceTemplateList(serviceTemplate.getName(), serviceTemplate.getVersion())) .thenReturn(List.of(serviceTemplate)); var serviceTemplateProvider = new ServiceTemplateProvider(modelsProvider); @@ -133,7 +132,7 @@ class ServiceTemplateProviderTest { serviceTemplate.setName("Name"); serviceTemplate.setVersion("1.0.0"); var modelsProvider = mock(PolicyModelsProvider.class); - when(modelsProvider.getServiceTemplateList(eq(serviceTemplate.getName()), eq(serviceTemplate.getVersion()))) + when(modelsProvider.getServiceTemplateList(serviceTemplate.getName(), serviceTemplate.getVersion())) .thenReturn(List.of(serviceTemplate)); var serviceTemplateProvider = new ServiceTemplateProvider(modelsProvider); diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java new file mode 100644 index 000000000..4dedae200 --- /dev/null +++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java @@ -0,0 +1,54 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.controlloop.models.rest; + +import static org.assertj.core.api.Assertions.assertThat; + +import javax.ws.rs.core.Response.Status; +import org.junit.jupiter.api.Test; +import org.onap.policy.models.errors.concepts.ErrorResponse; +import org.onap.policy.models.errors.concepts.ErrorResponseInfo; + +class RestUtilsTest { + + private static final String MESSAGE_ERROR = "Erorr"; + private static final Status STATUS_ERROR = Status.BAD_REQUEST; + + @Test + void testToSimpleResponse() { + var ex = new ErrorResponseInfo() { + + @Override + public ErrorResponse getErrorResponse() { + var er = new ErrorResponse(); + er.setErrorMessage(MESSAGE_ERROR); + er.setResponseCode(STATUS_ERROR); + return er; + } + }; + + var response = RestUtils.toSimpleResponse(ex); + + assertThat(response.getStatusCodeValue()).isEqualTo(STATUS_ERROR.getStatusCode()); + assertThat(response.getBody()).isNotNull(); + assertThat(response.getBody().getErrorDetails()).isEqualTo(MESSAGE_ERROR); + } +} diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 451be1ec4..62181b9a2 100644 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>clamp-packages</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile index 1b9cb251a..9167b226a 100644 --- a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile @@ -21,7 +21,7 @@ # # Docker file to build an image that runs CLAMP on Java 11 or better in alpine # -FROM onap/policy-jre-alpine:2.3.0 +FROM onap/policy-jre-alpine:2.3.1 LABEL maintainer="Policy Team" diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile index fe14f7d7c..88bf34579 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile @@ -22,7 +22,7 @@ # Docker file to build an image that runs CLAMP on Java 11 or better in alpine # -FROM onap/policy-jre-alpine:2.3.0 +FROM onap/policy-jre-alpine:2.3.1 LABEL maintainer="Policy Team" diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile index 26fb66f22..e107b45af 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile @@ -21,7 +21,7 @@ # # Docker file to build an image that runs CLAMP on Java 11 or better in alpine # -FROM onap/policy-jre-alpine:2.3.0 +FROM onap/policy-jre-alpine:2.3.1 LABEL maintainer="Policy Team" diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile index 916ec2328..08a731c0c 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile @@ -21,7 +21,7 @@ # # Docker file to build an image that runs CLAMP on Java 11 or better in alpine # -FROM onap/policy-jre-alpine:2.3.0 +FROM onap/policy-jre-alpine:2.3.1 LABEL maintainer="Policy Team" diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh index 59d31dc8e..c428fd553 100644 --- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh +++ b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh @@ -61,5 +61,11 @@ $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \ -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ + -Dcom.sun.management.jmxremote.rmi.port=9090 \ + -Dcom.sun.management.jmxremote=true \ + -Dcom.sun.management.jmxremote.port=9090 \ + -Dcom.sun.management.jmxremote.ssl=false \ + -Dcom.sun.management.jmxremote.authenticate=false \ + -Dcom.sun.management.jmxremote.local.only=false \ -jar /app/app.jar \ --spring.config.location="${POLICY_HOME}/config/ClRuntimeParameters.yaml" diff --git a/packages/policy-clamp-tarball/pom.xml b/packages/policy-clamp-tarball/pom.xml index ea564c4dc..8db94f87c 100644 --- a/packages/policy-clamp-tarball/pom.xml +++ b/packages/policy-clamp-tarball/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>clamp-packages</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-tarball</artifactId> diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml index c8601cbdd..d399b82ba 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml @@ -33,8 +33,8 @@ runtime: implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl databaseDriver: org.mariadb.jdbc.Driver databaseUrl: jdbc:mariadb://${mariadb.host:mariadb}:${mariadb.port:3306}/controlloop - databaseUser: policy - databasePassword: P01icY + databaseUser: policy_user + databasePassword: policy_user persistenceUnit: CommissioningMariaDb topicParameterGroup: topicSources: diff --git a/packages/pom.xml b/packages/pom.xml index 07258cd44..0a913dc52 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>clamp-packages</artifactId> diff --git a/participant/participant-impl/participant-impl-cds/pom.xml b/participant/participant-impl/participant-impl-cds/pom.xml index 170a800da..c52c8f5cb 100644 --- a/participant/participant-impl/participant-impl-cds/pom.xml +++ b/participant/participant-impl/participant-impl-cds/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant-impl</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-impl-cds</artifactId> diff --git a/participant/participant-impl/participant-impl-http/pom.xml b/participant/participant-impl/participant-impl-http/pom.xml index 5cfb30f6a..668588f63 100644 --- a/participant/participant-impl/participant-impl-http/pom.xml +++ b/participant/participant-impl/participant-impl-http/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant-impl</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-impl-http</artifactId> diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml index 68c1a1418..fb4620621 100644 --- a/participant/participant-impl/participant-impl-kubernetes/pom.xml +++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant-impl</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-impl-kubernetes</artifactId> diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java index e1e9195eb..3f2113d98 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java +++ b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java @@ -20,9 +20,9 @@ package org.onap.policy.clamp.controlloop.participant.kubernetes.handler; - import java.io.IOException; import java.lang.invoke.MethodHandles; +import java.time.Instant; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ClElementStatistics; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; @@ -51,7 +52,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - /** * This class handles implementation of controlLoopElement updates. */ @@ -170,10 +170,16 @@ public class ControlLoopElementHandler implements ControlLoopElementListener { * Overridden method. * * @param controlLoopElementId controlLoopElement id - * @throws PfModelException incase of error + * @throws PfModelException in case of error */ @Override public synchronized void handleStatistics(UUID controlLoopElementId) throws PfModelException { - // TODO Implement statistics functionality + var clElement = intermediaryApi.getControlLoopElement(controlLoopElementId); + if (clElement != null) { + var clElementStatistics = new ClElementStatistics(); + clElementStatistics.setControlLoopState(clElement.getState()); + clElementStatistics.setTimeStamp(Instant.now()); + intermediaryApi.updateControlLoopElementStatistics(controlLoopElementId, clElementStatistics); + } } } diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClient.java b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClient.java index 1c405539b..31fa62f1f 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClient.java +++ b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClient.java @@ -47,6 +47,7 @@ public class HelmClient { private ChartStore chartStore; private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + private static final String PATH_DELIMITER = "/"; /** * Install a chart. @@ -100,7 +101,7 @@ public class HelmClient { } var localHelmChartDir = chartStore.getAppPath(chart.getChartId()).toString(); logger.info("Chart not found in helm repositories, verifying local repo {} ", localHelmChartDir); - if (verifyLocalHelmRepo(new File(localHelmChartDir + "/" + chart.getChartId().getName()))) { + if (verifyLocalHelmRepo(new File(localHelmChartDir + PATH_DELIMITER + chart.getChartId().getName()))) { repository = localHelmChartDir; } return repository; diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClientTest.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClientTest.java index 79a37f8e6..41b1fbeb5 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClientTest.java +++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/helm/HelmClientTest.java @@ -89,7 +89,10 @@ class HelmClientTest { .thenReturn("success"); doReturn(new File("/target/tmp/override.yaml")).when(chartStore) .getOverrideFile(any()); - assertDoesNotThrow(() -> helmClient.installChart(charts.get(0))); + var chartinfo = charts.get(0); + assertDoesNotThrow(() -> helmClient.installChart(chartinfo)); + chartinfo.setNamespace(""); + assertDoesNotThrow(() -> helmClient.installChart(chartinfo)); } @Test diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/rest/ChartControllerTest.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/rest/ChartControllerTest.java index bbb57c320..2af2a0171 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/rest/ChartControllerTest.java +++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/controlloop/participant/kubernetes/rest/ChartControllerTest.java @@ -73,6 +73,7 @@ class ChartControllerTest { private static String UNINSTALL_CHART_URL = "/helm/uninstall/"; private static String ONBOARD_CHART_URL = "/helm/onboard/chart"; private static String DELETE_CHART_URL = "/helm/chart"; + private static String CONFIGURE_REPO_URL = "/helm/repo"; @Autowired private MockMvc mockMvc; @@ -217,6 +218,23 @@ class ChartControllerTest { } + /** + * Test endpoint for configuring a helm repository. + * @throws Exception in case of error. + */ + @Test + void testConfigureRepo() throws Exception { + RequestBuilder requestBuilder; + + requestBuilder = MockMvcRequestBuilders.post(CONFIGURE_REPO_URL).accept(MediaType.APPLICATION_JSON_VALUE) + .content(getInstallationJson(charts.get(0).getChartId().getName(), charts.get(0).getChartId().getVersion())) + .contentType(MediaType.APPLICATION_JSON_VALUE); + + mockMvc.perform(requestBuilder).andExpect(status().isCreated()); + + } + + private String getInstallationJson(String name, String version) { JSONObject jsonObj = new JSONObject(); jsonObj.put("name", name); diff --git a/participant/participant-impl/participant-impl-policy/pom.xml b/participant/participant-impl/participant-impl-policy/pom.xml index bed42b081..ed0667ffd 100644 --- a/participant/participant-impl/participant-impl-policy/pom.xml +++ b/participant/participant-impl/participant-impl-policy/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant-impl</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-impl-policy</artifactId> diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyPapHttpClient.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyPapHttpClient.java index 3cce3bd8a..f835c6e04 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyPapHttpClient.java +++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/client/PolicyPapHttpClient.java @@ -20,12 +20,16 @@ package org.onap.policy.clamp.controlloop.participant.policy.client; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; +import java.util.LinkedList; +import java.util.List; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.onap.policy.clamp.controlloop.participant.policy.main.parameters.ParticipantPolicyParameters; +import org.onap.policy.models.pdp.concepts.DeploymentGroup; +import org.onap.policy.models.pdp.concepts.DeploymentGroups; +import org.onap.policy.models.pdp.concepts.DeploymentSubGroup; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.springframework.stereotype.Component; @Component @@ -55,33 +59,27 @@ public class PolicyPapHttpClient extends AbstractHttpClient { * @return Response */ public Response handlePolicyDeployOrUndeploy(final String policyName, final String policyVersion, - final String action) { - // policies - JsonObject policyArrayBody = new JsonObject(); - policyArrayBody.addProperty("name", policyName); - policyArrayBody.addProperty("version", policyVersion); - JsonArray policyArr = new JsonArray(); - policyArr.add(policyArrayBody); + final DeploymentSubGroup.Action action) { - // deploymentSubgroups - JsonObject deploymentSubGrpBody = new JsonObject(); - deploymentSubGrpBody.addProperty("pdpType", pdpType); - deploymentSubGrpBody.addProperty("action", action); - deploymentSubGrpBody.add("policies", policyArr); - JsonArray deployArr = new JsonArray(); - deployArr.add(deploymentSubGrpBody); + List<ToscaConceptIdentifier> policies = new LinkedList<ToscaConceptIdentifier>(); + policies.add(new ToscaConceptIdentifier(policyName, policyVersion)); - // groups - JsonObject groupArrayBody = new JsonObject(); - groupArrayBody.addProperty("name", pdpGroup); - groupArrayBody.add("deploymentSubgroups", deployArr); - JsonArray groupArr = new JsonArray(); - groupArr.add(groupArrayBody); + DeploymentSubGroup subGroup = new DeploymentSubGroup(); + subGroup.setPolicies(policies); + subGroup.setPdpType(pdpType); + subGroup.setAction(action); - // main json - JsonObject mainJson = new JsonObject(); - mainJson.add("groups", groupArr); + DeploymentGroup group = new DeploymentGroup(); + List<DeploymentSubGroup> subGroups = new LinkedList<DeploymentSubGroup>(); + subGroups.add(subGroup); + group.setDeploymentSubgroups(subGroups); + group.setName(pdpGroup); - return executePost(PAP_URI + "pdps/deployments/batch", Entity.entity(mainJson, MediaType.APPLICATION_JSON)); + DeploymentGroups groups = new DeploymentGroups(); + List<DeploymentGroup> groupsArr = new LinkedList<DeploymentGroup>(); + groupsArr.add(group); + groups.setGroups(groupsArr); + + return executePost(PAP_URI + "pdps/deployments/batch", Entity.entity(groups, MediaType.APPLICATION_JSON)); } } diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java index 29a7852f1..901fb682b 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java +++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java @@ -39,6 +39,7 @@ import org.onap.policy.clamp.controlloop.participant.policy.client.PolicyApiHttp import org.onap.policy.clamp.controlloop.participant.policy.client.PolicyPapHttpClient; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.base.PfModelRuntimeException; +import org.onap.policy.models.pdp.concepts.DeploymentSubGroup; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; @@ -101,7 +102,7 @@ public class ControlLoopElementHandler implements ControlLoopElementListener { break; case PASSIVE: try { - undeployPolicies(controlLoopElementId, orderedState); + undeployPolicies(controlLoopElementId); } catch (PfModelRuntimeException e) { LOGGER.debug("Undeploying policies failed - no policies to undeploy {}", controlLoopElementId); } @@ -144,7 +145,8 @@ public class ControlLoopElementHandler implements ControlLoopElementListener { // Deploy all policies of this controlLoop from Policy Framework if (policyMap.entrySet() != null) { for (Entry<String, String> policy : policyMap.entrySet()) { - papHttpClient.handlePolicyDeployOrUndeploy(policy.getKey(), policy.getValue(), "POST"); + papHttpClient.handlePolicyDeployOrUndeploy(policy.getKey(), policy.getValue(), + DeploymentSubGroup.Action.POST); } LOGGER.debug("Policies deployed to {} successfully", controlLoopElementId); } else { @@ -155,11 +157,12 @@ public class ControlLoopElementHandler implements ControlLoopElementListener { ParticipantMessageType.CONTROL_LOOP_STATE_CHANGE); } - private void undeployPolicies(UUID controlLoopElementId, ControlLoopOrderedState newState) { + private void undeployPolicies(UUID controlLoopElementId) { // Undeploy all policies of this controlloop from Policy Framework if (policyMap.entrySet() != null) { for (Entry<String, String> policy : policyMap.entrySet()) { - papHttpClient.handlePolicyDeployOrUndeploy(policy.getKey(), policy.getValue(), "DELETE"); + papHttpClient.handlePolicyDeployOrUndeploy(policy.getKey(), policy.getValue(), + DeploymentSubGroup.Action.DELETE); } LOGGER.debug("Undeployed policies from {} successfully", controlLoopElementId); } else { diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java index 25da5a3e9..d517ef61e 100644 --- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java +++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java @@ -33,9 +33,9 @@ import java.util.Set; import java.util.UUID; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.onap.policy.clamp.controlloop.common.utils.CommonUtils; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; -import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition; @@ -53,7 +53,6 @@ import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; -import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,8 +63,6 @@ public final class TestListenerUtils { private static final Coder CODER = new StandardCoder(); static CommonTestData commonTestData = new CommonTestData(); private static final Logger LOGGER = LoggerFactory.getLogger(TestListenerUtils.class); - private static final String POLICY_TYPE_ID = "policy_type_id"; - private static final String POLICY_ID = "policy_id"; /** * Method to create a controlLoop from a yaml file. @@ -174,65 +171,13 @@ public final class TestListenerUtils { List<ParticipantUpdates> participantUpdates = new ArrayList<>(); for (ControlLoopElement element : elements.values()) { - populateToscaNodeTemplateFragment(element, toscaServiceTemplate); - prepareParticipantUpdateForControlLoop(element, participantUpdates); + CommonUtils.setServiceTemplatePolicyInfo(element, toscaServiceTemplate); + CommonUtils.prepareParticipantUpdate(element, participantUpdates); } clUpdateMsg.setParticipantUpdatesList(participantUpdates); return clUpdateMsg; } - private static void populateToscaNodeTemplateFragment(ControlLoopElement clElement, - ToscaServiceTemplate toscaServiceTemplate) { - ToscaNodeTemplate toscaNodeTemplate = toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates() - .get(clElement.getDefinition().getName()); - // If the ControlLoopElement has policy_type_id or policy_id, identify it as a PolicyControlLoopElement - // and pass respective PolicyTypes or Policies as part of toscaServiceTemplateFragment - if ((toscaNodeTemplate.getProperties().get(POLICY_TYPE_ID) != null) - || (toscaNodeTemplate.getProperties().get(POLICY_ID) != null)) { - // ControlLoopElement for policy framework, send policies and policyTypes to participants - if ((toscaServiceTemplate.getPolicyTypes() != null) - || (toscaServiceTemplate.getToscaTopologyTemplate().getPolicies() != null)) { - ToscaServiceTemplate toscaServiceTemplateFragment = new ToscaServiceTemplate(); - toscaServiceTemplateFragment.setPolicyTypes(toscaServiceTemplate.getPolicyTypes()); - - ToscaTopologyTemplate toscaTopologyTemplate = new ToscaTopologyTemplate(); - toscaTopologyTemplate.setPolicies(toscaServiceTemplate.getToscaTopologyTemplate().getPolicies()); - toscaServiceTemplateFragment.setToscaTopologyTemplate(toscaTopologyTemplate); - - toscaServiceTemplateFragment.setDataTypes(toscaServiceTemplate.getDataTypes()); - - clElement.setToscaServiceTemplateFragment(toscaServiceTemplateFragment); - } - } - } - - private static void prepareParticipantUpdateForControlLoop(ControlLoopElement clElement, - List<ParticipantUpdates> participantUpdates) { - if (participantUpdates.isEmpty()) { - participantUpdates.add(getControlLoopElementList(clElement)); - } else { - boolean participantExists = false; - for (ParticipantUpdates participantUpdate : participantUpdates) { - if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) { - participantUpdate.getControlLoopElementList().add(clElement); - participantExists = true; - } - } - if (!participantExists) { - participantUpdates.add(getControlLoopElementList(clElement)); - } - } - } - - private static ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) { - ParticipantUpdates participantUpdate = new ParticipantUpdates(); - List<ControlLoopElement> controlLoopElementList = new ArrayList<>(); - participantUpdate.setParticipantId(clElement.getParticipantId()); - controlLoopElementList.add(clElement); - participantUpdate.setControlLoopElementList(controlLoopElementList); - return participantUpdate; - } - /** * Method to create participantUpdateMsg. * @@ -259,10 +204,10 @@ public final class TestListenerUtils { .getNodeTemplates().entrySet()) { if (ParticipantUtils.checkIfNodeTemplateIsControlLoopElement(toscaInputEntry.getValue(), toscaServiceTemplate)) { - var clParticipantType = - ParticipantUtils.findParticipantType(toscaInputEntry.getValue().getProperties()); - prepareParticipantDefinitionUpdate(clParticipantType, toscaInputEntry.getKey(), - toscaInputEntry.getValue(), participantDefinitionUpdates); + CommonUtils.prepareParticipantDefinitionUpdate( + ParticipantUtils.findParticipantType(toscaInputEntry.getValue().getProperties()), + toscaInputEntry.getKey(), toscaInputEntry.getValue(), + participantDefinitionUpdates, null); } } @@ -270,42 +215,6 @@ public final class TestListenerUtils { return participantUpdateMsg; } - private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantType, String entryKey, - ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates) { - - var clDefinition = new ControlLoopElementDefinition(); - clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(entryKey, entryValue.getVersion())); - clDefinition.setControlLoopElementToscaNodeTemplate(entryValue); - List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>(); - - if (participantDefinitionUpdates.isEmpty()) { - participantDefinitionUpdates - .add(getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); - } else { - boolean participantExists = false; - for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) { - if (participantDefinitionUpdate.getParticipantType().equals(clParticipantType)) { - participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition); - participantExists = true; - } - } - if (!participantExists) { - participantDefinitionUpdates.add( - getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); - } - } - } - - private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition, - ToscaConceptIdentifier clParticipantType, - List<ControlLoopElementDefinition> controlLoopElementDefinitionList) { - ParticipantDefinition participantDefinition = new ParticipantDefinition(); - participantDefinition.setParticipantType(clParticipantType); - controlLoopElementDefinitionList.add(clDefinition); - participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList); - return participantDefinition; - } - /** * Method to create ControlLoopUpdate using the arguments passed. * diff --git a/participant/participant-impl/participant-impl-simulator/pom.xml b/participant/participant-impl/participant-impl-simulator/pom.xml index d0d364605..324abea0e 100644 --- a/participant/participant-impl/participant-impl-simulator/pom.xml +++ b/participant/participant-impl/participant-impl-simulator/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant-impl</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-impl-simulator</artifactId> diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/ParticipantSimulatorApplication.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/ParticipantSimulatorApplication.java index 580bffa80..5e72d9479 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/ParticipantSimulatorApplication.java +++ b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/ParticipantSimulatorApplication.java @@ -34,7 +34,8 @@ import org.springframework.context.annotation.ComponentScan; @ConfigurationPropertiesScan("org.onap.policy.clamp.controlloop.participant.simulator.main.parameters")
@ComponentScan({
"org.onap.policy.clamp.controlloop.participant.simulator",
- "org.onap.policy.clamp.controlloop.participant.intermediary"
+ "org.onap.policy.clamp.controlloop.participant.intermediary",
+ "org.onap.policy.clamp.controlloop.common.rest"
})
//@formatter:on
public class ParticipantSimulatorApplication {
diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/ParticipantConfig.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/ParticipantConfig.java index d28ddf9dc..f2079edf5 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/ParticipantConfig.java +++ b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/ParticipantConfig.java @@ -20,9 +20,9 @@ package org.onap.policy.clamp.controlloop.participant.simulator.config; +import org.onap.policy.clamp.controlloop.common.rest.RequestResponseLoggingFilter; import org.onap.policy.clamp.controlloop.participant.intermediary.api.ParticipantIntermediaryApi; import org.onap.policy.clamp.controlloop.participant.simulator.main.handler.ControlLoopElementHandler; -import org.onap.policy.clamp.controlloop.participant.simulator.main.rest.RequestResponseLoggingFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlConfiguration.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlConfiguration.java index 16da5cf7f..28dd2f9bc 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlConfiguration.java +++ b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlConfiguration.java @@ -21,6 +21,7 @@ package org.onap.policy.clamp.controlloop.participant.simulator.config; import java.util.List; +import org.onap.policy.clamp.controlloop.common.rest.CoderHttpMesageConverter; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; @@ -32,8 +33,8 @@ public class YamlConfiguration implements WebMvcConfigurer { @Override public void extendMessageConverters(List<HttpMessageConverter<?>> converters) { - converters.add(new YamlHttpMessageConverter<>("yaml")); - converters.add(new YamlHttpMessageConverter<>("json")); + converters.add(new CoderHttpMesageConverter<>("yaml")); + converters.add(new CoderHttpMesageConverter<>("json")); StringHttpMessageConverter converter = new StringHttpMessageConverter(); converter.setSupportedMediaTypes(List.of(MediaType.TEXT_PLAIN)); diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlHttpMessageConverter.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlHttpMessageConverter.java deleted file mode 100644 index d9a72ce10..000000000 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/config/YamlHttpMessageConverter.java +++ /dev/null @@ -1,75 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation. - * ================================================================================ - * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.clamp.controlloop.participant.simulator.config; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.Response; -import org.onap.policy.clamp.controlloop.common.exception.ControlLoopRuntimeException; -import org.onap.policy.common.utils.coder.Coder; -import org.onap.policy.common.utils.coder.CoderException; -import org.onap.policy.common.utils.coder.StandardCoder; -import org.onap.policy.common.utils.coder.StandardYamlCoder; -import org.springframework.http.HttpInputMessage; -import org.springframework.http.HttpOutputMessage; -import org.springframework.http.MediaType; -import org.springframework.http.converter.AbstractHttpMessageConverter; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.http.converter.HttpMessageNotWritableException; - -public class YamlHttpMessageConverter<T> extends AbstractHttpMessageConverter<T> { - - private Coder coder; - - public YamlHttpMessageConverter(String type) { - super(new MediaType("application", type, StandardCharsets.UTF_8)); - this.coder = "json".equals(type) ? new StandardCoder() : new StandardYamlCoder(); - } - - @Override - protected boolean supports(Class<?> clazz) { - return true; - } - - @Override - protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage) - throws IOException, HttpMessageNotReadableException { - try (var is = new InputStreamReader(inputMessage.getBody(), StandardCharsets.UTF_8)) { - return coder.decode(is, clazz); - } catch (CoderException e) { - throw new ControlLoopRuntimeException(Response.Status.BAD_REQUEST, e.getMessage(), e); - } - } - - @Override - protected void writeInternal(T t, HttpOutputMessage outputMessage) - throws IOException, HttpMessageNotWritableException { - try (var writer = new OutputStreamWriter(outputMessage.getBody(), StandardCharsets.UTF_8)) { - coder.encode(writer, t); - } catch (CoderException e) { - throw new ControlLoopRuntimeException(Response.Status.BAD_REQUEST, e.getMessage(), e); - } - } -} diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/GlobalControllerExceptionHandler.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/GlobalControllerExceptionHandler.java index 34b212305..8648c253e 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/GlobalControllerExceptionHandler.java +++ b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/GlobalControllerExceptionHandler.java @@ -23,11 +23,10 @@ package org.onap.policy.clamp.controlloop.participant.simulator.main.rest; import org.onap.policy.clamp.controlloop.common.exception.ControlLoopException; -import org.onap.policy.clamp.controlloop.models.messages.rest.commissioning.CommissioningResponse; -import org.springframework.http.HttpStatus; +import org.onap.policy.clamp.controlloop.models.messages.rest.SimpleResponse; +import org.onap.policy.clamp.controlloop.models.rest.RestUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; @RestControllerAdvice @@ -40,12 +39,7 @@ public class GlobalControllerExceptionHandler { * @return ResponseEntity */ @ExceptionHandler(ControlLoopException.class) - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - public ResponseEntity<CommissioningResponse> handleBadRequest(ControlLoopException ex) { - - var resp = new CommissioningResponse(); - resp.setErrorDetails(ex.getErrorResponse().getErrorMessage()); - - return ResponseEntity.status(ex.getErrorResponse().getResponseCode().getStatusCode()).body(resp); + public ResponseEntity<SimpleResponse> handleBadRequest(ControlLoopException ex) { + return RestUtils.toSimpleResponse(ex); } } diff --git a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RequestResponseLoggingFilter.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RequestResponseLoggingFilter.java deleted file mode 100644 index 9626421e8..000000000 --- a/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RequestResponseLoggingFilter.java +++ /dev/null @@ -1,69 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation. - * ================================================================================ - * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.clamp.controlloop.participant.simulator.main.rest; - -import java.io.IOException; -import java.util.UUID; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@Order(2) -public class RequestResponseLoggingFilter implements Filter { - - private static final String VERSION_MINOR_NAME = "X-MinorVersion"; - private static final String VERSION_PATCH_NAME = "X-PatchVersion"; - private static final String VERSION_LATEST_NAME = "X-LatestVersion"; - public static final String API_VERSION = "1.0.0"; - public static final String REQUEST_ID_NAME = "X-ONAP-RequestID"; - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException { - - - HttpServletResponse res = (HttpServletResponse) response; - HttpServletRequest req = (HttpServletRequest) request; - - /* - * Disabling sonar because of ONAP requires the request ID to be copied from the request - * to the response, and just a simulator used during testing. - */ - String requestId = req.getHeader(REQUEST_ID_NAME); - res.addHeader(REQUEST_ID_NAME, requestId != null ? requestId : UUID.randomUUID().toString()); // NOSONAR - - res.addHeader(VERSION_MINOR_NAME, "0"); - res.addHeader(VERSION_PATCH_NAME, "0"); - res.addHeader(VERSION_LATEST_NAME, API_VERSION); - - chain.doFilter(request, response); - } - -} diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java index bd3316abb..c9848248e 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java +++ b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java @@ -33,9 +33,9 @@ import java.util.Set; import java.util.UUID; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.onap.policy.clamp.controlloop.common.utils.CommonUtils; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; -import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition; @@ -166,39 +166,12 @@ public final class TestListenerUtils { List<ParticipantUpdates> participantUpdates = new ArrayList<>(); for (ControlLoopElement element : elements.values()) { - prepareParticipantUpdateForControlLoop(element, participantUpdates); + CommonUtils.prepareParticipantUpdate(element, participantUpdates); } clUpdateMsg.setParticipantUpdatesList(participantUpdates); return clUpdateMsg; } - private static void prepareParticipantUpdateForControlLoop(ControlLoopElement clElement, - List<ParticipantUpdates> participantUpdates) { - if (participantUpdates.isEmpty()) { - participantUpdates.add(getControlLoopElementList(clElement)); - } else { - boolean participantExists = false; - for (ParticipantUpdates participantUpdate : participantUpdates) { - if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) { - participantUpdate.getControlLoopElementList().add(clElement); - participantExists = true; - } - } - if (!participantExists) { - participantUpdates.add(getControlLoopElementList(clElement)); - } - } - } - - private static ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) { - ParticipantUpdates participantUpdate = new ParticipantUpdates(); - List<ControlLoopElement> controlLoopElementList = new ArrayList<>(); - participantUpdate.setParticipantId(clElement.getParticipantId()); - controlLoopElementList.add(clElement); - participantUpdate.setControlLoopElementList(controlLoopElementList); - return participantUpdate; - } - /** * Method to create participantUpdateMsg. * @@ -226,8 +199,8 @@ public final class TestListenerUtils { toscaServiceTemplate)) { var clParticipantType = ParticipantUtils.findParticipantType(toscaInputEntry.getValue().getProperties()); - prepareParticipantDefinitionUpdate(clParticipantType, toscaInputEntry.getKey(), - toscaInputEntry.getValue(), participantDefinitionUpdates); + CommonUtils.prepareParticipantDefinitionUpdate(clParticipantType, toscaInputEntry.getKey(), + toscaInputEntry.getValue(), participantDefinitionUpdates, null); } } @@ -235,42 +208,6 @@ public final class TestListenerUtils { return participantUpdateMsg; } - private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantType, String entryKey, - ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates) { - - var clDefinition = new ControlLoopElementDefinition(); - clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(entryKey, entryValue.getVersion())); - clDefinition.setControlLoopElementToscaNodeTemplate(entryValue); - List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>(); - - if (participantDefinitionUpdates.isEmpty()) { - participantDefinitionUpdates - .add(getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); - } else { - boolean participantExists = false; - for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) { - if (participantDefinitionUpdate.getParticipantType().equals(clParticipantType)) { - participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition); - participantExists = true; - } - } - if (!participantExists) { - participantDefinitionUpdates.add( - getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); - } - } - } - - private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition, - ToscaConceptIdentifier clParticipantType, - List<ControlLoopElementDefinition> controlLoopElementDefinitionList) { - ParticipantDefinition participantDefinition = new ParticipantDefinition(); - participantDefinition.setParticipantType(clParticipantType); - controlLoopElementDefinitionList.add(clDefinition); - participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList); - return participantDefinition; - } - /** * Method to create ControlLoopUpdate using the arguments passed. * diff --git a/participant/participant-impl/pom.xml b/participant/participant-impl/pom.xml index 3d1acb0f0..646692b43 100644 --- a/participant/participant-impl/pom.xml +++ b/participant/participant-impl/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-impl</artifactId> diff --git a/participant/participant-intermediary/pom.xml b/participant/participant-intermediary/pom.xml index 0b111fbcc..a22826d28 100644 --- a/participant/participant-intermediary/pom.xml +++ b/participant/participant-intermediary/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.clamp.participant</groupId> <artifactId>policy-clamp-participant</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-participant-intermediary</artifactId> diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java index 43ac3464c..bbafc4678 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java @@ -89,7 +89,7 @@ public class ParticipantIntermediaryApiImpl implements ParticipantIntermediaryAp @Override public void updateParticipantStatistics(ParticipantStatistics participantStatistics) { - // TODO Auto-generated method stub + participantHandler.updateParticipantStatistics(participantStatistics); } @Override diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java index ac135b0d3..5a0f4989f 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java @@ -93,7 +93,8 @@ public class ControlLoopHandler { /** * Handle a control loop element state change message. * - * @param id controlloop element id + * @param controlLoopId the controlLoop Id + * @param id the controlLoop UUID * @param orderedState the current state * @param newState the ordered state * @return controlLoopElement the updated controlloop element @@ -160,8 +161,10 @@ public class ControlLoopHandler { * Handle a control loop state change message. * * @param stateChangeMsg the state change message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ - public void handleControlLoopStateChange(ControlLoopStateChange stateChangeMsg) { + public void handleControlLoopStateChange(ControlLoopStateChange stateChangeMsg, + List<ControlLoopElementDefinition> clElementDefinitions) { if (stateChangeMsg.getControlLoopId() == null) { return; } @@ -182,7 +185,8 @@ public class ControlLoopHandler { return; } - handleState(controlLoop, stateChangeMsg.getOrderedState()); + handleState(controlLoop, stateChangeMsg.getOrderedState(), stateChangeMsg.getStartPhase(), + clElementDefinitions); } /** @@ -190,17 +194,20 @@ public class ControlLoopHandler { * * @param controlLoop participant response * @param orderedState controlloop ordered state + * @param startPhaseMsg startPhase from message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ - private void handleState(final ControlLoop controlLoop, ControlLoopOrderedState orderedState) { + private void handleState(final ControlLoop controlLoop, ControlLoopOrderedState orderedState, Integer startPhaseMsg, + List<ControlLoopElementDefinition> clElementDefinitions) { switch (orderedState) { case UNINITIALISED: - handleUninitialisedState(controlLoop, orderedState); + handleUninitialisedState(controlLoop, orderedState, startPhaseMsg, clElementDefinitions); break; case PASSIVE: - handlePassiveState(controlLoop, orderedState); + handlePassiveState(controlLoop, orderedState, startPhaseMsg, clElementDefinitions); break; case RUNNING: - handleRunningState(controlLoop, orderedState); + handleRunningState(controlLoop, orderedState, startPhaseMsg, clElementDefinitions); break; default: LOGGER.debug("StateChange message has no state, state is null {}", controlLoop.getDefinition()); @@ -212,6 +219,7 @@ public class ControlLoopHandler { * Handle a control loop update message. * * @param updateMsg the update message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ public void handleControlLoopUpdate(ControlLoopUpdate updateMsg, List<ControlLoopElementDefinition> clElementDefinitions) { @@ -300,8 +308,7 @@ public class ControlLoopHandler { ToscaConceptIdentifier clElementDefId) { for (var clElementDefinition : clElementDefinitions) { - if (clElementDefId.getName().contains( - clElementDefinition.getClElementDefinitionId().getName())) { + if (clElementDefId.getName().contains(clElementDefinition.getClElementDefinitionId().getName())) { return clElementDefinition.getControlLoopElementToscaNodeTemplate(); } } @@ -332,11 +339,18 @@ public class ControlLoopHandler { * * @param controlLoop participant response * @param orderedState orderedState + * @param startPhaseMsg startPhase from message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ - private void handleUninitialisedState(final ControlLoop controlLoop, final ControlLoopOrderedState orderedState) { - handleStateChange(controlLoop, orderedState); - controlLoopMap.remove(controlLoop.getDefinition()); - controlLoop.getElements().values().forEach(element -> elementsOnThisParticipant.remove(element.getId())); + private void handleUninitialisedState(final ControlLoop controlLoop, final ControlLoopOrderedState orderedState, + Integer startPhaseMsg, List<ControlLoopElementDefinition> clElementDefinitions) { + handleStateChange(controlLoop, orderedState, startPhaseMsg, clElementDefinitions); + boolean isAllUninitialised = controlLoop.getElements().values().stream() + .filter(element -> !ControlLoopState.UNINITIALISED.equals(element.getState())).findAny().isEmpty(); + if (isAllUninitialised) { + controlLoopMap.remove(controlLoop.getDefinition()); + controlLoop.getElements().values().forEach(element -> elementsOnThisParticipant.remove(element.getId())); + } } /** @@ -344,9 +358,12 @@ public class ControlLoopHandler { * * @param controlLoop participant response * @param orderedState orderedState + * @param startPhaseMsg startPhase from message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ - private void handlePassiveState(final ControlLoop controlLoop, final ControlLoopOrderedState orderedState) { - handleStateChange(controlLoop, orderedState); + private void handlePassiveState(final ControlLoop controlLoop, final ControlLoopOrderedState orderedState, + Integer startPhaseMsg, List<ControlLoopElementDefinition> clElementDefinitions) { + handleStateChange(controlLoop, orderedState, startPhaseMsg, clElementDefinitions); } /** @@ -354,9 +371,12 @@ public class ControlLoopHandler { * * @param controlLoop participant response * @param orderedState orderedState + * @param startPhaseMsg startPhase from message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ - private void handleRunningState(final ControlLoop controlLoop, final ControlLoopOrderedState orderedState) { - handleStateChange(controlLoop, orderedState); + private void handleRunningState(final ControlLoop controlLoop, final ControlLoopOrderedState orderedState, + Integer startPhaseMsg, List<ControlLoopElementDefinition> clElementDefinitions) { + handleStateChange(controlLoop, orderedState, startPhaseMsg, clElementDefinitions); } /** @@ -364,8 +384,11 @@ public class ControlLoopHandler { * * @param controlLoop participant status in memory * @param orderedState orderedState the new ordered state the participant should have + * @param startPhaseMsg startPhase from message + * @param clElementDefinitions the list of ControlLoopElementDefinition */ - private void handleStateChange(ControlLoop controlLoop, final ControlLoopOrderedState orderedState) { + private void handleStateChange(ControlLoop controlLoop, final ControlLoopOrderedState orderedState, + Integer startPhaseMsg, List<ControlLoopElementDefinition> clElementDefinitions) { if (orderedState.equals(controlLoop.getOrderedState())) { var controlLoopAck = new ControlLoopAck(ParticipantMessageType.CONTROLLOOP_STATECHANGE_ACK); @@ -378,16 +401,27 @@ public class ControlLoopHandler { return; } - controlLoop.getElements().values().stream().forEach(clElement -> { - for (var clElementListener : listeners) { - try { - clElementListener.controlLoopElementStateChange(controlLoop.getDefinition(), clElement.getId(), - clElement.getState(), orderedState); - } catch (PfModelException e) { - LOGGER.debug("Control loop element update failed {}", controlLoop.getDefinition()); + controlLoop.getElements().values().stream().forEach(clElement -> controlLoopElementStateChange(controlLoop, + orderedState, clElement, startPhaseMsg, clElementDefinitions)); + } + + private void controlLoopElementStateChange(ControlLoop controlLoop, ControlLoopOrderedState orderedState, + ControlLoopElement clElement, Integer startPhaseMsg, + List<ControlLoopElementDefinition> clElementDefinitions) { + var clElementNodeTemplate = getClElementNodeTemplate(clElementDefinitions, clElement.getDefinition()); + if (clElementNodeTemplate != null) { + int startPhase = ParticipantUtils.findStartPhase(clElementNodeTemplate.getProperties()); + if (startPhaseMsg.equals(startPhase)) { + for (var clElementListener : listeners) { + try { + clElementListener.controlLoopElementStateChange(controlLoop.getDefinition(), clElement.getId(), + clElement.getState(), orderedState); + } catch (PfModelException e) { + LOGGER.debug("Control loop element update failed {}", controlLoop.getDefinition()); + } } } - }); + } } /** diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java index 0734cb9c7..89a13a84b 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java @@ -156,7 +156,7 @@ public class ParticipantHandler { * @param stateChangeMsg the state change message */ public void handleControlLoopStateChange(ControlLoopStateChange stateChangeMsg) { - controlLoopHandler.handleControlLoopStateChange(stateChangeMsg); + controlLoopHandler.handleControlLoopStateChange(stateChangeMsg, clElementDefsOnThisParticipant); } private void handleStateChange(ParticipantState newParticipantState, ParticipantUpdateAck response) { @@ -190,6 +190,19 @@ public class ParticipantHandler { } /** + * Method to update participant statistics. + * + * @param statistics participant statistics + */ + public void updateParticipantStatistics(ParticipantStatistics statistics) { + participantStatistics.setState(statistics.getState()); + participantStatistics.setHealthStatus(statistics.getHealthStatus()); + participantStatistics.setTimeStamp(statistics.getTimeStamp()); + participantStatistics.setAverageExecutionTime(statistics.getAverageExecutionTime()); + participantStatistics.setEventCount(statistics.getEventCount()); + } + + /** * Get participants as a {@link Participant} class. * * @param name the participant name to get diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java index 29387959b..676747d04 100644 --- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java +++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java @@ -21,20 +21,29 @@ package org.onap.policy.clamp.controlloop.participant.intermediary.handler; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.mockito.Mockito.mock; import java.time.Instant; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ClElementStatistics; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate; import org.onap.policy.clamp.controlloop.participant.intermediary.api.ControlLoopElementListener; import org.onap.policy.clamp.controlloop.participant.intermediary.main.parameters.CommonTestData; +import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -45,14 +54,14 @@ class ControlLoopHandlerTest { @Test void controlLoopHandlerTest() { - ControlLoopHandler clh = commonTestData.getMockControlLoopHandler(); + var clh = commonTestData.getMockControlLoopHandler(); assertNotNull(clh.getControlLoops()); assertNotNull(clh.getControlLoopMap()); assertNotNull(clh.getElementsOnThisParticipant()); - UUID elementId1 = UUID.randomUUID(); - ControlLoopElement element = new ControlLoopElement(); + var elementId1 = UUID.randomUUID(); + var element = new ControlLoopElement(); element.setId(elementId1); element.setDefinition(new ToscaConceptIdentifier( "org.onap.policy.controlloop.PolicyControlLoopParticipant", "1.0.1")); @@ -62,22 +71,21 @@ class ControlLoopHandlerTest { ControlLoopElementListener listener = mock(ControlLoopElementListener.class); clh.registerControlLoopElementListener(listener); assertThat(clh.getListeners()).contains(listener); - } @Test void updateNullControlLoopHandlerTest() { - UUID id = UUID.randomUUID(); + var id = UUID.randomUUID(); - ControlLoopHandler clh = commonTestData.getMockControlLoopHandler(); + var clh = commonTestData.getMockControlLoopHandler(); assertNull(clh.updateControlLoopElementState(null, null, ControlLoopOrderedState.UNINITIALISED, ControlLoopState.PASSIVE)); assertNull(clh.updateControlLoopElementState(null, id, ControlLoopOrderedState.UNINITIALISED, ControlLoopState.PASSIVE)); - ClElementStatistics clElementStatistics = new ClElementStatistics(); - ToscaConceptIdentifier controlLoopId = new ToscaConceptIdentifier("defName", "0.0.1"); + var clElementStatistics = new ClElementStatistics(); + var controlLoopId = new ToscaConceptIdentifier("defName", "0.0.1"); clElementStatistics.setParticipantId(controlLoopId); clElementStatistics.setControlLoopState(ControlLoopState.RUNNING); clElementStatistics.setTimeStamp(Instant.now()); @@ -85,9 +93,77 @@ class ControlLoopHandlerTest { clh.updateControlLoopElementStatistics(id, clElementStatistics); assertNull(clh.updateControlLoopElementState(controlLoopId, id, ControlLoopOrderedState.UNINITIALISED, ControlLoopState.PASSIVE)); + } + + @Test + void updateControlLoopHandlerTest() throws CoderException { + var uuid = UUID.randomUUID(); + var id = CommonTestData.getParticipantId(); + + var clh = setTestControlLoopHandler(id, uuid); + var key = clh.getElementsOnThisParticipant().keySet().iterator().next(); + var value = clh.getElementsOnThisParticipant().get(key); + assertEquals(ControlLoopState.UNINITIALISED, value.getState()); + clh.updateControlLoopElementState(id, uuid, ControlLoopOrderedState.UNINITIALISED, + ControlLoopState.PASSIVE); + assertEquals(ControlLoopState.PASSIVE, value.getState()); + + var clElementStatistics = new ClElementStatistics(); + clElementStatistics.setParticipantId(id); + clElementStatistics.setControlLoopState(ControlLoopState.RUNNING); + clElementStatistics.setTimeStamp(Instant.now()); + + assertNotEquals(uuid, value.getClElementStatistics().getId()); + clh.updateControlLoopElementStatistics(uuid, clElementStatistics); + assertEquals(uuid, value.getClElementStatistics().getId()); + } + + @Test + void handleControlLoopUpdateExceptionTest() throws CoderException { + var uuid = UUID.randomUUID(); + var id = CommonTestData.getParticipantId(); + + var stateChange = new ControlLoopStateChange(); + stateChange.setControlLoopId(id); + stateChange.setParticipantId(id); + stateChange.setMessageId(uuid); + stateChange.setOrderedState(ControlLoopOrderedState.RUNNING); + stateChange.setCurrentState(ControlLoopState.UNINITIALISED); + stateChange.setTimestamp(Instant.ofEpochMilli(3000)); + + var clh = setTestControlLoopHandler(id, uuid); + clh.handleControlLoopStateChange(stateChange, List.of()); + var newid = new ToscaConceptIdentifier("id", "1.2.3"); + stateChange.setControlLoopId(newid); + stateChange.setParticipantId(newid); + assertDoesNotThrow(() -> clh.handleControlLoopStateChange(stateChange, List.of())); + + List<ControlLoopElementDefinition> clElementDefinitions = new ArrayList<>(); + var cld = new ControlLoopElementDefinition(); + cld.setClElementDefinitionId(id); + clElementDefinitions.add(cld); + var updateMsg = new ControlLoopUpdate(); + updateMsg.setControlLoopId(id); + updateMsg.setMessageId(uuid); + updateMsg.setParticipantId(id); + updateMsg.setStartPhase(0); + assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, clElementDefinitions)); + updateMsg.setStartPhase(1); + assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, clElementDefinitions)); + } + + private ControlLoopHandler setTestControlLoopHandler(ToscaConceptIdentifier id, UUID uuid) throws CoderException { + var clh = commonTestData.getMockControlLoopHandler(); + var key = commonTestData.getTestControlLoopMap().keySet().iterator().next(); + var value = commonTestData.getTestControlLoopMap().get(key); + clh.getControlLoopMap().put(key, value); + var keyElem = commonTestData.setControlLoopElementTest(uuid, id).keySet().iterator().next(); + var valueElem = commonTestData.setControlLoopElementTest(uuid, id).get(keyElem); + clh.getElementsOnThisParticipant().put(keyElem, valueElem); + return clh; } } diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandlerTest.java new file mode 100644 index 000000000..d00697521 --- /dev/null +++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandlerTest.java @@ -0,0 +1,176 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.clamp.controlloop.participant.intermediary.handler; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import org.junit.jupiter.api.Test; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantHealthStatus; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantState; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantAckMessage; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantMessage; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantMessageType; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantRegisterAck; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate; +import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantMessagePublisher; +import org.onap.policy.clamp.controlloop.participant.intermediary.main.parameters.CommonTestData; +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; + +class ParticipantHandlerTest { + + private CommonTestData commonTestData = new CommonTestData(); + private static final String ID_NAME = "org.onap.PM_CDS_Blueprint"; + private static final String ID_VERSION = "1.0.1"; + + @Test + void mockParticipantHandlerTest() { + var participantHandler = commonTestData.getMockParticipantHandler(); + assertNull(participantHandler.getParticipant(null, null)); + assertEquals("org.onap.PM_CDS_Blueprint 1.0.1", participantHandler.getParticipantId().toString()); + + var id = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + assertEquals(id, participantHandler.getParticipantId()); + assertEquals(id, participantHandler.getParticipantType()); + assertThat(participantHandler.getClElementDefinitionCommonProperties(id)).isEmpty(); + + } + + @Test + void handleUpdateTest() { + var parameters = CommonTestData.getParticipantParameters(); + var controlLoopHander = commonTestData.getMockControlLoopHandler(); + var publisher = new ParticipantMessagePublisher(); + var emptyParticipantHandler = + new ParticipantHandler(parameters, publisher, controlLoopHander); + var participantUpdateMsg = new ParticipantUpdate(); + + assertThatThrownBy(() -> + emptyParticipantHandler.handleParticipantUpdate(participantUpdateMsg)) + .isInstanceOf(RuntimeException.class); + + var participantHandler = commonTestData.getMockParticipantHandler(); + + var id = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + participantUpdateMsg.setControlLoopId(id); + participantUpdateMsg.setParticipantId(id); + participantUpdateMsg.setParticipantType(id); + participantUpdateMsg.setMessageId(UUID.randomUUID()); + participantUpdateMsg.setTimestamp(Instant.ofEpochMilli(3000)); + + var heartbeatF = participantHandler.makeHeartbeat(false); + assertEquals(id, heartbeatF.getParticipantId()); + assertEquals(ParticipantState.UNKNOWN, heartbeatF.getParticipantStatistics().getState()); + assertThat(heartbeatF.getControlLoopInfoList()).isEmpty(); + + participantHandler.handleParticipantUpdate(participantUpdateMsg); + assertThat(participantHandler.getClElementDefinitionCommonProperties(id)).isEmpty(); + + var heartbeatT = participantHandler.makeHeartbeat(true); + assertEquals(id, heartbeatT.getParticipantId()); + assertEquals(ParticipantState.TERMINATED, heartbeatT.getParticipantStatistics().getState()); + assertThat(heartbeatT.getParticipantDefinitionUpdates()).isNotEmpty(); + assertEquals(id, heartbeatT.getParticipantDefinitionUpdates().get(0).getParticipantId()); + + var pum = setListParticipantDefinition(participantUpdateMsg); + participantHandler.handleParticipantUpdate(pum); + var heartbeatTAfterUpdate = participantHandler.makeHeartbeat(true); + assertEquals(id, heartbeatTAfterUpdate.getParticipantId()); + assertEquals(ParticipantState.PASSIVE, heartbeatTAfterUpdate.getParticipantStatistics().getState()); + + } + + private ParticipantUpdate setListParticipantDefinition(ParticipantUpdate participantUpdateMsg) { + var id = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + List<ParticipantDefinition> participantDefinitionUpdates = new ArrayList<>(); + var def = new ParticipantDefinition(); + def.setParticipantId(id); + def.setParticipantType(id); + participantDefinitionUpdates.add(def); + participantUpdateMsg.setParticipantDefinitionUpdates(participantDefinitionUpdates); + return participantUpdateMsg; + } + + @Test + void handleParticipantTest() { + var participantHandler = commonTestData.getMockParticipantHandler(); + var id = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + var p = participantHandler.getParticipant(id.getName(), id.getVersion()); + assertEquals(ParticipantState.UNKNOWN, p.getParticipantState()); + + participantHandler.updateParticipantState(id, ParticipantState.PASSIVE); + var p2 = participantHandler.getParticipant(id.getName(), id.getVersion()); + assertEquals(ParticipantState.PASSIVE, p2.getParticipantState()); + + var participantRegisterAckMsg = new ParticipantRegisterAck(); + participantRegisterAckMsg.setState(ParticipantState.TERMINATED); + participantHandler.handleParticipantRegisterAck(participantRegisterAckMsg); + assertEquals(ParticipantHealthStatus.HEALTHY, participantHandler.makeHeartbeat(false).getHealthStatus()); + + var emptyid = new ToscaConceptIdentifier("", ID_VERSION); + assertNull(participantHandler.updateParticipantState(emptyid, ParticipantState.PASSIVE)); + + var sameid = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + var participant = participantHandler.updateParticipantState(sameid, ParticipantState.PASSIVE); + assertEquals(participant.getDefinition(), sameid); + + } + + @Test + void checkAppliesTo() { + var participantHandler = commonTestData.getMockParticipantHandler(); + var participantAckMsg = + new ParticipantAckMessage(ParticipantMessageType.CONTROL_LOOP_UPDATE); + assertTrue(participantHandler.appliesTo(participantAckMsg)); + + var participantMsg = + new ParticipantMessage(ParticipantMessageType.PARTICIPANT_STATUS); + assertTrue(participantHandler.appliesTo(participantMsg)); + + var emptyid = new ToscaConceptIdentifier("", ID_VERSION); + participantMsg.setParticipantType(emptyid); + assertFalse(participantHandler.appliesTo(participantMsg)); + + } + + @Test + void getControlLoopInfoListTest() throws CoderException { + var participantHandler = commonTestData.getParticipantHandlerControlLoops(); + var id = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + participantHandler.sendHeartbeat(); + assertEquals(id, participantHandler.makeHeartbeat(false) + .getControlLoopInfoList() + .get(0) + .getControlLoopId()); + + } + +} diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/main/parameters/CommonTestData.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/main/parameters/CommonTestData.java index ae20f4b7f..43f3c8e2b 100644 --- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/main/parameters/CommonTestData.java +++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/main/parameters/CommonTestData.java @@ -20,15 +20,27 @@ package org.onap.policy.clamp.controlloop.participant.intermediary.main.parameters; +import java.io.File; +import java.time.Instant; import java.util.Arrays; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.UUID; import org.mockito.Mockito; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ClElementStatistics; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoops; +import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantDeregisterAck; import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantMessagePublisher; import org.onap.policy.clamp.controlloop.participant.intermediary.handler.ControlLoopHandler; import org.onap.policy.clamp.controlloop.participant.intermediary.handler.DummyParticipantParameters; +import org.onap.policy.clamp.controlloop.participant.intermediary.handler.ParticipantHandler; import org.onap.policy.clamp.controlloop.participant.intermediary.parameters.ParticipantIntermediaryParameters; import org.onap.policy.common.endpoints.event.comm.TopicSink; import org.onap.policy.common.endpoints.parameters.TopicParameters; @@ -45,7 +57,6 @@ public class CommonTestData { public static final String DESCRIPTION = "Participant description"; public static final long TIME_INTERVAL = 2000; public static final List<TopicParameters> TOPIC_PARAMS = Arrays.asList(getTopicParams()); - public static final Coder CODER = new StandardCoder(); private static final Object lockit = new Object(); @@ -128,7 +139,7 @@ public class CommonTestData { * @return topic parameters */ public static TopicParameters getTopicParams() { - final TopicParameters topicParams = new TopicParameters(); + final var topicParams = new TopicParameters(); topicParams.setTopic("POLICY-CLRUNTIME-PARTICIPANT"); topicParams.setTopicCommInfrastructure("dmaap"); topicParams.setServers(Arrays.asList("localhost")); @@ -151,8 +162,7 @@ public class CommonTestData { */ private ParticipantMessagePublisher getParticipantMessagePublisher() { synchronized (lockit) { - ParticipantMessagePublisher participantMessagePublisher = - new ParticipantMessagePublisher(); + var participantMessagePublisher = new ParticipantMessagePublisher(); participantMessagePublisher.active(Collections.singletonList(Mockito.mock(TopicSink.class))); return participantMessagePublisher; } @@ -168,4 +178,96 @@ public class CommonTestData { getParticipantParameters(), getParticipantMessagePublisher()); } + + /** + * Returns a mocked ParticipantHandler for test cases. + * + * @return participant Handler + */ + public ParticipantHandler getMockParticipantHandler() { + var parameters = getParticipantParameters(); + var controlLoopHandler = getMockControlLoopHandler(); + var publisher = new ParticipantMessagePublisher(); + publisher.active(Collections.singletonList(Mockito.mock(TopicSink.class))); + var participantHandler = new ParticipantHandler(parameters, publisher, controlLoopHandler); + return participantHandler; + } + + /** + * Returns a mocked ParticipantHandler for test cases. + * + * @return participant Handler + * + * @throws CoderException if there is an error with .json file. + */ + public ParticipantHandler getParticipantHandlerControlLoops() throws CoderException { + var controlLoopHandler = Mockito.mock(ControlLoopHandler.class); + Mockito.doReturn(getTestControlLoops()).when(controlLoopHandler).getControlLoops(); + Mockito.doReturn(getTestControlLoopMap()).when(controlLoopHandler).getControlLoopMap(); + var publisher = new ParticipantMessagePublisher(); + publisher.active(Collections.singletonList(Mockito.mock(TopicSink.class))); + var parameters = getParticipantParameters(); + var participantHandler = new ParticipantHandler(parameters, publisher, controlLoopHandler); + participantHandler.sendParticipantRegister(); + participantHandler.handleParticipantStatusReq(null); + participantHandler.sendParticipantDeregister(); + var participantDeregisterAckMsg = new ParticipantDeregisterAck(); + participantDeregisterAckMsg.setResponseTo(UUID.randomUUID()); + participantHandler.handleParticipantDeregisterAck(participantDeregisterAckMsg); + return participantHandler; + } + + /** + * Returns a Map of ToscaConceptIdentifier and ControlLoop for test cases. + * + * @return controlLoopMap + * + * @throws CoderException if there is an error with .json file. + */ + public Map<ToscaConceptIdentifier, ControlLoop> getTestControlLoopMap() throws CoderException { + var controlLoops = getTestControlLoops(); + var controlLoop = controlLoops.getControlLoopList().get(1); + var id = getParticipantId(); + Map<ToscaConceptIdentifier, ControlLoop> controlLoopMap = new LinkedHashMap<>(); + controlLoopMap.put(id, controlLoop); + return controlLoopMap; + } + + /** + * Returns List of ControlLoop for test cases. + * + * @return ControlLoops + * + * @throws CoderException if there is an error with .json file. + */ + public ControlLoops getTestControlLoops() throws CoderException { + return new StandardCoder() + .decode(new File("src/test/resources/providers/TestControlLoops.json"), ControlLoops.class); + } + + /** + * Returns a map for a elementsOnThisParticipant for test cases. + * + * @param uuid UUID and id ToscaConceptIdentifier + * @return a map suitable for elementsOnThisParticipant + */ + public Map<UUID, ControlLoopElement> setControlLoopElementTest(UUID uuid, ToscaConceptIdentifier id) { + var clElement = new ControlLoopElement(); + clElement.setId(uuid); + clElement.setParticipantId(id); + clElement.setDefinition(id); + clElement.setOrderedState(ControlLoopOrderedState.UNINITIALISED); + + var clElementStatistics = new ClElementStatistics(); + clElementStatistics.setParticipantId(id); + clElementStatistics.setControlLoopState(ControlLoopState.UNINITIALISED); + clElementStatistics.setTimeStamp(Instant.now()); + + clElement.setClElementStatistics(clElementStatistics); + + Map<UUID, ControlLoopElement> elementsOnThisParticipant = new LinkedHashMap<>(); + elementsOnThisParticipant.put(uuid, clElement); + return elementsOnThisParticipant; + } + } diff --git a/participant/participant-intermediary/src/test/resources/providers/TestControlLoops.json b/participant/participant-intermediary/src/test/resources/providers/TestControlLoops.json new file mode 100644 index 000000000..fedda9600 --- /dev/null +++ b/participant/participant-intermediary/src/test/resources/providers/TestControlLoops.json @@ -0,0 +1,142 @@ +{ + "controlLoopList": [ + { + "definition": { + "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition", + "version": "1.0.0" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "elements": { + "709c62b3-8918-41b9-a747-e21eb79c6c20": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c20", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "DCAE Control Loop Element for the PMSH instance 0 control loop" + }, + "709c62b3-8918-41b9-a747-e21eb79c6c21": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop" + }, + "709c62b3-8918-41b9-a747-e21eb79c6c22": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c22", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop" + }, + "709c62b3-8918-41b9-a747-e21eb79c6c23": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c23", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "CDS Control Loop Element for the PMSH instance 0 control loop" + } + }, + "name": "PMSHInstance0", + "version": "1.0.1", + "description": "PMSH control loop instance 0" + }, + { + "definition": { + "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition", + "version": "1.0.0" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "elements": { + "709c62b3-8918-41b9-a747-e21eb79c6c24": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c24", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "DCAE Control Loop Element for the PMSH instance 1 control loop" + }, + "709c62b3-8918-41b9-a747-e21eb79c6c25": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c25", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Monitoring Policy Control Loop Element for the PMSH instance 1 control loop" + }, + "709c62b3-8918-41b9-a747-e21eb79c6c26": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c26", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Operational Policy Control Loop Element for the PMSH instance 1 control loop" + }, + "709c62b3-8918-41b9-a747-e21eb79c6c27": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c27", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement", + "version": "1.2.3" + }, + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "CDS Control Loop Element for the PMSH instance 1 control loop" + } + }, + "name": "PMSHInstance1", + "version": "1.0.1", + "description": "PMSH control loop instance 1" + } + ] +} diff --git a/participant/pom.xml b/participant/pom.xml index 77108fbf5..fcfbe0c90 100644 --- a/participant/pom.xml +++ b/participant/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.clamp.participant</groupId> @@ -23,12 +23,12 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>3.4.2</version> + <version>3.5.0-SNAPSHOT</version> </parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> @@ -37,7 +37,7 @@ This is the root Maven module for the policy-clamp project. It contains the following modules: - - policy-clamp-common: Common code for all CLAMP modules + - policy-clamp-common: Common code for all Policy/CLAMP modules - policy-clamp-models: POJOs and other model code for REST and DMaaP messages and for persistence - policy-clamp-runtime: The runtime server for CLAMP - policy-clamp-participant: Modules for CLAMP control loop participants @@ -50,8 +50,8 @@ </description> <properties> - <policy.common.version>1.9.0</policy.common.version> - <policy.models.version>2.5.0</policy.models.version> + <policy.common.version>1.10.0-SNAPSHOT</policy.common.version> + <policy.models.version>2.6.0-SNAPSHOT</policy.models.version> </properties> <modules> diff --git a/releases/6.1.3-container.yaml b/releases/6.1.3-container.yaml new file mode 100644 index 000000000..040ff0ecf --- /dev/null +++ b/releases/6.1.3-container.yaml @@ -0,0 +1,18 @@ +distribution_type: 'container' +container_release_tag: '6.1.3' +project: 'policy-clamp' +log_dir: 'policy-clamp-maven-docker-stage-master/313' +ref: a7b129bcf9479d8af49a55c44482aacf0c5981e7 +containers: + - name: 'policy-clamp-backend' + version: '6.1-STAGING-20211013T202924Z' + - name: 'policy-clamp-frontend' + version: '6.1-STAGING-20211013T202924Z' + - name: 'policy-clamp-cl-pf-ppnt' + version: '6.1.3-20211013T2029' + - name: 'policy-clamp-cl-k8s-ppnt' + version: '6.1.3-20211013T2029' + - name: 'policy-clamp-cl-http-ppnt' + version: '6.1.3-20211013T2029' + - name: 'policy-clamp-cl-runtime' + version: '6.1.3-20211013T2029' diff --git a/releases/6.1.3.yaml b/releases/6.1.3.yaml new file mode 100644 index 000000000..fb7d2ffbb --- /dev/null +++ b/releases/6.1.3.yaml @@ -0,0 +1,5 @@ +distribution_type: 'maven' +version: '6.1.3' +project: 'policy-clamp' +tag_release: false +log_dir: 'policy-clamp-maven-stage-master/315/' diff --git a/runtime-controlloop/pom.xml b/runtime-controlloop/pom.xml index a5fc707f1..8ab9cc349 100644 --- a/runtime-controlloop/pom.xml +++ b/runtime-controlloop/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-runtime-controlloop</artifactId> diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java index 5fbd36c06..a9b45c589 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java @@ -29,7 +29,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling @SpringBootApplication @ComponentScan({"org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider", - "org.onap.policy.clamp.controlloop.runtime"}) + "org.onap.policy.clamp.controlloop.runtime", + "org.onap.policy.clamp.controlloop.common.rest"}) @ConfigurationPropertiesScan("org.onap.policy.clamp.controlloop.runtime.main.parameters") public class Application { diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/ConverterConfiguration.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/ConverterConfiguration.java index b14c675df..d67d2e75d 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/ConverterConfiguration.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/ConverterConfiguration.java @@ -22,6 +22,7 @@ package org.onap.policy.clamp.controlloop.runtime.config; import java.util.Arrays; import java.util.List; +import org.onap.policy.clamp.controlloop.common.rest.CoderHttpMesageConverter; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/FilterConfig.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/FilterConfig.java index d58553ae4..57bfc2e7c 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/FilterConfig.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/config/FilterConfig.java @@ -20,7 +20,7 @@ package org.onap.policy.clamp.controlloop.runtime.config; -import org.onap.policy.clamp.controlloop.runtime.main.web.RequestResponseLoggingFilter; +import org.onap.policy.clamp.controlloop.common.rest.RequestResponseLoggingFilter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java index 5ec6158bd..98ceacc3a 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java @@ -90,6 +90,7 @@ public class ControlLoopInstantiationProvider { private final ParticipantProvider participantProvider; private static final Object lockit = new Object(); + private static final String ENTRY = "entry "; /** * Creates Instance Properties and Control Loop. @@ -239,7 +240,7 @@ public class ControlLoopInstantiationProvider { var result = new BeanValidationResult("ControlLoops", controlLoops); for (ControlLoop controlLoop : controlLoops.getControlLoopList()) { - var subResult = new BeanValidationResult("entry " + controlLoop.getDefinition().getName(), controlLoop); + var subResult = new BeanValidationResult(ENTRY + controlLoop.getDefinition().getName(), controlLoop); List<ToscaNodeTemplate> toscaNodeTemplates = commissioningProvider.getControlLoopDefinitions( controlLoop.getDefinition().getName(), controlLoop.getDefinition().getVersion()); @@ -280,7 +281,7 @@ public class ControlLoopInstantiationProvider { */ private ValidationResult validateDefinition(Map<String, ToscaConceptIdentifier> definitions, ToscaConceptIdentifier definition) { - var result = new BeanValidationResult("entry " + definition.getName(), definition); + var result = new BeanValidationResult(ENTRY + definition.getName(), definition); ToscaConceptIdentifier identifier = definitions.get(definition.getName()); if (identifier == null) { result.setResult(ValidationStatus.INVALID, "Not FOUND"); @@ -383,7 +384,7 @@ public class ControlLoopInstantiationProvider { for (ControlLoop controlLoop : controlLoops) { for (var element : controlLoop.getElements().values()) { - var subResult = new BeanValidationResult("entry " + element.getDefinition().getName(), element); + var subResult = new BeanValidationResult(ENTRY + element.getDefinition().getName(), element); Participant p = participantMap.get(element.getParticipantId()); if (p == null) { diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/web/GlobalControllerExceptionHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/web/GlobalControllerExceptionHandler.java index d093c677f..fd493fd89 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/web/GlobalControllerExceptionHandler.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/web/GlobalControllerExceptionHandler.java @@ -22,6 +22,7 @@ package org.onap.policy.clamp.controlloop.runtime.main.web; import org.onap.policy.clamp.controlloop.common.exception.ControlLoopException; import org.onap.policy.clamp.controlloop.models.messages.rest.SimpleResponse; +import org.onap.policy.clamp.controlloop.models.rest.RestUtils; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.base.PfModelRuntimeException; import org.springframework.http.ResponseEntity; @@ -39,9 +40,7 @@ public class GlobalControllerExceptionHandler { */ @ExceptionHandler(ControlLoopException.class) public ResponseEntity<SimpleResponse> handleBadRequest(ControlLoopException ex) { - var resp = new SimpleResponse(); - resp.setErrorDetails(ex.getErrorResponse().getErrorMessage()); - return ResponseEntity.status(ex.getErrorResponse().getResponseCode().getStatusCode()).body(resp); + return RestUtils.toSimpleResponse(ex); } /** @@ -52,9 +51,7 @@ public class GlobalControllerExceptionHandler { */ @ExceptionHandler(PfModelRuntimeException.class) public ResponseEntity<SimpleResponse> handleBadRequest(PfModelRuntimeException ex) { - var resp = new SimpleResponse(); - resp.setErrorDetails(ex.getErrorResponse().getErrorMessage()); - return ResponseEntity.status(ex.getErrorResponse().getResponseCode().getStatusCode()).body(resp); + return RestUtils.toSimpleResponse(ex); } /** @@ -65,9 +62,6 @@ public class GlobalControllerExceptionHandler { */ @ExceptionHandler(PfModelException.class) public ResponseEntity<SimpleResponse> handleBadRequest(PfModelException ex) { - var resp = new SimpleResponse(); - resp.setErrorDetails(ex.getErrorResponse().getErrorMessage()); - return ResponseEntity.status(ex.getErrorResponse().getResponseCode().getStatusCode()).body(resp); + return RestUtils.toSimpleResponse(ex); } - } diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java index 1f6246bd6..802413a6a 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java @@ -232,12 +232,4 @@ public class MonitoringProvider { } return clElementId; } - - public void updateClElementStatistics(List<ClElementStatistics> clElementStatistics) { - // TODO Auto-generated method stub - } - - public void updateParticipantStatistics(List<ParticipantStatistics> statisticsList) { - // TODO Auto-generated method stub - } } diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java index 960cb4304..2a1f9082f 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.onap.policy.clamp.controlloop.common.exception.ControlLoopException; @@ -36,6 +37,7 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop import org.onap.policy.clamp.controlloop.models.controlloop.concepts.Participant; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantHealthStatus; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantState; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUtils; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ControlLoopProvider; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ParticipantProvider; import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopAck; @@ -51,7 +53,10 @@ import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantDer import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantRegisterAckPublisher; import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantUpdatePublisher; import org.onap.policy.models.base.PfModelException; +import org.onap.policy.models.base.PfModelRuntimeException; +import org.onap.policy.models.provider.PolicyModelsProvider; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -75,6 +80,7 @@ public class SupervisionHandler { private final ControlLoopProvider controlLoopProvider; private final ParticipantProvider participantProvider; private final MonitoringProvider monitoringProvider; + private final PolicyModelsProvider modelsProvider; // Publishers for participant communication private final ControlLoopUpdatePublisher controlLoopUpdatePublisher; @@ -350,7 +356,7 @@ public class SupervisionHandler { case UNINITIALISED2PASSIVE: case PASSIVE: controlLoop.setState(ControlLoopState.PASSIVE2UNINITIALISED); - controlLoopStateChangePublisher.send(controlLoop); + controlLoopStateChangePublisher.send(controlLoop, getFirstStartPhase(controlLoop)); break; case PASSIVE2UNINITIALISED: @@ -384,7 +390,7 @@ public class SupervisionHandler { case RUNNING: controlLoop.setState(ControlLoopState.RUNNING2PASSIVE); - controlLoopStateChangePublisher.send(controlLoop); + controlLoopStateChangePublisher.send(controlLoop, getFirstStartPhase(controlLoop)); break; default: @@ -408,7 +414,7 @@ public class SupervisionHandler { case PASSIVE: controlLoop.setState(ControlLoopState.PASSIVE2RUNNING); - controlLoopStateChangePublisher.send(controlLoop); + controlLoopStateChangePublisher.send(controlLoop, getFirstStartPhase(controlLoop)); break; default: @@ -418,6 +424,16 @@ public class SupervisionHandler { } } + private int getFirstStartPhase(ControlLoop controlLoop) { + ToscaServiceTemplate toscaServiceTemplate = null; + try { + toscaServiceTemplate = modelsProvider.getServiceTemplateList(null, null).get(0); + } catch (PfModelException e) { + throw new PfModelRuntimeException(Status.BAD_REQUEST, "Canont load ToscaServiceTemplate from DB", e); + } + return ParticipantUtils.getFirstStartPhase(controlLoop, toscaServiceTemplate); + } + private void checkParticipant(ParticipantMessage participantMessage, ParticipantState participantState, ParticipantHealthStatus healthStatus) throws ControlLoopException, PfModelException { if (participantMessage.getParticipantId() == null) { diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java index 5147aa241..48e06010d 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java @@ -220,13 +220,19 @@ public class SupervisionScanner { var completed = true; var minSpNotCompleted = 1000; // min startPhase not completed + var maxSpNotCompleted = 0; // max startPhase not completed + var defaultMin = 1000; // min startPhase + var defaultMax = 0; // max startPhase for (ControlLoopElement element : controlLoop.getElements().values()) { + ToscaNodeTemplate toscaNodeTemplate = toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates() + .get(element.getDefinition().getName()); + int startPhase = ParticipantUtils.findStartPhase(toscaNodeTemplate.getProperties()); + defaultMin = Math.min(defaultMin, startPhase); + defaultMax = Math.max(defaultMax, startPhase); if (!element.getState().equals(element.getOrderedState().asState())) { completed = false; - ToscaNodeTemplate toscaNodeTemplate = toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates() - .get(element.getDefinition().getName()); - int startPhase = ParticipantUtils.findStartPhase(toscaNodeTemplate.getProperties()); minSpNotCompleted = Math.min(minSpNotCompleted, startPhase); + maxSpNotCompleted = Math.max(maxSpNotCompleted, startPhase); } } @@ -243,12 +249,20 @@ public class SupervisionScanner { LOGGER.debug("control loop scan: transition from state {} to {} not completed", controlLoop.getState(), controlLoop.getOrderedState()); - if (minSpNotCompleted != phaseMap.getOrDefault(controlLoop.getKey().asIdentifier(), 0) - && ControlLoopState.UNINITIALISED2PASSIVE.equals(controlLoop.getState())) { - phaseMap.put(controlLoop.getKey().asIdentifier(), minSpNotCompleted); - sendControlLoopMsg(controlLoop, minSpNotCompleted); + var nextSpNotCompleted = ControlLoopState.UNINITIALISED2PASSIVE.equals(controlLoop.getState()) + || ControlLoopState.PASSIVE2RUNNING.equals(controlLoop.getState()) ? minSpNotCompleted + : maxSpNotCompleted; + + var firstStartPhase = ControlLoopState.UNINITIALISED2PASSIVE.equals(controlLoop.getState()) + || ControlLoopState.PASSIVE2RUNNING.equals(controlLoop.getState()) ? defaultMin + : defaultMax; + + if (nextSpNotCompleted != phaseMap.getOrDefault(controlLoop.getKey().asIdentifier(), firstStartPhase)) { + phaseMap.put(controlLoop.getKey().asIdentifier(), nextSpNotCompleted); + sendControlLoopMsg(controlLoop, nextSpNotCompleted); } else if (counterCheck) { - handleCounter(controlLoop, minSpNotCompleted); + phaseMap.put(controlLoop.getKey().asIdentifier(), nextSpNotCompleted); + handleCounter(controlLoop, nextSpNotCompleted); } } } @@ -282,7 +296,7 @@ public class SupervisionScanner { controlLoopUpdatePublisher.send(controlLoop, startPhase); } else { LOGGER.debug("retry message ControlLoopStateChange"); - controlLoopStateChangePublisher.send(controlLoop); + controlLoopStateChangePublisher.send(controlLoop, startPhase); } } } diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopStateChangePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopStateChangePublisher.java index 79d113c14..69d7b73d0 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopStateChangePublisher.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopStateChangePublisher.java @@ -36,12 +36,14 @@ public class ControlLoopStateChangePublisher * Send ControlLoopStateChange to Participant. * * @param controlLoop the ControlLoop + * @param startPhase the startPhase */ - public void send(ControlLoop controlLoop) { + public void send(ControlLoop controlLoop, int startPhase) { var clsc = new ControlLoopStateChange(); clsc.setControlLoopId(controlLoop.getKey().asIdentifier()); clsc.setMessageId(UUID.randomUUID()); clsc.setOrderedState(controlLoop.getOrderedState()); + clsc.setStartPhase(startPhase); super.send(clsc); } diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopUpdatePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopUpdatePublisher.java index 74d987240..06fbcd649 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopUpdatePublisher.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ControlLoopUpdatePublisher.java @@ -27,15 +27,14 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import lombok.AllArgsConstructor; +import org.onap.policy.clamp.controlloop.common.utils.CommonUtils; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUpdates; import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.provider.PolicyModelsProvider; -import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; -import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -48,8 +47,6 @@ import org.springframework.stereotype.Component; public class ControlLoopUpdatePublisher extends AbstractParticipantPublisher<ControlLoopUpdate> { private static final Logger LOGGER = LoggerFactory.getLogger(ControlLoopUpdatePublisher.class); - private static final String POLICY_TYPE_ID = "policy_type_id"; - private static final String POLICY_ID = "policy_id"; private final PolicyModelsProvider modelsProvider; /** @@ -83,59 +80,12 @@ public class ControlLoopUpdatePublisher extends AbstractParticipantPublisher<Con List<ParticipantUpdates> participantUpdates = new ArrayList<>(); for (ControlLoopElement element : controlLoop.getElements().values()) { - ToscaNodeTemplate toscaNodeTemplate = toscaServiceTemplate - .getToscaTopologyTemplate().getNodeTemplates().get(element.getDefinition().getName()); - // If the ControlLoopElement has policy_type_id or policy_id, identify it as a PolicyControlLoopElement - // and pass respective PolicyTypes or Policies as part of toscaServiceTemplateFragment - if ((toscaNodeTemplate.getProperties().get(POLICY_TYPE_ID) != null) - || (toscaNodeTemplate.getProperties().get(POLICY_ID) != null)) { - // ControlLoopElement for policy framework, send policies and policyTypes to participants - if ((toscaServiceTemplate.getPolicyTypes() != null) - || (toscaServiceTemplate.getToscaTopologyTemplate().getPolicies() != null)) { - ToscaServiceTemplate toscaServiceTemplateFragment = new ToscaServiceTemplate(); - toscaServiceTemplateFragment.setPolicyTypes(toscaServiceTemplate.getPolicyTypes()); - - ToscaTopologyTemplate toscaTopologyTemplate = new ToscaTopologyTemplate(); - toscaTopologyTemplate.setPolicies(toscaServiceTemplate.getToscaTopologyTemplate().getPolicies()); - toscaServiceTemplateFragment.setToscaTopologyTemplate(toscaTopologyTemplate); - - toscaServiceTemplateFragment.setDataTypes(toscaServiceTemplate.getDataTypes()); - - element.setToscaServiceTemplateFragment(toscaServiceTemplateFragment); - } - } - prepareParticipantUpdate(element, participantUpdates); + CommonUtils.setServiceTemplatePolicyInfo(element, toscaServiceTemplate); + CommonUtils.prepareParticipantUpdate(element, participantUpdates); } controlLoopUpdateMsg.setParticipantUpdatesList(participantUpdates); LOGGER.debug("ControlLoopUpdate message sent {}", controlLoopUpdateMsg); super.send(controlLoopUpdateMsg); } - - private void prepareParticipantUpdate(ControlLoopElement clElement, - List<ParticipantUpdates> participantUpdates) { - if (participantUpdates.isEmpty()) { - participantUpdates.add(getControlLoopElementList(clElement)); - } else { - var participantExists = false; - for (ParticipantUpdates participantUpdate : participantUpdates) { - if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) { - participantUpdate.getControlLoopElementList().add(clElement); - participantExists = true; - } - } - if (!participantExists) { - participantUpdates.add(getControlLoopElementList(clElement)); - } - } - } - - private ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) { - var participantUpdate = new ParticipantUpdates(); - List<ControlLoopElement> controlLoopElementList = new ArrayList<>(); - participantUpdate.setParticipantId(clElement.getParticipantId()); - controlLoopElementList.add(clElement); - participantUpdate.setControlLoopElementList(controlLoopElementList); - return participantUpdate; - } } diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java index 5d879dc56..c6788f12c 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java @@ -27,14 +27,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import lombok.AllArgsConstructor; -import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; +import org.onap.policy.clamp.controlloop.common.utils.CommonUtils; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUtils; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ServiceTemplateProvider; import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; -import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.slf4j.Logger; @@ -99,10 +98,10 @@ public class ParticipantUpdatePublisher extends AbstractParticipantPublisher<Par for (var toscaInputEntry : toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates().entrySet()) { if (ParticipantUtils.checkIfNodeTemplateIsControlLoopElement(toscaInputEntry.getValue(), toscaServiceTemplate)) { - var clParticipantType = - ParticipantUtils.findParticipantType(toscaInputEntry.getValue().getProperties()); - prepareParticipantDefinitionUpdate(clParticipantType, toscaInputEntry.getKey(), - toscaInputEntry.getValue(), participantDefinitionUpdates, commonPropertiesMap); + CommonUtils.prepareParticipantDefinitionUpdate( + ParticipantUtils.findParticipantType(toscaInputEntry.getValue().getProperties()), + toscaInputEntry.getKey(), toscaInputEntry.getValue(), + participantDefinitionUpdates, commonPropertiesMap); } } @@ -113,48 +112,6 @@ public class ParticipantUpdatePublisher extends AbstractParticipantPublisher<Par return true; } - private void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantType, String entryKey, - ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates, - Map<String, ToscaNodeType> commonPropertiesMap) { - - var clDefinition = new ControlLoopElementDefinition(); - clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(entryKey, entryValue.getVersion())); - clDefinition.setControlLoopElementToscaNodeTemplate(entryValue); - ToscaNodeType nodeType = commonPropertiesMap.get(entryValue.getType()); - if (nodeType != null) { - clDefinition.setCommonPropertiesMap(nodeType.getProperties()); - } - - List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>(); - - if (participantDefinitionUpdates.isEmpty()) { - participantDefinitionUpdates - .add(getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); - } else { - var participantExists = false; - for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) { - if (participantDefinitionUpdate.getParticipantType().equals(clParticipantType)) { - participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition); - participantExists = true; - } - } - if (!participantExists) { - participantDefinitionUpdates.add( - getParticipantDefinition(clDefinition, clParticipantType, controlLoopElementDefinitionList)); - } - } - } - - private ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition, - ToscaConceptIdentifier clParticipantType, - List<ControlLoopElementDefinition> controlLoopElementDefinitionList) { - var participantDefinition = new ParticipantDefinition(); - participantDefinition.setParticipantType(clParticipantType); - controlLoopElementDefinitionList.add(clDefinition); - participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList); - return participantDefinition; - } - /** * Send ParticipantUpdate to Participant after that commissioning has been removed. */ diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java index 82f7e66d5..ae1c59851 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java @@ -23,6 +23,9 @@ package org.onap.policy.clamp.controlloop.runtime.instantiation; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.io.IOException; import java.util.ArrayList; @@ -34,6 +37,7 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.onap.policy.clamp.controlloop.common.exception.ControlLoopRuntimeException; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoops; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ClElementStatisticsProvider; @@ -63,7 +67,8 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; * */ class ControlLoopInstantiationProviderTest { - + private static final String ID_NAME = "PMSH_Instance1"; + private static final String ID_VERSION = "1.2.3"; private static final String CL_INSTANTIATION_CREATE_JSON = "src/test/resources/rest/controlloops/ControlLoops.json"; private static final String CL_INSTANTIATION_UPDATE_JSON = "src/test/resources/rest/controlloops/ControlLoopsUpdate.json"; @@ -133,7 +138,9 @@ class ControlLoopInstantiationProviderTest { var participantRegisterAckPublisher = Mockito.mock(ParticipantRegisterAckPublisher.class); var participantDeregisterAckPublisher = Mockito.mock(ParticipantDeregisterAckPublisher.class); var participantUpdatePublisher = Mockito.mock(ParticipantUpdatePublisher.class); - supervisionHandler = new SupervisionHandler(clProvider, participantProvider, monitoringProvider, + var modelsProvider = Mockito.mock(PolicyModelsProvider.class); + + supervisionHandler = new SupervisionHandler(clProvider, participantProvider, monitoringProvider, modelsProvider, controlLoopUpdatePublisher, controlLoopStateChangePublisher, participantRegisterAckPublisher, participantDeregisterAckPublisher, participantUpdatePublisher); } @@ -155,6 +162,24 @@ class ControlLoopInstantiationProviderTest { } @Test + void testIntanceResponses() throws PfModelException { + var instantiationProvider = new ControlLoopInstantiationProvider(clProvider, commissioningProvider, + supervisionHandler, participantProvider); + var instancePropertyList = instantiationProvider.createInstanceProperties(serviceTemplate); + assertNull(instancePropertyList.getErrorDetails()); + var id = new ToscaConceptIdentifier(ID_NAME, ID_VERSION); + assertEquals(id, instancePropertyList.getAffectedInstanceProperties().get(0)); + var instanceOrderState = instantiationProvider.getInstantiationOrderState(ID_NAME, ID_VERSION); + assertEquals(ControlLoopOrderedState.UNINITIALISED, instanceOrderState.getOrderedState()); + assertEquals(ID_NAME, instanceOrderState.getControlLoopIdentifierList().get(0).getName()); + + assertNotNull(clProvider.getControlLoop(id)); + var instanceResponse = instantiationProvider.deleteInstanceProperties(ID_NAME, ID_VERSION); + assertEquals(ID_NAME, instanceResponse.getAffectedControlLoops().get(0).getName()); + assertNull(clProvider.getControlLoop(id)); + } + + @Test void testInstantiationCrud() throws Exception { participantProvider.createParticipants(CommonTestData.createParticipants()); diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java index 0ad8aad43..bbc4deec1 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java @@ -23,7 +23,6 @@ package org.onap.policy.clamp.controlloop.runtime.supervision; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import org.onap.policy.clamp.controlloop.common.exception.ControlLoopException; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; @@ -56,9 +56,12 @@ import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantReg import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantUpdatePublisher; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.models.base.PfModelException; +import org.onap.policy.models.provider.PolicyModelsProvider; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; class SupervisionHandlerTest { + private static final String TOSCA_TEMPLATE_YAML = + "src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml"; private static final String CL_INSTANTIATION_CREATE_JSON = "src/test/resources/rest/controlloops/ControlLoops.json"; private static final ToscaConceptIdentifier identifier = new ToscaConceptIdentifier("PMSHInstance0Crud", "1.0.1"); private static final ToscaConceptIdentifier participantId = new ToscaConceptIdentifier("ParticipantId", "1.0.0"); @@ -133,7 +136,7 @@ class SupervisionHandlerTest { participant.setParticipantType(participantType); var participantProvider = mock(ParticipantProvider.class); - when(participantProvider.getParticipants(eq(participantId.getName()), eq(participantId.getVersion()))) + when(participantProvider.getParticipants(participantId.getName(), participantId.getVersion())) .thenReturn(List.of(participant)); var participantDeregisterMessage = new ParticipantDeregister(); @@ -149,7 +152,7 @@ class SupervisionHandlerTest { handler.handleParticipantMessage(participantDeregisterMessage); verify(participantProvider).updateParticipants(anyList()); - verify(participantDeregisterAckPublisher).send(eq(participantDeregisterMessage.getMessageId())); + verify(participantDeregisterAckPublisher).send(participantDeregisterMessage.getMessageId()); } @Test @@ -173,8 +176,8 @@ class SupervisionHandlerTest { handler.handleParticipantMessage(participantRegisterMessage); verify(participantProvider).createParticipants(anyList()); - verify(participantRegisterAckPublisher).send(eq(participantRegisterMessage.getMessageId()), eq(participantId), - eq(participantType)); + verify(participantRegisterAckPublisher).send(participantRegisterMessage.getMessageId(), participantId, + participantType); } @Test @@ -185,7 +188,7 @@ class SupervisionHandlerTest { participant.setParticipantType(participantType); var participantProvider = mock(ParticipantProvider.class); - when(participantProvider.getParticipants(eq(participantId.getName()), eq(participantId.getVersion()))) + when(participantProvider.getParticipants(participantId.getName(), participantId.getVersion())) .thenReturn(List.of(participant)); var participantUpdateAckMessage = new ParticipantUpdateAck(); @@ -231,8 +234,8 @@ class SupervisionHandlerTest { participantUpdatePublisher); handler.handleSendCommissionMessage(participantId.getName(), participantId.getVersion()); - verify(participantUpdatePublisher).sendComissioningBroadcast(eq(participantId.getName()), - eq(participantId.getVersion())); + verify(participantUpdatePublisher).sendComissioningBroadcast(participantId.getName(), + participantId.getVersion()); } @Test @@ -260,9 +263,13 @@ class SupervisionHandlerTest { var controlLoopStateChangePublisher = mock(ControlLoopStateChangePublisher.class); - when(controlLoopProvider.getControlLoop(eq(identifier))).thenReturn(controlLoop); + when(controlLoopProvider.getControlLoop(identifier)).thenReturn(controlLoop); - return new SupervisionHandler(controlLoopProvider, participantProvider, monitoringProvider, + var modelsProvider = Mockito.mock(PolicyModelsProvider.class); + when(modelsProvider.getServiceTemplateList(any(), any())) + .thenReturn(List.of(InstantiationUtils.getToscaServiceTemplate(TOSCA_TEMPLATE_YAML))); + + return new SupervisionHandler(controlLoopProvider, participantProvider, monitoringProvider, modelsProvider, controlLoopUpdatePublisher, controlLoopStateChangePublisher, participantRegisterAckPublisher, participantDeregisterAckPublisher, participantUpdatePublisher); diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScannerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScannerTest.java index 47cc6f1dc..f884e0129 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScannerTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScannerTest.java @@ -29,11 +29,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; -import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.Participant; @@ -47,6 +45,7 @@ import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ControlLoopUpd import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantStatusReqPublisher; import org.onap.policy.clamp.controlloop.runtime.supervision.comm.ParticipantUpdatePublisher; import org.onap.policy.clamp.controlloop.runtime.util.CommonTestData; +import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.provider.PolicyModelsProvider; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; @@ -56,11 +55,19 @@ class SupervisionScannerTest { private static final String TOSCA_SERVICE_TEMPLATE_YAML = "src/test/resources/rest/servicetemplates/tosca-for-smoke-testing.yaml"; + private static final String CONTROLLOOP_JSON = "src/test/resources/rest/controlloops/ControlLoopsSmoke.json"; + + private static PolicyModelsProvider modelsProvider = mock(PolicyModelsProvider.class); + + @BeforeAll + public static void setUpBeforeAll() throws Exception { + ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML); + when(modelsProvider.getServiceTemplateList(null, null)).thenReturn(List.of(serviceTemplate)); + } @Test - void testScannerOrderedStateEqualsToState() throws PfModelException { + void testScannerOrderedStateEqualsToState() throws PfModelException, CoderException { var controlLoopProvider = mock(ControlLoopProvider.class); - var modelsProvider = mock(PolicyModelsProvider.class); var controlLoopStateChangePublisher = mock(ControlLoopStateChangePublisher.class); var controlLoopUpdatePublisher = mock(ControlLoopUpdatePublisher.class); var participantProvider = mock(ParticipantProvider.class); @@ -68,8 +75,9 @@ class SupervisionScannerTest { var participantUpdatePublisher = mock(ParticipantUpdatePublisher.class); var clRuntimeParameterGroup = CommonTestData.geParameterGroup("dbScanner"); - var controlLoop = new ControlLoop(); - when(controlLoopProvider.getControlLoops(null, null)).thenReturn(List.of(controlLoop)); + var controlLoops = + InstantiationUtils.getControlLoopsFromResource(CONTROLLOOP_JSON, "Crud").getControlLoopList(); + when(controlLoopProvider.getControlLoops(null, null)).thenReturn(controlLoops); var supervisionScanner = new SupervisionScanner(controlLoopProvider, modelsProvider, controlLoopStateChangePublisher, controlLoopUpdatePublisher, participantProvider, @@ -80,13 +88,13 @@ class SupervisionScannerTest { } @Test - void testScannerOrderedStateDifferentToState() throws PfModelException { - var controlLoop = new ControlLoop(); - controlLoop.setState(ControlLoopState.UNINITIALISED2PASSIVE); - controlLoop.setOrderedState(ControlLoopOrderedState.UNINITIALISED); - controlLoop.setElements(Map.of(UUID.randomUUID(), new ControlLoopElement())); + void testScannerOrderedStateDifferentToState() throws PfModelException, CoderException { + var controlLoops = + InstantiationUtils.getControlLoopsFromResource(CONTROLLOOP_JSON, "Crud").getControlLoopList(); + controlLoops.get(0).setState(ControlLoopState.UNINITIALISED2PASSIVE); + controlLoops.get(0).setOrderedState(ControlLoopOrderedState.UNINITIALISED); var controlLoopProvider = mock(ControlLoopProvider.class); - when(controlLoopProvider.getControlLoops(null, null)).thenReturn(List.of(controlLoop)); + when(controlLoopProvider.getControlLoops(null, null)).thenReturn(controlLoops); var controlLoopUpdatePublisher = mock(ControlLoopUpdatePublisher.class); var controlLoopStateChangePublisher = mock(ControlLoopStateChangePublisher.class); @@ -95,9 +103,6 @@ class SupervisionScannerTest { var participantUpdatePublisher = mock(ParticipantUpdatePublisher.class); var clRuntimeParameterGroup = CommonTestData.geParameterGroup("dbScanner"); - var modelsProvider = mock(PolicyModelsProvider.class); - when(modelsProvider.getServiceTemplateList(null, null)).thenReturn(List.of(new ToscaServiceTemplate())); - var supervisionScanner = new SupervisionScanner(controlLoopProvider, modelsProvider, controlLoopStateChangePublisher, controlLoopUpdatePublisher, participantProvider, participantStatusReqPublisher, participantUpdatePublisher, clRuntimeParameterGroup); @@ -118,7 +123,6 @@ class SupervisionScannerTest { participant.setVersion("1.0.0"); when(participantProvider.getParticipants(null, null)).thenReturn(List.of(participant)); - var modelsProvider = mock(PolicyModelsProvider.class); var controlLoopUpdatePublisher = mock(ControlLoopUpdatePublisher.class); var participantStatusReqPublisher = mock(ParticipantStatusReqPublisher.class); var controlLoopStateChangePublisher = mock(ControlLoopStateChangePublisher.class); @@ -136,19 +140,24 @@ class SupervisionScannerTest { } @Test - void testSendControlLoopMsgUpdate() throws PfModelException { - var controlLoop = new ControlLoop(); - controlLoop.setState(ControlLoopState.UNINITIALISED2PASSIVE); - controlLoop.setOrderedState(ControlLoopOrderedState.PASSIVE); - controlLoop.setElements(Map.of(UUID.randomUUID(), - createHttpElement(ControlLoopState.UNINITIALISED, ControlLoopOrderedState.PASSIVE))); + void testSendControlLoopMsgUpdate() throws PfModelException, CoderException { + var controlLoops = + InstantiationUtils.getControlLoopsFromResource(CONTROLLOOP_JSON, "Crud").getControlLoopList(); + controlLoops.get(0).setState(ControlLoopState.UNINITIALISED2PASSIVE); + controlLoops.get(0).setOrderedState(ControlLoopOrderedState.PASSIVE); + for (var element : controlLoops.get(0).getElements().values()) { + if ("org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement" + .equals(element.getDefinition().getName())) { + element.setOrderedState(ControlLoopOrderedState.PASSIVE); + element.setState(ControlLoopState.UNINITIALISED); + } else { + element.setOrderedState(ControlLoopOrderedState.PASSIVE); + element.setState(ControlLoopState.PASSIVE); + } + } var controlLoopProvider = mock(ControlLoopProvider.class); - when(controlLoopProvider.getControlLoops(null, null)).thenReturn(List.of(controlLoop)); - - ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML); - var modelsProvider = mock(PolicyModelsProvider.class); - when(modelsProvider.getServiceTemplateList(null, null)).thenReturn(List.of(serviceTemplate)); + when(controlLoopProvider.getControlLoops(null, null)).thenReturn(controlLoops); var participantProvider = mock(ParticipantProvider.class); var controlLoopUpdatePublisher = mock(ControlLoopUpdatePublisher.class); @@ -166,19 +175,6 @@ class SupervisionScannerTest { verify(controlLoopUpdatePublisher).send(any(ControlLoop.class), anyInt()); } - private ControlLoopElement createHttpElement(ControlLoopState state, ControlLoopOrderedState orderedState) { - var element = new ControlLoopElement(); - element.setDefinition(new ToscaConceptIdentifier( - "org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement", "1.2.3")); - element.setState(state); - element.setOrderedState(orderedState); - element.setParticipantId(new ToscaConceptIdentifier("HttpParticipant0", "1.0.0")); - element.setParticipantType( - new ToscaConceptIdentifier("org.onap.k8s.controlloop.HttpControlLoopParticipant", "2.3.4")); - - return element; - } - @Test void testScanParticipant() throws PfModelException { var controlLoopProvider = mock(ControlLoopProvider.class); @@ -199,7 +195,6 @@ class SupervisionScannerTest { var participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider.updateParticipants(List.of(participant)); - var modelsProvider = mock(PolicyModelsProvider.class); var controlLoopUpdatePublisher = mock(ControlLoopUpdatePublisher.class); var participantStatusReqPublisher = mock(ParticipantStatusReqPublisher.class); var controlLoopStateChangePublisher = mock(ControlLoopStateChangePublisher.class); diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java index 70d115e47..4dfb8a9fd 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java @@ -22,14 +22,21 @@ package org.onap.policy.clamp.controlloop.runtime.supervision.comm; import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import java.time.Instant; import java.util.Collections; +import java.util.List; import java.util.UUID; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ClElementStatisticsProvider; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ControlLoopProvider; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ParticipantProvider; @@ -51,6 +58,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; class SupervisionMessagesTest extends CommonRestController { + private static final String NOT_ACTIVE = "Not Active!"; private static final Object lockit = new Object(); private static final CommInfrastructure INFRA = CommInfrastructure.NOOP; private static final String TOPIC = "my-topic"; @@ -77,12 +85,13 @@ class SupervisionMessagesTest extends CommonRestController { var monitoringProvider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); var participantProvider = new ParticipantProvider(controlLoopParameters.getDatabaseProviderParameters()); + var modelsProvider = Mockito.mock(PolicyModelsProvider.class); var controlLoopUpdatePublisher = Mockito.mock(ControlLoopUpdatePublisher.class); var controlLoopStateChangePublisher = Mockito.mock(ControlLoopStateChangePublisher.class); var participantRegisterAckPublisher = Mockito.mock(ParticipantRegisterAckPublisher.class); var participantDeregisterAckPublisher = Mockito.mock(ParticipantDeregisterAckPublisher.class); var participantUpdatePublisher = Mockito.mock(ParticipantUpdatePublisher.class); - supervisionHandler = new SupervisionHandler(clProvider, participantProvider, monitoringProvider, + supervisionHandler = new SupervisionHandler(clProvider, participantProvider, monitoringProvider, modelsProvider, controlLoopUpdatePublisher, controlLoopStateChangePublisher, participantRegisterAckPublisher, participantDeregisterAckPublisher, participantUpdatePublisher); } @@ -154,6 +163,29 @@ class SupervisionMessagesTest extends CommonRestController { } } + @Test + void testSendControlLoopStateChangePublisherNotActive() { + var publisher = new ControlLoopStateChangePublisher(); + assertThatThrownBy(() -> publisher.send(getControlLoop(), 0)).hasMessage(NOT_ACTIVE); + } + + @Test + void testSendControlLoopStateChangePublisher() { + var publisher = new ControlLoopStateChangePublisher(); + var topicSink = mock(TopicSink.class); + publisher.active(List.of(topicSink)); + publisher.send(getControlLoop(), 0); + verify(topicSink).send(anyString()); + } + + private ControlLoop getControlLoop() { + var controlLoop = new ControlLoop(); + controlLoop.setName("NAME"); + controlLoop.setVersion("0.0.1"); + controlLoop.setState(ControlLoopState.UNINITIALISED); + return controlLoop; + } + private ToscaConceptIdentifier getParticipantId() { return new ToscaConceptIdentifier("org.onap.PM_Policy", "1.0.0"); } diff --git a/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsSmoke.json b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsSmoke.json new file mode 100644 index 000000000..47f379b84 --- /dev/null +++ b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsSmoke.json @@ -0,0 +1,174 @@ +{ + "controlLoopList": [ + { + "name": "PMSHInstance0", + "version": "1.0.1", + "definition": { + "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition", + "version": "1.2.3" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "PMSH control loop instance 0", + "elements": { + "709c62b3-8918-41b9-a747-d21eb79c6c20": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c20", + "definition": { + "name": "org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" + }, + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "DCAE Control Loop Element for the PMSH instance 0 control loop" + }, + "709c62b3-8918-41b9-a747-d21eb79c6c21": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop" + }, + "709c62b3-8918-41b9-a747-d21eb79c6c22": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c22", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop" + }, + "709c62b3-8918-41b9-a747-d21eb79c6c23": { + "id": "709c62b3-8918-41b9-a747-d21eb79c6c23", + "definition": { + "name": "org.onap.domain.database.PMSH_K8SMicroserviceControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" + }, + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "CDS Control Loop Element for the PMSH instance 0 control loop" + } + } + }, + { + "name": "PMSHInstance1", + "version": "1.0.1", + "definition": { + "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition", + "version": "1.2.3" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "PMSH control loop instance 1", + "elements": { + "709c62b3-8918-41b9-a747-d21eb79c6c24": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c24", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" + }, + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "DCAE Control Loop Element for the PMSH instance 1 control loop" + }, + "709c62b3-8918-41b9-a747-d21eb79c6c25": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c25", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Monitoring Policy Control Loop Element for the PMSH instance 1 control loop" + }, + "709c62b3-8918-41b9-a747-d21eb79c6c26": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c26", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "Operational Policy Control Loop Element for the PMSH instance 1 control loop" + }, + "709c62b3-8918-41b9-a747-d21eb79c6c27": { + "id": "709c62b3-8918-41b9-a747-e21eb79c6c27", + "definition": { + "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement", + "version": "1.2.3" + }, + "participantId": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" + }, + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" + }, + "state": "UNINITIALISED", + "orderedState": "UNINITIALISED", + "description": "CDS Control Loop Element for the PMSH instance 1 control loop" + } + } + } + ] +} diff --git a/runtime/pom.xml b/runtime/pom.xml index 4fb1ac6cc..30e0f19bf 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.clamp</groupId> <artifactId>policy-clamp</artifactId> - <version>6.1.3-SNAPSHOT</version> + <version>6.2.0-SNAPSHOT</version> </parent> <artifactId>policy-clamp-runtime</artifactId> diff --git a/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml index 82e1940b1..e7ba1283f 100644 --- a/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -336,6 +336,9 @@ <to uri="direct:load-loop"/> <to uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})"/> + <setProperty name="raiseHttpExceptionFlag"> + <simple resultType="java.lang.Boolean">true</simple> + </setProperty> <to uri="direct:undeploy-loop"/> <log loggingLevel="INFO" @@ -549,9 +552,6 @@ <doTry> <log loggingLevel="INFO" message="DELETE request for loop: ${header.loopName}"/> - <setProperty name="raiseHttpExceptionFlag"> - <simple resultType="java.lang.Boolean">true</simple> - </setProperty> <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')"/> <to @@ -559,11 +559,17 @@ <to uri="direct:load-loop"/> <to uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})"/> + + <setProperty name="raiseHttpExceptionFlag"> + <simple resultType="java.lang.Boolean">false</simple> + </setProperty> <to uri="direct:undeploy-loop"/> + <setProperty name="raiseHttpExceptionFlag"> <simple resultType="java.lang.Boolean">false</simple> </setProperty> <to uri="direct:remove-all-policy-from-active-pdp-group"/> + <log loggingLevel="INFO" message="Deleting all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}"/> <split> diff --git a/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml b/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml index 517fb09a9..55ec70d16 100644 --- a/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml +++ b/runtime/src/main/resources/clds/camel/routes/dcae-flows.xml @@ -180,17 +180,11 @@ <when> <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true </simple> - <setProperty name="raiseHttpExceptionFlag"> - <simple resultType="java.lang.Boolean">true</simple> - </setProperty> <to uri="direct:undeploy-loop-single-blueprint"/> </when> <when> <simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false </simple> - <setProperty name="raiseHttpExceptionFlag"> - <simple resultType="java.lang.Boolean">true</simple> - </setProperty> <to uri="direct:undeploy-loop-multi-blueprint"/> </when> </choice> diff --git a/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowItTestCase.java b/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowItTestCase.java index bfd5b0377..899b6206b 100644 --- a/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowItTestCase.java +++ b/runtime/src/test/java/org/onap/policy/clamp/loop/DeployFlowItTestCase.java @@ -154,7 +154,7 @@ public class DeployFlowItTestCase { loopTest.addMicroServicePolicy(microServicePolicy); loopService.saveOrUpdateLoop(loopTest); Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest) - .build(); + .withProperty("raiseHttpExceptionFlag", true).build(); camelContext.createProducerTemplate().send("direct:undeploy-loop", myCamelExchange); @@ -189,7 +189,7 @@ public class DeployFlowItTestCase { loopTest2.addMicroServicePolicy(microServicePolicy2); loopsRepository.saveAndFlush(loopTest2); Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest2) - .build(); + .withProperty("raiseHttpExceptionFlag", true).build(); camelContext.createProducerTemplate().send("direct:undeploy-loop", myCamelExchange); diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml new file mode 100644 index 000000000..71a20d4f9 --- /dev/null +++ b/testsuites/performance/pom.xml @@ -0,0 +1,31 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2021 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.policy.clamp</groupId> + <artifactId>clamp-testsuites</artifactId> + <version>6.1.3-SNAPSHOT</version> + </parent> + + <artifactId>clamp-performance</artifactId> +</project> diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx new file mode 100644 index 000000000..bb0cfc98d --- /dev/null +++ b/testsuites/performance/src/main/resources/testplans/performance.jmx @@ -0,0 +1,2292 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.4.1"> + <hashTree> + <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Policy Clamp ControlLoop Performance" enabled="true"> + <stringProp name="TestPlan.comments">Policy Clamp ControlLoop Performance Tests</stringProp> + <boolProp name="TestPlan.functional_mode">false</boolProp> + <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp> + <boolProp name="TestPlan.serialize_threadgroups">true</boolProp> + <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="RUNTIME_HOST" elementType="Argument"> + <stringProp name="Argument.name">RUNTIME_HOST</stringProp> + <stringProp name="Argument.value">192.168.32.9</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="RUNTIME_PORT" elementType="Argument"> + <stringProp name="Argument.name">RUNTIME_PORT</stringProp> + <stringProp name="Argument.value">6969</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="POLICY_PARTICIPANT_HOST" elementType="Argument"> + <stringProp name="Argument.name">POLICY_PARTICIPANT_HOST</stringProp> + <stringProp name="Argument.value">192.168.32.8</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="POLICY_PARTICIPANT_PORT" elementType="Argument"> + <stringProp name="Argument.name">POLICY_PARTICIPANT_PORT</stringProp> + <stringProp name="Argument.value">6970</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="HOME_PATH" elementType="Argument"> + <stringProp name="Argument.name">HOME_PATH</stringProp> + <stringProp name="Argument.value">./</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="LOGS_PATH" elementType="Argument"> + <stringProp name="Argument.name">LOGS_PATH</stringProp> + <stringProp name="Argument.value">${HOME_PATH}/controlloop_perf/</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="DURATION" elementType="Argument"> + <stringProp name="Argument.name">DURATION</stringProp> + <stringProp name="Argument.value">${__P(DURATION,14400)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="USERS" elementType="Argument"> + <stringProp name="Argument.name">USERS</stringProp> + <stringProp name="Argument.value">${__P(USERS,5)}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="TestPlan.user_define_classpath"></stringProp> + </TestPlan> + <hashTree> + <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true"> + <collectionProp name="AuthManager.auth_list"> + <elementProp name="" elementType="Authorization"> + <stringProp name="Authorization.url">https://${RUNTIME_HOST}:${RUNTIME_PORT}/onap/controlloop/v2</stringProp> + <stringProp name="Authorization.username">healthcheck</stringProp> + <stringProp name="Authorization.password">zb!XztG34</stringProp> + <stringProp name="Authorization.domain"></stringProp> + <stringProp name="Authorization.realm"></stringProp> + </elementProp> + </collectionProp> + <boolProp name="AuthManager.clearEachIteration">true</boolProp> + <boolProp name="AuthManager.controlledByThreadGroup">false</boolProp> + </AuthManager> + <hashTree/> + <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true"> + <collectionProp name="HeaderManager.headers"> + <elementProp name="" elementType="Header"> + <stringProp name="Header.name">Accept</stringProp> + <stringProp name="Header.value">application/json</stringProp> + </elementProp> + <elementProp name="" elementType="Header"> + <stringProp name="Header.name">Content-Type</stringProp> + <stringProp name="Header.value">application/json</stringProp> + </elementProp> + </collectionProp> + </HeaderManager> + <hashTree/> + <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">1</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration">260000</stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp> + </SetupThreadGroup> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Comission control loop definition" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
 + "data_types": {
 + "onap.datatypes.ToscaConceptIdentifier": {
 + "derived_from": "tosca.datatypes.Root",
 + "properties": {
 + "name": {
 + "type": "string",
 + "required": true
 + },
 + "version": {
 + "type": "string",
 + "required": true
 + }
 + }
 + },
 + "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo": {
 + "name": "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo",
 + "version": "0.0.0",
 + "derived_from": "tosca.datatypes.Root",
 + "properties": {
 + "consulUrl": {
 + "name": "consulUrl",
 + "type": "string",
 + "typeVersion": "0.0.0",
 + "description": "Consul url for this entry",
 + "required": true
 + },
 + "consul_body": {
 + "name": "consulBody",
 + "type": "string",
 + "typeVersion": "0.0.0",
 + "description": "Body of Consul entry",
 + "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\nentity that generated the ONSET event will be the target.\n",
 + "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": {}
 + }
 + },
 + "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.test123": {
 + "derived_from": "tosca.policies.Root",
 + "description": "a base policy type for all policies that govern monitoring provisioning",
 + "version": "1.0.0",
 + "name": "onap.policies.test123"
 + },
 + "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\nPolicy Types. This does NOT support the legacy Policy YAML policy type.\n",
 + "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\ntimeout for each operation listed.\n",
 + "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",
 + "requred": 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"
 + },
 + "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.DCAEMicroserviceControlLoopElement": {
 + "version": "1.0.1",
 + "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement",
 + "properties": {
 + "dcae_blueprint_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": false
 + },
 + "dcae_blueprint": {
 + "type": "onap.dcae.cloudify_blueprint",
 + "requred": false
 + },
 + "consul_info": {
 + "type": "list",
 + "required": false,
 + "entry_schema": {
 + "type": "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo"
 + }
 + }
 + }
 + },
 + "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",
 + "requred": true
 + },
 + "policy_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": false
 + }
 + }
 + },
 + "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement": {
 + "version": "1.0.1",
 + "derived_from": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
 + "properties": {
 + "policy_type_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": true
 + },
 + "policy_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": false
 + }
 + }
 + },
 + "org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement": {
 + "version": "1.0.1",
 + "derived_from": "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement",
 + "properties": {
 + "policy_type_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": true
 + },
 + "policy_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": 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",
 + "requred": true
 + }
 + }
 + }
 + },
 + "topology_template": {
 + "inputs": {
 + "pmsh_monitoring_policy": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "description": "The ID of the PMSH monitoring policy to use",
 + "default": {
 + "name": "MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test",
 + "version": "1.0.0"
 + }
 + },
 + "pmsh_operational_policy": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "description": "The ID of the PMSH operational policy to use",
 + "default": {
 + "name": "operational.apex.pmcontrol",
 + "version": "1.0.0"
 + }
 + }
 + },
 + "node_templates": {
 + "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant": {
 + "version": "2.3.4",
 + "type": "org.onap.policy.clamp.controlloop.Participant",
 + "type_version": "1.0.1",
 + "description": "Participant for DCAE microservices",
 + "properties": {
 + "provider": "ONAP"
 + }
 + },
 + "org.onap.policy.controlloop.PolicyControlLoopParticipant": {
 + "version": "2.3.1",
 + "type": "org.onap.policy.clamp.controlloop.Participant",
 + "type_version": "1.0.1",
 + "description": "Participant for DCAE microservices",
 + "properties": {
 + "provider": "ONAP"
 + }
 + },
 + "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement": {
 + "version": "1.2.3",
 + "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
 + "type_version": "1.0.0",
 + "description": "Control loop element for the monitoring policy for Performance Management Subscription Handling",
 + "properties": {
 + "provider": "Ericsson",
 + "participantType": {
 + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version": "2.3.1"
 + },
 + "policy_type_id": {
 + "name": "onap.policies.monitoring.pm-subscription-handler",
 + "version": "1.0.0"
 + },
 + "policy_id": {
 + "get_input": "pmsh_monitoring_policy"
 + }
 + }
 + },
 + "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement": {
 + "version": "1.2.3",
 + "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
 + "type_version": "1.0.0",
 + "description": "Control loop element for the operational policy for Performance Management Subscription Handling",
 + "properties": {
 + "provider": "Ericsson",
 + "participantType": {
 + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version": "2.3.1"
 + },
 + "policy_type_id": {
 + "name": "onap.policies.operational.pm-subscription-handler",
 + "version": "1.0.0"
 + },
 + "policy_id": {
 + "get_input": "pmsh_operational_policy"
 + }
 + }
 + },
 + "org.onap.domain.pmsh.PMSHControlLoopDefinition": {
 + "version": "1.2.3",
 + "type": "org.onap.policy.clamp.controlloop.ControlLoop",
 + "type_version": "1.0.0",
 + "description": "Control loop for Performance Management Subscription Handling",
 + "properties": {
 + "provider": "Ericsson",
 + "elements": [
 + {
 + "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
 + "version": "1.2.3"
 + },
 + {
 + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
 + "version": "1.2.3"
 + },
 + {
 + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
 + "version": "1.2.3"
 + }
 + ]
 + }
 + }
 + }
 + }
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/commission</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Instantiate control loop" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "controlLoopList": [
 + {
 + "name": "PMSHInstance0",
 + "version": "1.0.1",
 + "definition": {
 + "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
 + "version": "1.2.3"
 + },
 + "state": "UNINITIALISED",
 + "orderedState": "UNINITIALISED",
 + "description": "PMSH control loop instance 0",
 + "elements": {
 + "709c62b3-8918-41b9-a747-d21eb79c6c21": {
 + "id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
 + "definition": {
 + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
 + "version": "1.2.3"
 + },
 + "participantType":{
 + "name":"org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version":"2.3.1"
 + },
 + "participantId":{
 + "name":"org.onap.PM_Policy",
 + "version":"1.0.0"
 + },
 + "state":"UNINITIALISED",
 + "orderedState":"UNINITIALISED",
 + "toscaServiceTemplateFragment":{
 + "data_types":{
 + "onap.datatype.controlloop.Actor":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "payload":{
 + "name":"payload",
 + "type":"map",
 + "type_version":"0.0.0",
 + "description":"Name/value pairs of payload information passed by Policy to the actor",
 + "required":false,
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0"
 + },
 + "metadata":{
 + "clamp_possible_values":"ClampExecution:CDS/payload"
 + }
 + },
 + "target":{
 + "name":"target",
 + "type":"onap.datatype.controlloop.Target",
 + "type_version":"0.0.0",
 + "description":"The resource the operation should be performed on.",
 + "required":true
 + },
 + "actor":{
 + "name":"actor",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The actor performing the operation.",
 + "required":true,
 + "metadata":{
 + "clamp_possible_values":"Dictionary:DefaultActors,ClampExecution:CDS/actor"
 + }
 + },
 + "operation":{
 + "name":"operation",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The operation the actor is performing.",
 + "required":true,
 + "metadata":{
 + "clamp_possible_values":"Dictionary:DefaultOperations,ClampExecution:CDS/operation"
 + }
 + }
 + },
 + "name":"onap.datatype.controlloop.Actor",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + },
 + "description":"An actor/operation/target definition"
 + },
 + "onap.datatype.controlloop.Operation":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "failure_retries":{
 + "name":"failure_retries",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the current operation has exceeded its max retries.",
 + "default":"final_failure_retries",
 + "required":false
 + },
 + "id":{
 + "name":"id",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Unique identifier for the operation",
 + "required":true
 + },
 + "failure_timeout":{
 + "name":"failure_timeout",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the time out for the operation occurs.",
 + "default":"final_failure_timeout",
 + "required":false
 + },
 + "failure":{
 + "name":"failure",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke on Actor operation failure.",
 + "default":"final_failure",
 + "required":false
 + },
 + "operation":{
 + "name":"operation",
 + "type":"onap.datatype.controlloop.Actor",
 + "type_version":"0.0.0",
 + "description":"The definition of the operation to be performed.",
 + "required":true
 + },
 + "failure_guard":{
 + "name":"failure_guard",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.",
 + "default":"final_failure_guard",
 + "required":false
 + },
 + "retries":{
 + "name":"retries",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"The number of retries the actor should attempt to perform the operation.",
 + "default":0.0,
 + "required":true
 + },
 + "timeout":{
 + "name":"timeout",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"The amount of time for the actor to perform the operation.",
 + "required":true
 + },
 + "failure_exception":{
 + "name":"failure_exception",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the current operation causes an exception.",
 + "default":"final_failure_exception",
 + "required":false
 + },
 + "description":{
 + "name":"description",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"A user-friendly description of the intent for the operation",
 + "required":false
 + },
 + "success":{
 + "name":"success",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.",
 + "default":"final_success",
 + "required":false
 + }
 + },
 + "name":"onap.datatype.controlloop.Operation",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + },
 + "description":"An operation supported by an actor"
 + },
 + "onap.datatype.controlloop.Target":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "entityIds":{
 + "name":"entityIds",
 + "type":"map",
 + "type_version":"0.0.0",
 + "description":"Map of values that identify the resource. If none are provided, it is assumed that the\nentity that generated the ONSET event will be the target.\n",
 + "required":false,
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0"
 + },
 + "metadata":{
 + "clamp_possible_values":"ClampExecution:CSAR_RESOURCES"
 + }
 + },
 + "targetType":{
 + "name":"targetType",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Category for the target type",
 + "required":true,
 + "constraints":[
 + {
 + "valid_values":[
 + "VNF",
 + "VM",
 + "VFMODULE",
 + "PNF"
 + ]
 + }
 + ]
 + }
 + },
 + "name":"onap.datatype.controlloop.Target",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + },
 + "description":"Definition for a entity in A&AI to perform a control loop operation on"
 + },
 + "onap.datatypes.ToscaConceptIdentifier":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "version":{
 + "name":"version",
 + "type":"string",
 + "type_version":"0.0.0",
 + "required":true
 + },
 + "name":{
 + "name":"name",
 + "type":"string",
 + "type_version":"0.0.0",
 + "required":true
 + }
 + },
 + "name":"onap.datatypes.ToscaConceptIdentifier",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + }
 + },
 + "onap.datatypes.monitoring.managedObjectDNsBasic":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "DN":{
 + "name":"DN",
 + "type":"string",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Managed object distinguished name object",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.managedObjectDNsBasic",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"List of measurement types",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementTypes",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "managedObjectDNsBasic":{
 + "name":"managedObjectDNsBasic",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of managed object distinguished names",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.managedObjectDNsBasics",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Measurement Group",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementGroup",
 + "type_version":"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",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Measurement type object",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementType",
 + "type_version":"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":{
 + "modelVersionIDs":{
 + "name":"modelVersionIDs",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of model version IDs",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "modelInvariantIDs":{
 + "name":"modelInvariantIDs",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of model invariant IDs",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "modelNames":{
 + "name":"modelNames",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of model names",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "nfNames":{
 + "name":"nfNames",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of network functions",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Measurement Groups",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementGroups",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "fileBasedGP":{
 + "name":"fileBasedGP",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"File based granularity period",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "fileLocation":{
 + "name":"fileLocation",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"ROP file location",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "subscriptionName":{
 + "name":"subscriptionName",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Name of the subscription",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "administrativeState":{
 + "name":"administrativeState",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"State of the subscription",
 + "required":true,
 + "constraints":[
 + {
 + "valid_values":[
 + "LOCKED",
 + "UNLOCKED"
 + ]
 + }
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "nfFilter":{
 + "name":"nfFilter",
 + "type":"map",
 + "type_version":"0.0.0",
 + "description":"Network function filter",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.nfFilter",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + }
 + },
 + "name":"onap.datatypes.monitoring.subscription",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + }
 + }
 + },
 + "policy_types":{
 + "onap.policies.Monitoring":{
 + "properties":{
 + 
 + },
 + "name":"onap.policies.Monitoring",
 + "version":"1.0.0",
 + "derived_from":"tosca.policies.Root",
 + "metadata":{
 + 
 + },
 + "description":"a base policy type for all policies that govern monitoring provisioning"
 + },
 + "onap.policies.test123":{
 + "properties":{
 + 
 + },
 + "name":"onap.policies.test123",
 + "version":"1.0.0",
 + "derived_from":"tosca.policies.Root",
 + "metadata":{
 + 
 + },
 + "description":"a base policy type for all policies that govern monitoring provisioning"
 + },
 + "onap.policies.controlloop.operational.Common":{
 + "properties":{
 + "abatement":{
 + "name":"abatement",
 + "type":"boolean",
 + "type_version":"0.0.0",
 + "description":"Whether an abatement event message will be expected for the control loop from DCAE.",
 + "default":false,
 + "required":true
 + },
 + "operations":{
 + "name":"operations",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of operations to be performed when Control Loop is triggered.",
 + "required":true,
 + "entry_schema":{
 + "type":"onap.datatype.controlloop.Operation",
 + "type_version":"0.0.0"
 + }
 + },
 + "trigger":{
 + "name":"trigger",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Initial operation to execute upon receiving an Onset event message for the Control Loop.",
 + "required":true
 + },
 + "timeout":{
 + "name":"timeout",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"Overall timeout for executing all the operations. This timeout should equal or exceed the total\ntimeout for each operation listed.\n",
 + "required":true
 + },
 + "id":{
 + "name":"id",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The unique control loop id.",
 + "required":true
 + }
 + },
 + "name":"onap.policies.controlloop.operational.Common",
 + "version":"1.0.0",
 + "derived_from":"tosca.policies.Root",
 + "metadata":{
 + 
 + },
 + "description":"Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\nPolicy Types. This does NOT support the legacy Policy YAML policy type.\n"
 + },
 + "onap.policies.controlloop.operational.common.Apex":{
 + "properties":{
 + "engineServiceParameters":{
 + "name":"engineServiceParameters",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The engine parameters like name, instanceCount, policy implementation, parameters etc.",
 + "required":true
 + },
 + "eventOutputParameters":{
 + "name":"eventOutputParameters",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The event output parameters.",
 + "required":true
 + },
 + "javaProperties":{
 + "name":"javaProperties",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Name/value pairs of properties to be set for APEX if needed.",
 + "required":false
 + },
 + "eventInputParameters":{
 + "name":"eventInputParameters",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The event input parameters.",
 + "required":true
 + }
 + },
 + "name":"onap.policies.controlloop.operational.common.Apex",
 + "version":"1.0.0",
 + "derived_from":"onap.policies.controlloop.operational.Common",
 + "metadata":{
 + 
 + },
 + "description":"Operational policies for Apex PDP"
 + },
 + "onap.policies.monitoring.dcae-pm-subscription-handler":{
 + "properties":{
 + "pmsh_policy":{
 + "name":"pmsh_policy",
 + "type":"onap.datatypes.monitoring.subscription",
 + "type_version":"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":{
 + 
 + }
 + }
 + },
 + "topology_template":{
 + 
 + },
 + "name":"NULL",
 + "version":"0.0.0"
 + },
 + "propertiesMap": {
 + "provider_instance": {
 + "name": "provider_instance",
 + "version": "1.2.3",
 + "type": "org.onap.datatypes.policy.clamp.controlloop.policControlLoopElement.Chart",
 + "typeVersion": "1.0.0",
 + "description": "The helm chart for the microservice",
 + "required": true
 + }
 + },
 + "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop"
 + },
 + "709c62b3-8918-41b9-a747-d21eb79c6c22": {
 + "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
 + "definition": {
 + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
 + "version": "1.2.3"
 + },
 + "participantType":{
 + "name":"org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version":"2.3.1"
 + },
 + "participantId":{
 + "name":"org.onap.PM_Policy",
 + "version":"1.0.0"
 + },
 + "state":"UNINITIALISED",
 + "orderedState":"UNINITIALISED",
 + "propertiesMap": {
 + "provider_instance": {
 + "name": "provider_instance",
 + "version": "1.2.3",
 + "type": "org.onap.datatypes.policy.clamp.controlloop.policControlLoopElement.Chart",
 + "typeVersion": "1.0.0",
 + "description": "The helm chart for the microservice",
 + "required": true
 + }
 + },
 + "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop"
 + }
 + }
 + }
 + ]
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ControlLoop Test Flow" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">continue</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <intProp name="LoopController.loops">-1</intProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">${USERS}</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <boolProp name="ThreadGroup.scheduler">true</boolProp> + <stringProp name="ThreadGroup.duration">7200</stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp> + </ThreadGroup> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="TestPlan.comments">Basic Health Check</stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Change State to PASSIVE" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "orderedState": "PASSIVE",
 + "controlLoopIdentifierList": [
 + {
 + "name": "PMSHInstance0",
 + "version": "1.0.1"
 + }
 + ]
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation/command</stringProp> + <stringProp name="HTTPSampler.method">PUT</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> + <stringProp name="ConstantTimer.delay">6000</stringProp> + </ConstantTimer> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49588">202</stringProp> + <stringProp name="51508">400</stringProp> + <stringProp name="51514">406</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">true</boolProp> + <intProp name="Assertion.test_type">34</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="TestPlan.comments">Basic Health Check</stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Change State to UNINITIALISED" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "orderedState": "UNINITIALISED",
 + "controlLoopIdentifierList": [
 + {
 + "name": "PMSHInstance0",
 + "version": "1.0.1"
 + }
 + ]
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation/command</stringProp> + <stringProp name="HTTPSampler.method">PUT</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="51508">400</stringProp> + <stringProp name="51514">406</stringProp> + <stringProp name="49588">202</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">true</boolProp> + <intProp name="Assertion.test_type">34</intProp> + </ResponseAssertion> + <hashTree/> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> + <stringProp name="ConstantTimer.delay">6000</stringProp> + </ConstantTimer> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="TestPlan.comments">Basic Health Check</stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="false"> + <stringProp name="ConstantTimer.delay">1000</stringProp> + </ConstantTimer> + <hashTree/> + </hashTree> + <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">1</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp> + </PostThreadGroup> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete instantiated controlloop" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation?name=PMSHInstance0&version=1.0.1</stringProp> + <stringProp name="HTTPSampler.method">DELETE</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> + <stringProp name="ConstantTimer.delay">6000</stringProp> + </ConstantTimer> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete ControlLoop Definition" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/commission?name=NULL&version=0.0.0</stringProp> + <stringProp name="HTTPSampler.method">DELETE</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + </hashTree> + <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + <sentBytes>true</sentBytes> + <url>true</url> + <threadCounts>true</threadCounts> + <idleTime>true</idleTime> + <connectTime>true</connectTime> + </value> + </objProp> + <stringProp name="filename">${LOGS_PATH}testresults.jtl</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + <sentBytes>true</sentBytes> + <url>true</url> + <threadCounts>true</threadCounts> + <idleTime>true</idleTime> + <connectTime>true</connectTime> + </value> + </objProp> + <stringProp name="filename">${LOGS_PATH}resultTree.log</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + <sentBytes>true</sentBytes> + <url>true</url> + <threadCounts>true</threadCounts> + <idleTime>true</idleTime> + <connectTime>true</connectTime> + </value> + </objProp> + <stringProp name="filename">${LOGS_PATH}resultTable.log</stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + </hashTree> +</jmeterTestPlan> diff --git a/testsuites/performance/src/main/resources/testplans/results.sh b/testsuites/performance/src/main/resources/testplans/results.sh new file mode 100644 index 000000000..adb3e03dd --- /dev/null +++ b/testsuites/performance/src/main/resources/testplans/results.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +#============LICENSE_START======================================================= +#Copyright (C) 2021 Nordix Foundation. +#================================================================================ +#Licensed under the Apache License, Version 2.0 (the "License"); +#you may not use this file except in compliance with the License. +#You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +#Unless required by applicable law or agreed to in writing, software +#distributed under the License is distributed on an "AS IS" BASIS, +#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +#See the License for the specific language governing permissions and +#limitations under the License. +#============LICENSE_END========================================================= + +LOGFILE=$1 +if [[ ! -f $LOGFILE ]]; then + echo "The file '$LOGFILE' in not provided." + echo "Please provide log file to process." + exit 1 +fi + +echo "File being processed: " $LOGFILE +RES=$(awk -F "," 'NR>1 { total += $15 } END { print total/NR }' $LOGFILE) +echo "Average Latency: " $RES +LC=$(awk 'END{print NR}' $LOGFILE) +echo "Total Requests:" $LC +echo "Requests/sec:" $((LC/5)) + diff --git a/testsuites/pom.xml b/testsuites/pom.xml new file mode 100644 index 000000000..6c972e9a1 --- /dev/null +++ b/testsuites/pom.xml @@ -0,0 +1,40 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2021 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.policy.clamp</groupId> + <artifactId>policy-clamp</artifactId> + <version>6.1.3-SNAPSHOT</version> + </parent> + + <artifactId>clamp-testsuites</artifactId> + <packaging>pom</packaging> + + <properties> + <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. --> + <sonar.skip>true</sonar.skip> + </properties> + + <modules> + <module>stability</module> + <module>performance</module> + </modules> +</project> diff --git a/testsuites/readme.text b/testsuites/readme.text new file mode 100644 index 000000000..2257452d5 --- /dev/null +++ b/testsuites/readme.text @@ -0,0 +1,73 @@ +#------------------------------------------------------------------------------- +# ============LICENSE_START======================================================= + Copyright (C) 2021 Nordix Foundation. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +#------------------------------------------------------------------------------- + +To set up S3P test environment with all docker images, either build the docker images locally with +"mvn clean install -P docker" in clamp/packages directory Or use policy/docker/csit to bring up docker images. + +Important Instructions to setup environment using CSIT: +------------------------------------------------------- +Step 1: $cd policy/docker/csit + +Step 2: +$vi run-project-csit.sh +Comment the on_exit cleanup function call in run-project-csit.sh file. By doing this, docker images once started will not be shutdown. +All images will be up and running, to carryout any Stability or Performance tests using JMeter. +# ensure that teardown and other finalizing steps are always executed +#trap on_exit EXIT + +Step 3: +./run-project-csit.sh clamp +This command will bring up all required docker images + +Step 4: Ensure the IP's and Ports in stability.jmx and performance.jmx are changed, and reflecting to the IP's of docker images. +Example: +$cd ./clamp/testsuites/stability/src/main/resources/testplans/stability.jmx + <elementProp name="RUNTIME_HOST" elementType="Argument"> + <stringProp name="Argument.name">RUNTIME_HOST</stringProp> + <stringProp name="Argument.value">192.168.48.9</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + + +On successfull docker image bring up: +------------------------------------ +$docker ps +CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES +a9cb0cd103cf onap/policy-clamp-cl-runtime:latest "/opt/app/policy/bin…" 41 seconds ago Up 40 seconds 6969/tcp policy-clamp-cl-runtime +886e572b8438 onap/policy-clamp-cl-pf-ppnt:latest "/opt/app/policy/bin…" 42 seconds ago Up 41 seconds 6973/tcp policy-clamp-cl-pf-ppnt +035707b1b95f nexus3.onap.org:10001/onap/policy-api:2.5-SNAPSHOT-latest "./wait_for_port.sh …" 42 seconds ago Up 42 seconds 6969/tcp policy-api +d34204f95ff3 onap/policy-clamp-cl-http-ppnt:latest "/opt/app/policy/bin…" 43 seconds ago Up 42 seconds 6971/tcp policy-clamp-cl-http-ppnt +4470e608c9a8 onap/policy-clamp-cl-k8s-ppnt:latest "/opt/app/policy/bin…" 43 seconds ago Up 42 seconds 6972/tcp, 8083/tcp policy-clamp-cl-k8s-ppnt +62229d46b79c nexus3.onap.org:10001/onap/policy-models-simulator:2.5-SNAPSHOT-latest "bash simulators.sh" 45 seconds ago Up 43 seconds 3905/tcp, 6666/tcp, 6668-6670/tcp, 6680/tcp simulator +efaf0ca5e1f0 nexus3.onap.org:10001/mariadb:10.5.8 "docker-entrypoint.s…" 45 seconds ago Up 43 seconds 3306/tcp mariadb + +To start performance tests: +-------------------------- +nohup ./jMeter/apache-jmeter-5.2.1/bin/jmeter -n -t performance.jmx -l testresults.jtl + +To start stability tests: +-------------------------- +nohup ./jMeter/apache-jmeter-5.2.1/bin/jmeter -n -t stability.jmx -l testresults.jtl + +To remove all docker images after Stability (72hrs) and Performance(2hrs) test runs: +----------------------------------------------------------------------------------- +cd policy/docker/csit +docker-compose -f ./docker-compose-all.yml down -v + diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml new file mode 100644 index 000000000..0cec5d317 --- /dev/null +++ b/testsuites/stability/pom.xml @@ -0,0 +1,28 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2021 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.policy.clamp</groupId> + <artifactId>clamp-testsuites</artifactId> + <version>6.1.3-SNAPSHOT</version> + </parent> + <artifactId>clamp-stability</artifactId> +</project> diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx new file mode 100644 index 000000000..32bb36012 --- /dev/null +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -0,0 +1,2268 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.4.1"> + <hashTree> + <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Policy Clamp Controlloop Stability" enabled="true"> + <stringProp name="TestPlan.comments">Policy Clamp Controlloop Stability Tests</stringProp> + <boolProp name="TestPlan.functional_mode">false</boolProp> + <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp> + <boolProp name="TestPlan.serialize_threadgroups">true</boolProp> + <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"> + <elementProp name="RUNTIME_HOST" elementType="Argument"> + <stringProp name="Argument.name">RUNTIME_HOST</stringProp> + <stringProp name="Argument.value">192.168.48.9</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="RUNTIME_PORT" elementType="Argument"> + <stringProp name="Argument.name">RUNTIME_PORT</stringProp> + <stringProp name="Argument.value">6969</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="POLICY_PARTICIPANT_HOST" elementType="Argument"> + <stringProp name="Argument.name">POLICY_PARTICIPANT_HOST</stringProp> + <stringProp name="Argument.value">192.168.48.8</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + <elementProp name="POLICY_PARTICIPANT_HOST_PORT" elementType="Argument"> + <stringProp name="Argument.name">POLICY_PARTICIPANT_HOST_PORT</stringProp> + <stringProp name="Argument.value">6973</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="TestPlan.user_define_classpath"></stringProp> + </TestPlan> + <hashTree> + <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true"> + <collectionProp name="AuthManager.auth_list"> + <elementProp name="" elementType="Authorization"> + <stringProp name="Authorization.url">https://${RUNTIME_HOST}:${RUNTIME_PORT}/onap/controlloop/v2</stringProp> + <stringProp name="Authorization.username">healthcheck</stringProp> + <stringProp name="Authorization.password">zb!XztG34</stringProp> + <stringProp name="Authorization.domain"></stringProp> + <stringProp name="Authorization.realm"></stringProp> + </elementProp> + </collectionProp> + <boolProp name="AuthManager.clearEachIteration">true</boolProp> + <boolProp name="AuthManager.controlledByThreadGroup">false</boolProp> + </AuthManager> + <hashTree/> + <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true"> + <collectionProp name="HeaderManager.headers"> + <elementProp name="" elementType="Header"> + <stringProp name="Header.name">Content-Type</stringProp> + <stringProp name="Header.value">application/json</stringProp> + </elementProp> + <elementProp name="" elementType="Header"> + <stringProp name="Header.name">X-ONAP-RequestID</stringProp> + <stringProp name="Header.value">709c62b3-8918-41b9-a747-d21eb79c6c20</stringProp> + </elementProp> + </collectionProp> + </HeaderManager> + <hashTree/> + <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">1</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration">260000</stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp> + </SetupThreadGroup> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Commission Contorlloop definition" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
 + "data_types": {
 + "onap.datatypes.ToscaConceptIdentifier": {
 + "derived_from": "tosca.datatypes.Root",
 + "properties": {
 + "name": {
 + "type": "string",
 + "required": true
 + },
 + "version": {
 + "type": "string",
 + "required": true
 + }
 + }
 + },
 + "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo": {
 + "name": "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo",
 + "version": "0.0.0",
 + "derived_from": "tosca.datatypes.Root",
 + "properties": {
 + "consulUrl": {
 + "name": "consulUrl",
 + "type": "string",
 + "typeVersion": "0.0.0",
 + "description": "Consul url for this entry",
 + "required": true
 + },
 + "consul_body": {
 + "name": "consulBody",
 + "type": "string",
 + "typeVersion": "0.0.0",
 + "description": "Body of Consul entry",
 + "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\nentity that generated the ONSET event will be the target.\n",
 + "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": {}
 + }
 + },
 + "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.test123": {
 + "derived_from": "tosca.policies.Root",
 + "description": "a base policy type for all policies that govern monitoring provisioning",
 + "version": "1.0.0",
 + "name": "onap.policies.test123"
 + },
 + "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\nPolicy Types. This does NOT support the legacy Policy YAML policy type.\n",
 + "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\ntimeout for each operation listed.\n",
 + "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",
 + "requred": 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"
 + },
 + "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.DCAEMicroserviceControlLoopElement": {
 + "version": "1.0.1",
 + "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement",
 + "properties": {
 + "dcae_blueprint_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": false
 + },
 + "dcae_blueprint": {
 + "type": "onap.dcae.cloudify_blueprint",
 + "requred": false
 + },
 + "consul_info": {
 + "type": "list",
 + "required": false,
 + "entry_schema": {
 + "type": "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo"
 + }
 + }
 + }
 + },
 + "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",
 + "requred": true
 + },
 + "policy_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": false
 + }
 + }
 + },
 + "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement": {
 + "version": "1.0.1",
 + "derived_from": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
 + "properties": {
 + "policy_type_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": true
 + },
 + "policy_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": false
 + }
 + }
 + },
 + "org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement": {
 + "version": "1.0.1",
 + "derived_from": "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement",
 + "properties": {
 + "policy_type_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": true
 + },
 + "policy_id": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "requred": 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",
 + "requred": true
 + }
 + }
 + }
 + },
 + "topology_template": {
 + "inputs": {
 + "pmsh_monitoring_policy": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "description": "The ID of the PMSH monitoring policy to use",
 + "default": {
 + "name": "MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test",
 + "version": "1.0.0"
 + }
 + },
 + "pmsh_operational_policy": {
 + "type": "onap.datatypes.ToscaConceptIdentifier",
 + "description": "The ID of the PMSH operational policy to use",
 + "default": {
 + "name": "operational.apex.pmcontrol",
 + "version": "1.0.0"
 + }
 + }
 + },
 + "node_templates": {
 + "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant": {
 + "version": "2.3.4",
 + "type": "org.onap.policy.clamp.controlloop.Participant",
 + "type_version": "1.0.1",
 + "description": "Participant for DCAE microservices",
 + "properties": {
 + "provider": "ONAP"
 + }
 + },
 + "org.onap.policy.controlloop.PolicyControlLoopParticipant": {
 + "version": "2.3.1",
 + "type": "org.onap.policy.clamp.controlloop.Participant",
 + "type_version": "1.0.1",
 + "description": "Participant for DCAE microservices",
 + "properties": {
 + "provider": "ONAP"
 + }
 + },
 + "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement": {
 + "version": "1.2.3",
 + "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
 + "type_version": "1.0.0",
 + "description": "Control loop element for the monitoring policy for Performance Management Subscription Handling",
 + "properties": {
 + "provider": "Ericsson",
 + "participantType": {
 + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version": "2.3.1"
 + },
 + "policy_type_id": {
 + "name": "onap.policies.monitoring.pm-subscription-handler",
 + "version": "1.0.0"
 + },
 + "policy_id": {
 + "get_input": "pmsh_monitoring_policy"
 + }
 + }
 + },
 + "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement": {
 + "version": "1.2.3",
 + "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
 + "type_version": "1.0.0",
 + "description": "Control loop element for the operational policy for Performance Management Subscription Handling",
 + "properties": {
 + "provider": "Ericsson",
 + "participantType": {
 + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version": "2.3.1"
 + },
 + "policy_type_id": {
 + "name": "onap.policies.operational.pm-subscription-handler",
 + "version": "1.0.0"
 + },
 + "policy_id": {
 + "get_input": "pmsh_operational_policy"
 + }
 + }
 + },
 + "org.onap.domain.pmsh.PMSHControlLoopDefinition": {
 + "version": "1.2.3",
 + "type": "org.onap.policy.clamp.controlloop.ControlLoop",
 + "type_version": "1.0.0",
 + "description": "Control loop for Performance Management Subscription Handling",
 + "properties": {
 + "provider": "Ericsson",
 + "elements": [
 + {
 + "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
 + "version": "1.2.3"
 + },
 + {
 + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
 + "version": "1.2.3"
 + },
 + {
 + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
 + "version": "1.2.3"
 + }
 + ]
 + }
 + }
 + }
 + }
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/commission</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Instantiate controlloop" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "controlLoopList": [
 + {
 + "name": "PMSHInstance0",
 + "version": "1.0.1",
 + "definition": {
 + "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
 + "version": "1.2.3"
 + },
 + "state": "UNINITIALISED",
 + "orderedState": "UNINITIALISED",
 + "description": "PMSH control loop instance 0",
 + "elements": {
 + "709c62b3-8918-41b9-a747-d21eb79c6c21": {
 + "id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
 + "definition": {
 + "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
 + "version": "1.2.3"
 + },
 + "participantType":{
 + "name":"org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version":"2.3.1"
 + },
 + "participantId":{
 + "name":"org.onap.PM_Policy",
 + "version":"1.0.0"
 + },
 + "state":"UNINITIALISED",
 + "orderedState":"UNINITIALISED",
 + "toscaServiceTemplateFragment":{
 + "data_types":{
 + "onap.datatype.controlloop.Actor":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "payload":{
 + "name":"payload",
 + "type":"map",
 + "type_version":"0.0.0",
 + "description":"Name/value pairs of payload information passed by Policy to the actor",
 + "required":false,
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0"
 + },
 + "metadata":{
 + "clamp_possible_values":"ClampExecution:CDS/payload"
 + }
 + },
 + "target":{
 + "name":"target",
 + "type":"onap.datatype.controlloop.Target",
 + "type_version":"0.0.0",
 + "description":"The resource the operation should be performed on.",
 + "required":true
 + },
 + "actor":{
 + "name":"actor",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The actor performing the operation.",
 + "required":true,
 + "metadata":{
 + "clamp_possible_values":"Dictionary:DefaultActors,ClampExecution:CDS/actor"
 + }
 + },
 + "operation":{
 + "name":"operation",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The operation the actor is performing.",
 + "required":true,
 + "metadata":{
 + "clamp_possible_values":"Dictionary:DefaultOperations,ClampExecution:CDS/operation"
 + }
 + }
 + },
 + "name":"onap.datatype.controlloop.Actor",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + },
 + "description":"An actor/operation/target definition"
 + },
 + "onap.datatype.controlloop.Operation":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "failure_retries":{
 + "name":"failure_retries",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the current operation has exceeded its max retries.",
 + "default":"final_failure_retries",
 + "required":false
 + },
 + "id":{
 + "name":"id",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Unique identifier for the operation",
 + "required":true
 + },
 + "failure_timeout":{
 + "name":"failure_timeout",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the time out for the operation occurs.",
 + "default":"final_failure_timeout",
 + "required":false
 + },
 + "failure":{
 + "name":"failure",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke on Actor operation failure.",
 + "default":"final_failure",
 + "required":false
 + },
 + "operation":{
 + "name":"operation",
 + "type":"onap.datatype.controlloop.Actor",
 + "type_version":"0.0.0",
 + "description":"The definition of the operation to be performed.",
 + "required":true
 + },
 + "failure_guard":{
 + "name":"failure_guard",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.",
 + "default":"final_failure_guard",
 + "required":false
 + },
 + "retries":{
 + "name":"retries",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"The number of retries the actor should attempt to perform the operation.",
 + "default":0.0,
 + "required":true
 + },
 + "timeout":{
 + "name":"timeout",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"The amount of time for the actor to perform the operation.",
 + "required":true
 + },
 + "failure_exception":{
 + "name":"failure_exception",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke when the current operation causes an exception.",
 + "default":"final_failure_exception",
 + "required":false
 + },
 + "description":{
 + "name":"description",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"A user-friendly description of the intent for the operation",
 + "required":false
 + },
 + "success":{
 + "name":"success",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.",
 + "default":"final_success",
 + "required":false
 + }
 + },
 + "name":"onap.datatype.controlloop.Operation",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + },
 + "description":"An operation supported by an actor"
 + },
 + "onap.datatype.controlloop.Target":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "entityIds":{
 + "name":"entityIds",
 + "type":"map",
 + "type_version":"0.0.0",
 + "description":"Map of values that identify the resource. If none are provided, it is assumed that the\nentity that generated the ONSET event will be the target.\n",
 + "required":false,
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0"
 + },
 + "metadata":{
 + "clamp_possible_values":"ClampExecution:CSAR_RESOURCES"
 + }
 + },
 + "targetType":{
 + "name":"targetType",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Category for the target type",
 + "required":true,
 + "constraints":[
 + {
 + "valid_values":[
 + "VNF",
 + "VM",
 + "VFMODULE",
 + "PNF"
 + ]
 + }
 + ]
 + }
 + },
 + "name":"onap.datatype.controlloop.Target",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + },
 + "description":"Definition for a entity in A&AI to perform a control loop operation on"
 + },
 + "onap.datatypes.ToscaConceptIdentifier":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "version":{
 + "name":"version",
 + "type":"string",
 + "type_version":"0.0.0",
 + "required":true
 + },
 + "name":{
 + "name":"name",
 + "type":"string",
 + "type_version":"0.0.0",
 + "required":true
 + }
 + },
 + "name":"onap.datatypes.ToscaConceptIdentifier",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + }
 + },
 + "onap.datatypes.monitoring.managedObjectDNsBasic":{
 + "constraints":[
 + 
 + ],
 + "properties":{
 + "DN":{
 + "name":"DN",
 + "type":"string",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Managed object distinguished name object",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.managedObjectDNsBasic",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"List of measurement types",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementTypes",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "managedObjectDNsBasic":{
 + "name":"managedObjectDNsBasic",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of managed object distinguished names",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.managedObjectDNsBasics",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Measurement Group",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementGroup",
 + "type_version":"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",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Measurement type object",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementType",
 + "type_version":"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":{
 + "modelVersionIDs":{
 + "name":"modelVersionIDs",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of model version IDs",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "modelInvariantIDs":{
 + "name":"modelInvariantIDs",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of model invariant IDs",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "modelNames":{
 + "name":"modelNames",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of model names",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "nfNames":{
 + "name":"nfNames",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of network functions",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"string",
 + "type_version":"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",
 + "type_version":"0.0.0",
 + "description":"Measurement Groups",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.measurementGroups",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + },
 + "fileBasedGP":{
 + "name":"fileBasedGP",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"File based granularity period",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "fileLocation":{
 + "name":"fileLocation",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"ROP file location",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "subscriptionName":{
 + "name":"subscriptionName",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Name of the subscription",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "administrativeState":{
 + "name":"administrativeState",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"State of the subscription",
 + "required":true,
 + "constraints":[
 + {
 + "valid_values":[
 + "LOCKED",
 + "UNLOCKED"
 + ]
 + }
 + ],
 + "metadata":{
 + 
 + }
 + },
 + "nfFilter":{
 + "name":"nfFilter",
 + "type":"map",
 + "type_version":"0.0.0",
 + "description":"Network function filter",
 + "required":true,
 + "constraints":[
 + 
 + ],
 + "entry_schema":{
 + "type":"onap.datatypes.monitoring.nfFilter",
 + "type_version":"0.0.0",
 + "constraints":[
 + 
 + ]
 + },
 + "metadata":{
 + 
 + }
 + }
 + },
 + "name":"onap.datatypes.monitoring.subscription",
 + "version":"0.0.0",
 + "derived_from":"tosca.datatypes.Root",
 + "metadata":{
 + 
 + }
 + }
 + },
 + "policy_types":{
 + "onap.policies.Monitoring":{
 + "properties":{
 + 
 + },
 + "name":"onap.policies.Monitoring",
 + "version":"1.0.0",
 + "derived_from":"tosca.policies.Root",
 + "metadata":{
 + 
 + },
 + "description":"a base policy type for all policies that govern monitoring provisioning"
 + },
 + "onap.policies.test123":{
 + "properties":{
 + 
 + },
 + "name":"onap.policies.test123",
 + "version":"1.0.0",
 + "derived_from":"tosca.policies.Root",
 + "metadata":{
 + 
 + },
 + "description":"a base policy type for all policies that govern monitoring provisioning"
 + },
 + "onap.policies.controlloop.operational.Common":{
 + "properties":{
 + "abatement":{
 + "name":"abatement",
 + "type":"boolean",
 + "type_version":"0.0.0",
 + "description":"Whether an abatement event message will be expected for the control loop from DCAE.",
 + "default":false,
 + "required":true
 + },
 + "operations":{
 + "name":"operations",
 + "type":"list",
 + "type_version":"0.0.0",
 + "description":"List of operations to be performed when Control Loop is triggered.",
 + "required":true,
 + "entry_schema":{
 + "type":"onap.datatype.controlloop.Operation",
 + "type_version":"0.0.0"
 + }
 + },
 + "trigger":{
 + "name":"trigger",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Initial operation to execute upon receiving an Onset event message for the Control Loop.",
 + "required":true
 + },
 + "timeout":{
 + "name":"timeout",
 + "type":"integer",
 + "type_version":"0.0.0",
 + "description":"Overall timeout for executing all the operations. This timeout should equal or exceed the total\ntimeout for each operation listed.\n",
 + "required":true
 + },
 + "id":{
 + "name":"id",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The unique control loop id.",
 + "required":true
 + }
 + },
 + "name":"onap.policies.controlloop.operational.Common",
 + "version":"1.0.0",
 + "derived_from":"tosca.policies.Root",
 + "metadata":{
 + 
 + },
 + "description":"Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\nPolicy Types. This does NOT support the legacy Policy YAML policy type.\n"
 + },
 + "onap.policies.controlloop.operational.common.Apex":{
 + "properties":{
 + "engineServiceParameters":{
 + "name":"engineServiceParameters",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The engine parameters like name, instanceCount, policy implementation, parameters etc.",
 + "required":true
 + },
 + "eventOutputParameters":{
 + "name":"eventOutputParameters",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The event output parameters.",
 + "required":true
 + },
 + "javaProperties":{
 + "name":"javaProperties",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"Name/value pairs of properties to be set for APEX if needed.",
 + "required":false
 + },
 + "eventInputParameters":{
 + "name":"eventInputParameters",
 + "type":"string",
 + "type_version":"0.0.0",
 + "description":"The event input parameters.",
 + "required":true
 + }
 + },
 + "name":"onap.policies.controlloop.operational.common.Apex",
 + "version":"1.0.0",
 + "derived_from":"onap.policies.controlloop.operational.Common",
 + "metadata":{
 + 
 + },
 + "description":"Operational policies for Apex PDP"
 + },
 + "onap.policies.monitoring.dcae-pm-subscription-handler":{
 + "properties":{
 + "pmsh_policy":{
 + "name":"pmsh_policy",
 + "type":"onap.datatypes.monitoring.subscription",
 + "type_version":"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":{
 + 
 + }
 + }
 + },
 + "topology_template":{
 + 
 + },
 + "name":"NULL",
 + "version":"0.0.0"
 + },
 + "propertiesMap": {
 + "provider_instance": {
 + "name": "provider_instance",
 + "version": "1.2.3",
 + "type": "org.onap.datatypes.policy.clamp.controlloop.policControlLoopElement.Chart",
 + "typeVersion": "1.0.0",
 + "description": "The helm chart for the microservice",
 + "required": true
 + }
 + },
 + "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop"
 + },
 + "709c62b3-8918-41b9-a747-d21eb79c6c22": {
 + "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
 + "definition": {
 + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
 + "version": "1.2.3"
 + },
 + "participantType":{
 + "name":"org.onap.policy.controlloop.PolicyControlLoopParticipant",
 + "version":"2.3.1"
 + },
 + "participantId":{
 + "name":"org.onap.PM_Policy",
 + "version":"1.0.0"
 + },
 + "state":"UNINITIALISED",
 + "orderedState":"UNINITIALISED",
 + "propertiesMap": {
 + "provider_instance": {
 + "name": "provider_instance",
 + "version": "1.2.3",
 + "type": "org.onap.datatypes.policy.clamp.controlloop.policControlLoopElement.Chart",
 + "typeVersion": "1.0.0",
 + "description": "The helm chart for the microservice",
 + "required": true
 + }
 + },
 + "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop"
 + }
 + }
 + }
 + ]
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">POST</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ControlLoop Test Flow" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">continue</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <intProp name="LoopController.loops">-1</intProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <boolProp name="ThreadGroup.scheduler">true</boolProp> + <stringProp name="ThreadGroup.duration">259200</stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp> + </ThreadGroup> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="TestPlan.comments">Basic Health Check</stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Change State to PASSIVE" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "orderedState": "PASSIVE",
 + "controlLoopIdentifierList": [
 + {
 + "name": "PMSHInstance0",
 + "version": "1.0.1"
 + }
 + ]
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation/command</stringProp> + <stringProp name="HTTPSampler.method">PUT</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> + <stringProp name="ConstantTimer.delay">6000</stringProp> + </ConstantTimer> + <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49588">202</stringProp> + <stringProp name="51508">400</stringProp> + <stringProp name="51514">406</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">true</boolProp> + <intProp name="Assertion.test_type">34</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="TestPlan.comments">Basic Health Check</stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Change State to UNINITIALISED" enabled="true"> + <boolProp name="HTTPSampler.postBodyRaw">true</boolProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"> + <elementProp name="" elementType="HTTPArgument"> + <boolProp name="HTTPArgument.always_encode">false</boolProp> + <stringProp name="Argument.value">{
 + "orderedState": "UNINITIALISED",
 + "controlLoopIdentifierList": [
 + {
 + "name": "PMSHInstance0",
 + "version": "1.0.1"
 + }
 + ]
 +}</stringProp> + <stringProp name="Argument.metadata">=</stringProp> + </elementProp> + </collectionProp> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation/command</stringProp> + <stringProp name="HTTPSampler.method">PUT</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="51508">400</stringProp> + <stringProp name="51514">406</stringProp> + <stringProp name="49588">202</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">true</boolProp> + <intProp name="Assertion.test_type">34</intProp> + </ResponseAssertion> + <hashTree/> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> + <stringProp name="ConstantTimer.delay">6000</stringProp> + </ConstantTimer> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation</stringProp> + <stringProp name="HTTPSampler.method">GET</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + <stringProp name="TestPlan.comments">Basic Health Check</stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + </hashTree> + <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true"> + <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <boolProp name="LoopController.continue_forever">false</boolProp> + <stringProp name="LoopController.loops">1</stringProp> + </elementProp> + <stringProp name="ThreadGroup.num_threads">1</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp> + </PostThreadGroup> + <hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete instantiated controlloop" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/instantiation?name=PMSHInstance0&version=1.0.1</stringProp> + <stringProp name="HTTPSampler.method">DELETE</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="Constant Timer" enabled="true"> + <stringProp name="ConstantTimer.delay">6000</stringProp> + </ConstantTimer> + <hashTree/> + </hashTree> + <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete ControlLoop Definition" enabled="true"> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="HTTPSampler.domain">${RUNTIME_HOST}</stringProp> + <stringProp name="HTTPSampler.port">${RUNTIME_PORT}</stringProp> + <stringProp name="HTTPSampler.protocol">https</stringProp> + <stringProp name="HTTPSampler.contentEncoding"></stringProp> + <stringProp name="HTTPSampler.path">/onap/controlloop/v2/commission?name=NULL&version=0.0.0</stringProp> + <stringProp name="HTTPSampler.method">DELETE</stringProp> + <boolProp name="HTTPSampler.follow_redirects">true</boolProp> + <boolProp name="HTTPSampler.auto_redirects">false</boolProp> + <boolProp name="HTTPSampler.use_keepalive">true</boolProp> + <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp> + <stringProp name="HTTPSampler.embedded_url_re"></stringProp> + <stringProp name="HTTPSampler.connect_timeout"></stringProp> + <stringProp name="HTTPSampler.response_timeout"></stringProp> + </HTTPSamplerProxy> + <hashTree> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.custom_message"></stringProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <boolProp name="Assertion.assume_success">false</boolProp> + <intProp name="Assertion.test_type">1</intProp> + </ResponseAssertion> + <hashTree/> + </hashTree> + </hashTree> + <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + <sentBytes>true</sentBytes> + <url>true</url> + <threadCounts>true</threadCounts> + <idleTime>true</idleTime> + <connectTime>true</connectTime> + </value> + </objProp> + <stringProp name="filename">./controlloop_stability/testsummary.jtl</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + <sentBytes>true</sentBytes> + <url>true</url> + <threadCounts>true</threadCounts> + <idleTime>true</idleTime> + <connectTime>true</connectTime> + </value> + </objProp> + <stringProp name="filename">./controlloop_stability/resultTree.log</stringProp> + </ResultCollector> + <hashTree/> + <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true"> + <boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp> + <name>saveConfig</name> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>false</xml> + <fieldNames>true</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + <bytes>true</bytes> + <sentBytes>true</sentBytes> + <url>true</url> + <threadCounts>true</threadCounts> + <idleTime>true</idleTime> + <connectTime>true</connectTime> + </value> + </objProp> + <stringProp name="filename">./controlloop_stability/resultTable.log</stringProp> + </ResultCollector> + <hashTree/> + </hashTree> + </hashTree> +</jmeterTestPlan> diff --git a/version.properties b/version.properties index 077f8aeb0..cc93736c2 100644 --- a/version.properties +++ b/version.properties @@ -26,8 +26,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=6 -minor=1 -patch=3 +minor=2 +patch=0 base_version=${major}.${minor}.${patch} |
