From 37090755865dc15f877ba8eb2261d2f342fd3a0d Mon Sep 17 00:00:00 2001 From: kleberu Date: Wed, 31 Jan 2024 11:18:22 +0000 Subject: [PATCH 1/4] Update MecAppDTypes.yaml to v3.1.6 --- MecAppDTypes.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml index 9e1906d..38d0ed6 100644 --- a/MecAppDTypes.yaml +++ b/MecAppDTypes.yaml @@ -1,12 +1,12 @@ tosca_definitions_version: tosca_simple_yaml_1_3 -description: ETSI MEC 037 appd types definitions version 3.1.1 +description: ETSI MEC 037 appd types definitions version 3.2.1 metadata: template_name: etsi_mec037_appd_types template_author: ETSI_MEC - template_version: 3.1.1 + template_version: 3.2.1 imports: - - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.6.1/etsi_nfv_sol001_vnfd_types.yaml + - https://forge.etsi.org/rep/nfv/SOL001/raw/v4.4.1/etsi_nfv_sol001_vnfd_types.yaml data_types: tosca.datatypes.mec.ServiceDependency: @@ -120,7 +120,7 @@ data_types: description: the action of the MEC host data plane, when a packet matches the traffic_filter. required: true constraints: - - valid_values: [ DROP, FORWARD_DECAPSULATED, FORWARD_AS_IS, PASSTHROUGH, DUPLICATED_DECAPSULATED, DUPLICATE_AS_IS ] + - valid_values: [ DROP, FORWARD_DECAPSULATED, FORWARD_ENCAPSULATED, PASSTHROUGH, DUPLICATE_DECAPSULATED, DUPLICATE_ENCAPSULATED ] dst_interface: type: list description: describes the destination interface information, if the action is FORWARD. @@ -295,6 +295,8 @@ data_types: derived_from: tosca.datatypes.Root description: specification of MEC application requirements related to traffic rules properties: + direction: + - valid_values: [ 00, 01 ] src_address: type: list description: source IP address(es). @@ -415,10 +417,6 @@ data_types: type: string description: source address of the tunnel. required: true - tunnel_specific_data: - type: string - description: parameters specific to the tunnel. - required: false node_types: tosca.nodes.mec.MecApp: -- GitLab From 1d178dd48457f47df32c87198ba607e164a5941f Mon Sep 17 00:00:00 2001 From: kleberu Date: Thu, 22 Feb 2024 13:45:08 +0000 Subject: [PATCH 2/4] Update MecAppDTypes.yaml Fix syntax of property "direction" --- MecAppDTypes.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml index 38d0ed6..06ec9cf 100644 --- a/MecAppDTypes.yaml +++ b/MecAppDTypes.yaml @@ -296,7 +296,11 @@ data_types: description: specification of MEC application requirements related to traffic rules properties: direction: - - valid_values: [ 00, 01 ] + type: string + description: Identifies the direction of the data flow when the value of “filterType” is “per FLOW”. + required: false + constraints: + - valid_values: [ "00", "01" ] src_address: type: list description: source IP address(es). -- GitLab From b3642f32bfbac5b8df17e66d24d96230114df1d2 Mon Sep 17 00:00:00 2001 From: kleberu Date: Thu, 22 Feb 2024 13:46:34 +0000 Subject: [PATCH 3/4] Update MecAppDTypes.yaml --- MecAppDTypes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml index 06ec9cf..5a75d20 100644 --- a/MecAppDTypes.yaml +++ b/MecAppDTypes.yaml @@ -300,7 +300,7 @@ data_types: description: Identifies the direction of the data flow when the value of “filterType” is “per FLOW”. required: false constraints: - - valid_values: [ "00", "01" ] + - valid_values: [ "00", "01" ] src_address: type: list description: source IP address(es). -- GitLab From 3a47397eb0ec3a9bb796cf4322abef4187e5a115 Mon Sep 17 00:00:00 2001 From: kleberu Date: Thu, 22 Feb 2024 15:54:52 +0000 Subject: [PATCH 4/4] Update MecAppDTypes.yaml --- MecAppDTypes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml index 5a75d20..e63f6b3 100644 --- a/MecAppDTypes.yaml +++ b/MecAppDTypes.yaml @@ -297,7 +297,7 @@ data_types: properties: direction: type: string - description: Identifies the direction of the data flow when the value of “filterType” is “per FLOW”. + description: Direction of the data flow when filtering per flow, "00" = downlink, "01" = uplink. required: false constraints: - valid_values: [ "00", "01" ] -- GitLab