From b2b6fb1f031475e0578aff56d2812ca7963931a4 Mon Sep 17 00:00:00 2001 From: Ashutosh Mishra Date: Fri, 29 Aug 2025 06:37:27 +0000 Subject: [PATCH] Modify user guide for ODU deployment via tacker. Modify user guideline for ODU deployment using tacker V2-API. Change-Id: I838d4caec975151d54acd55d4d8afaf1e71d9654 Signed-off-by: Ashutosh Mishra --- docs/tacker-user-guide-odu-v2.rst | 13 ++-- .../odu_v2/Definitions/sample_cnf_df_simple.yaml | 75 +++++---------------- .../odu_v2/Definitions/sample_cnf_top.vnfd.yaml | 2 +- .../odu_v2/Definitions/sample_cnf_types.yaml | 6 +- .../packages/odu_v2/Files/kubernetes/du.tgz | Bin 0 -> 4358 bytes .../Files/kubernetes/{test-chart => du}/Chart.yaml | 0 .../{test-chart => du}/templates/NOTES.txt | 0 .../{test-chart => du}/templates/_helpers.tpl | 0 .../{test-chart => du}/templates/deployment.yaml | 17 ++--- .../{test-chart => du}/templates/hpa.yaml | 0 .../{test-chart => du}/templates/ingress.yaml | 0 .../{test-chart => du}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../kubernetes/{test-chart => du}/values.yaml | 3 +- .../packages/odu_v2/TOSCA-Metadata/TOSCA.meta | 4 +- tacker/samples/packages/odu_v2/inst.json | 9 +-- 17 files changed, 36 insertions(+), 93 deletions(-) create mode 100644 tacker/samples/packages/odu_v2/Files/kubernetes/du.tgz rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/Chart.yaml (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/NOTES.txt (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/_helpers.tpl (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/deployment.yaml (74%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/hpa.yaml (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/ingress.yaml (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/service.yaml (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/serviceaccount.yaml (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/templates/tests/test-connection.yaml (100%) rename tacker/samples/packages/odu_v2/Files/kubernetes/{test-chart => du}/values.yaml (98%) diff --git a/docs/tacker-user-guide-odu-v2.rst b/docs/tacker-user-guide-odu-v2.rst index b05467e..923ca23 100644 --- a/docs/tacker-user-guide-odu-v2.rst +++ b/docs/tacker-user-guide-odu-v2.rst @@ -227,17 +227,14 @@ Create and Instantiate VNF } }, "additionalParams": { - "helm_chart_path": "Files/kubernetes/test-chart-0.1.0.tgz", + "helm_chart_path": "Files/kubernetes/du.tgz", "helm_parameters": { "service.port": 8081, "service.type": "NodePort" }, "helm_value_names": { - "VDU1": { - "replica": "replicaCountVdu1" - }, - "odu": { - "replica": "replicaCountodu" + "odu1": { + "replica": "replicaCount" } }, "namespace": "default" @@ -270,8 +267,8 @@ Check ODU status $ kubectl get pods - NAME READY STATUS RESTARTS AGE - vnff770aa831a9c4c8e9bcefc9d1e652c25-du-d5887d5dc-gh6xg 1/1 Running 0 7d4h + NAME READY STATUS RESTARTS AGE + odu1-vnff770aa831a9c4c8e9bcefc9d1e652c25-d5887d5dc-gh6xg 1/1 Running 0 7d4h 3. VNF Status diff --git a/tacker/samples/packages/odu_v2/Definitions/sample_cnf_df_simple.yaml b/tacker/samples/packages/odu_v2/Definitions/sample_cnf_df_simple.yaml index 987126f..233bb6f 100644 --- a/tacker/samples/packages/odu_v2/Definitions/sample_cnf_df_simple.yaml +++ b/tacker/samples/packages/odu_v2/Definitions/sample_cnf_df_simple.yaml @@ -68,20 +68,11 @@ topology_template: type: tosca.artifacts.Implementation.Python file: ../Scripts/sample_script.py - VDU1: + ODU1: type: tosca.nodes.nfv.Vdu.Compute properties: - name: vdu1 - description: VDU1 compute node - vdu_profile: - min_number_of_instances: 1 - max_number_of_instances: 3 - - ODU: - type: tosca.nodes.nfv.Vdu.Compute - properties: - name: odu - description: ODU compute node + name: odu1 + description: ODU1 compute node vdu_profile: min_number_of_instances: 1 max_number_of_instances: 3 @@ -91,50 +82,28 @@ topology_template: type: tosca.policies.nfv.ScalingAspects properties: aspects: - vdu1_aspect: - name: vdu1_aspect - description: vdu1 scaling aspect + odu1_aspect: + name: odu1_aspect + description: odu1 scaling aspect max_scale_level: 2 step_deltas: - delta_1 - odu_aspect: - name: odu_aspect - description: odu scaling aspect - max_scale_level: 2 - step_deltas: - - delta_1 - - - VDU1_initial_delta: - type: tosca.policies.nfv.VduInitialDelta - properties: - initial_delta: - number_of_instances: 1 - targets: [ VDU1 ] - - - VDU1_scaling_aspect_deltas: - type: tosca.policies.nfv.VduScalingAspectDeltas - properties: - aspect: vdu1_aspect - deltas: - delta_1: - number_of_instances: 1 - targets: [ VDU1 ] - - ODU_initial_delta: + - odu1_initial_delta: type: tosca.policies.nfv.VduInitialDelta properties: initial_delta: number_of_instances: 1 - targets: [ ODU ] + targets: [ ODU1 ] - - ODU_scaling_aspect_deltas: + - ODU1_scaling_aspect_deltas: type: tosca.policies.nfv.VduScalingAspectDeltas properties: - aspect: odu_aspect + aspect: odu1_aspect deltas: delta_1: number_of_instances: 1 - targets: [ ODU ] + targets: [ ODU1 ] - instantiation_levels: type: tosca.policies.nfv.InstantiationLevels @@ -143,30 +112,16 @@ topology_template: instantiation_level_1: description: Smallest size scale_info: - vdu1_aspect: - scale_level: 0 - odu_aspect: + odu1_aspect: scale_level: 0 instantiation_level_2: description: Largest size scale_info: - vdu1_aspect: - scale_level: 2 - odu_aspect: + odu1_aspect: scale_level: 2 default_level: instantiation_level_1 - - VDU1_instantiation_levels: - type: tosca.policies.nfv.VduInstantiationLevels - properties: - levels: - instantiation_level_1: - number_of_instances: 1 - instantiation_level_2: - number_of_instances: 3 - targets: [ VDU1 ] - - - ODU_instantiation_levels: + - ODU1_instantiation_levels: type: tosca.policies.nfv.VduInstantiationLevels properties: levels: @@ -174,4 +129,4 @@ topology_template: number_of_instances: 1 instantiation_level_2: number_of_instances: 3 - targets: [ ODU ] + targets: [ ODU1 ] diff --git a/tacker/samples/packages/odu_v2/Definitions/sample_cnf_top.vnfd.yaml b/tacker/samples/packages/odu_v2/Definitions/sample_cnf_top.vnfd.yaml index bbcfbab..d9bb98d 100644 --- a/tacker/samples/packages/odu_v2/Definitions/sample_cnf_top.vnfd.yaml +++ b/tacker/samples/packages/odu_v2/Definitions/sample_cnf_top.vnfd.yaml @@ -19,7 +19,7 @@ topology_template: type: company.provider.VNF properties: flavour_id: { get_input: selected_flavour } - descriptor_id: 6fd8696a-2c3a-48e9-8f59-3cbb250844c3 + descriptor_id: 56f4eb23-4075-4a2f-a3e1-329c93d656c0 provider: Company product_name: Sample VNF software_version: '1.0' diff --git a/tacker/samples/packages/odu_v2/Definitions/sample_cnf_types.yaml b/tacker/samples/packages/odu_v2/Definitions/sample_cnf_types.yaml index 41207ba..7124a2a 100644 --- a/tacker/samples/packages/odu_v2/Definitions/sample_cnf_types.yaml +++ b/tacker/samples/packages/odu_v2/Definitions/sample_cnf_types.yaml @@ -12,8 +12,8 @@ node_types: properties: descriptor_id: type: string - constraints: [ valid_values: [ 6fd8696a-2c3a-48e9-8f59-3cbb250844c3 ] ] - default: 6fd8696a-2c3a-48e9-8f59-3cbb250844c3 + constraints: [ valid_values: [ 56f4eb23-4075-4a2f-a3e1-329c93d656c0 ] ] + default: 56f4eb23-4075-4a2f-a3e1-329c93d656c0 descriptor_version: type: string constraints: [ valid_values: [ '1.0' ] ] @@ -46,8 +46,10 @@ node_types: requirements: - virtual_link_external: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, UNBOUNDED] - virtual_link_internal: capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [0, UNBOUNDED] interfaces: Vnflcm: type: tosca.interfaces.nfv.Vnflcm diff --git a/tacker/samples/packages/odu_v2/Files/kubernetes/du.tgz b/tacker/samples/packages/odu_v2/Files/kubernetes/du.tgz new file mode 100644 index 0000000000000000000000000000000000000000..291bad34094c4e3b2bf810c440c2096dafaad934 GIT binary patch literal 4358 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