X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=smo-install%2Ftest%2Fpythonsdk%2Fsrc%2Foransdk%2Fpolicy%2Ftemplates%2Fcommission_apex.json.j2;h=f7546fad6f9d7d7f3ffbdd68fcee7e2d989b80cb;hb=645e0e6d5d5df3fbe91a14b4965f4de6cb84ca35;hp=57f4734c3050239bc8293b3a31cf0d5f99746817;hpb=397cc164dbbee967d227df897859e55ac807349f;p=it%2Fdep.git diff --git a/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 b/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 index 57f4734c..f7546fad 100644 --- a/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 +++ b/smo-install/test/pythonsdk/src/oransdk/policy/templates/commission_apex.json.j2 @@ -1833,64 +1833,68 @@ true;", "deploymentPort": 12345 } }, - "metadata": { - "policy-id": "operational.apex.linkmonitor", - "policy-version": "1.0.0" - }, "version": "1.0.0", "type_version": "1.0.0", "type": "onap.policies.controlloop.operational.common.Apex" } }], "node_templates": { - "org.onap.domain.linkmonitor.LinkMonitorControlLoopDefinition0": { + "org.onap.domain.sample.GenericK8s_AutomationCompositionDefinition": { "properties": { "elements": [ { "version": "1.2.3", - "name": "org.onap.domain.linkmonitor.LinkMonitorPolicyControlLoopElement" + "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement" }], "provider": "Ericsson" }, - "description": "Control loop for Link Monitor", + "description": "Automation composition for Hello World", "version": "1.2.3", - "type_version": "1.0.0", - "type": "org.onap.policy.clamp.controlloop.ControlLoop" - }, - "org.onap.policy.controlloop.PolicyControlLoopParticipant": { - "properties": { - "provider": "ONAP" - }, - "description": "Participant for policy framework", - "version": "2.3.1", "type_version": "1.0.1", - "type": "org.onap.policy.clamp.controlloop.Participant" + "type": "org.onap.policy.clamp.acm.AutomationComposition" }, - "org.onap.domain.linkmonitor.LinkMonitorPolicyControlLoopElement": { + "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement": { "properties": { "participantType": { "version": "2.3.1", - "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant" + "name": "org.onap.policy.clamp.acm.PolicyParticipant" }, "policy_type_id": { "version": "1.0.0", - "name": "onap.policies.controlloop.operational.common.Apex" + "name": "onap.policies.operational.pm-subscription-handler" }, "participant_id": { "version": "1.0.0", "name": "org.onap.PM_Policy" }, - "pdpGroup": "defaultGroup", "provider": "Ericsson", "policy_id": { - "version": "1.0.0", - "name": "operational.apex.linkmonitor" + "get_input": "pmsh_operational_policy" } }, - "description": "Control loop element for the Link Monitor", + "description": "Automation composition element for the operational policy for Performance Management Subscription Handling", "version": "1.2.3", "type_version": "1.0.1", - "type": "org.onap.policy.clamp.controlloop.PolicyControlLoopElement" + "type": "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement" + }, + "org.onap.policy.clamp.acm.PolicyParticipant": { + "properties": { + "provider": "ONAP" + }, + "description": "Participant for DCAE microservices", + "version": "2.3.1", + "type_version": "1.0.1", + "type": "org.onap.policy.clamp.acm.Participant" + } + }, + "inputs": { + "pmsh_operational_policy": { + "default": { + "version": "1.0.0", + "name": "operational.apex.linkmonitor" + }, + "description": "The ID of the PMSH operational policy to use", + "type": "onap.datatypes.ToscaConceptIdentifier" } } }, @@ -1966,9 +1970,9 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. "name": "onap.policies.controlloop.operational.common.Apex" } }, - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "tosca_definitions_version": "tosca_simple_yaml_1_3", "node_types": { - "org.onap.policy.clamp.controlloop.ControlLoop": { + "org.onap.policy.clamp.acm.AutomationComposition": { "derived_from": "tosca.nodetypes.Root", "properties": { "elements": { @@ -1979,7 +1983,7 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. "entry_schema": { "type": "onap.datatypes.ToscaConceptIdentifier" }, - "description": "Specifies a list of control loop element definitions that make up this control loop definition", + "description": "Specifies a list of automation composition element definitions that make up this automation composition definition", "type": "list" }, "provider": { @@ -1987,23 +1991,13 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. "metadata": { "common": true }, - "description": "Specifies the organization that provides the control loop element", + "description": "Specifies the organization that provides the automation composition element", "type": "string" } }, "version": "1.0.1" }, - "org.onap.policy.clamp.controlloop.Participant": { - "derived_from": "tosca.nodetypes.Root", - "properties": { - "provider": { - "requred": false, - "type": "string" - } - }, - "version": "1.0.1" - }, - "org.onap.policy.clamp.controlloop.ControlLoopElement": { + "org.onap.policy.clamp.acm.AutomationCompositionElement": { "derived_from": "tosca.nodetypes.Root", "properties": { "runningToPassiveTimeout": { @@ -2024,7 +2018,7 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. "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", "type": "onap.datatypes.ToscaConceptIdentifier" }, "startPhase": { @@ -2036,7 +2030,7 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. { "greater_or_equal": 0 }], - "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", "type": "integer" }, "passiveToUninitializedTimeout": { @@ -2077,7 +2071,7 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. "metadata": { "common": true }, - "description": "Specifies the organization that provides the control loop element", + "description": "Specifies the organization that provides the automation composition element", "type": "string" }, "passiveToRunningTimeout": { @@ -2096,8 +2090,8 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. }, "version": "1.0.1" }, - "org.onap.policy.clamp.controlloop.PolicyControlLoopElement": { - "derived_from": "org.onap.policy.clamp.controlloop.ControlLoopElement", + "org.onap.policy.clamp.acm.PolicyAutomationCompositionElement": { + "derived_from": "org.onap.policy.clamp.acm.AutomationCompositionElement", "properties": { "policy_type_id": { "requred": true, @@ -2109,6 +2103,16 @@ Policy Types. This does NOT support the legacy Policy YAML policy type. } }, "version": "1.0.1" + }, + "org.onap.policy.clamp.acm.Participant": { + "derived_from": "tosca.nodetypes.Root", + "properties": { + "provider": { + "requred": false, + "type": "string" + } + }, + "version": "1.0.1" } } -} +} \ No newline at end of file