From e3901c66783e3c0e5fff5878b43c0e1357c99da8 Mon Sep 17 00:00:00 2001 From: qingshuting Date: Tue, 30 Aug 2022 14:39:38 +0800 Subject: [INTENT-ANALYSIS] Add policy models for bandwidth assurance intent Add policy models, one for cll bw assurance policy, another for runtime configuration policy. Update .gitignore file. Issue-ID: USECASEUI-714 Signed-off-by: qingshuting Change-Id: If170aacb47d4ac2febae0c3b03ffb4ffd0b62b27 --- .../intentPolicy/deploy_intent_configs.json | 8 ++++ .../resources/intentPolicy/deploy_modifycll.json | 9 ++++ .../intentPolicy/intent_configs_policy.json | 23 ++++++++++ .../intentPolicy/intent_configs_policy_type.json | 28 ++++++++++++ .../src/main/resources/intentPolicy/modifycll.json | 50 ++++++++++++++++++++++ .../intentPolicy/deploy_intent_configs.json | 8 ++++ .../resources/intentPolicy/deploy_modifycll.json | 9 ++++ .../intentPolicy/intent_configs_policy.json | 23 ++++++++++ .../intentPolicy/intent_configs_policy_type.json | 28 ++++++++++++ .../src/test/resources/intentPolicy/modifycll.json | 50 ++++++++++++++++++++++ 10 files changed, 236 insertions(+) create mode 100644 intentanalysis/src/main/resources/intentPolicy/deploy_intent_configs.json create mode 100644 intentanalysis/src/main/resources/intentPolicy/deploy_modifycll.json create mode 100644 intentanalysis/src/main/resources/intentPolicy/intent_configs_policy.json create mode 100644 intentanalysis/src/main/resources/intentPolicy/intent_configs_policy_type.json create mode 100644 intentanalysis/src/main/resources/intentPolicy/modifycll.json create mode 100644 intentanalysis/src/test/resources/intentPolicy/deploy_intent_configs.json create mode 100644 intentanalysis/src/test/resources/intentPolicy/deploy_modifycll.json create mode 100644 intentanalysis/src/test/resources/intentPolicy/intent_configs_policy.json create mode 100644 intentanalysis/src/test/resources/intentPolicy/intent_configs_policy_type.json create mode 100644 intentanalysis/src/test/resources/intentPolicy/modifycll.json (limited to 'intentanalysis') diff --git a/intentanalysis/src/main/resources/intentPolicy/deploy_intent_configs.json b/intentanalysis/src/main/resources/intentPolicy/deploy_intent_configs.json new file mode 100644 index 0000000..1e22ce4 --- /dev/null +++ b/intentanalysis/src/main/resources/intentPolicy/deploy_intent_configs.json @@ -0,0 +1,8 @@ +{ + "policies": [ + { + "policy-id": "onap.dcae.slicems.config", + "policy-version": 1 + } + ] +} diff --git a/intentanalysis/src/main/resources/intentPolicy/deploy_modifycll.json b/intentanalysis/src/main/resources/intentPolicy/deploy_modifycll.json new file mode 100644 index 0000000..c8685cf --- /dev/null +++ b/intentanalysis/src/main/resources/intentPolicy/deploy_modifycll.json @@ -0,0 +1,9 @@ +{ + "policies":[ + { + "policy-id":"operational.modifycll", + "policy-version":1 + } + ] +} + diff --git a/intentanalysis/src/main/resources/intentPolicy/intent_configs_policy.json b/intentanalysis/src/main/resources/intentPolicy/intent_configs_policy.json new file mode 100644 index 0000000..a9d1e79 --- /dev/null +++ b/intentanalysis/src/main/resources/intentPolicy/intent_configs_policy.json @@ -0,0 +1,23 @@ +{ + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "topology_template": { + "policies": [ + { + "onap.dcae.slicems.config": { + "type": "onap.policies.monitoring.docker.slicems.app", + "type_version": "1.0.0", + "version": "1.0.0", + "metadata": { + "policy-id": "onap.dcae.slicems.config", + "policy-version": 1 + }, + "properties": { + "cllId": "cll-01", + "closedLoopStatus": "on", + "originalBw": "1000" + } + } + } + ] + } +} diff --git a/intentanalysis/src/main/resources/intentPolicy/intent_configs_policy_type.json b/intentanalysis/src/main/resources/intentPolicy/intent_configs_policy_type.json new file mode 100644 index 0000000..318b098 --- /dev/null +++ b/intentanalysis/src/main/resources/intentPolicy/intent_configs_policy_type.json @@ -0,0 +1,28 @@ +{ + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "policy_types": { + "onap.policies.monitoring.docker.slicems.app": { + "version": "1.0.0", + "description": "son handler policy type", + "derived_from": "onap.policies.Monitoring:1.0.0", + "description": "Runtime Configuration of Slice MS", + "properties": { + "cllId": { + "type": "string", + "required": true, + "description": "cll id" + }, + "closedLoopStatus": { + "type": "string", + "required": true, + "description": "whether provide closed loop assurance for one cll" + }, + "originalBw": { + "type": "string", + "required": true, + "description": "original bw of one cll" + } + } + } + } +} \ No newline at end of file diff --git a/intentanalysis/src/main/resources/intentPolicy/modifycll.json b/intentanalysis/src/main/resources/intentPolicy/modifycll.json new file mode 100644 index 0000000..778a669 --- /dev/null +++ b/intentanalysis/src/main/resources/intentPolicy/modifycll.json @@ -0,0 +1,50 @@ +{ + + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "topology_template": { + "policies": [ + { + "operational.modifycll": { + "type": "onap.policies.controlloop.operational.common.Drools", + "type_version": "1.0.0", + "version": "1.0.0", + "name": "operational.modifycll", + "metadata": { + "policy_id": "operational.modifycll" + }, + "properties": { + "id": "ControlLoop-CCVPN-CLL-227e8b00-dbeb-4d03-8719-d0a658fb846c", + "timeout": 1200, + "abatement": false, + "trigger": "unique-policy-id-1-modify-cll", + "operations": [ + { + "id": "unique-policy-id-1-modify-cll", + "description": "Modify resource allocation for a slice subnet instance", + "operation": { + "actor": "SO", + "operation": "ModifyCloudLeasedLine", + "target": { + "targetType": "VNF" + } + }, + "timeout": 1200, + "retries": 0, + "success": "final_success", + "failure": "final_failure", + "failure_timeout": "final_failure_timeout", + "failure_retries": "final_failure_retires", + "failure_exception": "final_failure_exception", + "failure_guard": "final_failure_guard" + } + ], + "controllerName": "usecases" + } + + } + + } + ] + } + +} \ No newline at end of file diff --git a/intentanalysis/src/test/resources/intentPolicy/deploy_intent_configs.json b/intentanalysis/src/test/resources/intentPolicy/deploy_intent_configs.json new file mode 100644 index 0000000..1e22ce4 --- /dev/null +++ b/intentanalysis/src/test/resources/intentPolicy/deploy_intent_configs.json @@ -0,0 +1,8 @@ +{ + "policies": [ + { + "policy-id": "onap.dcae.slicems.config", + "policy-version": 1 + } + ] +} diff --git a/intentanalysis/src/test/resources/intentPolicy/deploy_modifycll.json b/intentanalysis/src/test/resources/intentPolicy/deploy_modifycll.json new file mode 100644 index 0000000..c8685cf --- /dev/null +++ b/intentanalysis/src/test/resources/intentPolicy/deploy_modifycll.json @@ -0,0 +1,9 @@ +{ + "policies":[ + { + "policy-id":"operational.modifycll", + "policy-version":1 + } + ] +} + diff --git a/intentanalysis/src/test/resources/intentPolicy/intent_configs_policy.json b/intentanalysis/src/test/resources/intentPolicy/intent_configs_policy.json new file mode 100644 index 0000000..a9d1e79 --- /dev/null +++ b/intentanalysis/src/test/resources/intentPolicy/intent_configs_policy.json @@ -0,0 +1,23 @@ +{ + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "topology_template": { + "policies": [ + { + "onap.dcae.slicems.config": { + "type": "onap.policies.monitoring.docker.slicems.app", + "type_version": "1.0.0", + "version": "1.0.0", + "metadata": { + "policy-id": "onap.dcae.slicems.config", + "policy-version": 1 + }, + "properties": { + "cllId": "cll-01", + "closedLoopStatus": "on", + "originalBw": "1000" + } + } + } + ] + } +} diff --git a/intentanalysis/src/test/resources/intentPolicy/intent_configs_policy_type.json b/intentanalysis/src/test/resources/intentPolicy/intent_configs_policy_type.json new file mode 100644 index 0000000..318b098 --- /dev/null +++ b/intentanalysis/src/test/resources/intentPolicy/intent_configs_policy_type.json @@ -0,0 +1,28 @@ +{ + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "policy_types": { + "onap.policies.monitoring.docker.slicems.app": { + "version": "1.0.0", + "description": "son handler policy type", + "derived_from": "onap.policies.Monitoring:1.0.0", + "description": "Runtime Configuration of Slice MS", + "properties": { + "cllId": { + "type": "string", + "required": true, + "description": "cll id" + }, + "closedLoopStatus": { + "type": "string", + "required": true, + "description": "whether provide closed loop assurance for one cll" + }, + "originalBw": { + "type": "string", + "required": true, + "description": "original bw of one cll" + } + } + } + } +} \ No newline at end of file diff --git a/intentanalysis/src/test/resources/intentPolicy/modifycll.json b/intentanalysis/src/test/resources/intentPolicy/modifycll.json new file mode 100644 index 0000000..778a669 --- /dev/null +++ b/intentanalysis/src/test/resources/intentPolicy/modifycll.json @@ -0,0 +1,50 @@ +{ + + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", + "topology_template": { + "policies": [ + { + "operational.modifycll": { + "type": "onap.policies.controlloop.operational.common.Drools", + "type_version": "1.0.0", + "version": "1.0.0", + "name": "operational.modifycll", + "metadata": { + "policy_id": "operational.modifycll" + }, + "properties": { + "id": "ControlLoop-CCVPN-CLL-227e8b00-dbeb-4d03-8719-d0a658fb846c", + "timeout": 1200, + "abatement": false, + "trigger": "unique-policy-id-1-modify-cll", + "operations": [ + { + "id": "unique-policy-id-1-modify-cll", + "description": "Modify resource allocation for a slice subnet instance", + "operation": { + "actor": "SO", + "operation": "ModifyCloudLeasedLine", + "target": { + "targetType": "VNF" + } + }, + "timeout": 1200, + "retries": 0, + "success": "final_success", + "failure": "final_failure", + "failure_timeout": "final_failure_timeout", + "failure_retries": "final_failure_retires", + "failure_exception": "final_failure_exception", + "failure_guard": "final_failure_guard" + } + ], + "controllerName": "usecases" + } + + } + + } + ] + } + +} \ No newline at end of file -- cgit 1.2.3-korg