<?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>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Policy Clamp AutomationComposition Performance" enabled="true">
+ <stringProp name="TestPlan.comments">Policy Clamp AutomationComposition 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>
<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.value">${HOME_PATH}/acm_perf/</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="DURATION" elementType="Argument">
<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.url">https://${RUNTIME_HOST}:${RUNTIME_PORT}/onap/policy/clamp/acm/v2</stringProp>
<stringProp name="Authorization.username">runtimeUser</stringProp>
<stringProp name="Authorization.password">zb!XztG34</stringProp>
<stringProp name="Authorization.domain"></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">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Comission Automation Composition 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",
+ "tosca_definitions_version": "tosca_simple_yaml_1_3",
"data_types": {
"onap.datatypes.ToscaConceptIdentifier": {
"derived_from": "tosca.datatypes.Root",
}
}
},
- "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo": {
- "name": "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo",
- "version": "0.0.0",
+ "onap.datatype.acm.Target": {
"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",
+ "description": "Definition for a entity in A&AI to perform an Automation Composition operation on",
"properties": {
"targetType": {
"type": "string",
}
}
},
- "onap.datatype.controlloop.Actor": {
+ "onap.datatype.acm.Actor": {
"derived_from": "tosca.datatypes.Root",
"description": "An actor/operation/target definition",
"properties": {
"required": true
},
"target": {
- "type": "onap.datatype.controlloop.Target",
+ "type": "onap.datatype.acm.Target",
"description": "The resource the operation should be performed on.",
"required": true
},
}
}
},
- "onap.datatype.controlloop.Operation": {
+ "onap.datatype.acm.Operation": {
"derived_from": "tosca.datatypes.Root",
"description": "An operation supported by an actor",
"properties": {
"required": false
},
"operation": {
- "type": "onap.datatype.controlloop.Actor",
+ "type": "onap.datatype.acm.Actor",
"description": "The definition of the operation to be performed.",
"required": true
},
"version": "0.0.0",
"derived_from": "tosca.datatypes.Root",
"metadata": {}
+ },
+ "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest": {
+ "version": "1.0.0",
+ "derived_from": "tosca.datatypes.Root",
+ "properties": {
+ "restRequestId": {
+ "type": "onap.datatypes.ToscaConceptIdentifier",
+ "typeVersion": "1.0.0",
+ "required": true,
+ "description": "The name and version of a REST request to be sent to a REST endpoint"
+ },
+ "httpMethod": {
+ "type": "string",
+ "required": true,
+ "constraints": [
+ {
+ "valid_values": [
+ "POST",
+ "PUT",
+ "GET",
+ "DELETE"
+ ]
+ }
+ ],
+ "description": "The REST method to use"
+ },
+ "path": {
+ "type": "string",
+ "required": true,
+ "description": "The path of the REST request relative to the base URL"
+ },
+ "body": {
+ "type": "string",
+ "required": false,
+ "description": "The body of the REST request for PUT and POST requests"
+ },
+ "expectedResponse": {
+ "type": "integer",
+ "required": true,
+ "constraints": [],
+ "description": "THe expected HTTP status code for the REST request"
+ }
+ },
+ "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity": {
+ "version": "1.0.0",
+ "derived_from": "tosca.datatypes.Root",
+ "properties": {
+ "configurationEntityId": {
+ "type": "onap.datatypes.ToscaConceptIdentifier",
+ "typeVersion": "1.0.0",
+ "required": true,
+ "description": "The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element"
+ },
+ "restSequence": {
+ "type": "list",
+ "entry_schema": {
+ "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest",
+ "typeVersion": "1.0.0"
+ },
+ "description": "A sequence of REST commands to send to the REST endpoint"
+ }
+ }
+ }
}
},
"policy_types": {
"version": "1.0.0",
"name": "onap.policies.Monitoring"
},
- "onap.policies.test123": {
+ "onap.policies.Sirisha": {
"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"
+ "name": "onap.policies.Sirisha"
},
"onap.policies.monitoring.dcae-pm-subscription-handler": {
"properties": {
"derived_from": "onap.policies.Monitoring",
"metadata": {}
},
- "onap.policies.controlloop.operational.Common": {
+ "onap.policies.acm.operational.Common": {
"derived_from": "tosca.policies.Root",
"version": "1.0.0",
- "name": "onap.policies.controlloop.operational.Common",
- "description": "Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\nPolicy Types. This does NOT support the legacy Policy YAML policy type.\n",
+ "name": "onap.policies.acm.operational.Common",
+ "description": "Operational Policy for Automation Composition 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.",
+ "description": "The unique Automation Composition id.",
"required": true
},
"timeout": {
},
"abatement": {
"type": "boolean",
- "description": "Whether an abatement event message will be expected for the control loop from DCAE.",
+ "description": "Whether an abatement event message will be expected for the Automation Composition from DCAE.",
"required": true,
"default": false
},
"trigger": {
"type": "string",
- "description": "Initial operation to execute upon receiving an Onset event message for the Control Loop.",
+ "description": "Initial operation to execute upon receiving an Onset event message for the Automation Composition.",
"required": true
},
"operations": {
"type": "list",
- "description": "List of operations to be performed when Control Loop is triggered.",
+ "description": "List of operations to be performed when Automation Composition is triggered.",
"required": true,
"entry_schema": {
- "type": "onap.datatype.controlloop.Operation"
+ "type": "onap.datatype.acm.Operation"
}
}
}
},
- "onap.policies.controlloop.operational.common.Apex": {
- "derived_from": "onap.policies.controlloop.operational.Common",
+ "onap.policies.acm.operational.common.Apex": {
+ "derived_from": "onap.policies.acm.operational.Common",
"type_version": "1.0.0",
"version": "1.0.0",
- "name": "onap.policies.controlloop.operational.common.Apex",
+ "name": "onap.policies.acm.operational.common.Apex",
"description": "Operational policies for Apex PDP",
"properties": {
"engineServiceParameters": {
}
},
"node_types": {
- "org.onap.policy.clamp.controlloop.Participant": {
+ "org.onap.policy.clamp.acm.Participant": {
"version": "1.0.1",
"derived_from": "tosca.nodetypes.Root",
"properties": {
}
}
},
- "org.onap.policy.clamp.controlloop.ControlLoopElement": {
+ "org.onap.policy.clamp.acm.AutomationCompositionElement": {
"version": "1.0.1",
"derived_from": "tosca.nodetypes.Root",
"properties": {
"metadata": {
"common": true
},
- "description": "Specifies the organization that provides the control loop element"
+ "description": "Specifies the organization that provides the automation composition element"
+ },
+ "participant_id": {
+ "type": "onap.datatypes.ToscaConceptIdentifier",
+ "requred": true,
+ "metadata": {
+ "common": true
+ }
},
"participantType": {
"type": "onap.datatypes.ToscaConceptIdentifier",
"metadata": {
"common": true
},
- "description": "The identity of the participant type that hosts this type of Control Loop Element"
+ "description": "The identity of the participant type that hosts this type of Automation Composition Element"
},
"startPhase": {
"type": "integer",
"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"
+ "description": "A value indicating the start phase in which this automation composition element will be started, the first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped in reverse start phase order. Automation Composition Elements with the same start phase are started and stopped simultaneously"
},
"uninitializedToPassiveTimeout": {
"type": "integer",
}
}
},
- "org.onap.policy.clamp.controlloop.ControlLoop": {
+ "org.onap.policy.clamp.acm.AutomationComposition": {
"version": "1.0.1",
"derived_from": "tosca.nodetypes.Root",
"properties": {
"metadata": {
"common": true
},
- "description": "Specifies the organization that provides the control loop element"
+ "description": "Specifies the organization that provides the automation composition element"
},
"elements": {
"type": "list",
"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"
- }
+ "description": "Specifies a list of automation composition element definitions that make up this automation composition definition"
}
}
},
- "org.onap.policy.clamp.controlloop.PolicyControlLoopElement": {
+ "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
"policy_type_id": {
"type": "onap.datatypes.ToscaConceptIdentifier",
}
}
},
- "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement": {
+ "org.onap.policy.clamp.acm.CDSAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
- "policy_type_id": {
+ "cds_blueprint_id": {
"type": "onap.datatypes.ToscaConceptIdentifier",
"requred": true
- },
- "policy_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
- "requred": false
}
}
},
- "org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement": {
+ "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
- "policy_type_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
- "requred": true
+ "chart": {
+ "type": "string",
+ "required": true
},
- "policy_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
+ "configs": {
+ "type": "list",
+ "required": false
+ },
+ "requirements": {
+ "type": "string",
"requred": false
+ },
+ "templates": {
+ "type": "list",
+ "required": false,
+ "entry_schema": null
+ },
+ "values": {
+ "type": "string",
+ "requred": true
}
}
},
- "org.onap.policy.clamp.controlloop.CDSControlLoopElement": {
+ "org.onap.policy.clamp.acm.HttpAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
- "cds_blueprint_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
- "requred": true
+ "baseUrl": {
+ "type": "string",
+ "required": true,
+ "description": "The base URL to be prepended to each path, identifies the host for the REST endpoints."
+ },
+ "httpHeaders": {
+ "type": "map",
+ "required": false,
+ "entry_schema": {
+ "type": "string"
+ },
+ "description": "HTTP headers to send on REST requests"
+ },
+ "configurationEntities": {
+ "type": "map",
+ "required": true,
+ "entry_schema": {
+ "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity",
+ "typeVersion": "1.0.0"
+ },
+ "description": "The connfiguration entities the Automation Composition Element is managing and their associated REST requests"
}
}
}
}
},
"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": {
+ "org.onap.policy.clamp.acm.PolicyParticipant": {
"version": "2.3.1",
- "type": "org.onap.policy.clamp.controlloop.Participant",
+ "type": "org.onap.policy.clamp.acm.Participant",
"type_version": "1.0.1",
"description": "Participant for DCAE microservices",
"properties": {
"provider": "ONAP"
}
},
- "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement": {
+ "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement": {
"version": "1.2.3",
- "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
+ "type": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
"type_version": "1.0.0",
- "description": "Control loop element for the monitoring policy for Performance Management Subscription Handling",
+ "description": "Automation composition element for the monitoring policy for Performance Management Subscription Handling",
"properties": {
"provider": "Ericsson",
+ "participant_id": {
+ "name": "org.onap.PM_Policy",
+ "version": "1.0.0"
+ },
"participantType": {
- "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
"version": "2.3.1"
},
"policy_type_id": {
}
}
},
- "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement": {
+ "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement": {
"version": "1.2.3",
- "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
+ "type": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
"type_version": "1.0.0",
- "description": "Control loop element for the operational policy for Performance Management Subscription Handling",
+ "description": "Automation composition element for the operational policy for Performance Management Subscription Handling",
"properties": {
"provider": "Ericsson",
+ "participant_id": {
+ "name": "org.onap.PM_Policy",
+ "version": "1.0.0"
+ },
"participantType": {
- "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
"version": "2.3.1"
},
"policy_type_id": {
}
}
},
- "org.onap.domain.pmsh.PMSHControlLoopDefinition": {
+ "org.onap.policy.clamp.acm.KubernetesParticipant": {
+ "version": "2.3.4",
+ "type": "org.onap.policy.clamp.acm.Participant",
+ "type_version": "1.0.1",
+ "description": "Participant for K8S",
+ "properties": {
+ "provider": "ONAP"
+ }
+ },
+ "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement": {
"version": "1.2.3",
- "type": "org.onap.policy.clamp.controlloop.ControlLoop",
+ "type": "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement",
"type_version": "1.0.0",
- "description": "Control loop for Performance Management Subscription Handling",
+ "description": "Automation composition element for the K8S microservice for PMSH",
"properties": {
- "provider": "Ericsson",
+ "provider": "ONAP",
+ "participant_id": {
+ "name": "K8sParticipant0",
+ "version": "1.0.0"
+ },
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.KubernetesParticipant",
+ "version": "2.3.4"
+ },
+ "chart": {
+ "chartId": {
+ "name": "dcae-pmsh",
+ "version": "10.0.0"
+ },
+ "namespace": "onap",
+ "releaseName": "onap-dcae-pmsh",
+ "repository": {
+ "repoName": "chartmuseum",
+ "address": "http://chart-museum:80",
+ "userName": "onapinitializer",
+ "password": "demo123456!"
+ },
+ "overrideParams": {
+ "global.masterPassword": "test"
+ }
+ }
+ }
+ },
+ "org.onap.policy.clamp.acm.HttpParticipant": {
+ "version": "2.3.4",
+ "type": "org.onap.policy.clamp.acm.Participant",
+ "type_version": "1.0.1",
+ "description": "Participant for Http requests",
+ "properties": {
+ "provider": "ONAP"
+ }
+ },
+ "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement": {
+ "version": "1.2.3",
+ "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+ "type_version": "1.0.1",
+ "description": "Automation composition element for the http requests of PMSH microservice",
+ "properties": {
+ "provider": "ONAP",
+ "participant_id": {
+ "name": "HttpParticipant0",
+ "version": "1.0.0"
+ },
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.HttpParticipant",
+ "version": "2.3.4"
+ },
+ "uninitializedToPassiveTimeout": 180,
+ "startPhase": 1,
+ "baseUrl": "https://dcae-pmsh:8443",
+ "httpHeaders": {
+ "Content-Type": "application/json"
+ },
+ "configurationEntities": [
+ {
+ "configurationEntityId": {
+ "name": "entity1",
+ "version": "1.0.1"
+ },
+ "restSequence": [
+ {
+ "restRequestId": {
+ "name": "request1",
+ "version": "1.0.1"
+ },
+ "httpMethod": "POST",
+ "path": "subscription",
+ "body": "{ \"subscription\":{ \"subscriptionName\":\"new_sub_01\", \"operationalPolicyName\":\"pmsh-operational-policy\", \"automationCompositionName\":\"automationComposition-name\", \"nfFilter\":{ \"nfNames\":[ \"^pnf*\" ], \"modelInvariantIDs\":[ \"7129e420-d396-4efb-af02-6b83499b12f5\" ], \"modelVersionIDs\":[ \"e80a6ae3-cafd-4d24-850d-e14c084a5ca7\" ], \"modelNames\":[ \"pnf_134\" ] }, \"measurementGroups\":[ { \"measurementGroup\":{ \"measurementGroupName\":\"msgroup_01\", \"administrativeState\":\"UNLOCKED\", \"fileBasedGP\":15, \"fileLocation\":\"/pm/pm.xml\", \"measurementTypes\":[ { \"measurementType\":\"EutranCell.*\" }, { \"measurementType\":\"EutranCellRelation.pmCounter1\" }, { \"measurementType\":\"EutranCellRelation.pmCounter2\" } ], \"managedObjectDNsBasic\":[ { \"DN\":\"ManagedElement=1,ENodeBFunction=1,EUtranCell=CityCenter1\" }, { \"DN\":\"ManagedElement=1,ENodeBFunction=1,EUtranCell=CityCenter1, EUtranCellRelation=CityCenter2\" }, { \"DN\":\"ManagedElement=1,ENodeBFunction=1,EUtranCell=CityCenter1, EUtranCellRelation=CityCenter3\" } ] } } ] } }",
+ "expectedResponse": 201
+ }
+ ]
+ }
+ ]
+ }
+ },
+ "org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition": {
+ "version": "1.2.3",
+ "type": "org.onap.policy.clamp.acm.AutomationComposition",
+ "type_version": "1.0.0",
+ "description": "Automation composition for Hello World",
+ "properties": {
+ "provider": "ONAP",
"elements": [
{
- "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
+ "name": "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement",
+ "version": "1.2.3"
+ },
+ {
+ "name": "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement",
"version": "1.2.3"
},
{
- "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
"version": "1.2.3"
},
{
- "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
"version": "1.2.3"
}
]
<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.path">/onap/policy/clamp/acm/v2/commission</stringProp>
<stringProp name="HTTPSampler.method">POST</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
</ResponseAssertion>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Instantiate control loop" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Instantiate automation composition" 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": [
+ "automationCompositionList": [
{
"name": "PMSHInstance0",
"version": "1.0.1",
"definition": {
- "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+ "name": "org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition",
"version": "1.2.3"
},
"state": "UNINITIALISED",
"orderedState": "UNINITIALISED",
- "description": "PMSH control loop instance 0",
+ "description": "PMSH automation composition instance 0",
"elements": {
"709c62b3-8918-41b9-a747-d21eb79c6c21": {
"id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
"definition": {
- "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
"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"
},
- "participantId":{
- "name":"org.onap.PM_Policy",
- "version":"1.0.0"
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
+ "version": "2.3.1"
},
- "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"
+ "state": "UNINITIALISED",
+ "orderedState": "UNINITIALISED",
+ "description": "Monitoring Policy Automation Composition Element for the PMSH instance 0 automation composition"
},
"709c62b3-8918-41b9-a747-d21eb79c6c22": {
"id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
"definition": {
- "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
"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"
},
- "participantId":{
- "name":"org.onap.PM_Policy",
- "version":"1.0.0"
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
+ "version": "2.3.1"
},
- "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"
+ "state": "UNINITIALISED",
+ "orderedState": "UNINITIALISED",
+ "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
}
}
}
]
-}</stringProp>
+}
+
+</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
<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.path">/onap/policy/clamp/acm/v2/instantiation</stringProp>
<stringProp name="HTTPSampler.method">POST</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
<hashTree/>
</hashTree>
</hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ControlLoop Test Flow" enabled="true">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="AutomationComposition 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>
<boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
</ThreadGroup>
<hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check acm 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.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.path">/onap/policy/clamp/acm/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="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value">{
"orderedState": "PASSIVE",
- "controlLoopIdentifierList": [
+ "automationCompositionIdentifierList": [
{
"name": "PMSHInstance0",
"version": "1.0.1"
}
]
-}</stringProp>
+}
+</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
<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.path">/onap/policy/clamp/acm/v2/instantiation/command</stringProp>
<stringProp name="HTTPSampler.method">PUT</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
</ResponseAssertion>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check acm 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.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.path">/onap/policy/clamp/acm/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="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value">{
"orderedState": "UNINITIALISED",
- "controlLoopIdentifierList": [
+ "automationCompositionIdentifierList": [
{
"name": "PMSHInstance0",
"version": "1.0.1"
}
]
-}</stringProp>
+}
+</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
<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.path">/onap/policy/clamp/acm/v2/instantiation/command</stringProp>
<stringProp name="HTTPSampler.method">PUT</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
</ConstantTimer>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check acm 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.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.path">/onap/policy/clamp/acm/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="ThreadGroup.same_user_on_next_iteration">true</boolProp>
</PostThreadGroup>
<hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete instantiated controlloop" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete instantiated acm" 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.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.path">/onap/policy/clamp/acm/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>
</ConstantTimer>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete ControlLoop Definition" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete AutomationComposition 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.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.path">/onap/policy/clamp/acm/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>
<?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>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Policy Clamp ACM Stability" enabled="true">
+ <stringProp name="TestPlan.comments">Policy Clamp ACM 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>
<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.url">https://${RUNTIME_HOST}:${RUNTIME_PORT}/onap/policy/clamp/acm/v2</stringProp>
<stringProp name="Authorization.username">runtimeUser</stringProp>
<stringProp name="Authorization.password">zb!XztG34</stringProp>
<stringProp name="Authorization.domain"></stringProp>
<boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
</SetupThreadGroup>
<hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Commission Contorlloop definition" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Commission AutomationComposition 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",
+ "tosca_definitions_version": "tosca_simple_yaml_1_3",
"data_types": {
"onap.datatypes.ToscaConceptIdentifier": {
"derived_from": "tosca.datatypes.Root",
}
}
},
- "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo": {
- "name": "org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo",
- "version": "0.0.0",
+ "onap.datatype.acm.Target": {
"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",
+ "description": "Definition for a entity in A&AI to perform an Automation Composition operation on",
"properties": {
"targetType": {
"type": "string",
}
}
},
- "onap.datatype.controlloop.Actor": {
+ "onap.datatype.acm.Actor": {
"derived_from": "tosca.datatypes.Root",
"description": "An actor/operation/target definition",
"properties": {
"required": true
},
"target": {
- "type": "onap.datatype.controlloop.Target",
+ "type": "onap.datatype.acm.Target",
"description": "The resource the operation should be performed on.",
"required": true
},
}
}
},
- "onap.datatype.controlloop.Operation": {
+ "onap.datatype.acm.Operation": {
"derived_from": "tosca.datatypes.Root",
"description": "An operation supported by an actor",
"properties": {
"required": false
},
"operation": {
- "type": "onap.datatype.controlloop.Actor",
+ "type": "onap.datatype.acm.Actor",
"description": "The definition of the operation to be performed.",
"required": true
},
"version": "0.0.0",
"derived_from": "tosca.datatypes.Root",
"metadata": {}
+ },
+ "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest": {
+ "version": "1.0.0",
+ "derived_from": "tosca.datatypes.Root",
+ "properties": {
+ "restRequestId": {
+ "type": "onap.datatypes.ToscaConceptIdentifier",
+ "typeVersion": "1.0.0",
+ "required": true,
+ "description": "The name and version of a REST request to be sent to a REST endpoint"
+ },
+ "httpMethod": {
+ "type": "string",
+ "required": true,
+ "constraints": [
+ {
+ "valid_values": [
+ "POST",
+ "PUT",
+ "GET",
+ "DELETE"
+ ]
+ }
+ ],
+ "description": "The REST method to use"
+ },
+ "path": {
+ "type": "string",
+ "required": true,
+ "description": "The path of the REST request relative to the base URL"
+ },
+ "body": {
+ "type": "string",
+ "required": false,
+ "description": "The body of the REST request for PUT and POST requests"
+ },
+ "expectedResponse": {
+ "type": "integer",
+ "required": true,
+ "constraints": [],
+ "description": "THe expected HTTP status code for the REST request"
+ }
+ },
+ "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity": {
+ "version": "1.0.0",
+ "derived_from": "tosca.datatypes.Root",
+ "properties": {
+ "configurationEntityId": {
+ "type": "onap.datatypes.ToscaConceptIdentifier",
+ "typeVersion": "1.0.0",
+ "required": true,
+ "description": "The name and version of a Configuration Entity to be handled by the HTTP Automation Composition Element"
+ },
+ "restSequence": {
+ "type": "list",
+ "entry_schema": {
+ "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest",
+ "typeVersion": "1.0.0"
+ },
+ "description": "A sequence of REST commands to send to the REST endpoint"
+ }
+ }
+ }
}
},
"policy_types": {
"version": "1.0.0",
"name": "onap.policies.Monitoring"
},
- "onap.policies.test123": {
+ "onap.policies.Sirisha": {
"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"
+ "name": "onap.policies.Sirisha"
},
"onap.policies.monitoring.dcae-pm-subscription-handler": {
"properties": {
"derived_from": "onap.policies.Monitoring",
"metadata": {}
},
- "onap.policies.controlloop.operational.Common": {
+ "onap.policies.acm.operational.Common": {
"derived_from": "tosca.policies.Root",
"version": "1.0.0",
- "name": "onap.policies.controlloop.operational.Common",
- "description": "Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\nPolicy Types. This does NOT support the legacy Policy YAML policy type.\n",
+ "name": "onap.policies.acm.operational.Common",
+ "description": "Operational Policy for Automation Composition 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.",
+ "description": "The unique Automation Composition id.",
"required": true
},
"timeout": {
},
"abatement": {
"type": "boolean",
- "description": "Whether an abatement event message will be expected for the control loop from DCAE.",
+ "description": "Whether an abatement event message will be expected for the Automation Composition from DCAE.",
"required": true,
"default": false
},
"trigger": {
"type": "string",
- "description": "Initial operation to execute upon receiving an Onset event message for the Control Loop.",
+ "description": "Initial operation to execute upon receiving an Onset event message for the Automation Composition.",
"required": true
},
"operations": {
"type": "list",
- "description": "List of operations to be performed when Control Loop is triggered.",
+ "description": "List of operations to be performed when Automation Composition is triggered.",
"required": true,
"entry_schema": {
- "type": "onap.datatype.controlloop.Operation"
+ "type": "onap.datatype.acm.Operation"
}
}
}
},
- "onap.policies.controlloop.operational.common.Apex": {
- "derived_from": "onap.policies.controlloop.operational.Common",
+ "onap.policies.acm.operational.common.Apex": {
+ "derived_from": "onap.policies.acm.operational.Common",
"type_version": "1.0.0",
"version": "1.0.0",
- "name": "onap.policies.controlloop.operational.common.Apex",
+ "name": "onap.policies.acm.operational.common.Apex",
"description": "Operational policies for Apex PDP",
"properties": {
"engineServiceParameters": {
}
},
"node_types": {
- "org.onap.policy.clamp.controlloop.Participant": {
+ "org.onap.policy.clamp.acm.Participant": {
"version": "1.0.1",
"derived_from": "tosca.nodetypes.Root",
"properties": {
}
}
},
- "org.onap.policy.clamp.controlloop.ControlLoopElement": {
+ "org.onap.policy.clamp.acm.AutomationCompositionElement": {
"version": "1.0.1",
"derived_from": "tosca.nodetypes.Root",
"properties": {
"metadata": {
"common": true
},
- "description": "Specifies the organization that provides the control loop element"
+ "description": "Specifies the organization that provides the automation composition element"
+ },
+ "participant_id": {
+ "type": "onap.datatypes.ToscaConceptIdentifier",
+ "requred": true,
+ "metadata": {
+ "common": true
+ }
},
"participantType": {
"type": "onap.datatypes.ToscaConceptIdentifier",
"metadata": {
"common": true
},
- "description": "The identity of the participant type that hosts this type of Control Loop Element"
+ "description": "The identity of the participant type that hosts this type of Automation Composition Element"
},
"startPhase": {
"type": "integer",
"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"
+ "description": "A value indicating the start phase in which this automation composition element will be started, the first start phase is zero. Automation Composition Elements are started in their start_phase order and stopped in reverse start phase order. Automation Composition Elements with the same start phase are started and stopped simultaneously"
},
"uninitializedToPassiveTimeout": {
"type": "integer",
}
}
},
- "org.onap.policy.clamp.controlloop.ControlLoop": {
+ "org.onap.policy.clamp.acm.AutomationComposition": {
"version": "1.0.1",
"derived_from": "tosca.nodetypes.Root",
"properties": {
"metadata": {
"common": true
},
- "description": "Specifies the organization that provides the control loop element"
+ "description": "Specifies the organization that provides the automation composition element"
},
"elements": {
"type": "list",
"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"
- }
+ "description": "Specifies a list of automation composition element definitions that make up this automation composition definition"
}
}
},
- "org.onap.policy.clamp.controlloop.PolicyControlLoopElement": {
+ "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
"policy_type_id": {
"type": "onap.datatypes.ToscaConceptIdentifier",
}
}
},
- "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement": {
+ "org.onap.policy.clamp.acm.CDSAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
- "policy_type_id": {
+ "cds_blueprint_id": {
"type": "onap.datatypes.ToscaConceptIdentifier",
"requred": true
- },
- "policy_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
- "requred": false
}
}
},
- "org.onap.policy.clamp.controlloop.DerivedDerivedPolicyControlLoopElement": {
+ "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.DerivedPolicyControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
- "policy_type_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
- "requred": true
+ "chart": {
+ "type": "string",
+ "required": true
},
- "policy_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
+ "configs": {
+ "type": "list",
+ "required": false
+ },
+ "requirements": {
+ "type": "string",
"requred": false
+ },
+ "templates": {
+ "type": "list",
+ "required": false,
+ "entry_schema": null
+ },
+ "values": {
+ "type": "string",
+ "requred": true
}
}
},
- "org.onap.policy.clamp.controlloop.CDSControlLoopElement": {
+ "org.onap.policy.clamp.acm.HttpAutomationCompositionElement": {
"version": "1.0.1",
- "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement",
+ "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement",
"properties": {
- "cds_blueprint_id": {
- "type": "onap.datatypes.ToscaConceptIdentifier",
- "requred": true
+ "baseUrl": {
+ "type": "string",
+ "required": true,
+ "description": "The base URL to be prepended to each path, identifies the host for the REST endpoints."
+ },
+ "httpHeaders": {
+ "type": "map",
+ "required": false,
+ "entry_schema": {
+ "type": "string"
+ },
+ "description": "HTTP headers to send on REST requests"
+ },
+ "configurationEntities": {
+ "type": "map",
+ "required": true,
+ "entry_schema": {
+ "type": "org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity",
+ "typeVersion": "1.0.0"
+ },
+ "description": "The connfiguration entities the Automation Composition Element is managing and their associated REST requests"
}
}
}
}
},
"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": {
+ "org.onap.policy.clamp.acm.PolicyParticipant": {
"version": "2.3.1",
- "type": "org.onap.policy.clamp.controlloop.Participant",
+ "type": "org.onap.policy.clamp.acm.Participant",
"type_version": "1.0.1",
"description": "Participant for DCAE microservices",
"properties": {
"provider": "ONAP"
}
},
- "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement": {
+ "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement": {
"version": "1.2.3",
- "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
+ "type": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
"type_version": "1.0.0",
- "description": "Control loop element for the monitoring policy for Performance Management Subscription Handling",
+ "description": "Automation composition element for the monitoring policy for Performance Management Subscription Handling",
"properties": {
"provider": "Ericsson",
+ "participant_id": {
+ "name": "org.onap.PM_Policy",
+ "version": "1.0.0"
+ },
"participantType": {
- "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
"version": "2.3.1"
},
"policy_type_id": {
}
}
},
- "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement": {
+ "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement": {
"version": "1.2.3",
- "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement",
+ "type": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement",
"type_version": "1.0.0",
- "description": "Control loop element for the operational policy for Performance Management Subscription Handling",
+ "description": "Automation composition element for the operational policy for Performance Management Subscription Handling",
"properties": {
"provider": "Ericsson",
+ "participant_id": {
+ "name": "org.onap.PM_Policy",
+ "version": "1.0.0"
+ },
"participantType": {
- "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
"version": "2.3.1"
},
"policy_type_id": {
}
}
},
- "org.onap.domain.pmsh.PMSHControlLoopDefinition": {
+ "org.onap.policy.clamp.acm.KubernetesParticipant": {
+ "version": "2.3.4",
+ "type": "org.onap.policy.clamp.acm.Participant",
+ "type_version": "1.0.1",
+ "description": "Participant for K8S",
+ "properties": {
+ "provider": "ONAP"
+ }
+ },
+ "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement": {
"version": "1.2.3",
- "type": "org.onap.policy.clamp.controlloop.ControlLoop",
+ "type": "org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement",
"type_version": "1.0.0",
- "description": "Control loop for Performance Management Subscription Handling",
+ "description": "Automation composition element for the K8S microservice for PMSH",
"properties": {
- "provider": "Ericsson",
+ "provider": "ONAP",
+ "participant_id": {
+ "name": "K8sParticipant0",
+ "version": "1.0.0"
+ },
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.KubernetesParticipant",
+ "version": "2.3.4"
+ },
+ "chart": {
+ "chartId": {
+ "name": "dcae-pmsh",
+ "version": "10.0.0"
+ },
+ "namespace": "onap",
+ "releaseName": "onap-dcae-pmsh",
+ "repository": {
+ "repoName": "chartmuseum",
+ "address": "http://chart-museum:80",
+ "userName": "onapinitializer",
+ "password": "demo123456!"
+ },
+ "overrideParams": {
+ "global.masterPassword": "test"
+ }
+ }
+ }
+ },
+ "org.onap.policy.clamp.acm.HttpParticipant": {
+ "version": "2.3.4",
+ "type": "org.onap.policy.clamp.acm.Participant",
+ "type_version": "1.0.1",
+ "description": "Participant for Http requests",
+ "properties": {
+ "provider": "ONAP"
+ }
+ },
+ "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement": {
+ "version": "1.2.3",
+ "type": "org.onap.policy.clamp.acm.HttpAutomationCompositionElement",
+ "type_version": "1.0.1",
+ "description": "Automation composition element for the http requests of PMSH microservice",
+ "properties": {
+ "provider": "ONAP",
+ "participant_id": {
+ "name": "HttpParticipant0",
+ "version": "1.0.0"
+ },
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.HttpParticipant",
+ "version": "2.3.4"
+ },
+ "uninitializedToPassiveTimeout": 180,
+ "startPhase": 1,
+ "baseUrl": "https://dcae-pmsh:8443",
+ "httpHeaders": {
+ "Content-Type": "application/json"
+ },
+ "configurationEntities": [
+ {
+ "configurationEntityId": {
+ "name": "entity1",
+ "version": "1.0.1"
+ },
+ "restSequence": [
+ {
+ "restRequestId": {
+ "name": "request1",
+ "version": "1.0.1"
+ },
+ "httpMethod": "POST",
+ "path": "subscription",
+ "body": "{ \"subscription\":{ \"subscriptionName\":\"new_sub_01\", \"operationalPolicyName\":\"pmsh-operational-policy\", \"automationCompositionName\":\"automationComposition-name\", \"nfFilter\":{ \"nfNames\":[ \"^pnf*\" ], \"modelInvariantIDs\":[ \"7129e420-d396-4efb-af02-6b83499b12f5\" ], \"modelVersionIDs\":[ \"e80a6ae3-cafd-4d24-850d-e14c084a5ca7\" ], \"modelNames\":[ \"pnf_134\" ] }, \"measurementGroups\":[ { \"measurementGroup\":{ \"measurementGroupName\":\"msgroup_01\", \"administrativeState\":\"UNLOCKED\", \"fileBasedGP\":15, \"fileLocation\":\"/pm/pm.xml\", \"measurementTypes\":[ { \"measurementType\":\"EutranCell.*\" }, { \"measurementType\":\"EutranCellRelation.pmCounter1\" }, { \"measurementType\":\"EutranCellRelation.pmCounter2\" } ], \"managedObjectDNsBasic\":[ { \"DN\":\"ManagedElement=1,ENodeBFunction=1,EUtranCell=CityCenter1\" }, { \"DN\":\"ManagedElement=1,ENodeBFunction=1,EUtranCell=CityCenter1, EUtranCellRelation=CityCenter2\" }, { \"DN\":\"ManagedElement=1,ENodeBFunction=1,EUtranCell=CityCenter1, EUtranCellRelation=CityCenter3\" } ] } } ] } }",
+ "expectedResponse": 201
+ }
+ ]
+ }
+ ]
+ }
+ },
+ "org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition": {
+ "version": "1.2.3",
+ "type": "org.onap.policy.clamp.acm.AutomationComposition",
+ "type_version": "1.0.0",
+ "description": "Automation composition for Hello World",
+ "properties": {
+ "provider": "ONAP",
"elements": [
{
- "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice",
+ "name": "org.onap.domain.database.PMSH_K8SMicroserviceAutomationCompositionElement",
+ "version": "1.2.3"
+ },
+ {
+ "name": "org.onap.domain.database.Http_PMSHMicroserviceAutomationCompositionElement",
"version": "1.2.3"
},
{
- "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
"version": "1.2.3"
},
{
- "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
"version": "1.2.3"
}
]
<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.path">/onap/policy/clamp/acm/v2/commission</stringProp>
<stringProp name="HTTPSampler.method">POST</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
</ResponseAssertion>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Instantiate controlloop" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Instantiate acm" 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": [
+ "automationCompositionList": [
{
"name": "PMSHInstance0",
"version": "1.0.1",
"definition": {
- "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+ "name": "org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition",
"version": "1.2.3"
},
"state": "UNINITIALISED",
"orderedState": "UNINITIALISED",
- "description": "PMSH control loop instance 0",
+ "description": "PMSH automation composition instance 0",
"elements": {
"709c62b3-8918-41b9-a747-d21eb79c6c21": {
"id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
"definition": {
- "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
"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"
},
- "participantId":{
- "name":"org.onap.PM_Policy",
- "version":"1.0.0"
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
+ "version": "2.3.1"
},
- "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"
+ "state": "UNINITIALISED",
+ "orderedState": "UNINITIALISED",
+ "description": "Monitoring Policy Automation Composition Element for the PMSH instance 0 automation composition"
},
"709c62b3-8918-41b9-a747-d21eb79c6c22": {
"id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
"definition": {
- "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+ "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
"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"
},
- "participantId":{
- "name":"org.onap.PM_Policy",
- "version":"1.0.0"
+ "participantType": {
+ "name": "org.onap.policy.clamp.acm.PolicyParticipant",
+ "version": "2.3.1"
},
- "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"
+ "state": "UNINITIALISED",
+ "orderedState": "UNINITIALISED",
+ "description": "Operational Policy Automation Composition Element for the PMSH instance 0 automation composition"
}
}
}
]
-}</stringProp>
+}
+
+</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
<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.path">/onap/policy/clamp/acm/v2/instantiation</stringProp>
<stringProp name="HTTPSampler.method">POST</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
<hashTree/>
</hashTree>
</hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ControlLoop Test Flow" enabled="true">
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="AutomationComposition 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>
<boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
</ThreadGroup>
<hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check acm 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.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.path">/onap/policy/clamp/acm/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="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value">{
"orderedState": "PASSIVE",
- "controlLoopIdentifierList": [
+ "automationCompositionIdentifierList": [
{
"name": "PMSHInstance0",
"version": "1.0.1"
}
]
-}</stringProp>
+}
+</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
<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.path">/onap/policy/clamp/acm/v2/instantiation/command</stringProp>
<stringProp name="HTTPSampler.method">PUT</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
</ResponseAssertion>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check acm 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.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.path">/onap/policy/clamp/acm/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="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value">{
"orderedState": "UNINITIALISED",
- "controlLoopIdentifierList": [
+ "automationCompositionIdentifierList": [
{
"name": "PMSHInstance0",
"version": "1.0.1"
}
]
-}</stringProp>
+}
+</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
<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.path">/onap/policy/clamp/acm/v2/instantiation/command</stringProp>
<stringProp name="HTTPSampler.method">PUT</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
</ConstantTimer>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check controlloop state" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check acm 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.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.path">/onap/policy/clamp/acm/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="ThreadGroup.same_user_on_next_iteration">true</boolProp>
</PostThreadGroup>
<hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete instantiated controlloop" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete instantiated acm" 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.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.path">/onap/policy/clamp/acm/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>
</ConstantTimer>
<hashTree/>
</hashTree>
- <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete ControlLoop Definition" enabled="true">
+ <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete AutomationComposition 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.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.path">/onap/policy/clamp/acm/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>
<connectTime>true</connectTime>
</value>
</objProp>
- <stringProp name="filename">./controlloop_stability/testsummary.jtl</stringProp>
+ <stringProp name="filename">./acm_stability/testsummary.jtl</stringProp>
</ResultCollector>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
<connectTime>true</connectTime>
</value>
</objProp>
- <stringProp name="filename">./controlloop_stability/resultTree.log</stringProp>
+ <stringProp name="filename">./acm_stability/resultTree.log</stringProp>
</ResultCollector>
<hashTree/>
<ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">
<connectTime>true</connectTime>
</value>
</objProp>
- <stringProp name="filename">./controlloop_stability/resultTable.log</stringProp>
+ <stringProp name="filename">./acm_stability/resultTable.log</stringProp>
</ResultCollector>
<hashTree/>
</hashTree>
Code Review / policy / clamp.git / commitdiff