From 52ff76df8dc6962f0d8a40a40afc71f550c28a7e Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 8 Nov 2022 16:30:35 +0000
Subject: [PATCH 01/15] Add new file MecAppDTypes.yaml

---
 MecAppDTypes.yaml | 464 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 464 insertions(+)
 create mode 100644 MecAppDTypes.yaml

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
new file mode 100644
index 0000000..72251e4
--- /dev/null
+++ b/MecAppDTypes.yaml
@@ -0,0 +1,464 @@
+tosca_definitions_version: tosca_simple_yaml_1_3
+description: ETSI MEC 037 appd types definitions version 3.1.1
+metadata:
+  template_name: etsi_mec037_appd_types
+  template_author: ETSI_MEC
+  template_version: 3.1.1
+
+imports:
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.5.1/etsi_nfv_sol001_vnfd_types.yaml 
+
+data_types:
+  tosca.datatypes.mec.ServiceDependency:
+    derived_from: tosca.datatypes.Root
+    description: The requirements of a service-consuming MEC application to a MEC service
+    properties:
+      ser_name:
+        type: string
+        description: name of the service, for example, RNIS, LocationService, etc.
+        required: true
+      ser_category:
+        type: tosca.datatypes.mec.CategoryRef
+        description: a category reference of the service
+        required: false
+      version:
+        type: string
+        description: version of the service
+        required: true
+      ser_transport_dependencies:
+        type: list
+        description: the transport and serialization format dependencies of consuming the service
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.TransportDependency
+      requested_permissions:        
+        type: list
+        description: requested permissions regarding the access of the application to the service
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.Permission
+
+  tosca.datatypes.mec.ServiceDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: a MEC service produced by a service-providing MEC application
+    properties:
+      ser_name:
+        type: string
+        description: name of the service, for example, RNIS, LocationService, etc.
+        required: true
+      ser_category:
+        type: tosca.datatypes.mec.CategoryRef
+        description: a category reference of the service
+        required: false
+      version:
+        type: string
+        description: version of the service
+        required: true
+      transport_supported:
+        type: list
+        description: transport and serialization format supported by the service produced by the application
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.TransportSerializerDescriptor
+
+  tosca.datatypes.mec.FeatureDependency:
+    derived_from: tosca.datatypes.Root
+    description: requirements of a MEC application to a feature of the MEC platform
+    properties:
+      feature_name:
+        type: string
+        description: name of the feature, for example, UserApps, UEIdentity, etc.
+        required: true
+      version:
+        type: string
+        description: version of the feature
+        required: true
+
+  tosca.datatypes.mec.TransportDependency:
+    derived_from: tosca.datatypes.Root
+    description: requirements of a MEC application to the transport bindings
+    properties:
+      transport_serializer:
+        type: tosca.datatypes.mec.TransportSerializerDescriptor
+        description: information about the transport in this transport binding
+        required: true
+      labels:
+        type: list
+        description: set of labels that allow to define groups of transport bindings
+        required: true
+        entry_schema:
+          type: string
+
+  tosca.datatypes.mec.TrafficRuleDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: traffic rules related to a MEC application
+    properties:
+      traffic_rule_id:
+        type: string
+        description: identifier of the traffic rule.
+        required: true
+      filter_type:
+        type: string
+        description: filter type
+        required: true
+        constraints:
+          - valid_values: [ FLOW, PACKET ]
+      priority:
+        type: integer
+        description: priority of this traffic rule.
+        required: true
+        constraints:
+          - greater_or_equal: 0
+      traffic_filter:
+        type: list
+        description: the filter used to identify specific flow/packets that need to be handled by the MEC host.
+        required: true
+        entry_schema:
+          type: tosca.datatypes.mec.TrafficFilter
+      action:
+        type: string
+        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 ]
+      dst_interface:
+        type: list
+        description: describes the destination interface information, if the action is FORWARD.
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.InterfaceDescriptor
+        constraints:
+          - max_length: 2
+
+  tosca.datatypes.mec.DNSRuleDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: DNS rules associated with a MEC application
+    properties:
+      dns_rule_id:
+        type: string
+        description: identifier of the DNS rule
+        required: true
+      domain_name:
+        type: string
+        description: FQDN of the DNS rule
+        required: true
+      ip_address_type:
+        type: string
+        description: IP address type
+        required: true
+        constraints:
+          - valid_values: [ IP_V6, IP_V4 ]
+      ip_address:
+        type: string
+        description: IP address given by the DNS rule
+        required: true
+      ttl:
+        type: integer
+        description: time-to-live value
+        required: true
+        constraints:
+          - greater_than: 0
+
+  tosca.datatypes.mec.LatencyDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: latency requirements of a MEC application
+    properties:
+      max_latency:
+        type: integer
+        description: maximum latency (in nano seconds) tolerated by the MEC application.
+        required: true
+        constraints:
+          - greater_than: 0
+
+  tosca.datatypes.mec.UserContextTransferCapability:
+    derived_from: tosca.datatypes.Root
+    description: information of user context transfer capability of the application
+    properties:
+      stateful_application:
+        type: boolean
+        description: whether the application is stateful.
+        required: true
+      user_context_transfer_support:
+        type: boolean
+        description: whether the application supports the user context transfer capability, only applicable when the application is stateful
+        required: false
+
+  tosca.datatypes.mec.AppNetworkPolicy:
+    derived_from: tosca.datatypes.Root
+    description: network policy used in the application instantiation and operation
+    properties:
+      cellular_network:
+        type: boolean
+        description: whether the application prefers a cellular network to carry the traffic.
+        required: false
+      wifi_network:
+        type: boolean
+        description: whether the application prefers a Wi-Fi network to carry the traffic.
+        required: false
+      fixed_access_network:
+        type: boolean
+        description: whether the application prefers a fixed access network to carry the traffic.
+        required: false
+
+  tosca.datatypes.mec.CategoryRef:
+    derived_from: tosca.datatypes.Root
+    description: a category reference
+    properties:
+      href:
+        type: string
+        description: reference of the category.
+        required: true
+      id:
+        type: string
+        description: unique identifier of the category.
+        required: true
+      name:
+        type: string
+        description: name of the category.
+        required: true
+      version:
+        type: string
+        description: category version.
+        required: true
+
+  tosca.datatypes.mec.Permission:
+    derived_from: tosca.datatypes.Root
+    description: access right of a particular MEC service
+    properties:
+      id:
+        type: string
+        description: name of a right within a particular MEC service
+        required: true
+      display_name:
+        type: string
+        description: human-readable string to describe the permission
+        required: false
+
+  tosca.datatypes.mec.TransportSerializerDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: requirements of a MEC application to the transport bindings
+    properties:
+      transport:
+        type: tosca.datatypes.mec.TransportDescriptor
+        description: information about the transport in this transport binding
+        required: true
+      serializers:
+        type: list
+        description: information about the serializers in this transport binding
+        required: true
+        entry_schema:
+          type: string
+          constraints:
+            - valid_values: [ JSON, XML, PROTOBUF3 ]
+
+  tosca.datatypes.mec.TransportDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: a transport
+    properties:
+      type:
+        type: string
+        description: type of the transport.
+        required: true
+        constraints:
+          - valid_values: [ REST_HTTP, MB_TOPIC_BASED, MB_ROUTING, MB_PUBSUB, RPC, RPC_STREAMING, WEBSOCKET ]
+      protocol:
+        type: string
+        description: name of the protocol used.
+        required: true
+      version:
+        type: string
+        description: version of the protocol used.
+        required: true
+      security:
+        type: tosca.datatypes.mec.SecurityInfo
+        description: information about the security used by the transport.
+        required: true
+
+  tosca.datatypes.mec.SecurityInfo:
+    derived_from: tosca.datatypes.Root
+    description: security information related to a transport
+    properties:
+      oauth2_grant_type:
+        type: list
+        description: supported OAuth 2.0 grant types.
+        required: false
+        entry_schema:
+          type: string
+          constraints:
+            - valid_values: [ OAUTH2_AUTHORIZATION_CODE, OAUTH2_IMPLICIT_GRANT, OAUTH2_RESOURCE_OWNER, OAUTH2_CLIENT_CREDENTIALS ]
+      oauth2_token_endpoint:
+        type: string
+        description: token endpoint URI.
+        required: false
+
+  tosca.datatypes.mec.TrafficFilter:
+    derived_from: tosca.datatypes.Root
+    description: specification of MEC application requirements related to traffic rules
+    properties:
+      src_address:
+        type: list
+        description: source IP address(es).
+        required: false
+        entry_schema:
+          type: string
+      dst_address:
+        type: list
+        description: destination IP address(es).
+        required: false
+        entry_schema:
+          type: string
+      src_port:
+        type: list
+        description: source port(s).
+        required: false
+        entry_schema:
+          type: string
+      dst_port:
+        type: list
+        description: destination port(s).
+        required: false
+        entry_schema:
+          type: string
+      protocol:
+        type: list
+        description: protocol of the traffic filter.
+        required: false
+        entry_schema:
+          type: string
+      tag:
+        type: list
+        description: used for tag based traffic rule.
+        required: false
+        entry_schema:
+          type: string
+      src_tunnel_address:
+        type: list
+        description: source IP address(es) for GTP tunnel.
+        required: false
+        entry_schema:
+          type: string
+      tgt_tunnel_address:
+        type: list
+        description: target IP address(es) for GTP tunnel.
+        required: false
+        entry_schema:
+          type: string
+      src_tunnel_port:
+        type: list
+        description: source port(s) for GTP tunnel.
+        required: false
+        entry_schema:
+          type: string
+      dst_tunnel_port:
+        type: list
+        description: destination port(s) for GTP tunnel.
+        required: false
+        entry_schema:
+          type: string
+      qci:
+        type: integer
+        description: QCI of the packets.
+        required: false
+        constraints:
+          - greater_than: 0
+      dscp:
+        type: integer
+        description: DSCP of IPv4 packets.
+        required: false
+      tc:
+        type: integer
+        description: TC of IPv6 packets.
+        required: false
+
+  tosca.datatypes.mec.InterfaceDescriptor:
+    derived_from: tosca.datatypes.Root
+    description: an interface of a MEC application
+    properties:
+      interface_type:
+        type: string
+        description: type of interface.
+        required: true
+        constraints:
+          - valid_values: [ TUNNEL, MAC, IP ]
+      tunnel_info:
+        type: tosca.datatypes.mec.TunnelInfo
+        description: information of the tunnel, if the interface type is TUNNEL.
+        required: false
+      src_mac_address:
+        type: string
+        description: source address of the interface, if the interface type is MAC.
+        required: false
+      dst_mac_address:
+        type: string
+        description: destination address of the interface, if the interface type is MAC.
+        required: false
+      dst_ip_address:
+        type: string
+        description: destination address of the interface, if the interface type is IP.
+        required: false
+
+  tosca.datatypes.mec.TunnelInfo:
+    derived_from: tosca.datatypes.Root
+    description: information about a tunnel transport.
+    properties:
+      tunnel_type:
+        type: string
+        description: type of tunnel.
+        required: true
+        constraints:
+          - valid_values: [ GTP-U, GRE ]
+      tunnel_dst_address:
+        type: string
+        description: destination address of the tunnel.
+        required: true
+      tunnel_src_address:
+        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:
+    derived_from: tosca.nodes.nfv.VNF
+    description: The generic abstract type from which all specific MEC application node types shall be derived from, together with other node types, the TOSCA service template(s) representing the AppD
+    properties:
+      flavour_id: # NFV value common for all MEC applications
+        type: string
+        constraints: [ equal: simple ]
+        default: simple
+      flavour_description: # NFV value common for all MEC applications
+        type: string
+        default: ""
+      mec_version:
+        type: list
+        description: version of the MEC system compatible with the MEC application
+        required: true
+        entry_schema:
+          type: string
+          constraints:
+            - pattern: ([0-9]?[0-9]\.[0-9]?[0-9]\.[0-9]?[0-9]$)
+      app_service_required:
+        type: list
+        description: services the MEC application requires to run
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.ServiceDependency
+      app_service_optional:
+        type: list
+        description: services the MEC application may use if available
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.ServiceDependency
+      app_service_produced:
+        type: list
+        description: services a MEC application is able to produce to the platform or other MEC applications. Only relevant for service-producing apps
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.ServiceDescriptor
+      app_feature_required:
+        type: list
+        description: features the MEC application requires to run
+        required: false
-- 
GitLab


From fe84623aa98ab74eba38b6d51206fee089477b2d Mon Sep 17 00:00:00 2001
From: Laurent Velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 10:40:57 +0000
Subject: [PATCH 02/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba701a7..eeca5ff 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This repository contains Application Package Format and Descriptor specified in ETSI GS MEC 037.
 
-## Online resources
+## Online resources 
 
 
 
-- 
GitLab


From 143f73102049cd5b4ddfc3f5eb46f0d009bc4e31 Mon Sep 17 00:00:00 2001
From: Laurent Velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 10:49:49 +0000
Subject: [PATCH 03/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba701a7..7c32770 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This repository contains Application Package Format and Descriptor specified in
 
 ## Online resources
 
-
+  
 
 ## License
 
-- 
GitLab


From 448215f2f3f3f1176526bd10f59b0f21a0da9599 Mon Sep 17 00:00:00 2001
From: Laurent Velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 10:52:14 +0000
Subject: [PATCH 04/15] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eeca5ff..a190b69 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,10 @@ This repository contains Application Package Format and Descriptor specified in
 ## Online resources 
 
 
-
+ 
 ## License
 
 Unless specified otherwise, the content of this repository and the files contained
 are released under the BSD-3-Clause license.
 See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
+ 
-- 
GitLab


From 7e84e18437cd09ce22ebe286f0dddbb0df326bd6 Mon Sep 17 00:00:00 2001
From: velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 12:03:47 +0100
Subject: [PATCH 05/15] update CI/CD

---
 .gitlab-ci.yml                     | 48 ++++++++++++++++++
 scripts/Dockerfile.puccini         | 14 ++++++
 scripts/build_tosca_parser.sh      | 36 ++++++++++++++
 scripts/parse_tosca_definitions.sh | 79 ++++++++++++++++++++++++++++++
 scripts/puccini_parse.sh           | 15 ++++++
 5 files changed, 192 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 scripts/Dockerfile.puccini
 create mode 100644 scripts/build_tosca_parser.sh
 create mode 100644 scripts/parse_tosca_definitions.sh
 create mode 100644 scripts/puccini_parse.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..8728a52
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,48 @@
+# CI/CD:
+# * branch      Continuously Builds & Push TOSCA parser image
+
+#image: docker:latest
+
+#services:
+#  - docker:dind
+
+variables:
+  GIT_DEPTH: "3"
+
+stages:
+  - build
+  - test
+
+build-tosca-toolbox:
+  stage: build
+  script:
+    - echo "Building Cloudnet-TOSCA-toolbox image..."
+    - ./scripts/build_tosca_parser.sh -v "Cloudnet-TOSCA-toolbox"
+    - echo "Build finished"    
+    
+build-tosca-puccini:
+  stage: build
+  script:
+    - echo "Building Puccini image..."
+    - ./scripts/build_tosca_parser.sh -v "Puccini"
+    - echo "Build finished"    
+
+test-definitions-cloudnet:
+  stage: test
+  script:
+    - echo "Parsing TOSCA definitions"
+    - ./scripts/parse_tosca_definitions.sh -v "Cloudnet-TOSCA-toolbox"
+  artifacts:
+    when: always
+    paths:
+      - debugCloudnet.log
+      
+test-definitions-puccini:
+  stage: test
+  script:
+    - echo "Parsing TOSCA definitions"
+    - ./scripts/parse_tosca_definitions.sh -v "Puccini"
+  artifacts:
+    when: always
+    paths:
+      - debugPuccini.log
diff --git a/scripts/Dockerfile.puccini b/scripts/Dockerfile.puccini
new file mode 100644
index 0000000..ff41878
--- /dev/null
+++ b/scripts/Dockerfile.puccini
@@ -0,0 +1,14 @@
+FROM ubuntu:16.04
+
+#COPY requirements.txt /requirements.txt
+RUN apt-get update && apt-get install -y -qq curl git gcc
+RUN curl -OL https://golang.org/dl/go1.18.3.linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz
+
+ENV PATH="${PATH}:/usr/local/go/bin"
+
+RUN git clone https://github.com/tliron/puccini.git /puccini
+
+RUN ./puccini/scripts/build
+
+ENV PATH="${PATH}:/root/go/bin"
diff --git a/scripts/build_tosca_parser.sh b/scripts/build_tosca_parser.sh
new file mode 100644
index 0000000..9f68332
--- /dev/null
+++ b/scripts/build_tosca_parser.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+TOSCA_PARSER="Cloudnet-TOSCA-toolbox"
+GIT_URL_TOSCA_TOOLBOX="https://github.com/Orange-OpenSource/Cloudnet-TOSCA-toolbox.git"
+TOSCA_PARSER_FOLDER="tosca-parser/"
+
+while getopts v: flag
+do
+        case "${flag}" in
+                v) TOSCA_PARSER=${OPTARG};;
+        esac
+done
+
+if [ ${TOSCA_PARSER} == "Cloudnet-TOSCA-toolbox" ] ; then
+	# clone robot tests
+    git clone $GIT_URL_TOSCA_TOOLBOX $TOSCA_PARSER_FOLDER
+    cd $TOSCA_PARSER_FOLDER
+	
+    docker build -t cloudnet/toscaware bin/toscaware
+	
+	#pwd
+	#docker run -v "${PWD}:/work" -v "${PWD}/bin/cloudnet:/cloudnet" --workdir="/work" cloudnet/toscaware /bin/sh -c "echo Building image"
+	#docker run --name=tosca-parser -v "${PWD}:/work" --workdir="/work" cloudnet/toscaware /bin/sh -c "ls"
+	#sleep 5;
+	#container_to_update=`docker ps -n 1 --format '{{.Names}}'`
+	#echo "Creating updated image from container ${container_to_update}"
+	#docker container commit ${container_to_update} cloudnet/toscaware:latest
+	#echo "Deleting old container ${container_to_update}"
+	#docker container rm ${container_to_update}
+
+elif [ ${TOSCA_PARSER} == "Puccini" ] ; then
+	#Build Puccini docker from Dockerfile
+	docker build -t puccini -f scripts/Dockerfile.puccini .
+	
+fi
+
+exit
diff --git a/scripts/parse_tosca_definitions.sh b/scripts/parse_tosca_definitions.sh
new file mode 100644
index 0000000..d2ff06c
--- /dev/null
+++ b/scripts/parse_tosca_definitions.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+TOSCA_PARSER="Cloudnet-TOSCA-toolbox"
+GIT_URL_TOSCA_TOOLBOX="https://github.com/Orange-OpenSource/Cloudnet-TOSCA-toolbox.git"
+TOSCA_PARSER_FOLDER="tosca-parser/"
+
+while getopts v: flag
+do
+        case "${flag}" in
+                v) TOSCA_PARSER=${OPTARG};;
+        esac
+done
+
+if [ ${TOSCA_PARSER} == "Cloudnet-TOSCA-toolbox" ] ; then
+	# Parse TOSCA definitions
+	echo "Cloudnet-TOSCA-toolbox: Validation starting ..."
+	# Cloudnet-TOSCA-toolbox 
+    git clone $GIT_URL_TOSCA_TOOLBOX $TOSCA_PARSER_FOLDER
+    
+	mkdir ${TOSCA_PARSER_FOLDER}examples/mec037
+	cp *.yaml -t ${TOSCA_PARSER_FOLDER}examples/mec037
+	
+	cd ${TOSCA_PARSER_FOLDER}examples/mec037
+	
+	CLOUDNET_BINDIR=../../bin  
+	. ${CLOUDNET_BINDIR}/cloudnet_rc.sh
+	
+	finalResult=0
+	for i in *.yaml ; do
+    
+		result=0
+		echo "Cloudnet-TOSCA-toolbox: Validating file $i..." >> debugCloudnet.log
+		../../bin/toscaware/toscaware $i &> debug.log
+		#docker ${DOCKER_OPTS} run --user "$(id -u)":"$(id -g)" -v "${PWD}/${TOSCA_PARSER_FOLDER}:/work" -v "${PWD}/${TOSCA_PARSER_FOLDER}/bin/cloudnet:/cloudnet" --workdir="/work" --rm --attach=stdin --attach=stdout --attach=stderr cloudnet/toscaware python ${PYTHON_OPTS} /cloudnet/tosca/tosca2cloudnet.py --template-file "$i" ${TOSCAWARE_OPTS}
+		
+		#docker ${DOCKER_OPTS} run --user "$(id -u)":"$(id -g)" --rm --attach=stdin --attach=stdout --attach=stderr cloudnet/toscaware python ${PYTHON_OPTS} /cloudnet/tosca/tosca2cloudnet.py --template-file "$1" ${TOSCAWARE_OPTS}
+		#./${TOSCA_PARSER_FOLDER}/bin/toscaware/toscaware $i $> debug.log
+
+		if [ $? == 2 ] ; then
+
+			echo "Cloudnet-TOSCA-toolbox: ++++ Issues found with TOSCA file syntax in $i"
+			grep "ERROR" < debug.log
+			finalResult=1
+		else
+			echo "Cloudnet-TOSCA-toolbox: ++++ TOSCA parser finished validation of $i"
+			#Check the debug messages, if there's at least one ERROR then res=1
+			if [ `grep "ERROR" < debug.log | wc -l` == 0 ] ; then
+				echo "++++ TOSCA parser finished validation of $i with no errors"
+			else
+				echo "Cloudnet-TOSCA-toolbox: ++++ TOSCA parser finished validation of $i with errors"
+				grep "ERROR" < debug.log
+				finalResult=1
+			fi
+		fi 
+		cat debug.log >> debugCloudnet.log
+	done
+	
+	cp debugCloudnet.log ../../../debugCloudnet.log
+elif [ ${TOSCA_PARSER} == "Puccini" ] ; then
+	finalResult=0
+	echo "Puccini: Validation starting ..."
+		
+	docker run --rm -v "${PWD}:/mec037" puccini ./mec037/scripts/puccini_parse.sh &> debugPuccini.log
+		
+	if [ $? == 0 ] ; then
+		echo "Puccini: ++++ TOSCA parser finished validation with no errors"
+	elif  [ $? == 1 ] ; then
+		echo "Puccini: ++++ TOSCA parser finished validation with errors"
+			#Check the debug messages, if there's at least one ERROR then res=1
+			#if [ `grep "PROBLEMS" < debug.log | wc -l` > 0 ] ; then
+			#	echo "Puccini: ++++ ERRORS: "
+			#	grep "PROBLEMS" < debug.log
+			#	res=1
+			#fi
+			finalResult=1
+	fi 
+		
+fi
+
+exit $finalResult
\ No newline at end of file
diff --git a/scripts/puccini_parse.sh b/scripts/puccini_parse.sh
new file mode 100644
index 0000000..19caa48
--- /dev/null
+++ b/scripts/puccini_parse.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+res=0
+for i in /mec037/*.yaml ; do
+
+	echo "Puccini: Validating file $i..."
+	
+	puccini-tosca parse $i
+	
+	if [ $? == 1 ] ; then
+		res=1
+	fi 
+	
+done
+exit $res
\ No newline at end of file
-- 
GitLab


From a7b3bd61660268427e139e5a43fd704f81fe7dec Mon Sep 17 00:00:00 2001
From: Laurent Velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 11:05:17 +0000
Subject: [PATCH 06/15] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a190b69..2dc36aa 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,4 @@ Unless specified otherwise, the content of this repository and the files contain
 are released under the BSD-3-Clause license.
 See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
  
+  
-- 
GitLab


From a6d35e97874da8c21d549405783a6ec26e70fc11 Mon Sep 17 00:00:00 2001
From: velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 12:33:53 +0100
Subject: [PATCH 07/15] update

---
 scripts/build_tosca_parser.sh      | 0
 scripts/parse_tosca_definitions.sh | 0
 scripts/puccini_parse.sh           | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/build_tosca_parser.sh
 mode change 100644 => 100755 scripts/parse_tosca_definitions.sh
 mode change 100644 => 100755 scripts/puccini_parse.sh

diff --git a/scripts/build_tosca_parser.sh b/scripts/build_tosca_parser.sh
old mode 100644
new mode 100755
diff --git a/scripts/parse_tosca_definitions.sh b/scripts/parse_tosca_definitions.sh
old mode 100644
new mode 100755
diff --git a/scripts/puccini_parse.sh b/scripts/puccini_parse.sh
old mode 100644
new mode 100755
-- 
GitLab


From 1090c36dfc9fe653d9d70b663b4ce32d0f412b0b Mon Sep 17 00:00:00 2001
From: Laurent Velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 11:35:58 +0000
Subject: [PATCH 08/15] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2dc36aa..665e87e 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,4 @@ are released under the BSD-3-Clause license.
 See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
  
   
+     
-- 
GitLab


From cc724dbf12305e2844060a44e2ffea6731add3fa Mon Sep 17 00:00:00 2001
From: velez <laurent.velez@etsi.org>
Date: Wed, 9 Nov 2022 13:08:47 +0100
Subject: [PATCH 09/15] test

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 625d0cf..4526793 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This repository contains Application Package Format and Descriptor specified in
 ## Online resources 
 
 
-## License
+## License:
 
 Unless specified otherwise, the content of this repository and the files contained
 are released under the BSD-3-Clause license.
-- 
GitLab


From c9f745754ef45cb4fa217ca2bff07c1c3d522d98 Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 15 Nov 2022 09:11:41 +0000
Subject: [PATCH 10/15] Update URL of the import statement

---
 MecAppDTypes.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
index 72251e4..76db22a 100644
--- a/MecAppDTypes.yaml
+++ b/MecAppDTypes.yaml
@@ -6,7 +6,7 @@ metadata:
   template_version: 3.1.1
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.5.1/etsi_nfv_sol001_vnfd_types.yaml 
+  - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
 
 data_types:
   tosca.datatypes.mec.ServiceDependency:
-- 
GitLab


From f7faed63b7435c9d6c74632f36fb58ed5a560762 Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 15 Nov 2022 09:17:07 +0000
Subject: [PATCH 11/15] Apply 1 suggestion(s) to 1 file(s)

---
 MecAppDTypes.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
index 76db22a..bed8626 100644
--- a/MecAppDTypes.yaml
+++ b/MecAppDTypes.yaml
@@ -6,7 +6,7 @@ metadata:
   template_version: 3.1.1
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
+   - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
 
 data_types:
   tosca.datatypes.mec.ServiceDependency:
-- 
GitLab


From 097a979efabda300ba6481a23da03fe06911f076 Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 15 Nov 2022 09:34:33 +0000
Subject: [PATCH 12/15] Apply 1 suggestion(s) to 1 file(s)

---
 MecAppDTypes.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
index bed8626..988bb72 100644
--- a/MecAppDTypes.yaml
+++ b/MecAppDTypes.yaml
@@ -6,7 +6,8 @@ metadata:
   template_version: 3.1.1
 
 imports:
-   - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
+#   - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
+   - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.6.1/etsi_nfv_sol001_common_types.yaml
 
 data_types:
   tosca.datatypes.mec.ServiceDependency:
-- 
GitLab


From 2c5f1d37cc0ee4a983c105bda7f4d9fa12def553 Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 15 Nov 2022 09:38:19 +0000
Subject: [PATCH 13/15] Apply again to vnfd.yaml

---
 MecAppDTypes.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
index 988bb72..50dae11 100644
--- a/MecAppDTypes.yaml
+++ b/MecAppDTypes.yaml
@@ -7,7 +7,7 @@ metadata:
 
 imports:
 #   - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
-   - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.6.1/etsi_nfv_sol001_common_types.yaml
+   - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.6.1/etsi_nfv_sol001_vnfd_types.yaml
 
 data_types:
   tosca.datatypes.mec.ServiceDependency:
-- 
GitLab


From 55b400c0f78b4570a40b24ae6fd2dcb5a5a8b63f Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 15 Nov 2022 09:44:03 +0000
Subject: [PATCH 14/15] remove comment

---
 MecAppDTypes.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
index 50dae11..e75008e 100644
--- a/MecAppDTypes.yaml
+++ b/MecAppDTypes.yaml
@@ -6,7 +6,6 @@ metadata:
   template_version: 3.1.1
 
 imports:
-#   - https://forge.etsi.org/rep/nfv/SOL001/-/blob/Release_3/etsi_nfv_sol001_vnfd_types.yaml
    - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.6.1/etsi_nfv_sol001_vnfd_types.yaml
 
 data_types:
-- 
GitLab


From d7e8ca32271f90bb1cd1ffeff7efef5e37279ce9 Mon Sep 17 00:00:00 2001
From: kleberulr <ulrich.kleber@huawei.com>
Date: Tue, 15 Nov 2022 10:00:36 +0000
Subject: [PATCH 15/15] Update MecAppDTypes.yaml, add missing part of node
 definition

---
 MecAppDTypes.yaml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/MecAppDTypes.yaml b/MecAppDTypes.yaml
index e75008e..9e1906d 100644
--- a/MecAppDTypes.yaml
+++ b/MecAppDTypes.yaml
@@ -462,3 +462,41 @@ node_types:
         type: list
         description: features the MEC application requires to run
         required: false
+        entry_schema:
+          type: tosca.datatypes.mec.FeatureDependency
+      app_feature_optional:
+        type: list
+        description: features the MEC application may use if available
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.FeatureDependency
+      transport_dependencies:
+        type: list
+        description: transport required by the MEC application
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.TransportDependency
+      app_traffic_rule:
+        type: list
+        description: traffic rules the MEC application requires
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.TrafficRuleDescriptor
+      app_dns_rule:
+        type: list
+        description: DNS rules the MEC application requires
+        required: false
+        entry_schema:
+          type: tosca.datatypes.mec.DNSRuleDescriptor
+      app_latency:
+        type: tosca.datatypes.mec.LatencyDescriptor
+        description: the maximum latency tolerated by the MEC application
+        required: false
+      user_context_transfer_capability:
+        type: tosca.datatypes.mec.UserContextTransferCapability
+        description: whether the MEC application supports the user context transfer capability
+        required: false
+      app_network_policy:
+        type: tosca.datatypes.mec.AppNetworkPolicy
+        description: the application network policy of carrying the application traffic
+        required: false
-- 
GitLab