diff --git a/plugins/org.etsi.mts.tdl.yang2tdl/samples.tdltx b/plugins/org.etsi.mts.tdl.yang2tdl/samples.tdltx
new file mode 100644
index 0000000000000000000000000000000000000000..210bd895bf768f2cefa75cdd1aa0732e3355a993
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.yang2tdl/samples.tdltx
@@ -0,0 +1,1937 @@
+Package generated_from_samples {
+    Type String
+    Type TODO_RESOLVE_REFERENCED
+    Use "samples" as SOURCE_MAPPING
+    Structure system (
+        string host_name,
+        string_collection domain_search,
+        system___login login
+    )
+    Type string extends string
+    Collection string_collection of string
+    Structure system___login (
+        string message,
+        login___user_collection user
+    )
+    Structure login___user (
+        string ^name,
+        string full_name,
+        string class
+    )
+    Collection login___user_collection of login___user
+    Structure nfv (
+        nfv___vnfd_collection vnfd,
+        nfv___nsd_collection nsd,
+        nfv___pnfd_collection pnfd
+    )
+    Structure nfv___vnfd (
+        string id,
+        string provider,
+        string product_name,
+        string software_version,
+        string version,
+        string product_info_name,
+        string product_info_description,
+        string_collection vnfm_info,
+        string localization_language,
+        string default_localization_language,
+        vnfd___vdu_collection vdu,
+        vnfd___virtual_compute_desc_collection virtual_compute_desc,
+        vnfd___virtual_storage_desc_collection virtual_storage_desc,
+        vnfd___sw_image_desc_collection sw_image_desc,
+        vnfd___int_virtual_link_desc_collection int_virtual_link_desc,
+        vnfd___ext_cpd_collection ext_cpd,
+        vnfd___df_collection df,
+        vnfd___configurable_properties configurable_properties,
+        vnfd___modifiable_attributes modifiable_attributes,
+        vnfd___lifecycle_management_script_collection lifecycle_management_script,
+        vnfd___element_group_collection element_group,
+        vnfd___indicator_collection indicator,
+        string_collection auto_scale,
+        vnfd___security_group_rule_collection security_group_rule
+    )
+    Structure vnfd___vdu (
+        string id,
+        string ^name,
+        string description,
+        vdu___int_cpd_collection int_cpd,
+        @LeafRefPath : "../../virtual-compute-desc/id"
+        leafref virtual_compute_desc,
+        @LeafRefPath : "../../virtual-storage-desc/id"
+        leafref_collection virtual_storage_desc,
+        vdu___boot_order_collection boot_order,
+        @LeafRefPath : "../../sw-image-desc/id"
+        leafref sw_image_desc,
+        string_collection nfvi_constraint,
+        vdu___monitoring_parameter_collection monitoring_parameter,
+        vdu___configurable_properties_collection configurable_properties,
+        string boot_data
+    )
+    Structure vdu___int_cpd (
+        @LeafRefPath : "../../../int-virtual-link-desc/id"
+        leafref int_virtual_link_desc,
+        bitrate_requirement bitrate_requirement,
+        @LeafRefPath : "../../../virtual-compute-desc/id"
+        leafref nicio_requirements,
+        uint32_collection order,
+        @LeafRefPath : "../../../security-group-rule/id"
+        leafref security_group_rule_id,
+        int_cpd___virtual_network_interface_requirement_collection virtual_network_interface_requirement,
+        string id,
+        identityref_collection layer_protocol,
+        identityref role,
+        string description,
+        int_cpd___protocol_collection protocol,
+        boolean trunk_mode
+    )
+    Type leafref
+    Annotation LeafRefPath
+    Type bitrate_requirement extends uint64
+    Type uint64
+    Type uint32 extends uint32
+    Collection uint32_collection of uint32
+    Structure int_cpd___virtual_network_interface_requirement (
+        string ^name,
+        string description,
+        support_mandatory support_mandatory,
+        virtual_network_interface_requirement___network_interface_requirements_collection network_interface_requirements
+    )
+    Type support_mandatory extends boolean
+    Type boolean
+    Structure virtual_network_interface_requirement___network_interface_requirements (
+        string key,
+        string ^value
+    )
+    Collection virtual_network_interface_requirement___network_interface_requirements_collection of virtual_network_interface_requirement___network_interface_requirements
+    Collection int_cpd___virtual_network_interface_requirement_collection of int_cpd___virtual_network_interface_requirement
+    Type identityref
+    Collection identityref_collection of identityref
+    Structure int_cpd___protocol (
+        identityref associated_layer_protocol,
+        protocol___address_data_collection address_data
+    )
+    Structure protocol___address_data (
+        identityref ^type,
+        address_data___l2_address_data l2_address_data,
+        address_data___l3_address_data l3_address_data
+    )
+    Structure address_data___l2_address_data (
+        boolean mac_address_assignment
+    )
+    Structure address_data___l3_address_data (
+        boolean ip_address_assignment,
+        boolean floating_ip_activated,
+        enumeration ip_address_type,
+        uint32 number_of_ip_addresses
+    )
+    Type enumeration
+    Collection protocol___address_data_collection of protocol___address_data
+    Collection int_cpd___protocol_collection of int_cpd___protocol
+    Collection vdu___int_cpd_collection of vdu___int_cpd
+    Collection leafref_collection of leafref
+    Structure vdu___boot_order (
+        uint32 key,
+        @LeafRefPath : "../../virtual-storage-desc"
+        leafref ^value
+    )
+    Collection vdu___boot_order_collection of vdu___boot_order
+    Structure vdu___monitoring_parameter (
+        string id,
+        string ^name,
+        string performance_metric,
+        collection_period collection_period
+    )
+    Type collection_period extends uint64
+    Collection vdu___monitoring_parameter_collection of vdu___monitoring_parameter
+    Structure vdu___configurable_properties (
+        string key,
+        string ^value
+    )
+    Collection vdu___configurable_properties_collection of vdu___configurable_properties
+    Collection vnfd___vdu_collection of vnfd___vdu
+    Structure vnfd___virtual_compute_desc (
+        string id,
+        virtual_compute_desc___logical_node_collection logical_node,
+        virtual_compute_desc___request_additional_capability_collection request_additional_capability,
+        string compute_requirements,
+        virtual_compute_desc___virtual_memory virtual_memory,
+        virtual_compute_desc___virtual_cpu virtual_cpu
+    )
+    Structure virtual_compute_desc___logical_node (
+        string id,
+        logical_node___requirement_detail_collection requirement_detail
+    )
+    Structure logical_node___requirement_detail (
+        string key,
+        string ^value
+    )
+    Collection logical_node___requirement_detail_collection of logical_node___requirement_detail
+    Collection virtual_compute_desc___logical_node_collection of virtual_compute_desc___logical_node
+    Structure virtual_compute_desc___request_additional_capability (
+        string ^name,
+        boolean support_mandatory,
+        string min_version,
+        string preferred_version,
+        request_additional_capability___target_performance_parameters_collection target_performance_parameters
+    )
+    Structure request_additional_capability___target_performance_parameters (
+        string key,
+        string ^value
+    )
+    Collection request_additional_capability___target_performance_parameters_collection of request_additional_capability___target_performance_parameters
+    Collection virtual_compute_desc___request_additional_capability_collection of virtual_compute_desc___request_additional_capability
+    Structure virtual_compute_desc___virtual_memory (
+        ^size ^size,
+        string over_subscription_policy,
+        virtual_memory___vdu_mem_requirements_collection vdu_mem_requirements,
+        boolean numa_enabled
+    )
+    Type ^size extends uint64
+    Type decimal64
+    Structure virtual_memory___vdu_mem_requirements (
+        string key,
+        string ^value
+    )
+    Collection virtual_memory___vdu_mem_requirements_collection of virtual_memory___vdu_mem_requirements
+    Structure virtual_compute_desc___virtual_cpu (
+        string cpu_architecture,
+        num_virtual_cpu num_virtual_cpu,
+        clock clock,
+        string oversubscription_policy,
+        virtual_cpu___vdu_cpu_requirements_collection vdu_cpu_requirements,
+        virtual_cpu___pinning pinning
+    )
+    Type num_virtual_cpu extends uint16
+    Type uint16 extends uint16
+    Type clock extends uint32
+    Structure virtual_cpu___vdu_cpu_requirements (
+        string key,
+        string ^value
+    )
+    Collection virtual_cpu___vdu_cpu_requirements_collection of virtual_cpu___vdu_cpu_requirements
+    Structure virtual_cpu___pinning (
+        policy policy,
+        pinning___rule_collection rule
+    )
+    Enumerated policy {
+        policy static,
+        policy dynamic
+    }
+    Structure pinning___rule (
+        string key,
+        string ^value
+    )
+    Collection pinning___rule_collection of pinning___rule
+    Collection vnfd___virtual_compute_desc_collection of vnfd___virtual_compute_desc
+    Structure vnfd___virtual_storage_desc (
+        string id,
+        type_of_storage type_of_storage,
+        size_of_storage size_of_storage,
+        virtual_storage_desc___vdu_storage_requirements_collection vdu_storage_requirements,
+        boolean rdma_enabled,
+        @LeafRefPath : "../../sw-image-desc/id"
+        leafref sw_image_desc
+    )
+    Type type_of_storage extends identityref
+    Type size_of_storage extends uint64
+    Structure virtual_storage_desc___vdu_storage_requirements (
+        string key,
+        string ^value
+    )
+    Collection virtual_storage_desc___vdu_storage_requirements_collection of virtual_storage_desc___vdu_storage_requirements
+    Collection vnfd___virtual_storage_desc_collection of vnfd___virtual_storage_desc
+    Structure vnfd___sw_image_desc (
+        string id,
+        string ^name,
+        string version,
+        sw_image_desc___checksum checksum,
+        container_format container_format,
+        disk_format disk_format,
+        min_disk min_disk,
+        min_ram min_ram,
+        ^size ^size,
+        image image,
+        string operating_system,
+        string_collection supported_virtualization_environment
+    )
+    Structure sw_image_desc___checksum (
+        identityref algorithm,
+        string hash
+    )
+    Enumerated container_format {
+        container_format aki,
+        container_format ami,
+        container_format ari,
+        container_format bare,
+        container_format docker,
+        container_format ova,
+        container_format ovf
+    }
+    Enumerated disk_format {
+        disk_format aki,
+        disk_format ami,
+        disk_format ari,
+        disk_format iso,
+        disk_format qcow2,
+        disk_format raw,
+        disk_format vdi,
+        disk_format vhd,
+        disk_format vhdx,
+        disk_format vmdk
+    }
+    Type min_disk extends uint64
+    Type min_ram extends decimal64
+    Type image extends uri
+    Type uri
+    Collection vnfd___sw_image_desc_collection of vnfd___sw_image_desc
+    Structure vnfd___int_virtual_link_desc (
+        string id,
+        int_virtual_link_desc___flavour_collection flavour,
+        string_collection test_access,
+        string description,
+        int_virtual_link_desc___monitoring_parameters_collection monitoring_parameters,
+        int_virtual_link_desc___connectivity_type connectivity_type
+    )
+    Structure int_virtual_link_desc___flavour (
+        string id,
+        flavour___qos qos
+    )
+    Structure flavour___qos (
+        latency latency,
+        packet_delay_variation packet_delay_variation,
+        decimal64 packet_loss_ratio
+    )
+    Type latency extends uint32
+    Type packet_delay_variation extends uint32
+    Collection int_virtual_link_desc___flavour_collection of int_virtual_link_desc___flavour
+    Structure int_virtual_link_desc___monitoring_parameters (
+        string id,
+        string ^name,
+        string performance_metric,
+        collection_period collection_period
+    )
+    Collection int_virtual_link_desc___monitoring_parameters_collection of int_virtual_link_desc___monitoring_parameters
+    Structure int_virtual_link_desc___connectivity_type (
+        identityref_collection layer_protocol,
+        flow_pattern flow_pattern
+    )
+    Enumerated flow_pattern {
+        flow_pattern line,
+        flow_pattern tree,
+        flow_pattern mesh,
+        flow_pattern line,
+        flow_pattern tree,
+        flow_pattern mesh
+    }
+    Collection vnfd___int_virtual_link_desc_collection of vnfd___int_virtual_link_desc
+    Structure vnfd___ext_cpd (
+        ext_cpd___cp_connection cp_connection,
+        @LeafRefPath : "../../virtual-compute-desc/id"
+        leafref nicio_requirements,
+        @LeafRefPath : "../../security-group-rule/id"
+        leafref security_group_rule_id,
+        ext_cpd___virtual_network_interface_requirement_collection virtual_network_interface_requirement,
+        string id,
+        identityref_collection layer_protocol,
+        identityref role,
+        string description,
+        ext_cpd___protocol_collection protocol,
+        boolean trunk_mode
+    )
+    Structure ext_cpd___cp_connection (
+        cp_connection___int_virtual_link_desc int_virtual_link_desc,
+        cp_connection___int_cpd int_cpd
+    )
+    Structure cp_connection___int_virtual_link_desc (
+        @LeafRefPath : "../../int-virtual-link-desc/id"
+        string int_virtual_link_desc
+    )
+    Structure cp_connection___int_cpd (
+        int_cpd___int_cpd int_cpd
+    )
+    Structure int_cpd___int_cpd (
+        @LeafRefPath : "../../../vdu/id"
+        string vdu_id,
+        @LeafRefPath : "deref(../vdu-id)/../int-cpd/id"
+        string cpd
+    )
+    Structure ext_cpd___virtual_network_interface_requirement (
+        string ^name,
+        string description,
+        support_mandatory support_mandatory,
+        virtual_network_interface_requirement___network_interface_requirements_collection network_interface_requirements
+    )
+    Collection ext_cpd___virtual_network_interface_requirement_collection of ext_cpd___virtual_network_interface_requirement
+    Structure ext_cpd___protocol (
+        identityref associated_layer_protocol,
+        protocol___address_data_collection address_data
+    )
+    Collection ext_cpd___protocol_collection of ext_cpd___protocol
+    Collection vnfd___ext_cpd_collection of vnfd___ext_cpd
+    Structure vnfd___df (
+        string id,
+        string description,
+        df___vdu_profile_collection vdu_profile,
+        df___virtual_link_profile_collection virtual_link_profile,
+        df___instantiation_level_collection instantiation_level,
+        @LeafRefPath : "../instantiation-level/id"
+        leafref default_instantiation_level,
+        identityref_collection supported_operation,
+        df___lcm_operations_configuration lcm_operations_configuration,
+        df___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
+        df___indicator_collection indicator,
+        df___supported_vnf_interfaces_collection supported_vnf_interfaces,
+        df___monitoring_parameter_collection monitoring_parameter,
+        df___scaling_aspect_collection scaling_aspect
+    )
+    Structure df___vdu_profile (
+        @LeafRefPath : "../../../vdu/id"
+        leafref id,
+        min_number_of_instances min_number_of_instances,
+        max_number_of_instances max_number_of_instances,
+        vdu_profile___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
+        vdu_profile___local_affinity_or_anti_affinity_rule_collection local_affinity_or_anti_affinity_rule
+    )
+    Type min_number_of_instances extends uint16
+    Type max_number_of_instances extends uint16
+    Structure vdu_profile___affinity_or_anti_affinity_group (
+        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
+        leafref id
+    )
+    Collection vdu_profile___affinity_or_anti_affinity_group_collection of vdu_profile___affinity_or_anti_affinity_group
+    Structure vdu_profile___local_affinity_or_anti_affinity_rule (
+        affinity_type affinity_type,
+        affinity_scope affinity_scope
+    )
+    Enumerated affinity_type {
+        affinity_type affinity,
+        affinity_type anti_affinity,
+        affinity_type affinity,
+        affinity_type anti_affinity,
+        affinity_type affinity,
+        affinity_type anti_affinity,
+        affinity_type affinity,
+        affinity_type anti_affinity,
+        affinity_type affinity,
+        affinity_type anti_affinity,
+        affinity_type affinity,
+        affinity_type anti_affinity
+    }
+    Enumerated affinity_scope {
+        affinity_scope nfvi_node,
+        affinity_scope zone_group,
+        affinity_scope zone,
+        affinity_scope nfvi_pop,
+        affinity_scope nfvi_node,
+        affinity_scope zone_group,
+        affinity_scope zone,
+        affinity_scope nfvi_pop,
+        affinity_scope nfvi_node,
+        affinity_scope zone_group,
+        affinity_scope zone,
+        affinity_scope nfvi_pop,
+        affinity_scope nfvi_node,
+        affinity_scope zone_group,
+        affinity_scope zone,
+        affinity_scope nfvi_pop,
+        affinity_scope nfvi_node,
+        affinity_scope zone_group,
+        affinity_scope zone,
+        affinity_scope nfvi_pop,
+        affinity_scope nfvi_node,
+        affinity_scope zone_group,
+        affinity_scope zone,
+        affinity_scope nfvi_pop
+    }
+    Collection vdu_profile___local_affinity_or_anti_affinity_rule_collection of vdu_profile___local_affinity_or_anti_affinity_rule
+    Collection df___vdu_profile_collection of df___vdu_profile
+    Structure df___virtual_link_profile (
+        @LeafRefPath : "../../../int-virtual-link-desc/id"
+        leafref id,
+        @LeafRefPath : "deref(../../../ext-cpd/int-virtual-link-desc)/../flavour/id"
+        leafref flavour,
+        virtual_link_profile___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
+        virtual_link_profile___max_bit_rate_requirements max_bit_rate_requirements,
+        virtual_link_profile___min_bit_rate_requirements min_bit_rate_requirements,
+        virtual_link_profile___virtual_link_protocol_data virtual_link_protocol_data,
+        virtual_link_profile___local_affinity_or_anti_affinity_rule_collection local_affinity_or_anti_affinity_rule,
+        @LeafRefPath : "../../../virtual-link-desc/id"
+        leafref virtual_link_desc_id,
+        @LeafRefPath : "deref(../virtual-link-desc-id)/../df/id"
+        leafref flavour_id,
+        virtual_link_profile___max_bitrate_requirements max_bitrate_requirements,
+        virtual_link_profile___min_bitrate_requirements min_bitrate_requirements
+    )
+    Structure virtual_link_profile___affinity_or_anti_affinity_group (
+        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
+        leafref id
+    )
+    Collection virtual_link_profile___affinity_or_anti_affinity_group_collection of virtual_link_profile___affinity_or_anti_affinity_group
+    Structure virtual_link_profile___max_bit_rate_requirements (
+        uint32 root,
+        uint32 leaf
+    )
+    Structure virtual_link_profile___min_bit_rate_requirements (
+        uint32 root,
+        uint32 leaf
+    )
+    Structure virtual_link_profile___virtual_link_protocol_data (
+        identityref associated_layer_protocol,
+        virtual_link_protocol_data___l2_protocol_data l2_protocol_data,
+        virtual_link_protocol_data___l3_protocol_data l3_protocol_data
+    )
+    Structure virtual_link_protocol_data___l2_protocol_data (
+        string ^name,
+        enumeration network_type,
+        boolean vlan_transparent,
+        uint16 mtu
+    )
+    Structure virtual_link_protocol_data___l3_protocol_data (
+        string ^name,
+        ip_version ip_version,
+        string cidr,
+        string_collection ip_allocation_pools,
+        ip_address gateway_ip,
+        dhcp_enabled dhcp_enabled,
+        enumeration ipv6_address_mode
+    )
+    Enumerated ip_version {
+        ip_version ipv4,
+        ip_version ipv6
+    }
+    Type ip_address extends union
+    Type union
+    Type dhcp_enabled extends boolean
+    Structure virtual_link_profile___local_affinity_or_anti_affinity_rule (
+        affinity_type affinity_type,
+        affinity_scope affinity_scope
+    )
+    Collection virtual_link_profile___local_affinity_or_anti_affinity_rule_collection of virtual_link_profile___local_affinity_or_anti_affinity_rule
+    Collection df___virtual_link_profile_collection of df___virtual_link_profile
+    Structure df___instantiation_level (
+        string id,
+        string description,
+        instantiation_level___vdu_level_collection vdu_level,
+        instantiation_level___scaling_info_collection scaling_info
+    )
+    Structure instantiation_level___vdu_level (
+        @LeafRefPath : "../../../../vdu/id"
+        leafref vdu_id,
+        number_of_instances number_of_instances
+    )
+    Type number_of_instances extends uint32
+    Collection instantiation_level___vdu_level_collection of instantiation_level___vdu_level
+    Structure instantiation_level___scaling_info (
+        @LeafRefPath : "../../../scaling-aspect/id"
+        leafref scaling_aspect_id,
+        uint32 scale_level
+    )
+    Collection instantiation_level___scaling_info_collection of instantiation_level___scaling_info
+    Collection df___instantiation_level_collection of df___instantiation_level
+    Structure df___lcm_operations_configuration (
+        lcm_operations_configuration___parameter_collection instantiate_vnf_op_config,
+        lcm_operations_configuration___scale_vnf_op_config scale_vnf_op_config,
+        lcm_operations_configuration___scale_vnf_to_level_op_config scale_vnf_to_level_op_config,
+        lcm_operations_configuration___heal_vnf_op_config heal_vnf_op_config,
+        lcm_operations_configuration___terminate_vnf_op_config terminate_vnf_op_config,
+        lcm_operations_configuration___operate_vnf_op_config operate_vnf_op_config,
+        lcm_operations_configuration___parameter_collection change_vnf_flavour_op_config,
+        lcm_operations_configuration___parameter_collection change_ext_vnf_connectivity_op_config
+    )
+    Structure lcm_operations_configuration___parameter (
+        string key,
+        string ^value
+    )
+    Collection lcm_operations_configuration___parameter_collection of lcm_operations_configuration___parameter
+    Structure lcm_operations_configuration___scale_vnf_op_config (
+        scale_vnf_op_config___parameter_collection ^parameter,
+        scaling_by_more_than_one_step_supported scaling_by_more_than_one_step_supported
+    )
+    Structure scale_vnf_op_config___parameter (
+        string key,
+        string ^value
+    )
+    Collection scale_vnf_op_config___parameter_collection of scale_vnf_op_config___parameter
+    Type scaling_by_more_than_one_step_supported extends boolean
+    Structure lcm_operations_configuration___scale_vnf_to_level_op_config (
+        scale_vnf_to_level_op_config___parameter_collection ^parameter,
+        arbitrary_target_levels_supported arbitrary_target_levels_supported
+    )
+    Structure scale_vnf_to_level_op_config___parameter (
+        string key,
+        string ^value
+    )
+    Collection scale_vnf_to_level_op_config___parameter_collection of scale_vnf_to_level_op_config___parameter
+    Type arbitrary_target_levels_supported extends boolean
+    Structure lcm_operations_configuration___heal_vnf_op_config (
+        heal_vnf_op_config___parameter_collection ^parameter,
+        string_collection cause
+    )
+    Structure heal_vnf_op_config___parameter (
+        string key,
+        string ^value
+    )
+    Collection heal_vnf_op_config___parameter_collection of heal_vnf_op_config___parameter
+    Structure lcm_operations_configuration___terminate_vnf_op_config (
+        min_graceful_termination min_graceful_termination,
+        timeticks max_recommended_graceful_termination,
+        terminate_vnf_op_config___parameter_collection ^parameter
+    )
+    Type min_graceful_termination extends timeticks
+    Type timeticks extends uint32
+    Structure terminate_vnf_op_config___parameter (
+        string key,
+        string ^value
+    )
+    Collection terminate_vnf_op_config___parameter_collection of terminate_vnf_op_config___parameter
+    Structure lcm_operations_configuration___operate_vnf_op_config (
+        min_graceful_stop_timeout min_graceful_stop_timeout,
+        timeticks max_recommended_graceful_stop_timeout,
+        operate_vnf_op_config___parameter_collection ^parameter
+    )
+    Type min_graceful_stop_timeout extends timeticks
+    Structure operate_vnf_op_config___parameter (
+        string key,
+        string ^value
+    )
+    Collection operate_vnf_op_config___parameter_collection of operate_vnf_op_config___parameter
+    Structure df___affinity_or_anti_affinity_group (
+        string id,
+        affinity_type ^type,
+        affinity_scope scope
+    )
+    Collection df___affinity_or_anti_affinity_group_collection of df___affinity_or_anti_affinity_group
+    Structure df___indicator (
+        string id,
+        string ^name,
+        string indicator_value,
+        enumeration source
+    )
+    Collection df___indicator_collection of df___indicator
+    Structure df___supported_vnf_interfaces (
+        enumeration ^name,
+        @LeafRefPath : "../../../ext-cpd/id"
+        leafref_collection cpd_id,
+        supported_vnf_interfaces___interface_details_collection interface_details
+    )
+    Structure supported_vnf_interfaces___interface_details (
+        string key,
+        string ^value
+    )
+    Collection supported_vnf_interfaces___interface_details_collection of supported_vnf_interfaces___interface_details
+    Collection df___supported_vnf_interfaces_collection of df___supported_vnf_interfaces
+    Structure df___monitoring_parameter (
+        string id,
+        string ^name,
+        string performance_metric,
+        collection_period collection_period
+    )
+    Collection df___monitoring_parameter_collection of df___monitoring_parameter
+    Structure df___scaling_aspect (
+        string id,
+        string ^name,
+        string description,
+        uint32 max_scale_level,
+        scaling_aspect___aspect_delta_details aspect_delta_details,
+        @LeafRefPath : "../../ns-instantiation-level/id"
+        leafref scaling_level
+    )
+    Structure scaling_aspect___aspect_delta_details (
+        aspect_delta_details___deltas_collection deltas,
+        @LeafRefPath : "../deltas/id"
+        leafref step_deltas
+    )
+    Structure aspect_delta_details___deltas (
+        string id,
+        deltas___vdu_delta_collection vdu_delta,
+        deltas___virtual_link_bit_rate_delta_collection virtual_link_bit_rate_delta
+    )
+    Structure deltas___vdu_delta (
+        @LeafRefPath : "../../../../../../vdu/id"
+        leafref id,
+        uint32 number_of_instances
+    )
+    Collection deltas___vdu_delta_collection of deltas___vdu_delta
+    Structure deltas___virtual_link_bit_rate_delta (
+        string id,
+        virtual_link_bit_rate_delta___bit_rate_requirements bit_rate_requirements
+    )
+    Structure virtual_link_bit_rate_delta___bit_rate_requirements (
+        root root,
+        leaf leaf
+    )
+    Type root extends uint64
+    Type leaf extends uint64
+    Collection deltas___virtual_link_bit_rate_delta_collection of deltas___virtual_link_bit_rate_delta
+    Collection aspect_delta_details___deltas_collection of aspect_delta_details___deltas
+    Collection df___scaling_aspect_collection of df___scaling_aspect
+    Collection vnfd___df_collection of vnfd___df
+    Structure vnfd___configurable_properties (
+        boolean is_auto_scalable_enabled,
+        boolean is_auto_heal_enabled,
+        configurable_properties___additional_configurable_property_collection additional_configurable_property
+    )
+    Structure configurable_properties___additional_configurable_property (
+        string key,
+        string ^value
+    )
+    Collection configurable_properties___additional_configurable_property_collection of configurable_properties___additional_configurable_property
+    Structure vnfd___modifiable_attributes (
+        string_collection extension,
+        string_collection metadata
+    )
+    Structure vnfd___lifecycle_management_script (
+        string id,
+        internal_lifecycle_management_script_event_collection ^event,
+        string_collection lcm_transition_event,
+        string script,
+        string script_dsl,
+        lifecycle_management_script___script_input_collection script_input
+    )
+    Enumerated internal_lifecycle_management_script_event {
+        internal_lifecycle_management_script_event start_instantiation,
+        internal_lifecycle_management_script_event end_instantiation,
+        internal_lifecycle_management_script_event start_scaling,
+        internal_lifecycle_management_script_event end_scaling,
+        internal_lifecycle_management_script_event start_healing,
+        internal_lifecycle_management_script_event end_healing,
+        internal_lifecycle_management_script_event start_termination,
+        internal_lifecycle_management_script_event end_termination,
+        internal_lifecycle_management_script_event start_vnf_flavour_change,
+        internal_lifecycle_management_script_event end_vnf_flavour_change,
+        internal_lifecycle_management_script_event start_vnf_operation_change,
+        internal_lifecycle_management_script_event end_vnf_operation_change,
+        internal_lifecycle_management_script_event start_vnf_ext_conn_change,
+        internal_lifecycle_management_script_event end_vnf_ext_conn_change,
+        internal_lifecycle_management_script_event start_vnfinfo_modification,
+        internal_lifecycle_management_script_event end_vnfinfo_modification,
+        internal_lifecycle_management_script_event start_instantiation,
+        internal_lifecycle_management_script_event end_instantiation,
+        internal_lifecycle_management_script_event start_scaling,
+        internal_lifecycle_management_script_event end_scaling,
+        internal_lifecycle_management_script_event start_healing,
+        internal_lifecycle_management_script_event end_healing,
+        internal_lifecycle_management_script_event start_termination,
+        internal_lifecycle_management_script_event end_termination,
+        internal_lifecycle_management_script_event start_vnf_flavour_change,
+        internal_lifecycle_management_script_event end_vnf_flavour_change,
+        internal_lifecycle_management_script_event start_vnf_operation_change,
+        internal_lifecycle_management_script_event end_vnf_operation_change,
+        internal_lifecycle_management_script_event start_vnf_ext_conn_change,
+        internal_lifecycle_management_script_event end_vnf_ext_conn_change,
+        internal_lifecycle_management_script_event start_vnfinfo_modification,
+        internal_lifecycle_management_script_event end_vnfinfo_modification,
+        internal_lifecycle_management_script_event start_instantiation,
+        internal_lifecycle_management_script_event end_instantiation,
+        internal_lifecycle_management_script_event start_scaling,
+        internal_lifecycle_management_script_event end_scaling,
+        internal_lifecycle_management_script_event start_healing,
+        internal_lifecycle_management_script_event end_healing,
+        internal_lifecycle_management_script_event start_termination,
+        internal_lifecycle_management_script_event end_termination,
+        internal_lifecycle_management_script_event start_vnf_flavour_change,
+        internal_lifecycle_management_script_event end_vnf_flavour_change,
+        internal_lifecycle_management_script_event start_vnf_operation_change,
+        internal_lifecycle_management_script_event end_vnf_operation_change,
+        internal_lifecycle_management_script_event start_vnf_ext_conn_change,
+        internal_lifecycle_management_script_event end_vnf_ext_conn_change,
+        internal_lifecycle_management_script_event start_vnfinfo_modification,
+        internal_lifecycle_management_script_event end_vnfinfo_modification
+    }
+    Collection internal_lifecycle_management_script_event_collection of internal_lifecycle_management_script_event
+    Structure lifecycle_management_script___script_input (
+        string key,
+        string ^value
+    )
+    Collection lifecycle_management_script___script_input_collection of lifecycle_management_script___script_input
+    Collection vnfd___lifecycle_management_script_collection of vnfd___lifecycle_management_script
+    Structure vnfd___element_group (
+        string id,
+        string description,
+        @LeafRefPath : "../../vdu/id"
+        leafref_collection vdu,
+        @LeafRefPath : "../../int-virtual-link-desc/id"
+        leafref_collection virtual_link_desc
+    )
+    Collection vnfd___element_group_collection of vnfd___element_group
+    Structure vnfd___indicator (
+        string id,
+        string ^name,
+        string_collection indicator_value,
+        enumeration source
+    )
+    Collection vnfd___indicator_collection of vnfd___indicator
+    Structure vnfd___security_group_rule (
+        string id,
+        string description,
+        direction direction,
+        ether_type ether_type,
+        protocol protocol,
+        port_range_min port_range_min,
+        port_range_max port_range_max
+    )
+    Enumerated direction {
+        direction ingress,
+        direction egress,
+        direction ingress,
+        direction egress
+    }
+    Enumerated ether_type {
+        ether_type ipv4,
+        ether_type ipv6,
+        ether_type ipv4,
+        ether_type ipv6
+    }
+    Enumerated protocol {
+        protocol tcp,
+        protocol udp,
+        protocol icmp,
+        protocol tcp,
+        protocol udp,
+        protocol icmp,
+        protocol tcp,
+        protocol udp,
+        protocol icmp
+    }
+    Type port_range_min extends uint16
+    Type port_range_max extends uint16
+    Collection vnfd___security_group_rule_collection of vnfd___security_group_rule
+    Collection nfv___vnfd_collection of nfv___vnfd
+    Structure nfv___nsd (
+        string id,
+        string designer,
+        string version,
+        string ^name,
+        string invariant_id,
+        @LeafRefPath : "../../nsd/id"
+        leafref_collection nested_nsd_id,
+        @LeafRefPath : "../../vnfd/id"
+        leafref_collection vnfd_id,
+        @LeafRefPath : "../../pnfd/id"
+        leafref_collection pnfd_id,
+        nsd___sapd_collection sapd,
+        nsd___virtual_link_desc_collection virtual_link_desc,
+        nsd___vnffgd_collection vnffgd,
+        string_collection autoscale_rule,
+        nsd___lifecycle_management_script_collection lifecycle_management_script,
+        nsd___df_collection df,
+        string signature,
+        string algorithm,
+        string certificate
+    )
+    Structure nsd___sapd (
+        string id,
+        boolean address_assignment,
+        sapd___cpd_or_virtual_link cpd_or_virtual_link
+    )
+    Structure sapd___cpd_or_virtual_link (
+        cpd_or_virtual_link___virtual_link_desc virtual_link_desc,
+        cpd_or_virtual_link___associated_cpd_id associated_cpd_id
+    )
+    Structure cpd_or_virtual_link___virtual_link_desc (
+        @LeafRefPath : "../../virtual-link-desc/id"
+        leafref virtual_link_desc
+    )
+    Structure cpd_or_virtual_link___associated_cpd_id (
+        associated_cpd_id___associated_cpd_id associated_cpd_id
+    )
+    Structure associated_cpd_id___associated_cpd_id (
+        associated_cpd_id___vnf vnf,
+        associated_cpd_id___pnf pnf,
+        associated_cpd_id___ns ns
+    )
+    Structure associated_cpd_id___vnf (
+        vnf___vnf vnf
+    )
+    Structure vnf___vnf (
+        @LeafRefPath : "../../../../../vnfd/id"
+        leafref vnfd_id,
+        @LeafRefPath : "deref(../vnfd-id)/../ext-cpd/id"
+        leafref ext_cpd_id,
+        @LeafRefPath : "deref(../vnfd-id)/../ext-cpd/id"
+        leafref cpd_id
+    )
+    Structure associated_cpd_id___pnf (
+        pnf___pnf pnf
+    )
+    Structure pnf___pnf (
+        @LeafRefPath : "../../../../../pnfd/id"
+        leafref pnfd_id,
+        @LeafRefPath : "deref(../pnfd-id)/../ext-cpd/id"
+        leafref ext_cpd_id,
+        @LeafRefPath : "deref(../pnfd-id)/../ext-cpd/id"
+        leafref pnf_cpd_id
+    )
+    Structure associated_cpd_id___ns (
+        ns___ns ns
+    )
+    Structure ns___ns (
+        @LeafRefPath : "../../../../../nsd/id"
+        leafref nsd_id,
+        @LeafRefPath : "deref(../nsd-id)/../sapd/id"
+        leafref ext_cpd_id,
+        @LeafRefPath : "deref(../nsd-id)/../sapd/id"
+        leafref sap_cpd_id
+    )
+    Collection nsd___sapd_collection of nsd___sapd
+    Structure nsd___virtual_link_desc (
+        string id,
+        virtual_link_desc___df_collection df,
+        enumeration test_access,
+        string description,
+        virtual_link_desc___connectivity_type connectivity_type,
+        string signature,
+        string algorithm,
+        string certificate
+    )
+    Structure virtual_link_desc___df (
+        string id,
+        df___qos qos,
+        enumeration service_availability_level
+    )
+    Structure df___qos (
+        latency latency,
+        packet_delay_variation packet_delay_variation,
+        decimal64 packet_loss_ratio,
+        uint32 priority
+    )
+    Collection virtual_link_desc___df_collection of virtual_link_desc___df
+    Structure virtual_link_desc___connectivity_type (
+        identityref_collection layer_protocol,
+        flow_pattern flow_pattern
+    )
+    Collection nsd___virtual_link_desc_collection of nsd___virtual_link_desc
+    Structure nsd___vnffgd (
+        string id,
+        @LeafRefPath : "../../df/vnf-profile/id"
+        leafref_collection vnf_profile_id,
+        @LeafRefPath : "../../df/pnf-profile/id"
+        leafref_collection pnf_profile_id,
+        @LeafRefPath : "../../df/ns-profile/id"
+        leafref_collection nested_ns_profile_id,
+        @LeafRefPath : "../../df/virtual-link-profile/id"
+        leafref virtual_link_profile_id,
+        vnffgd___cpd_pool_collection cpd_pool,
+        vnffgd___nfpd_collection nfpd
+    )
+    Structure vnffgd___cpd_pool (
+        string id,
+        cpd_pool___constituent_base_element_id constituent_base_element_id,
+        cpd_pool___constituent_cpd_id constituent_cpd_id
+    )
+    Structure cpd_pool___constituent_base_element_id (
+        constituent_base_element_id___vnf_profile vnf_profile,
+        constituent_base_element_id___pnf_profile pnf_profile,
+        constituent_base_element_id___ns_profile ns_profile
+    )
+    Structure constituent_base_element_id___vnf_profile (
+        vnf_profile___vnf_profile vnf_profile
+    )
+    Structure vnf_profile___vnf_profile (
+        @LeafRefPath : "../../../../../nsd/df/vnf-profile/id"
+        leafref vnf_profile_id
+    )
+    Structure constituent_base_element_id___pnf_profile (
+        pnf_profile___pnf_profile pnf_profile
+    )
+    Structure pnf_profile___pnf_profile (
+        @LeafRefPath : "../../../../../nsd/df/pnf-profile/id"
+        leafref pnf_profile_id
+    )
+    Structure constituent_base_element_id___ns_profile (
+        ns_profile___ns_profile ns_profile
+    )
+    Structure ns_profile___ns_profile (
+        @LeafRefPath : "../../../../../nsd/df/ns-profile/id"
+        leafref ns_profile_id
+    )
+    Structure cpd_pool___constituent_cpd_id (
+        constituent_cpd_id___vnf vnf,
+        constituent_cpd_id___pnf pnf,
+        constituent_cpd_id___ns ns
+    )
+    Structure constituent_cpd_id___vnf (
+        vnf___vnf vnf
+    )
+    Structure constituent_cpd_id___pnf (
+        pnf___pnf pnf
+    )
+    Structure constituent_cpd_id___ns (
+        ns___ns ns
+    )
+    Collection vnffgd___cpd_pool_collection of vnffgd___cpd_pool
+    Structure vnffgd___nfpd (
+        string id,
+        string rule,
+        nfpd___position_desc_id_collection position_desc_id
+    )
+    Structure nfpd___position_desc_id (
+        string id,
+        position_desc_id___cp_profile_id_collection cp_profile_id
+    )
+    Structure position_desc_id___cp_profile_id (
+        string id,
+        cp_profile_id___constituent_profile_elements_collection constituent_profile_elements
+    )
+    Structure cp_profile_id___constituent_profile_elements (
+        string id,
+        string cpd_id
+    )
+    Collection cp_profile_id___constituent_profile_elements_collection of cp_profile_id___constituent_profile_elements
+    Collection position_desc_id___cp_profile_id_collection of position_desc_id___cp_profile_id
+    Collection nfpd___position_desc_id_collection of nfpd___position_desc_id
+    Collection vnffgd___nfpd_collection of vnffgd___nfpd
+    Collection nsd___vnffgd_collection of nsd___vnffgd
+    Structure nsd___lifecycle_management_script (
+        string ^event,
+        string script
+    )
+    Collection nsd___lifecycle_management_script_collection of nsd___lifecycle_management_script
+    Structure nsd___df (
+        string id,
+        @LeafRefPath : "../monitored-info/id"
+        leafref flavour_key,
+        df___vnf_profile_collection vnf_profile,
+        df___pnf_profile_collection pnf_profile,
+        df___virtual_link_profile_collection virtual_link_profile,
+        df___scaling_aspect_collection scaling_aspect,
+        df___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
+        df___ns_instantiation_level_collection ns_instantiation_level,
+        @LeafRefPath : "../ns-instantiation-level/id"
+        leafref default_instantiation_level,
+        df___ns_profile_collection ns_profile,
+        df___dependencies_collection dependencies,
+        df___monitored_info_collection monitored_info
+    )
+    Structure df___vnf_profile (
+        string id,
+        @LeafRefPath : "../../../../vnfd/id"
+        leafref vnfd_id,
+        @LeafRefPath : "deref(../vnfd-id)/../df/id"
+        leafref flavour_id,
+        @LeafRefPath : "deref(../flavour-id)/../instantiation-level/id"
+        leafref instantiation_level,
+        min_number_of_instances min_number_of_instances,
+        max_number_of_instances max_number_of_instances,
+        vnf_profile___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
+        vnf_profile___virtual_link_connectivity_collection virtual_link_connectivity,
+        vnf_profile___local_affinity_or_anti_affinity_rule_collection local_affinity_or_anti_affinity_rule
+    )
+    Structure vnf_profile___affinity_or_anti_affinity_group (
+        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
+        leafref id
+    )
+    Collection vnf_profile___affinity_or_anti_affinity_group_collection of vnf_profile___affinity_or_anti_affinity_group
+    Structure vnf_profile___virtual_link_connectivity (
+        @LeafRefPath : "../../../virtual-link-profile/id"
+        leafref virtual_link_profile_id,
+        virtual_link_connectivity___constituent_cpd_id_collection constituent_cpd_id
+    )
+    Structure virtual_link_connectivity___constituent_cpd_id (
+        @LeafRefPath : "../../../id"
+        leafref constituent_base_element_id,
+        @LeafRefPath : "deref(../../../nsd-id)/../sapd/id"
+        leafref constituent_cpd_id
+    )
+    Collection virtual_link_connectivity___constituent_cpd_id_collection of virtual_link_connectivity___constituent_cpd_id
+    Collection vnf_profile___virtual_link_connectivity_collection of vnf_profile___virtual_link_connectivity
+    Structure vnf_profile___local_affinity_or_anti_affinity_rule (
+        affinity_type affinity_type,
+        affinity_scope affinity_scope
+    )
+    Collection vnf_profile___local_affinity_or_anti_affinity_rule_collection of vnf_profile___local_affinity_or_anti_affinity_rule
+    Collection df___vnf_profile_collection of df___vnf_profile
+    Structure df___pnf_profile (
+        string id,
+        @LeafRefPath : "../../../../pnfd/id"
+        leafref pnfd_id,
+        pnf_profile___virtual_link_connectivity_collection virtual_link_connectivity
+    )
+    Structure pnf_profile___virtual_link_connectivity (
+        @LeafRefPath : "../../../virtual-link-profile/id"
+        leafref virtual_link_profile_id,
+        virtual_link_connectivity___constituent_cpd_id_collection constituent_cpd_id
+    )
+    Collection pnf_profile___virtual_link_connectivity_collection of pnf_profile___virtual_link_connectivity
+    Collection df___pnf_profile_collection of df___pnf_profile
+    Structure virtual_link_profile___max_bitrate_requirements (
+        root root,
+        leaf leaf
+    )
+    Structure virtual_link_profile___min_bitrate_requirements (
+        root root,
+        leaf leaf
+    )
+    Structure df___ns_instantiation_level (
+        string id,
+        string description,
+        ns_instantiation_level___vnf_to_level_mapping_collection vnf_to_level_mapping,
+        ns_instantiation_level___virtual_link_to_level_mapping_collection virtual_link_to_level_mapping,
+        ns_instantiation_level___ns_to_level_mapping_collection ns_to_level_mapping
+    )
+    Structure ns_instantiation_level___vnf_to_level_mapping (
+        @LeafRefPath : "../../../vnf-profile/id"
+        leafref vnf_profile_id,
+        number_of_instances number_of_instances
+    )
+    Collection ns_instantiation_level___vnf_to_level_mapping_collection of ns_instantiation_level___vnf_to_level_mapping
+    Structure ns_instantiation_level___virtual_link_to_level_mapping (
+        @LeafRefPath : "../../../virtual-link-profile/id"
+        leafref virtual_link_profile_id,
+        root root,
+        leaf leaf
+    )
+    Collection ns_instantiation_level___virtual_link_to_level_mapping_collection of ns_instantiation_level___virtual_link_to_level_mapping
+    Structure ns_instantiation_level___ns_to_level_mapping (
+        @LeafRefPath : "../../../ns-profile/id"
+        leafref ns_profile_id,
+        number_of_instances number_of_instances
+    )
+    Collection ns_instantiation_level___ns_to_level_mapping_collection of ns_instantiation_level___ns_to_level_mapping
+    Collection df___ns_instantiation_level_collection of df___ns_instantiation_level
+    Structure df___ns_profile (
+        string id,
+        @LeafRefPath : "../../../../nsd/id"
+        leafref nsd_id,
+        @LeafRefPath : "deref(../nsd-id)/../df/id"
+        leafref ns_df_id,
+        @LeafRefPath : "deref(../ns-df-id)/../ns-instantiation-level/id"
+        leafref instantiation_level_id,
+        min_number_of_instances min_number_of_instances,
+        max_number_of_instances max_number_of_instances,
+        ns_profile___affinity_or_anti_affinity_group_id_collection affinity_or_anti_affinity_group_id,
+        ns_profile___virtual_link_connectivity_collection virtual_link_connectivity
+    )
+    Structure ns_profile___affinity_or_anti_affinity_group_id (
+        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
+        leafref id
+    )
+    Collection ns_profile___affinity_or_anti_affinity_group_id_collection of ns_profile___affinity_or_anti_affinity_group_id
+    Structure ns_profile___virtual_link_connectivity (
+        @LeafRefPath : "../../../virtual-link-profile/id"
+        leafref virtual_link_profile_id,
+        virtual_link_connectivity___constituent_cpd_id_collection constituent_cpd_id
+    )
+    Collection ns_profile___virtual_link_connectivity_collection of ns_profile___virtual_link_connectivity
+    Collection df___ns_profile_collection of df___ns_profile
+    Structure df___dependencies (
+        string id,
+        dependencies___primary_id primary_id,
+        dependencies___secondary_id secondary_id
+    )
+    Structure dependencies___primary_id (
+        primary_id___primary_vnf_profile primary_vnf_profile,
+        primary_id___primary_ns_profile primary_ns_profile
+    )
+    Structure primary_id___primary_vnf_profile (
+        @LeafRefPath : "../../vnf-profile/vnfd-id"
+        leafref primary_vnf_profile
+    )
+    Structure primary_id___primary_ns_profile (
+        @LeafRefPath : "../../ns-profile/nsd-id"
+        leafref primary_ns_profile
+    )
+    Structure dependencies___secondary_id (
+        secondary_id___secondary_vnf_profile secondary_vnf_profile,
+        secondary_id___secondary_ns_profile secondary_ns_profile
+    )
+    Structure secondary_id___secondary_vnf_profile (
+        @LeafRefPath : "../../vnf-profile/vnfd-id"
+        leafref secondary_vnf_profile
+    )
+    Structure secondary_id___secondary_ns_profile (
+        @LeafRefPath : "../../ns-profile/nsd-id"
+        leafref secondary_ns_profile
+    )
+    Collection df___dependencies_collection of df___dependencies
+    Structure df___monitored_info (
+        string id,
+        monitored_info___vnf_indicator_info vnf_indicator_info,
+        monitored_info___monitoring_parameter monitoring_parameter
+    )
+    Structure monitored_info___vnf_indicator_info (
+        @LeafRefPath : "../../../../../vnfd/id"
+        leafref vnfd_id,
+        @LeafRefPath : "deref(../vnfd-id)/../indicator/id"
+        leafref vnf_indicator
+    )
+    Structure monitored_info___monitoring_parameter (
+        string id,
+        string ^name,
+        string performance_metric,
+        string collection_period
+    )
+    Collection df___monitored_info_collection of df___monitored_info
+    Collection nsd___df_collection of nsd___df
+    Collection nfv___nsd_collection of nfv___nsd
+    Structure nfv___pnfd (
+        string id,
+        string function_description,
+        string provider,
+        string version,
+        string invariant_id,
+        string ^name,
+        pnfd___ext_cpd_collection ext_cpd,
+        pnfd___security_collection security,
+        string geographical_location_info,
+        pnfd___security_group_rule_collection security_group_rule
+    )
+    Structure pnfd___ext_cpd (
+        string id,
+        identityref_collection layer_protocol,
+        identityref role,
+        string description,
+        ext_cpd___protocol_collection protocol,
+        boolean trunk_mode
+    )
+    Collection pnfd___ext_cpd_collection of pnfd___ext_cpd
+    Structure pnfd___security (
+        string signature,
+        string algorithm,
+        string certificate
+    )
+    Collection pnfd___security_collection of pnfd___security
+    Structure pnfd___security_group_rule (
+        string id,
+        string description,
+        direction direction,
+        ether_type ether_type,
+        protocol protocol,
+        port_range_min port_range_min,
+        port_range_max port_range_max
+    )
+    Collection pnfd___security_group_rule_collection of pnfd___security_group_rule
+    Collection nfv___pnfd_collection of nfv___pnfd
+    Structure nsd (
+        nsd___vnfd_collection vnfd,
+        nsd___nsd_collection nsd,
+        nsd___pnfd_collection pnfd
+    )
+    Structure nsd___vnfd (
+        string id,
+        string provider,
+        string product_name,
+        string software_version,
+        string version,
+        string product_info_name,
+        string product_info_description,
+        string_collection vnfm_info,
+        string localization_language,
+        string default_localization_language,
+        vnfd___vdu_collection vdu,
+        vnfd___virtual_compute_desc_collection virtual_compute_desc,
+        vnfd___virtual_storage_desc_collection virtual_storage_desc,
+        vnfd___sw_image_desc_collection sw_image_desc,
+        vnfd___int_virtual_link_desc_collection int_virtual_link_desc,
+        vnfd___ext_cpd_collection ext_cpd,
+        vnfd___df_collection df,
+        vnfd___configurable_properties configurable_properties,
+        vnfd___modifiable_attributes modifiable_attributes,
+        vnfd___lifecycle_management_script_collection lifecycle_management_script,
+        vnfd___element_group_collection element_group,
+        vnfd___indicator_collection indicator,
+        string_collection auto_scale,
+        vnfd___security_group_rule_collection security_group_rule
+    )
+    Collection nsd___vnfd_collection of nsd___vnfd
+    Structure nsd___nsd (
+        string id,
+        string designer,
+        string version,
+        string ^name,
+        string invariant_id,
+        @LeafRefPath : "../../nsd/id"
+        leafref_collection nested_nsd_id,
+        @LeafRefPath : "../../vnfd/id"
+        leafref_collection vnfd_id,
+        @LeafRefPath : "../../pnfd/id"
+        leafref_collection pnfd_id,
+        nsd___sapd_collection sapd,
+        nsd___virtual_link_desc_collection virtual_link_desc,
+        nsd___vnffgd_collection vnffgd,
+        string_collection autoscale_rule,
+        nsd___lifecycle_management_script_collection lifecycle_management_script,
+        nsd___df_collection df,
+        string signature,
+        string algorithm,
+        string certificate
+    )
+    Collection nsd___nsd_collection of nsd___nsd
+    Structure nsd___pnfd (
+        string id,
+        string function_description,
+        string provider,
+        string version,
+        string invariant_id,
+        string ^name,
+        pnfd___ext_cpd_collection ext_cpd,
+        pnfd___security_collection security,
+        string geographical_location_info,
+        pnfd___security_group_rule_collection security_group_rule
+    )
+    Collection nsd___pnfd_collection of nsd___pnfd
+    Structure pnfd (
+        string id,
+        string function_description,
+        string provider,
+        string version,
+        string invariant_id,
+        string ^name,
+        pnfd___ext_cpd_collection ext_cpd,
+        pnfd___security_collection security,
+        string geographical_location_info,
+        pnfd___security_group_rule_collection security_group_rule
+    )
+    Structure vnfd (
+        string id,
+        string provider,
+        string product_name,
+        string software_version,
+        string version,
+        string product_info_name,
+        string product_info_description,
+        string_collection vnfm_info,
+        string localization_language,
+        string default_localization_language,
+        vnfd___vdu_collection vdu,
+        vnfd___virtual_compute_desc_collection virtual_compute_desc,
+        vnfd___virtual_storage_desc_collection virtual_storage_desc,
+        vnfd___sw_image_desc_collection sw_image_desc,
+        vnfd___int_virtual_link_desc_collection int_virtual_link_desc,
+        vnfd___ext_cpd_collection ext_cpd,
+        vnfd___df_collection df,
+        vnfd___configurable_properties configurable_properties,
+        vnfd___modifiable_attributes modifiable_attributes,
+        vnfd___lifecycle_management_script_collection lifecycle_management_script,
+        vnfd___element_group_collection element_group,
+        vnfd___indicator_collection indicator,
+        string_collection auto_scale,
+        vnfd___security_group_rule_collection security_group_rule
+    )
+    Structure parent_container (
+        parent_container___parent_ordered_list_collection child_container
+    )
+    Structure parent_container___parent_ordered_list (
+        string parent_key_leaf,
+        string parent_ordinary_leaf,
+        parent_ordered_list___child_ordered_list_collection child_ordered_list
+    )
+    Structure parent_ordered_list___child_ordered_list (
+        string child_key_leaf,
+        string child_ordinary_leaf
+    )
+    Collection parent_ordered_list___child_ordered_list_collection of parent_ordered_list___child_ordered_list
+    Collection parent_container___parent_ordered_list_collection of parent_container___parent_ordered_list
+    Structure sports (
+        sports___person_collection person,
+        sports___team_collection team,
+        sports___protocol_collection protocol
+    )
+    Structure sports___person (
+        string ^name,
+        date_and_time birthday
+    )
+    Type date_and_time extends string
+    Collection sports___person_collection of sports___person
+    Structure sports___team (
+        string ^name,
+        team___player_collection player,
+        protocol protocol
+    )
+    Structure team___player (
+        @LeafRefPath : "/sports/person/name"
+        leafref ^name,
+        season season,
+        uint16 number,
+        scores scores,
+        uint16_collection score_list
+    )
+    Type season extends string
+    Type scores extends uint16
+    Collection uint16_collection of uint16
+    Collection team___player_collection of team___player
+    Collection sports___team_collection of sports___team
+    Structure sports___protocol (
+        string associated_layer_protocol,
+        protocoly protocoly,
+        protocol___ext_cpd_collection ext_cpd,
+        protocol___case_ext_cpd_collection case_ext_cpd,
+        string protocolz,
+        protocol___port_map_collection port_map
+    )
+    Enumerated protocoly {
+        protocoly tcp,
+        protocoly udp,
+        protocoly icmp
+    }
+    Structure protocol___ext_cpd (
+        string k,
+        ext_cpd___cp_connection cp_connection
+    )
+    Collection protocol___ext_cpd_collection of protocol___ext_cpd
+    Structure protocol___case_ext_cpd (
+        string k,
+        case_ext_cpd___cp_connection cp_connection
+    )
+    Structure case_ext_cpd___cp_connection (
+        cp_connection___a ^a,
+        cp_connection___b b
+    )
+    Structure cp_connection___a (
+        string int_virtual_link_desc
+    )
+    Structure cp_connection___b (
+        b___int_cpd int_cpd
+    )
+    Structure b___int_cpd (
+        string vdu_id,
+        string cpd
+    )
+    Collection protocol___case_ext_cpd_collection of protocol___case_ext_cpd
+    Structure protocol___port_map (
+        string port_ref,
+        port_map___map_type map_type
+    )
+    Structure port_map___map_type (
+        map_type___static_filtering_entries static_filtering_entries,
+        map_type___static_vlan_registration_entries static_vlan_registration_entries,
+        map_type___mac_address_registration_entries mac_address_registration_entries,
+        map_type___dynamic_vlan_registration_entries dynamic_vlan_registration_entries,
+        map_type___dynamic_reservation_entries dynamic_reservation_entries,
+        map_type___dynamic_filtering_entries dynamic_filtering_entries
+    )
+    Structure map_type___static_filtering_entries (
+        static_filtering_entries___static_filtering_entries static_filtering_entries
+    )
+    Structure static_filtering_entries___static_filtering_entries (
+        enumeration control_element,
+        port_number_type connection_identifier
+    )
+    Structure map_type___static_vlan_registration_entries (
+        static_vlan_registration_entries___static_vlan_registration_entries static_vlan_registration_entries
+    )
+    Structure static_vlan_registration_entries___static_vlan_registration_entries (
+        enumeration registrar_admin_control,
+        enumeration vlan_transmitted
+    )
+    Collection protocol___port_map_collection of protocol___port_map
+    Collection sports___protocol_collection of sports___protocol
+    Structure bridge (
+        name_type ^name,
+        mac_address address,
+        identityref bridge_type,
+        uint16 ports,
+        up_time up_time,
+        uint32 components,
+        bridge___component_collection ^component
+    )
+    Type name_type extends string
+    Type mac_address extends string
+    Type up_time extends zero_based_counter32
+    Type zero_based_counter32
+    Structure bridge___component (
+        string ^name,
+        uint32 id,
+        identityref ^type,
+        mac_address address,
+        traffic_class_enabled traffic_class_enabled,
+        uint16 ports,
+        @LeafRefPath : "/if:interfaces/if:interface/if:name"
+        interface_ref_collection bridge_port,
+        component___capabilities capabilities,
+        component___filtering_database filtering_database,
+        component___permanent_database permanent_database,
+        component___bridge_vlan bridge_vlan,
+        component___bridge_mst bridge_mst
+    )
+    Type traffic_class_enabled extends boolean
+    Type interface_ref extends leafref
+    Collection interface_ref_collection of interface_ref
+    Structure component___capabilities (
+        extended_filtering extended_filtering,
+        traffic_classes traffic_classes,
+        static_entry_individual_port static_entry_individual_port,
+        ivl_capable ivl_capable,
+        svl_capable svl_capable,
+        hybrid_capable hybrid_capable,
+        configurable_pvid_tagging configurable_pvid_tagging,
+        local_vlan_capable local_vlan_capable
+    )
+    Type extended_filtering extends boolean
+    Type traffic_classes extends boolean
+    Type static_entry_individual_port extends boolean
+    Type ivl_capable extends boolean
+    Type svl_capable extends boolean
+    Type hybrid_capable extends boolean
+    Type configurable_pvid_tagging extends boolean
+    Type local_vlan_capable extends boolean
+    Structure component___filtering_database (
+        aging_time aging_time,
+        gauge32 ^size,
+        gauge32 static_entries,
+        gauge32 dynamic_entries,
+        gauge32 static_vlan_registration_entries,
+        gauge32 dynamic_vlan_registration_entries,
+        gauge32 mac_address_registration_entries,
+        filtering_database___filtering_entry_collection filtering_entry,
+        filtering_database___vlan_registration_entry_collection vlan_registration_entry
+    )
+    Type aging_time extends uint32
+    Type gauge32 extends uint32
+    Structure filtering_database___filtering_entry (
+        uint32 database_id,
+        mac_address address,
+        vid_range_type vids,
+        enumeration entry_type,
+        filtering_entry___port_map_collection port_map,
+        enumeration status
+    )
+    Type vid_range_type extends string
+    Structure filtering_entry___port_map (
+        port_number_type port_ref,
+        port_map___map_type map_type
+    )
+    Type port_number_type extends uint32
+    Structure map_type___mac_address_registration_entries (
+        mac_address_registration_entries___mac_address_registration_entries mac_address_registration_entries
+    )
+    Structure mac_address_registration_entries___mac_address_registration_entries (
+        enumeration control_element
+    )
+    Structure map_type___dynamic_vlan_registration_entries (
+        dynamic_vlan_registration_entries___dynamic_vlan_registration_entries dynamic_vlan_registration_entries
+    )
+    Structure dynamic_vlan_registration_entries___dynamic_vlan_registration_entries (
+        enumeration control_element
+    )
+    Structure map_type___dynamic_reservation_entries (
+        dynamic_reservation_entries___dynamic_reservation_entries dynamic_reservation_entries
+    )
+    Structure dynamic_reservation_entries___dynamic_reservation_entries (
+        enumeration control_element
+    )
+    Structure map_type___dynamic_filtering_entries (
+        dynamic_filtering_entries___dynamic_filtering_entries dynamic_filtering_entries
+    )
+    Structure dynamic_filtering_entries___dynamic_filtering_entries (
+        enumeration control_element
+    )
+    Collection filtering_entry___port_map_collection of filtering_entry___port_map
+    Collection filtering_database___filtering_entry_collection of filtering_database___filtering_entry
+    Structure filtering_database___vlan_registration_entry (
+        uint32 database_id,
+        vid_range_type vids,
+        enumeration entry_type,
+        vlan_registration_entry___port_map_collection port_map
+    )
+    Structure vlan_registration_entry___port_map (
+        port_number_type port_ref,
+        port_map___map_type map_type
+    )
+    Collection vlan_registration_entry___port_map_collection of vlan_registration_entry___port_map
+    Collection filtering_database___vlan_registration_entry_collection of filtering_database___vlan_registration_entry
+    Structure component___permanent_database (
+        gauge32 ^size,
+        gauge32 static_entries,
+        gauge32 static_vlan_registration_entries,
+        permanent_database___filtering_entry_collection filtering_entry
+    )
+    Structure permanent_database___filtering_entry (
+        uint32 database_id,
+        mac_address address,
+        vid_range_type vids,
+        enumeration status,
+        filtering_entry___port_map_collection port_map
+    )
+    Collection permanent_database___filtering_entry_collection of permanent_database___filtering_entry
+    Structure component___bridge_vlan (
+        uint16 version,
+        uint16 max_vids,
+        override_default_pvid override_default_pvid,
+        protocol_frame_format_type protocol_template,
+        uint16 max_msti,
+        bridge_vlan___vlan_collection vlan,
+        bridge_vlan___protocol_group_database_collection protocol_group_database,
+        bridge_vlan___vid_to_fid_allocation_collection vid_to_fid_allocation,
+        bridge_vlan___fid_to_vid_allocation_collection fid_to_vid_allocation,
+        bridge_vlan___vid_to_fid_collection vid_to_fid
+    )
+    Type override_default_pvid extends boolean
+    Enumerated protocol_frame_format_type {
+        protocol_frame_format_type Ethernet,
+        protocol_frame_format_type rfc1042,
+        protocol_frame_format_type snap8021H,
+        protocol_frame_format_type snapOther,
+        protocol_frame_format_type llcOther,
+        protocol_frame_format_type Ethernet,
+        protocol_frame_format_type rfc1042,
+        protocol_frame_format_type snap8021H,
+        protocol_frame_format_type snapOther,
+        protocol_frame_format_type llcOther
+    }
+    Structure bridge_vlan___vlan (
+        vlan_index_type vid,
+        name_type ^name,
+        @LeafRefPath : "/if:interfaces/if:interface/if:name"
+        interface_ref_collection untagged_ports,
+        @LeafRefPath : "/if:interfaces/if:interface/if:name"
+        interface_ref_collection egress_ports
+    )
+    Type vlan_index_type extends uint32
+    Collection bridge_vlan___vlan_collection of bridge_vlan___vlan
+    Structure bridge_vlan___protocol_group_database (
+        uint16 db_index,
+        protocol_frame_format_type frame_format_type,
+        protocol_group_database___frame_format frame_format,
+        uint32 group_id
+    )
+    Structure protocol_group_database___frame_format (
+        frame_format___ethernet_rfc1042_snap8021H ethernet_rfc1042_snap8021H,
+        frame_format___snap_other snap_other,
+        frame_format___llc_other llc_other
+    )
+    Structure frame_format___ethernet_rfc1042_snap8021H (
+        ethertype_type ethertype
+    )
+    Type ethertype_type extends string
+    Structure frame_format___snap_other (
+        string protocol_id
+    )
+    Structure frame_format___llc_other (
+        llc_other___dsap_ssap_pairs dsap_ssap_pairs
+    )
+    Structure llc_other___dsap_ssap_pairs (
+        string llc_address
+    )
+    Collection bridge_vlan___protocol_group_database_collection of bridge_vlan___protocol_group_database
+    Structure bridge_vlan___vid_to_fid_allocation (
+        vid_range_type vids,
+        uint32 fid,
+        enumeration allocation_type
+    )
+    Collection bridge_vlan___vid_to_fid_allocation_collection of bridge_vlan___vid_to_fid_allocation
+    Structure bridge_vlan___fid_to_vid_allocation (
+        uint32 fid,
+        enumeration allocation_type,
+        vlan_index_type_collection vid
+    )
+    Collection vlan_index_type_collection of vlan_index_type
+    Collection bridge_vlan___fid_to_vid_allocation_collection of bridge_vlan___fid_to_vid_allocation
+    Structure bridge_vlan___vid_to_fid (
+        vlan_index_type vid,
+        uint32 fid
+    )
+    Collection bridge_vlan___vid_to_fid_collection of bridge_vlan___vid_to_fid
+    Structure component___bridge_mst (
+        mstid_type_collection mstid,
+        bridge_mst___fid_to_mstid_collection fid_to_mstid,
+        bridge_mst___fid_to_mstid_allocation_collection fid_to_mstid_allocation
+    )
+    Type mstid_type extends uint32
+    Collection mstid_type_collection of mstid_type
+    Structure bridge_mst___fid_to_mstid (
+        uint32 fid,
+        mstid_type mstid
+    )
+    Collection bridge_mst___fid_to_mstid_collection of bridge_mst___fid_to_mstid
+    Structure bridge_mst___fid_to_mstid_allocation (
+        vid_range_type fids,
+        mstid_type mstid
+    )
+    Collection bridge_mst___fid_to_mstid_allocation_collection of bridge_mst___fid_to_mstid_allocation
+    Collection bridge___component_collection of bridge___component
+    Collection bridge_collection of bridge
+    Structure interface (
+        string ^name,
+        string description,
+        identityref ^type,
+        enabled enabled,
+        enumeration link_up_down_trap_enable,
+        enumeration admin_status,
+        enumeration oper_status,
+        date_and_time last_change,
+        int32 if_index,
+        phys_address phys_address,
+        @LeafRefPath : "/if:interfaces-state/if:interface/if:name"
+        interface_state_ref_collection higher_layer_if,
+        @LeafRefPath : "/if:interfaces-state/if:interface/if:name"
+        interface_state_ref_collection lower_layer_if,
+        speed speed,
+        interface___statistics statistics,
+        interface___bridge_port bridge_port
+    )
+    Type enabled extends boolean
+    Type int32 extends int32
+    Type phys_address extends string
+    Type speed extends gauge64
+    Type gauge64
+    Structure interface___statistics (
+        date_and_time discontinuity_time,
+        counter64 in_octets,
+        counter64 in_unicast_pkts,
+        counter64 in_broadcast_pkts,
+        counter64 in_multicast_pkts,
+        counter32 in_discards,
+        counter32 in_errors,
+        counter32 in_unknown_protos,
+        counter64 out_octets,
+        counter64 out_unicast_pkts,
+        counter64 out_broadcast_pkts,
+        counter64 out_multicast_pkts,
+        counter32 out_discards,
+        counter32 out_errors
+    )
+    Type counter64 extends uint64
+    Type counter32 extends uint32
+    Structure interface___bridge_port (
+        @LeafRefPath : "/dot1q:bridges/dot1q:bridge/dot1q:name"
+        leafref bridge_name,
+        @LeafRefPath : "/dot1q:bridges/dot1q:bridge[dot1q:name=current()/../bridge-name]/dot1q:component/dot1q:name"
+        leafref component_name,
+        identityref port_type,
+        pvid pvid,
+        default_priority default_priority,
+        bridge_port___priority_regeneration priority_regeneration,
+        pcp_selection pcp_selection,
+        bridge_port___pcp_decoding_map_collection pcp_decoding_table,
+        bridge_port___pcp_encoding_map_collection pcp_encoding_table,
+        use_dei use_dei,
+        drop_encoding drop_encoding,
+        service_access_priority_selection service_access_priority_selection,
+        bridge_port___service_access_priority service_access_priority,
+        bridge_port___traffic_class_map_collection traffic_class,
+        bridge_port___transmission_selection_algorithm_map_collection transmission_selection_algorithm_table,
+        acceptable_frame acceptable_frame,
+        enable_ingress_filtering enable_ingress_filtering,
+        enable_restricted_vlan_registration enable_restricted_vlan_registration,
+        enable_vid_translation_table enable_vid_translation_table,
+        enable_egress_vid_translation_table enable_egress_vid_translation_table,
+        bridge_port___protocol_group_vid_set_collection protocol_group_vid_set,
+        enumeration admin_point_to_point,
+        boolean protocol_based_vlan_classification,
+        uint16 max_vid_set_entries,
+        port_number_type port_number,
+        mac_address address,
+        bits capabilities,
+        bits type_capabilties,
+        boolean external,
+        boolean oper_point_to_point,
+        media_dependent_overhead media_dependent_overhead,
+        bridge_port___statistics statistics,
+        bridge_port___vid_translations_collection vid_translations,
+        bridge_port___egress_vid_translations_collection egress_vid_translations,
+        vlanid svid,
+        bridge_port___cvid_registration_collection cvid_registration,
+        bridge_port___service_priority_regeneration_collection service_priority_regeneration,
+        bridge_port___rcap_internal_interface_collection rcap_internal_interface
+    )
+    Type pvid extends vlan_index_type
+    Type default_priority extends priority_type
+    Type priority_type
+    Structure bridge_port___priority_regeneration (
+        priority0 priority0,
+        priority1 priority1,
+        priority2 priority2,
+        priority3 priority3,
+        priority4 priority4,
+        priority5 priority5,
+        priority6 priority6,
+        priority7 priority7
+    )
+    Type priority0
+    Type priority1
+    Type priority2
+    Type priority3
+    Type priority4
+    Type priority5
+    Type priority6
+    Type priority7
+    Enumerated pcp_selection {
+        pcp_selection _1P0D,
+        pcp_selection _1P1D,
+        pcp_selection _1P2D,
+        pcp_selection _1P3D
+    }
+    Structure bridge_port___pcp_decoding_map (
+        pcp_selection_type pcp,
+        pcp_decoding_map___priority_map_collection priority_map
+    )
+    Type pcp_selection_type
+    Structure pcp_decoding_map___priority_map (
+        priority_type priority_code_point,
+        priority_type priority,
+        boolean drop_eligible
+    )
+    Collection pcp_decoding_map___priority_map_collection of pcp_decoding_map___priority_map
+    Collection bridge_port___pcp_decoding_map_collection of bridge_port___pcp_decoding_map
+    Structure bridge_port___pcp_encoding_map (
+        pcp_selection_type pcp,
+        pcp_encoding_map___priority_map_collection priority_map
+    )
+    Structure pcp_encoding_map___priority_map (
+        priority_type priority,
+        boolean dei,
+        priority_type priority_code_point
+    )
+    Collection pcp_encoding_map___priority_map_collection of pcp_encoding_map___priority_map
+    Collection bridge_port___pcp_encoding_map_collection of bridge_port___pcp_encoding_map
+    Type use_dei extends boolean
+    Type drop_encoding extends boolean
+    Type service_access_priority_selection extends boolean
+    Structure bridge_port___service_access_priority (
+        priority0 priority0,
+        priority1 priority1,
+        priority2 priority2,
+        priority3 priority3,
+        priority4 priority4,
+        priority5 priority5,
+        priority6 priority6,
+        priority7 priority7
+    )
+    Structure bridge_port___traffic_class_map (
+        priority_type priority,
+        traffic_class_map___available_traffic_class_collection available_traffic_class
+    )
+    Structure traffic_class_map___available_traffic_class (
+        uint8 num_traffic_class,
+        traffic_class_type traffic_class
+    )
+    Type uint8
+    Type traffic_class_type
+    Collection traffic_class_map___available_traffic_class_collection of traffic_class_map___available_traffic_class
+    Collection bridge_port___traffic_class_map_collection of bridge_port___traffic_class_map
+    Structure bridge_port___transmission_selection_algorithm_map (
+        traffic_class_type traffic_class,
+        identityref transmission_selection_algorithm
+    )
+    Collection bridge_port___transmission_selection_algorithm_map_collection of bridge_port___transmission_selection_algorithm_map
+    Enumerated acceptable_frame {
+        acceptable_frame admit_only_VLAN_tagged_frames,
+        acceptable_frame admit_only_untagged_and_priority_tagged,
+        acceptable_frame admit_all_frames
+    }
+    Type enable_ingress_filtering extends boolean
+    Type enable_restricted_vlan_registration extends boolean
+    Type enable_vid_translation_table extends boolean
+    Type enable_egress_vid_translation_table extends boolean
+    Structure bridge_port___protocol_group_vid_set (
+        uint32 group_id,
+        vlanid_collection vid
+    )
+    Type vlanid extends uint16
+    Collection vlanid_collection of vlanid
+    Collection bridge_port___protocol_group_vid_set_collection of bridge_port___protocol_group_vid_set
+    Type bits
+    Type media_dependent_overhead extends uint8
+    Structure bridge_port___statistics (
+        counter64 discard_on_ingress_filtering,
+        counter64 delay_exceeded_discards,
+        counter64 mtu_exceeded_discards,
+        counter64 frame_rx,
+        counter64 octets_rx,
+        counter64 frame_tx,
+        counter64 octets_tx,
+        counter64 discard_inbound,
+        counter64 forward_outbound,
+        counter64 discard_lack_of_buffers,
+        counter64 discard_transit_delay_exceeded,
+        counter64 discard_on_error
+    )
+    Structure bridge_port___vid_translations (
+        vlanid local_vid,
+        vlanid relay_vid
+    )
+    Collection bridge_port___vid_translations_collection of bridge_port___vid_translations
+    Structure bridge_port___egress_vid_translations (
+        vlanid relay_vid,
+        vlanid local_vid
+    )
+    Collection bridge_port___egress_vid_translations_collection of bridge_port___egress_vid_translations
+    Structure bridge_port___cvid_registration (
+        vlanid cvid,
+        vlanid svid,
+        untagged_pep untagged_pep,
+        untagged_cep untagged_cep
+    )
+    Type untagged_pep extends boolean
+    Type untagged_cep extends boolean
+    Collection bridge_port___cvid_registration_collection of bridge_port___cvid_registration
+    Structure bridge_port___service_priority_regeneration (
+        vlanid svid,
+        service_priority_regeneration___priority_regeneration priority_regeneration
+    )
+    Structure service_priority_regeneration___priority_regeneration (
+        priority0 priority0,
+        priority1 priority1,
+        priority2 priority2,
+        priority3 priority3,
+        priority4 priority4,
+        priority5 priority5,
+        priority6 priority6,
+        priority7 priority7
+    )
+    Collection bridge_port___service_priority_regeneration_collection of bridge_port___service_priority_regeneration
+    Structure bridge_port___rcap_internal_interface (
+        vlanid external_svid,
+        port_number_type internal_port_number,
+        vlanid internal_svid,
+        enumeration internal_interface_type
+    )
+    Collection bridge_port___rcap_internal_interface_collection of bridge_port___rcap_internal_interface
+    Collection interface_collection of interface
+    Type interface_state_ref extends leafref
+    Collection interface_state_ref_collection of interface_state_ref
+    Structure config (
+        config___link_collection links,
+        config___queueDiscipline_collection queueDisciplines,
+        config___linkLimitation_collection linkLimitations,
+        config___defaultLink defaultLink
+    )
+    Structure config___link (
+        string ^name,
+        link___flags flags,
+        mac_address addr,
+        mac_address brd,
+        mtu mtu
+    )
+    Structure link___flags (
+        empty UP,
+        empty NOARP,
+        empty BROADCAST,
+        empty MULTICAST,
+        empty LOOPBACK,
+        empty NOTRAILERS
+    )
+    Type empty
+    Type mtu extends uint32
+    Collection config___link_collection of config___link
+    Structure config___queueDiscipline (
+        @LeafRefPath : "/config/links/link/name"
+        leafref linkName,
+        QueueDisciplineType ^type,
+        uint32 length
+    )
+    Enumerated QueueDisciplineType {
+        QueueDisciplineType pfifo_fast,
+        QueueDisciplineType noqueue,
+        QueueDisciplineType noop,
+        QueueDisciplineType htb
+    }
+    Collection config___queueDiscipline_collection of config___queueDiscipline
+    Structure config___linkLimitation (
+        @LeafRefPath : "/config/links/link/name"
+        leafref linkName,
+        linkLimitation___limitations limitations
+    )
+    Structure linkLimitation___limitations (
+        only10Mbps only10Mbps,
+        onlyHalfDuplex onlyHalfDuplex
+    )
+    Type only10Mbps extends boolean
+    Type onlyHalfDuplex extends boolean
+    Collection config___linkLimitation_collection of config___linkLimitation
+    Structure config___defaultLink (
+        @LeafRefPath : "/config/links/link/name"
+        leafref linkName
+    )
+}
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.yang2tdl/samples/ietf-extra/ietf-interfaces@2018-02-20.yang b/plugins/org.etsi.mts.tdl.yang2tdl/samples/ietf-extra/ietf-interfaces@2018-02-20.yang
deleted file mode 100644
index f66c205ce076e65b2ded1d388c944a91829a48b5..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.yang2tdl/samples/ietf-extra/ietf-interfaces@2018-02-20.yang
+++ /dev/null
@@ -1,1123 +0,0 @@
-module ietf-interfaces {
-  yang-version 1.1;
-  namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
-  prefix if;
-
-  import ietf-yang-types {
-    prefix yang;
-  }
-
-  organization
-    "IETF NETMOD (Network Modeling) Working Group";
-
-  contact
-    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
-     WG List:  <mailto:netmod@ietf.org>
-
-     Editor:   Martin Bjorklund
-               <mailto:mbj@tail-f.com>";
-
-  description
-    "This module contains a collection of YANG definitions for
-     managing network interfaces.
-
-     Copyright (c) 2018 IETF Trust and the persons identified as
-     authors of the code.  All rights reserved.
-
-     Redistribution and use in source and binary forms, with or
-     without modification, is permitted pursuant to, and subject
-     to the license terms contained in, the Simplified BSD License
-     set forth in Section 4.c of the IETF Trust's Legal Provisions
-     Relating to IETF Documents
-     (https://trustee.ietf.org/license-info).
-
-     This version of this YANG module is part of RFC 8343; see
-     the RFC itself for full legal notices.";
-
-  revision 2018-02-20 {
-    description
-      "Updated to support NMDA.";
-    reference
-      "RFC 8343: A YANG Data Model for Interface Management";
-  }
-
-  revision 2014-05-08 {
-    description
-      "Initial revision.";
-    reference
-      "RFC 7223: A YANG Data Model for Interface Management";
-  }
-
-  /*
-   * Typedefs
-   */
-
-  typedef interface-ref {
-    type leafref {
-      path "/if:interfaces/if:interface/if:name";
-    }
-    description
-      "This type is used by data models that need to reference
-       interfaces.";
-  }
-
-  /*
-   * Identities
-   */
-
-  identity interface-type {
-    description
-      "Base identity from which specific interface types are
-       derived.";
-  }
-
-  /*
-   * Features
-   */
-
-  feature arbitrary-names {
-    description
-      "This feature indicates that the device allows user-controlled
-       interfaces to be named arbitrarily.";
-  }
-  feature pre-provisioning {
-    description
-      "This feature indicates that the device supports
-       pre-provisioning of interface configuration, i.e., it is
-       possible to configure an interface whose physical interface
-       hardware is not present on the device.";
-  }
-  feature if-mib {
-    description
-      "This feature indicates that the device implements
-       the IF-MIB.";
-    reference
-      "RFC 2863: The Interfaces Group MIB";
-  }
-
-  /*
-   * Data nodes
-   */
-
-  container interfaces {
-    description
-      "Interface parameters.";
-
-    list interface {
-      key "name";
-
-      description
-        "The list of interfaces on the device.
-
-         The status of an interface is available in this list in the
-         operational state.  If the configuration of a
-         system-controlled interface cannot be used by the system
-         (e.g., the interface hardware present does not match the
-         interface type), then the configuration is not applied to
-         the system-controlled interface shown in the operational
-         state.  If the configuration of a user-controlled interface
-         cannot be used by the system, the configured interface is
-         not instantiated in the operational state.
-
-         System-controlled interfaces created by the system are
-         always present in this list in the operational state,
-         whether or not they are configured.";
-
-     leaf name {
-        type string;
-        description
-          "The name of the interface.
-
-           A device MAY restrict the allowed values for this leaf,
-           possibly depending on the type of the interface.
-           For system-controlled interfaces, this leaf is the
-           device-specific name of the interface.
-
-           If a client tries to create configuration for a
-           system-controlled interface that is not present in the
-           operational state, the server MAY reject the request if
-           the implementation does not support pre-provisioning of
-           interfaces or if the name refers to an interface that can
-           never exist in the system.  A Network Configuration
-           Protocol (NETCONF) server MUST reply with an rpc-error
-           with the error-tag 'invalid-value' in this case.
-
-           If the device supports pre-provisioning of interface
-           configuration, the 'pre-provisioning' feature is
-           advertised.
-
-           If the device allows arbitrarily named user-controlled
-           interfaces, the 'arbitrary-names' feature is advertised.
-
-           When a configured user-controlled interface is created by
-           the system, it is instantiated with the same name in the
-           operational state.
-
-           A server implementation MAY map this leaf to the ifName
-           MIB object.  Such an implementation needs to use some
-           mechanism to handle the differences in size and characters
-           allowed between this leaf and ifName.  The definition of
-           such a mechanism is outside the scope of this document.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifName";
-      }
-
-      leaf description {
-        type string;
-        description
-          "A textual description of the interface.
-
-           A server implementation MAY map this leaf to the ifAlias
-           MIB object.  Such an implementation needs to use some
-           mechanism to handle the differences in size and characters
-           allowed between this leaf and ifAlias.  The definition of
-           such a mechanism is outside the scope of this document.
-
-           Since ifAlias is defined to be stored in non-volatile
-           storage, the MIB implementation MUST map ifAlias to the
-           value of 'description' in the persistently stored
-           configuration.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAlias";
-      }
-
-      leaf type {
-        type identityref {
-          base interface-type;
-        }
-        mandatory true;
-        description
-          "The type of the interface.
-
-           When an interface entry is created, a server MAY
-           initialize the type leaf with a valid value, e.g., if it
-           is possible to derive the type from the name of the
-           interface.
-
-           If a client tries to set the type of an interface to a
-           value that can never be used by the system, e.g., if the
-           type is not supported or if the type does not match the
-           name of the interface, the server MUST reject the request.
-           A NETCONF server MUST reply with an rpc-error with the
-           error-tag 'invalid-value' in this case.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifType";
-      }
-
-      leaf enabled {
-        type boolean;
-        default "true";
-        description
-          "This leaf contains the configured, desired state of the
-           interface.
-
-           Systems that implement the IF-MIB use the value of this
-           leaf in the intended configuration to set
-           IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
-           has been initialized, as described in RFC 2863.
-
-           Changes in this leaf in the intended configuration are
-           reflected in ifAdminStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-      }
-
-      leaf link-up-down-trap-enable {
-        if-feature if-mib;
-        type enumeration {
-          enum enabled {
-            value 1;
-            description
-              "The device will generate linkUp/linkDown SNMP
-               notifications for this interface.";
-          }
-          enum disabled {
-            value 2;
-            description
-              "The device will not generate linkUp/linkDown SNMP
-               notifications for this interface.";
-          }
-        }
-        description
-          "Controls whether linkUp/linkDown SNMP notifications
-           should be generated for this interface.
-
-           If this node is not configured, the value 'enabled' is
-           operationally used by the server for interfaces that do
-           not operate on top of any other interface (i.e., there are
-           no 'lower-layer-if' entries), and 'disabled' otherwise.";
-        reference
-          "RFC 2863: The Interfaces Group MIB -
-                     ifLinkUpDownTrapEnable";
-      }
-
-      leaf admin-status {
-        if-feature if-mib;
-        type enumeration {
-          enum up {
-            value 1;
-            description
-              "Ready to pass packets.";
-          }
-          enum down {
-            value 2;
-            description
-              "Not ready to pass packets and not in some test mode.";
-          }
-          enum testing {
-            value 3;
-            description
-              "In some test mode.";
-          }
-        }
-        config false;
-        mandatory true;
-        description
-          "The desired state of the interface.
-
-           This leaf has the same read semantics as ifAdminStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-      }
-
-      leaf oper-status {
-        type enumeration {
-          enum up {
-            value 1;
-            description
-              "Ready to pass packets.";
-          }
-          enum down {
-            value 2;
-
-            description
-              "The interface does not pass any packets.";
-          }
-          enum testing {
-            value 3;
-            description
-              "In some test mode.  No operational packets can
-               be passed.";
-          }
-          enum unknown {
-            value 4;
-            description
-              "Status cannot be determined for some reason.";
-          }
-          enum dormant {
-            value 5;
-            description
-              "Waiting for some external event.";
-          }
-          enum not-present {
-            value 6;
-            description
-              "Some component (typically hardware) is missing.";
-          }
-          enum lower-layer-down {
-            value 7;
-            description
-              "Down due to state of lower-layer interface(s).";
-          }
-        }
-        config false;
-        mandatory true;
-        description
-          "The current operational state of the interface.
-
-           This leaf has the same semantics as ifOperStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
-      }
-
-      leaf last-change {
-        type yang:date-and-time;
-        config false;
-        description
-          "The time the interface entered its current operational
-           state.  If the current state was entered prior to the
-           last re-initialization of the local network management
-           subsystem, then this node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifLastChange";
-      }
-
-      leaf if-index {
-        if-feature if-mib;
-        type int32 {
-          range "1..2147483647";
-        }
-        config false;
-        mandatory true;
-        description
-          "The ifIndex value for the ifEntry represented by this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifIndex";
-      }
-
-      leaf phys-address {
-        type yang:phys-address;
-        config false;
-        description
-          "The interface's address at its protocol sub-layer.  For
-           example, for an 802.x interface, this object normally
-           contains a Media Access Control (MAC) address.  The
-           interface's media-specific modules must define the bit
-           and byte ordering and the format of the value of this
-           object.  For interfaces that do not have such an address
-           (e.g., a serial line), this node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
-      }
-
-      leaf-list higher-layer-if {
-        type interface-ref;
-        config false;
-        description
-          "A list of references to interfaces layered on top of this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifStackTable";
-      }
-
-      leaf-list lower-layer-if {
-        type interface-ref;
-        config false;
-
-        description
-          "A list of references to interfaces layered underneath this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifStackTable";
-      }
-
-      leaf speed {
-        type yang:gauge64;
-        units "bits/second";
-        config false;
-        description
-            "An estimate of the interface's current bandwidth in bits
-             per second.  For interfaces that do not vary in
-             bandwidth or for those where no accurate estimation can
-             be made, this node should contain the nominal bandwidth.
-             For interfaces that have no concept of bandwidth, this
-             node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB -
-                     ifSpeed, ifHighSpeed";
-      }
-
-      container statistics {
-        config false;
-        description
-          "A collection of interface-related statistics objects.";
-
-        leaf discontinuity-time {
-          type yang:date-and-time;
-          mandatory true;
-          description
-            "The time on the most recent occasion at which any one or
-             more of this interface's counters suffered a
-             discontinuity.  If no such discontinuities have occurred
-             since the last re-initialization of the local management
-             subsystem, then this node contains the time the local
-             management subsystem re-initialized itself.";
-        }
-
-        leaf in-octets {
-          type yang:counter64;
-          description
-            "The total number of octets received on the interface,
-             including framing characters.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
-        }
-
-        leaf in-unicast-pkts {
-          type yang:counter64;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were not addressed to a
-             multicast or broadcast address at this sub-layer.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
-        }
-
-        leaf in-broadcast-pkts {
-          type yang:counter64;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were addressed to a broadcast
-             address at this sub-layer.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCInBroadcastPkts";
-        }
-
-        leaf in-multicast-pkts {
-          type yang:counter64;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were addressed to a multicast
-             address at this sub-layer.  For a MAC-layer protocol,
-             this includes both Group and Functional addresses.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCInMulticastPkts";
-        }
-
-        leaf in-discards {
-          type yang:counter32;
-          description
-            "The number of inbound packets that were chosen to be
-             discarded even though no errors had been detected to
-             prevent their being deliverable to a higher-layer
-             protocol.  One possible reason for discarding such a
-             packet could be to free up buffer space.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
-        }
-
-        leaf in-errors {
-          type yang:counter32;
-          description
-            "For packet-oriented interfaces, the number of inbound
-             packets that contained errors preventing them from being
-             deliverable to a higher-layer protocol.  For character-
-             oriented or fixed-length interfaces, the number of
-             inbound transmission units that contained errors
-             preventing them from being deliverable to a higher-layer
-             protocol.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInErrors";
-        }
-
-        leaf in-unknown-protos {
-          type yang:counter32;
-
-          description
-            "For packet-oriented interfaces, the number of packets
-             received via the interface that were discarded because
-             of an unknown or unsupported protocol.  For
-             character-oriented or fixed-length interfaces that
-             support protocol multiplexing, the number of
-             transmission units received via the interface that were
-             discarded because of an unknown or unsupported protocol.
-             For any interface that does not support protocol
-             multiplexing, this counter is not present.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
-        }
-
-        leaf out-octets {
-          type yang:counter64;
-          description
-            "The total number of octets transmitted out of the
-             interface, including framing characters.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
-        }
-
-        leaf out-unicast-pkts {
-          type yang:counter64;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted and that were not addressed
-             to a multicast or broadcast address at this sub-layer,
-             including those that were discarded or not sent.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
-        }
-
-        leaf out-broadcast-pkts {
-          type yang:counter64;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted and that were addressed to a
-             broadcast address at this sub-layer, including those
-             that were discarded or not sent.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCOutBroadcastPkts";
-        }
-
-        leaf out-multicast-pkts {
-          type yang:counter64;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted and that were addressed to a
-             multicast address at this sub-layer, including those
-             that were discarded or not sent.  For a MAC-layer
-             protocol, this includes both Group and Functional
-             addresses.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCOutMulticastPkts";
-        }
-
-        leaf out-discards {
-          type yang:counter32;
-          description
-            "The number of outbound packets that were chosen to be
-             discarded even though no errors had been detected to
-             prevent their being transmitted.  One possible reason
-             for discarding such a packet could be to free up buffer
-             space.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
-        }
-
-        leaf out-errors {
-          type yang:counter32;
-          description
-            "For packet-oriented interfaces, the number of outbound
-             packets that could not be transmitted because of errors.
-             For character-oriented or fixed-length interfaces, the
-             number of outbound transmission units that could not be
-             transmitted because of errors.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
-        }
-      }
-
-    }
-  }
-
-  /*
-   * Legacy typedefs
-   */
-
-  typedef interface-state-ref {
-    type leafref {
-      path "/if:interfaces-state/if:interface/if:name";
-    }
-    status deprecated;
-    description
-      "This type is used by data models that need to reference
-       the operationally present interfaces.";
-  }
-
-  /*
-   * Legacy operational state data nodes
-   */
-
-  container interfaces-state {
-    config false;
-    status deprecated;
-    description
-      "Data nodes for the operational state of interfaces.";
-
-    list interface {
-      key "name";
-      status deprecated;
-
-      description
-        "The list of interfaces on the device.
-
-         System-controlled interfaces created by the system are
-         always present in this list, whether or not they are
-         configured.";
-
-      leaf name {
-        type string;
-        status deprecated;
-        description
-          "The name of the interface.
-
-           A server implementation MAY map this leaf to the ifName
-           MIB object.  Such an implementation needs to use some
-           mechanism to handle the differences in size and characters
-           allowed between this leaf and ifName.  The definition of
-           such a mechanism is outside the scope of this document.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifName";
-      }
-
-      leaf type {
-        type identityref {
-          base interface-type;
-        }
-        mandatory true;
-        status deprecated;
-        description
-          "The type of the interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifType";
-      }
-
-      leaf admin-status {
-        if-feature if-mib;
-        type enumeration {
-          enum up {
-            value 1;
-            description
-              "Ready to pass packets.";
-          }
-          enum down {
-            value 2;
-            description
-              "Not ready to pass packets and not in some test mode.";
-          }
-          enum testing {
-            value 3;
-            description
-              "In some test mode.";
-          }
-        }
-        mandatory true;
-        status deprecated;
-        description
-          "The desired state of the interface.
-
-           This leaf has the same read semantics as ifAdminStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-      }
-
-      leaf oper-status {
-        type enumeration {
-          enum up {
-            value 1;
-            description
-              "Ready to pass packets.";
-          }
-          enum down {
-            value 2;
-            description
-              "The interface does not pass any packets.";
-          }
-          enum testing {
-            value 3;
-            description
-              "In some test mode.  No operational packets can
-               be passed.";
-          }
-          enum unknown {
-            value 4;
-            description
-              "Status cannot be determined for some reason.";
-          }
-          enum dormant {
-            value 5;
-            description
-              "Waiting for some external event.";
-          }
-          enum not-present {
-            value 6;
-            description
-              "Some component (typically hardware) is missing.";
-          }
-          enum lower-layer-down {
-            value 7;
-            description
-              "Down due to state of lower-layer interface(s).";
-          }
-        }
-        mandatory true;
-        status deprecated;
-        description
-          "The current operational state of the interface.
-
-           This leaf has the same semantics as ifOperStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
-      }
-
-      leaf last-change {
-        type yang:date-and-time;
-        status deprecated;
-        description
-          "The time the interface entered its current operational
-           state.  If the current state was entered prior to the
-           last re-initialization of the local network management
-           subsystem, then this node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifLastChange";
-      }
-
-      leaf if-index {
-        if-feature if-mib;
-        type int32 {
-          range "1..2147483647";
-        }
-        mandatory true;
-        status deprecated;
-        description
-          "The ifIndex value for the ifEntry represented by this
-           interface.";
-
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifIndex";
-      }
-
-      leaf phys-address {
-        type yang:phys-address;
-        status deprecated;
-        description
-          "The interface's address at its protocol sub-layer.  For
-           example, for an 802.x interface, this object normally
-           contains a Media Access Control (MAC) address.  The
-           interface's media-specific modules must define the bit
-           and byte ordering and the format of the value of this
-           object.  For interfaces that do not have such an address
-           (e.g., a serial line), this node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
-      }
-
-      leaf-list higher-layer-if {
-        type interface-state-ref;
-        status deprecated;
-        description
-          "A list of references to interfaces layered on top of this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifStackTable";
-      }
-
-      leaf-list lower-layer-if {
-        type interface-state-ref;
-        status deprecated;
-        description
-          "A list of references to interfaces layered underneath this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifStackTable";
-      }
-
-      leaf speed {
-        type yang:gauge64;
-        units "bits/second";
-        status deprecated;
-        description
-            "An estimate of the interface's current bandwidth in bits
-             per second.  For interfaces that do not vary in
-             bandwidth or for those where no accurate estimation can
-
-             be made, this node should contain the nominal bandwidth.
-             For interfaces that have no concept of bandwidth, this
-             node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB -
-                     ifSpeed, ifHighSpeed";
-      }
-
-      container statistics {
-        status deprecated;
-        description
-          "A collection of interface-related statistics objects.";
-
-        leaf discontinuity-time {
-          type yang:date-and-time;
-          mandatory true;
-          status deprecated;
-          description
-            "The time on the most recent occasion at which any one or
-             more of this interface's counters suffered a
-             discontinuity.  If no such discontinuities have occurred
-             since the last re-initialization of the local management
-             subsystem, then this node contains the time the local
-             management subsystem re-initialized itself.";
-        }
-
-        leaf in-octets {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The total number of octets received on the interface,
-             including framing characters.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
-        }
-
-        leaf in-unicast-pkts {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were not addressed to a
-             multicast or broadcast address at this sub-layer.
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
-        }
-
-        leaf in-broadcast-pkts {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were addressed to a broadcast
-             address at this sub-layer.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCInBroadcastPkts";
-        }
-
-        leaf in-multicast-pkts {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were addressed to a multicast
-             address at this sub-layer.  For a MAC-layer protocol,
-             this includes both Group and Functional addresses.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCInMulticastPkts";
-        }
-
-        leaf in-discards {
-          type yang:counter32;
-          status deprecated;
-
-          description
-            "The number of inbound packets that were chosen to be
-             discarded even though no errors had been detected to
-             prevent their being deliverable to a higher-layer
-             protocol.  One possible reason for discarding such a
-             packet could be to free up buffer space.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
-        }
-
-        leaf in-errors {
-          type yang:counter32;
-          status deprecated;
-          description
-            "For packet-oriented interfaces, the number of inbound
-             packets that contained errors preventing them from being
-             deliverable to a higher-layer protocol.  For character-
-             oriented or fixed-length interfaces, the number of
-             inbound transmission units that contained errors
-             preventing them from being deliverable to a higher-layer
-             protocol.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInErrors";
-        }
-
-        leaf in-unknown-protos {
-          type yang:counter32;
-          status deprecated;
-          description
-            "For packet-oriented interfaces, the number of packets
-             received via the interface that were discarded because
-             of an unknown or unsupported protocol.  For
-             character-oriented or fixed-length interfaces that
-             support protocol multiplexing, the number of
-             transmission units received via the interface that were
-             discarded because of an unknown or unsupported protocol.
-             For any interface that does not support protocol
-             multiplexing, this counter is not present.
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
-        }
-
-        leaf out-octets {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The total number of octets transmitted out of the
-             interface, including framing characters.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
-        }
-
-        leaf out-unicast-pkts {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted and that were not addressed
-             to a multicast or broadcast address at this sub-layer,
-             including those that were discarded or not sent.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
-        }
-
-        leaf out-broadcast-pkts {
-          type yang:counter64;
-          status deprecated;
-
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted and that were addressed to a
-             broadcast address at this sub-layer, including those
-             that were discarded or not sent.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCOutBroadcastPkts";
-        }
-
-        leaf out-multicast-pkts {
-          type yang:counter64;
-          status deprecated;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted and that were addressed to a
-             multicast address at this sub-layer, including those
-             that were discarded or not sent.  For a MAC-layer
-             protocol, this includes both Group and Functional
-             addresses.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCOutMulticastPkts";
-        }
-
-        leaf out-discards {
-          type yang:counter32;
-          status deprecated;
-          description
-            "The number of outbound packets that were chosen to be
-             discarded even though no errors had been detected to
-             prevent their being transmitted.  One possible reason
-             for discarding such a packet could be to free up buffer
-             space.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
-        }
-
-        leaf out-errors {
-          type yang:counter32;
-          status deprecated;
-          description
-            "For packet-oriented interfaces, the number of outbound
-             packets that could not be transmitted because of errors.
-             For character-oriented or fixed-length interfaces, the
-             number of outbound transmission units that could not be
-             transmitted because of errors.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple.tdltx b/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple.tdltx
new file mode 100644
index 0000000000000000000000000000000000000000..109df319d292451cc302c60b0b948c16a0d1f30a
--- /dev/null
+++ b/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple.tdltx
@@ -0,0 +1,204 @@
+Package generated_from_simple {
+    Type String
+    Type TODO_RESOLVE_REFERENCED
+    Use "simple" as SOURCE_MAPPING
+    Structure system (
+        string host_name,
+        string_collection domain_search,
+        system___login login
+    )
+    Type string
+    Collection string_collection of string
+    Structure system___login (
+        string message,
+        login___user_collection user
+    )
+    Structure login___user (
+        string ^name,
+        string full_name,
+        string class
+    )
+    Collection login___user_collection of login___user
+    Structure parent_container (
+        parent_container___parent_ordered_list_collection child_container
+    )
+    Structure parent_container___parent_ordered_list (
+        string parent_key_leaf,
+        string parent_ordinary_leaf,
+        parent_ordered_list___child_ordered_list_collection child_ordered_list
+    )
+    Structure parent_ordered_list___child_ordered_list (
+        string child_key_leaf,
+        string child_ordinary_leaf
+    )
+    Collection parent_ordered_list___child_ordered_list_collection of parent_ordered_list___child_ordered_list
+    Collection parent_container___parent_ordered_list_collection of parent_container___parent_ordered_list
+    Structure sports (
+        sports___person_collection person,
+        sports___team_collection team,
+        sports___protocol_collection protocol
+    )
+    Structure sports___person (
+        string ^name,
+        date_and_time birthday
+    )
+    Type date_and_time extends string
+    Collection sports___person_collection of sports___person
+    Structure sports___team (
+        string ^name,
+        team___player_collection player,
+        protocol protocol
+    )
+    Structure team___player (
+        @LeafRefPath : "/sports/person/name"
+        leafref ^name,
+        season season,
+        uint16 number,
+        scores scores,
+        uint16_collection score_list
+    )
+    Type leafref
+    Annotation LeafRefPath
+    Type season extends string
+    Type uint16
+    Type scores extends uint16
+    Collection uint16_collection of uint16
+    Collection team___player_collection of team___player
+    Enumerated protocol {
+        protocol tcp,
+        protocol udp,
+        protocol icmp
+    }
+    Collection sports___team_collection of sports___team
+    Structure sports___protocol (
+        string associated_layer_protocol,
+        protocoly protocoly,
+        protocol___ext_cpd_collection ext_cpd,
+        protocol___case_ext_cpd_collection case_ext_cpd,
+        string protocolz,
+        protocol___port_map_collection port_map
+    )
+    Enumerated protocoly {
+        protocoly tcp,
+        protocoly udp,
+        protocoly icmp
+    }
+    Structure protocol___ext_cpd (
+        string k,
+        ext_cpd___cp_connection cp_connection
+    )
+    Structure ext_cpd___cp_connection (
+        cp_connection___int_virtual_link_desc int_virtual_link_desc,
+        cp_connection___int_cpd int_cpd
+    )
+    Structure cp_connection___int_virtual_link_desc (
+        string int_virtual_link_desc
+    )
+    Structure cp_connection___int_cpd (
+        int_cpd___int_cpd int_cpd
+    )
+    Structure int_cpd___int_cpd (
+        string vdu_id,
+        string cpd
+    )
+    Collection protocol___ext_cpd_collection of protocol___ext_cpd
+    Structure protocol___case_ext_cpd (
+        string k,
+        case_ext_cpd___cp_connection cp_connection
+    )
+    Structure case_ext_cpd___cp_connection (
+        cp_connection___a ^a,
+        cp_connection___b b
+    )
+    Structure cp_connection___a (
+        string int_virtual_link_desc
+    )
+    Structure cp_connection___b (
+        b___int_cpd int_cpd
+    )
+    Structure b___int_cpd (
+        string vdu_id,
+        string cpd
+    )
+    Collection protocol___case_ext_cpd_collection of protocol___case_ext_cpd
+    Structure protocol___port_map (
+        string port_ref,
+        port_map___map_type map_type
+    )
+    Structure port_map___map_type (
+        map_type___static_filtering_entries static_filtering_entries,
+        map_type___static_vlan_registration_entries static_vlan_registration_entries
+    )
+    Structure map_type___static_filtering_entries (
+        static_filtering_entries___static_filtering_entries static_filtering_entries
+    )
+    Structure static_filtering_entries___static_filtering_entries (
+        enumeration control_element,
+        string connection_identifier
+    )
+    Type enumeration
+    Structure map_type___static_vlan_registration_entries (
+        static_vlan_registration_entries___static_vlan_registration_entries static_vlan_registration_entries
+    )
+    Structure static_vlan_registration_entries___static_vlan_registration_entries (
+        enumeration registrar_admin_control
+    )
+    Collection protocol___port_map_collection of protocol___port_map
+    Collection sports___protocol_collection of sports___protocol
+    Structure config (
+        config___link_collection links,
+        config___queueDiscipline_collection queueDisciplines,
+        config___linkLimitation_collection linkLimitations,
+        config___defaultLink defaultLink
+    )
+    Structure config___link (
+        string ^name,
+        link___flags flags,
+        mac_address addr,
+        mac_address brd,
+        mtu mtu
+    )
+    Structure link___flags (
+        empty UP,
+        empty NOARP,
+        empty BROADCAST,
+        empty MULTICAST,
+        empty LOOPBACK,
+        empty NOTRAILERS
+    )
+    Type empty
+    Type mac_address extends string
+    Type mtu extends uint32
+    Type uint32
+    Collection config___link_collection of config___link
+    Structure config___queueDiscipline (
+        @LeafRefPath : "/config/links/link/name"
+        leafref linkName,
+        QueueDisciplineType ^type,
+        uint32 length
+    )
+    Enumerated QueueDisciplineType {
+        QueueDisciplineType pfifo_fast,
+        QueueDisciplineType noqueue,
+        QueueDisciplineType noop,
+        QueueDisciplineType htb
+    }
+    Collection config___queueDiscipline_collection of config___queueDiscipline
+    Structure config___linkLimitation (
+        @LeafRefPath : "/config/links/link/name"
+        leafref linkName,
+        linkLimitation___limitations limitations
+    )
+    Structure linkLimitation___limitations (
+        only10Mbps only10Mbps,
+        onlyHalfDuplex onlyHalfDuplex
+    )
+    Type only10Mbps extends boolean
+    Type boolean
+    Type onlyHalfDuplex extends boolean
+    Collection config___linkLimitation_collection of config___linkLimitation
+    Structure config___defaultLink (
+        @LeafRefPath : "/config/links/link/name"
+        leafref linkName
+    )
+}
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang b/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang
index d007bd479a9f6857ef2669f4cc7f7dfbc439a976..53c5dc6536bf62fe2bbb82de995084f0ed139ad0 100644
--- a/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang
+++ b/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang
@@ -91,6 +91,10 @@ module example-sports {
             default "tcp";
         }
         list ext-cpd {
+        	key "k";
+        	leaf k {
+        		type string;
+        	}
             choice cp-connection {
                 // no case
                 leaf int-virtual-link-desc {
@@ -107,6 +111,10 @@ module example-sports {
             }
         }
         list case-ext-cpd {
+        	key "k";
+        	leaf k {
+        		type string;
+        	}
             choice cp-connection {
                 // case
                 case a {
diff --git a/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang.tdltx b/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang.tdltx
index e1a95041616f9bcef463d1dc76f417cd2914e256..e371cba09475a937f4f42301a2951c4108fac5b0 100644
--- a/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang.tdltx
+++ b/plugins/org.etsi.mts.tdl.yang2tdl/samples/simple/sports.yang.tdltx
@@ -2,1292 +2,117 @@ Package generated_from_sports_yang {
     Type String
     Type TODO_RESOLVE_REFERENCED
     Use "sports.yang" as SOURCE_MAPPING
-    Structure nfv (
-        nfv___vnfd_collection vnfd,
-        nfv___nsd_collection nsd,
-        nfv___pnfd_collection pnfd
+    Structure sports (
+        sports___person_collection person,
+        sports___team_collection team,
+        sports___protocol_collection protocol
     )
-    Structure nfv___vnfd (
-        string id,
-        string provider,
-        string product_name,
-        string software_version,
-        string version,
-        string product_info_name,
-        string product_info_description,
-        string_collection vnfm_info,
-        string localization_language,
-        string default_localization_language,
-        vnfd___vdu_collection vdu,
-        vnfd___virtual_compute_desc_collection virtual_compute_desc,
-        vnfd___virtual_storage_desc_collection virtual_storage_desc,
-        vnfd___sw_image_desc_collection sw_image_desc,
-        vnfd___int_virtual_link_desc_collection int_virtual_link_desc,
-        vnfd___ext_cpd_collection ext_cpd,
-        vnfd___df_collection df,
-        vnfd___configurable_properties configurable_properties,
-        vnfd___modifiable_attributes modifiable_attributes,
-        vnfd___lifecycle_management_script_collection lifecycle_management_script,
-        vnfd___element_group_collection element_group,
-        vnfd___indicator_collection indicator,
-        string_collection auto_scale,
-        vnfd___security_group_rule_collection security_group_rule
+    Structure sports___person (
+        string ^name,
+        date_and_time birthday
     )
     Type string
-    Collection string_collection of string
-    Structure vnfd___vdu (
-        string id,
+    Type date_and_time extends string
+    Collection sports___person_collection of sports___person
+    Structure sports___team (
         string ^name,
-        string description,
-        vdu___int_cpd_collection int_cpd,
-        @LeafRefPath : "../../virtual-compute-desc/id"
-        leafref virtual_compute_desc,
-        @LeafRefPath : "../../virtual-storage-desc/id"
-        leafref_collection virtual_storage_desc,
-        vdu___boot_order_collection boot_order,
-        @LeafRefPath : "../../sw-image-desc/id"
-        leafref sw_image_desc,
-        string_collection nfvi_constraint,
-        vdu___monitoring_parameter_collection monitoring_parameter,
-        vdu___configurable_properties_collection configurable_properties,
-        string boot_data
+        team___player_collection player,
+        protocol protocol
     )
-    Structure vdu___int_cpd (
-        @LeafRefPath : "../../../int-virtual-link-desc/id"
-        leafref int_virtual_link_desc,
-        bitrate_requirement bitrate_requirement,
-        @LeafRefPath : "../../../virtual-compute-desc/id"
-        leafref nicio_requirements,
-        uint32_collection order,
-        @LeafRefPath : "../../../security-group-rule/id"
-        leafref security_group_rule_id,
-        string id,
-        identityref_collection layer_protocol,
-        identityref role,
-        string description,
-        int_cpd___protocol_collection protocol,
-        boolean trunk_mode,
-        int_cpd___virtual_network_interface_requirement_collection virtual_network_interface_requirement
+    Structure team___player (
+        @LeafRefPath : "/sports/person/name"
+        leafref ^name,
+        season season,
+        uint16 number,
+        scores scores,
+        uint16_collection score_list
     )
     Type leafref
     Annotation LeafRefPath
-    Type bitrate_requirement extends uint64
-    Type uint64
-    Type uint32 extends uint32
-    Collection uint32_collection of uint32
-    Type identityref
-    Collection identityref_collection of identityref
-    Structure int_cpd___protocol (
-        identityref associated_layer_protocol,
-        protocol___address_data_collection address_data
-    )
-    Structure protocol___address_data (
-        identityref ^type,
-        address_data___l2_address_data l2_address_data,
-        address_data___l3_address_data l3_address_data
-    )
-    Structure address_data___l2_address_data (
-        boolean mac_address_assignment
-    )
-    Type boolean
-    Structure address_data___l3_address_data (
-        boolean ip_address_assignment,
-        boolean floating_ip_activated,
-        enumeration ip_address_type,
-        uint32 number_of_ip_addresses
-    )
-    Type enumeration
-    Collection protocol___address_data_collection of protocol___address_data
-    Collection int_cpd___protocol_collection of int_cpd___protocol
-    Structure int_cpd___virtual_network_interface_requirement (
-        string ^name,
-        string description,
-        support_mandatory support_mandatory,
-        virtual_network_interface_requirement___network_interface_requirements_collection network_interface_requirements
-    )
-    Type support_mandatory extends boolean
-    Structure virtual_network_interface_requirement___network_interface_requirements (
-        string key,
-        string ^value
-    )
-    Collection virtual_network_interface_requirement___network_interface_requirements_collection of virtual_network_interface_requirement___network_interface_requirements
-    Collection int_cpd___virtual_network_interface_requirement_collection of int_cpd___virtual_network_interface_requirement
-    Collection vdu___int_cpd_collection of vdu___int_cpd
-    Collection leafref_collection of leafref
-    Structure vdu___boot_order (
-        uint32 key,
-        @LeafRefPath : "../../virtual-storage-desc"
-        leafref ^value
-    )
-    Collection vdu___boot_order_collection of vdu___boot_order
-    Structure vdu___monitoring_parameter (
-        string id,
-        string ^name,
-        string performance_metric,
-        collection_period collection_period
-    )
-    Type collection_period extends uint64
-    Collection vdu___monitoring_parameter_collection of vdu___monitoring_parameter
-    Structure vdu___configurable_properties (
-        string key,
-        string ^value
-    )
-    Collection vdu___configurable_properties_collection of vdu___configurable_properties
-    Collection vnfd___vdu_collection of vnfd___vdu
-    Structure vnfd___virtual_compute_desc (
-        string id,
-        virtual_compute_desc___logical_node_collection logical_node,
-        virtual_compute_desc___request_additional_capability_collection request_additional_capability,
-        string compute_requirements,
-        virtual_compute_desc___virtual_memory virtual_memory,
-        virtual_compute_desc___virtual_cpu virtual_cpu
-    )
-    Structure virtual_compute_desc___logical_node (
-        string id,
-        logical_node___requirement_detail_collection requirement_detail
-    )
-    Structure logical_node___requirement_detail (
-        string key,
-        string ^value
-    )
-    Collection logical_node___requirement_detail_collection of logical_node___requirement_detail
-    Collection virtual_compute_desc___logical_node_collection of virtual_compute_desc___logical_node
-    Structure virtual_compute_desc___request_additional_capability (
-        string ^name,
-        boolean support_mandatory,
-        string min_version,
-        string preferred_version,
-        request_additional_capability___target_performance_parameters_collection target_performance_parameters
-    )
-    Structure request_additional_capability___target_performance_parameters (
-        string key,
-        string ^value
-    )
-    Collection request_additional_capability___target_performance_parameters_collection of request_additional_capability___target_performance_parameters
-    Collection virtual_compute_desc___request_additional_capability_collection of virtual_compute_desc___request_additional_capability
-    Structure virtual_compute_desc___virtual_memory (
-        ^size ^size,
-        string over_subscription_policy,
-        virtual_memory___vdu_mem_requirements_collection vdu_mem_requirements,
-        boolean numa_enabled
-    )
-    Type ^size extends uint64
-    Type decimal64
-    Structure virtual_memory___vdu_mem_requirements (
-        string key,
-        string ^value
-    )
-    Collection virtual_memory___vdu_mem_requirements_collection of virtual_memory___vdu_mem_requirements
-    Structure virtual_compute_desc___virtual_cpu (
-        string cpu_architecture,
-        num_virtual_cpu num_virtual_cpu,
-        clock clock,
-        string oversubscription_policy,
-        virtual_cpu___vdu_cpu_requirements_collection vdu_cpu_requirements,
-        virtual_cpu___pinning pinning
-    )
-    Type num_virtual_cpu extends uint16
+    Type season extends string
     Type uint16
-    Type clock extends uint32
-    Structure virtual_cpu___vdu_cpu_requirements (
-        string key,
-        string ^value
-    )
-    Collection virtual_cpu___vdu_cpu_requirements_collection of virtual_cpu___vdu_cpu_requirements
-    Structure virtual_cpu___pinning (
-        policy policy,
-        pinning___rule_collection rule
-    )
-    Enumerated policy {
-        policy static,
-        policy dynamic
-    }
-    Structure pinning___rule (
-        string key,
-        string ^value
-    )
-    Collection pinning___rule_collection of pinning___rule
-    Collection vnfd___virtual_compute_desc_collection of vnfd___virtual_compute_desc
-    Structure vnfd___virtual_storage_desc (
-        string id,
-        type_of_storage type_of_storage,
-        size_of_storage size_of_storage,
-        virtual_storage_desc___vdu_storage_requirements_collection vdu_storage_requirements,
-        boolean rdma_enabled,
-        @LeafRefPath : "../../sw-image-desc/id"
-        leafref sw_image_desc
-    )
-    Type type_of_storage extends identityref
-    Type size_of_storage extends uint64
-    Structure virtual_storage_desc___vdu_storage_requirements (
-        string key,
-        string ^value
-    )
-    Collection virtual_storage_desc___vdu_storage_requirements_collection of virtual_storage_desc___vdu_storage_requirements
-    Collection vnfd___virtual_storage_desc_collection of vnfd___virtual_storage_desc
-    Structure vnfd___sw_image_desc (
-        string id,
-        string ^name,
-        string version,
-        sw_image_desc___checksum checksum,
-        container_format container_format,
-        disk_format disk_format,
-        min_disk min_disk,
-        min_ram min_ram,
-        ^size ^size,
-        image image,
-        string operating_system,
-        string_collection supported_virtualization_environment
-    )
-    Structure sw_image_desc___checksum (
-        identityref algorithm,
-        string hash
-    )
-    Enumerated container_format {
-        container_format aki,
-        container_format ami,
-        container_format ari,
-        container_format bare,
-        container_format docker,
-        container_format ova,
-        container_format ovf
-    }
-    Enumerated disk_format {
-        disk_format aki,
-        disk_format ami,
-        disk_format ari,
-        disk_format iso,
-        disk_format qcow2,
-        disk_format raw,
-        disk_format vdi,
-        disk_format vhd,
-        disk_format vhdx,
-        disk_format vmdk
+    Type scores extends uint16
+    Collection uint16_collection of uint16
+    Collection team___player_collection of team___player
+    Enumerated protocol {
+        protocol tcp,
+        protocol udp,
+        protocol icmp
     }
-    Type min_disk extends uint64
-    Type min_ram extends decimal64
-    Type image extends uri
-    Type uri
-    Collection vnfd___sw_image_desc_collection of vnfd___sw_image_desc
-    Structure vnfd___int_virtual_link_desc (
-        string id,
-        int_virtual_link_desc___flavour_collection flavour,
-        string_collection test_access,
-        string description,
-        int_virtual_link_desc___monitoring_parameters_collection monitoring_parameters,
-        int_virtual_link_desc___connectivity_type connectivity_type
-    )
-    Structure int_virtual_link_desc___flavour (
-        string id,
-        flavour___qos qos
-    )
-    Structure flavour___qos (
-        latency latency,
-        packet_delay_variation packet_delay_variation,
-        decimal64 packet_loss_ratio
-    )
-    Type latency extends uint32
-    Type packet_delay_variation extends uint32
-    Collection int_virtual_link_desc___flavour_collection of int_virtual_link_desc___flavour
-    Structure int_virtual_link_desc___monitoring_parameters (
-        string id,
-        string ^name,
-        string performance_metric,
-        collection_period collection_period
-    )
-    Collection int_virtual_link_desc___monitoring_parameters_collection of int_virtual_link_desc___monitoring_parameters
-    Structure int_virtual_link_desc___connectivity_type (
-        identityref_collection layer_protocol,
-        flow_pattern flow_pattern
-    )
-    Enumerated flow_pattern {
-        flow_pattern line,
-        flow_pattern tree,
-        flow_pattern mesh,
-        flow_pattern line,
-        flow_pattern tree,
-        flow_pattern mesh
+    Collection sports___team_collection of sports___team
+    Structure sports___protocol (
+        string associated_layer_protocol,
+        protocoly protocoly,
+        protocol___ext_cpd_collection ext_cpd,
+        protocol___case_ext_cpd_collection case_ext_cpd,
+        string protocolz,
+        protocol___port_map_collection port_map
+    )
+    Enumerated protocoly {
+        protocoly tcp,
+        protocoly udp,
+        protocoly icmp
     }
-    Collection vnfd___int_virtual_link_desc_collection of vnfd___int_virtual_link_desc
-    Structure vnfd___ext_cpd (
-        ext_cpd___cp_connection cp_connection,
-        @LeafRefPath : "../../virtual-compute-desc/id"
-        leafref nicio_requirements,
-        @LeafRefPath : "../../security-group-rule/id"
-        leafref security_group_rule_id,
-        string id,
-        identityref_collection layer_protocol,
-        identityref role,
-        string description,
-        ext_cpd___protocol_collection protocol,
-        boolean trunk_mode,
-        ext_cpd___virtual_network_interface_requirement_collection virtual_network_interface_requirement
+    Structure protocol___ext_cpd (
+        string k,
+        ext_cpd___cp_connection cp_connection
     )
     Structure ext_cpd___cp_connection (
         cp_connection___int_virtual_link_desc int_virtual_link_desc,
         cp_connection___int_cpd int_cpd
     )
     Structure cp_connection___int_virtual_link_desc (
-        @LeafRefPath : "../../int-virtual-link-desc/id"
-        leafref int_virtual_link_desc
+        string int_virtual_link_desc
     )
     Structure cp_connection___int_cpd (
         int_cpd___int_cpd int_cpd
     )
     Structure int_cpd___int_cpd (
-        @LeafRefPath : "../../../vdu/id"
-        leafref vdu_id,
-        @LeafRefPath : "deref(../vdu-id)/../int-cpd/id"
-        leafref cpd
+        string vdu_id,
+        string cpd
     )
-    Structure ext_cpd___protocol (
-        identityref associated_layer_protocol,
-        protocol___address_data_collection address_data
+    Collection protocol___ext_cpd_collection of protocol___ext_cpd
+    Structure protocol___case_ext_cpd (
+        string k,
+        case_ext_cpd___cp_connection cp_connection
     )
-    Collection ext_cpd___protocol_collection of ext_cpd___protocol
-    Structure ext_cpd___virtual_network_interface_requirement (
-        string ^name,
-        string description,
-        support_mandatory support_mandatory,
-        virtual_network_interface_requirement___network_interface_requirements_collection network_interface_requirements
+    Structure case_ext_cpd___cp_connection (
+        cp_connection___a ^a,
+        cp_connection___b b
     )
-    Collection ext_cpd___virtual_network_interface_requirement_collection of ext_cpd___virtual_network_interface_requirement
-    Collection vnfd___ext_cpd_collection of vnfd___ext_cpd
-    Structure vnfd___df (
-        string id,
-        string description,
-        df___vdu_profile_collection vdu_profile,
-        df___virtual_link_profile_collection virtual_link_profile,
-        df___instantiation_level_collection instantiation_level,
-        @LeafRefPath : "../instantiation-level/id"
-        leafref default_instantiation_level,
-        identityref_collection supported_operation,
-        df___lcm_operations_configuration lcm_operations_configuration,
-        df___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
-        df___indicator_collection indicator,
-        df___supported_vnf_interfaces_collection supported_vnf_interfaces,
-        df___monitoring_parameter_collection monitoring_parameter,
-        df___scaling_aspect_collection scaling_aspect
+    Structure cp_connection___a (
+        string int_virtual_link_desc
     )
-    Structure df___vdu_profile (
-        @LeafRefPath : "../../../vdu/id"
-        leafref id,
-        min_number_of_instances min_number_of_instances,
-        max_number_of_instances max_number_of_instances,
-        vdu_profile___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
-        vdu_profile___local_affinity_or_anti_affinity_rule_collection local_affinity_or_anti_affinity_rule
+    Structure cp_connection___b (
+        b___int_cpd int_cpd
     )
-    Type min_number_of_instances extends uint16
-    Type max_number_of_instances extends uint16
-    Structure vdu_profile___affinity_or_anti_affinity_group (
-        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
-        leafref id
+    Structure b___int_cpd (
+        string vdu_id,
+        string cpd
     )
-    Collection vdu_profile___affinity_or_anti_affinity_group_collection of vdu_profile___affinity_or_anti_affinity_group
-    Structure vdu_profile___local_affinity_or_anti_affinity_rule (
-        affinity_type affinity_type,
-        affinity_scope affinity_scope
+    Collection protocol___case_ext_cpd_collection of protocol___case_ext_cpd
+    Structure protocol___port_map (
+        string port_ref,
+        port_map___map_type map_type
     )
-    Enumerated affinity_type {
-        affinity_type affinity,
-        affinity_type anti_affinity,
-        affinity_type affinity,
-        affinity_type anti_affinity,
-        affinity_type affinity,
-        affinity_type anti_affinity,
-        affinity_type affinity,
-        affinity_type anti_affinity,
-        affinity_type affinity,
-        affinity_type anti_affinity,
-        affinity_type affinity,
-        affinity_type anti_affinity
-    }
-    Enumerated affinity_scope {
-        affinity_scope nfvi_node,
-        affinity_scope zone_group,
-        affinity_scope zone,
-        affinity_scope nfvi_pop,
-        affinity_scope nfvi_node,
-        affinity_scope zone_group,
-        affinity_scope zone,
-        affinity_scope nfvi_pop,
-        affinity_scope nfvi_node,
-        affinity_scope zone_group,
-        affinity_scope zone,
-        affinity_scope nfvi_pop,
-        affinity_scope nfvi_node,
-        affinity_scope zone_group,
-        affinity_scope zone,
-        affinity_scope nfvi_pop,
-        affinity_scope nfvi_node,
-        affinity_scope zone_group,
-        affinity_scope zone,
-        affinity_scope nfvi_pop,
-        affinity_scope nfvi_node,
-        affinity_scope zone_group,
-        affinity_scope zone,
-        affinity_scope nfvi_pop
-    }
-    Collection vdu_profile___local_affinity_or_anti_affinity_rule_collection of vdu_profile___local_affinity_or_anti_affinity_rule
-    Collection df___vdu_profile_collection of df___vdu_profile
-    Structure df___virtual_link_profile (
-        @LeafRefPath : "../../../int-virtual-link-desc/id"
-        leafref id,
-        @LeafRefPath : "deref(../../../ext-cpd/int-virtual-link-desc)/../flavour/id"
-        leafref flavour,
-        virtual_link_profile___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
-        virtual_link_profile___max_bit_rate_requirements max_bit_rate_requirements,
-        virtual_link_profile___min_bit_rate_requirements min_bit_rate_requirements,
-        virtual_link_profile___virtual_link_protocol_data virtual_link_protocol_data,
-        virtual_link_profile___local_affinity_or_anti_affinity_rule_collection local_affinity_or_anti_affinity_rule,
-        @LeafRefPath : "../../../virtual-link-desc/id"
-        leafref virtual_link_desc_id,
-        @LeafRefPath : "deref(../virtual-link-desc-id)/../df/id"
-        leafref flavour_id,
-        virtual_link_profile___max_bitrate_requirements max_bitrate_requirements,
-        virtual_link_profile___min_bitrate_requirements min_bitrate_requirements
+    Structure port_map___map_type (
+        map_type___static_filtering_entries static_filtering_entries,
+        map_type___static_vlan_registration_entries static_vlan_registration_entries
     )
-    Structure virtual_link_profile___affinity_or_anti_affinity_group (
-        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
-        leafref id
-    )
-    Collection virtual_link_profile___affinity_or_anti_affinity_group_collection of virtual_link_profile___affinity_or_anti_affinity_group
-    Structure virtual_link_profile___max_bit_rate_requirements (
-        uint32 root,
-        uint32 leaf
-    )
-    Structure virtual_link_profile___min_bit_rate_requirements (
-        uint32 root,
-        uint32 leaf
-    )
-    Structure virtual_link_profile___virtual_link_protocol_data (
-        identityref associated_layer_protocol,
-        virtual_link_protocol_data___l2_protocol_data l2_protocol_data,
-        virtual_link_protocol_data___l3_protocol_data l3_protocol_data
-    )
-    Structure virtual_link_protocol_data___l2_protocol_data (
-        string ^name,
-        enumeration network_type,
-        boolean vlan_transparent,
-        uint16 mtu
-    )
-    Structure virtual_link_protocol_data___l3_protocol_data (
-        string ^name,
-        ip_version ip_version,
-        string cidr,
-        string_collection ip_allocation_pools,
-        ip_address gateway_ip,
-        dhcp_enabled dhcp_enabled,
-        enumeration ipv6_address_mode
-    )
-    Enumerated ip_version {
-        ip_version ipv4,
-        ip_version ipv6
-    }
-    Type ip_address extends union
-    Type union
-    Type dhcp_enabled extends boolean
-    Structure virtual_link_profile___local_affinity_or_anti_affinity_rule (
-        affinity_type affinity_type,
-        affinity_scope affinity_scope
-    )
-    Collection virtual_link_profile___local_affinity_or_anti_affinity_rule_collection of virtual_link_profile___local_affinity_or_anti_affinity_rule
-    Collection df___virtual_link_profile_collection of df___virtual_link_profile
-    Structure df___instantiation_level (
-        string id,
-        string description,
-        instantiation_level___vdu_level_collection vdu_level,
-        instantiation_level___scaling_info_collection scaling_info
-    )
-    Structure instantiation_level___vdu_level (
-        @LeafRefPath : "../../../../vdu/id"
-        leafref vdu_id,
-        number_of_instances number_of_instances
-    )
-    Type number_of_instances extends uint32
-    Collection instantiation_level___vdu_level_collection of instantiation_level___vdu_level
-    Structure instantiation_level___scaling_info (
-        @LeafRefPath : "../../../scaling-aspect/id"
-        leafref scaling_aspect_id,
-        uint32 scale_level
-    )
-    Collection instantiation_level___scaling_info_collection of instantiation_level___scaling_info
-    Collection df___instantiation_level_collection of df___instantiation_level
-    Structure df___lcm_operations_configuration (
-        lcm_operations_configuration___parameter_collection instantiate_vnf_op_config,
-        lcm_operations_configuration___scale_vnf_op_config scale_vnf_op_config,
-        lcm_operations_configuration___scale_vnf_to_level_op_config scale_vnf_to_level_op_config,
-        lcm_operations_configuration___heal_vnf_op_config heal_vnf_op_config,
-        lcm_operations_configuration___terminate_vnf_op_config terminate_vnf_op_config,
-        lcm_operations_configuration___operate_vnf_op_config operate_vnf_op_config,
-        lcm_operations_configuration___parameter_collection change_vnf_flavour_op_config,
-        lcm_operations_configuration___parameter_collection change_ext_vnf_connectivity_op_config
-    )
-    Structure lcm_operations_configuration___parameter (
-        string key,
-        string ^value
-    )
-    Collection lcm_operations_configuration___parameter_collection of lcm_operations_configuration___parameter
-    Structure lcm_operations_configuration___scale_vnf_op_config (
-        scale_vnf_op_config___parameter_collection ^parameter,
-        scaling_by_more_than_one_step_supported scaling_by_more_than_one_step_supported
-    )
-    Structure scale_vnf_op_config___parameter (
-        string key,
-        string ^value
-    )
-    Collection scale_vnf_op_config___parameter_collection of scale_vnf_op_config___parameter
-    Type scaling_by_more_than_one_step_supported extends boolean
-    Structure lcm_operations_configuration___scale_vnf_to_level_op_config (
-        scale_vnf_to_level_op_config___parameter_collection ^parameter,
-        arbitrary_target_levels_supported arbitrary_target_levels_supported
-    )
-    Structure scale_vnf_to_level_op_config___parameter (
-        string key,
-        string ^value
-    )
-    Collection scale_vnf_to_level_op_config___parameter_collection of scale_vnf_to_level_op_config___parameter
-    Type arbitrary_target_levels_supported extends boolean
-    Structure lcm_operations_configuration___heal_vnf_op_config (
-        heal_vnf_op_config___parameter_collection ^parameter,
-        string_collection cause
-    )
-    Structure heal_vnf_op_config___parameter (
-        string key,
-        string ^value
-    )
-    Collection heal_vnf_op_config___parameter_collection of heal_vnf_op_config___parameter
-    Structure lcm_operations_configuration___terminate_vnf_op_config (
-        min_graceful_termination min_graceful_termination,
-        timeticks max_recommended_graceful_termination,
-        terminate_vnf_op_config___parameter_collection ^parameter
-    )
-    Type min_graceful_termination extends timeticks
-    Type timeticks extends uint32
-    Structure terminate_vnf_op_config___parameter (
-        string key,
-        string ^value
-    )
-    Collection terminate_vnf_op_config___parameter_collection of terminate_vnf_op_config___parameter
-    Structure lcm_operations_configuration___operate_vnf_op_config (
-        min_graceful_stop_timeout min_graceful_stop_timeout,
-        timeticks max_recommended_graceful_stop_timeout,
-        operate_vnf_op_config___parameter_collection ^parameter
-    )
-    Type min_graceful_stop_timeout extends timeticks
-    Structure operate_vnf_op_config___parameter (
-        string key,
-        string ^value
-    )
-    Collection operate_vnf_op_config___parameter_collection of operate_vnf_op_config___parameter
-    Structure df___affinity_or_anti_affinity_group (
-        string id,
-        affinity_type ^type,
-        affinity_scope scope
-    )
-    Collection df___affinity_or_anti_affinity_group_collection of df___affinity_or_anti_affinity_group
-    Structure df___indicator (
-        string id,
-        string ^name,
-        string indicator_value,
-        enumeration source
-    )
-    Collection df___indicator_collection of df___indicator
-    Structure df___supported_vnf_interfaces (
-        enumeration ^name,
-        @LeafRefPath : "../../../ext-cpd/id"
-        leafref_collection cpd_id,
-        supported_vnf_interfaces___interface_details_collection interface_details
-    )
-    Structure supported_vnf_interfaces___interface_details (
-        string key,
-        string ^value
-    )
-    Collection supported_vnf_interfaces___interface_details_collection of supported_vnf_interfaces___interface_details
-    Collection df___supported_vnf_interfaces_collection of df___supported_vnf_interfaces
-    Structure df___monitoring_parameter (
-        string id,
-        string ^name,
-        string performance_metric,
-        collection_period collection_period
-    )
-    Collection df___monitoring_parameter_collection of df___monitoring_parameter
-    Structure df___scaling_aspect (
-        string id,
-        string ^name,
-        string description,
-        uint32 max_scale_level,
-        scaling_aspect___aspect_delta_details aspect_delta_details,
-        @LeafRefPath : "../../ns-instantiation-level/id"
-        leafref scaling_level
-    )
-    Structure scaling_aspect___aspect_delta_details (
-        aspect_delta_details___deltas_collection deltas,
-        @LeafRefPath : "../deltas/id"
-        leafref step_deltas
-    )
-    Structure aspect_delta_details___deltas (
-        string id,
-        deltas___vdu_delta_collection vdu_delta,
-        deltas___virtual_link_bit_rate_delta_collection virtual_link_bit_rate_delta
-    )
-    Structure deltas___vdu_delta (
-        @LeafRefPath : "../../../../../../vdu/id"
-        leafref id,
-        uint32 number_of_instances
-    )
-    Collection deltas___vdu_delta_collection of deltas___vdu_delta
-    Structure deltas___virtual_link_bit_rate_delta (
-        string id,
-        virtual_link_bit_rate_delta___bit_rate_requirements bit_rate_requirements
-    )
-    Structure virtual_link_bit_rate_delta___bit_rate_requirements (
-        root root,
-        leaf leaf
-    )
-    Type root extends uint64
-    Type leaf extends uint64
-    Collection deltas___virtual_link_bit_rate_delta_collection of deltas___virtual_link_bit_rate_delta
-    Collection aspect_delta_details___deltas_collection of aspect_delta_details___deltas
-    Collection df___scaling_aspect_collection of df___scaling_aspect
-    Collection vnfd___df_collection of vnfd___df
-    Structure vnfd___configurable_properties (
-        boolean is_auto_scalable_enabled,
-        boolean is_auto_heal_enabled,
-        configurable_properties___additional_configurable_property_collection additional_configurable_property
-    )
-    Structure configurable_properties___additional_configurable_property (
-        string key,
-        string ^value
-    )
-    Collection configurable_properties___additional_configurable_property_collection of configurable_properties___additional_configurable_property
-    Structure vnfd___modifiable_attributes (
-        string_collection extension,
-        string_collection metadata
-    )
-    Structure vnfd___lifecycle_management_script (
-        string id,
-        internal_lifecycle_management_script_event_collection ^event,
-        string_collection lcm_transition_event,
-        string script,
-        string script_dsl,
-        lifecycle_management_script___script_input_collection script_input
-    )
-    Enumerated internal_lifecycle_management_script_event {
-        internal_lifecycle_management_script_event start_instantiation,
-        internal_lifecycle_management_script_event end_instantiation,
-        internal_lifecycle_management_script_event start_scaling,
-        internal_lifecycle_management_script_event end_scaling,
-        internal_lifecycle_management_script_event start_healing,
-        internal_lifecycle_management_script_event end_healing,
-        internal_lifecycle_management_script_event start_termination,
-        internal_lifecycle_management_script_event end_termination,
-        internal_lifecycle_management_script_event start_vnf_flavour_change,
-        internal_lifecycle_management_script_event end_vnf_flavour_change,
-        internal_lifecycle_management_script_event start_vnf_operation_change,
-        internal_lifecycle_management_script_event end_vnf_operation_change,
-        internal_lifecycle_management_script_event start_vnf_ext_conn_change,
-        internal_lifecycle_management_script_event end_vnf_ext_conn_change,
-        internal_lifecycle_management_script_event start_vnfinfo_modification,
-        internal_lifecycle_management_script_event end_vnfinfo_modification,
-        internal_lifecycle_management_script_event start_instantiation,
-        internal_lifecycle_management_script_event end_instantiation,
-        internal_lifecycle_management_script_event start_scaling,
-        internal_lifecycle_management_script_event end_scaling,
-        internal_lifecycle_management_script_event start_healing,
-        internal_lifecycle_management_script_event end_healing,
-        internal_lifecycle_management_script_event start_termination,
-        internal_lifecycle_management_script_event end_termination,
-        internal_lifecycle_management_script_event start_vnf_flavour_change,
-        internal_lifecycle_management_script_event end_vnf_flavour_change,
-        internal_lifecycle_management_script_event start_vnf_operation_change,
-        internal_lifecycle_management_script_event end_vnf_operation_change,
-        internal_lifecycle_management_script_event start_vnf_ext_conn_change,
-        internal_lifecycle_management_script_event end_vnf_ext_conn_change,
-        internal_lifecycle_management_script_event start_vnfinfo_modification,
-        internal_lifecycle_management_script_event end_vnfinfo_modification,
-        internal_lifecycle_management_script_event start_instantiation,
-        internal_lifecycle_management_script_event end_instantiation,
-        internal_lifecycle_management_script_event start_scaling,
-        internal_lifecycle_management_script_event end_scaling,
-        internal_lifecycle_management_script_event start_healing,
-        internal_lifecycle_management_script_event end_healing,
-        internal_lifecycle_management_script_event start_termination,
-        internal_lifecycle_management_script_event end_termination,
-        internal_lifecycle_management_script_event start_vnf_flavour_change,
-        internal_lifecycle_management_script_event end_vnf_flavour_change,
-        internal_lifecycle_management_script_event start_vnf_operation_change,
-        internal_lifecycle_management_script_event end_vnf_operation_change,
-        internal_lifecycle_management_script_event start_vnf_ext_conn_change,
-        internal_lifecycle_management_script_event end_vnf_ext_conn_change,
-        internal_lifecycle_management_script_event start_vnfinfo_modification,
-        internal_lifecycle_management_script_event end_vnfinfo_modification
-    }
-    Collection internal_lifecycle_management_script_event_collection of internal_lifecycle_management_script_event
-    Structure lifecycle_management_script___script_input (
-        string key,
-        string ^value
+    Structure map_type___static_filtering_entries (
+        static_filtering_entries___static_filtering_entries static_filtering_entries
     )
-    Collection lifecycle_management_script___script_input_collection of lifecycle_management_script___script_input
-    Collection vnfd___lifecycle_management_script_collection of vnfd___lifecycle_management_script
-    Structure vnfd___element_group (
-        string id,
-        string description,
-        @LeafRefPath : "../../vdu/id"
-        leafref_collection vdu,
-        @LeafRefPath : "../../int-virtual-link-desc/id"
-        leafref_collection virtual_link_desc
+    Structure static_filtering_entries___static_filtering_entries (
+        enumeration control_element,
+        string connection_identifier
     )
-    Collection vnfd___element_group_collection of vnfd___element_group
-    Structure vnfd___indicator (
-        string id,
-        string ^name,
-        string_collection indicator_value,
-        enumeration source
-    )
-    Collection vnfd___indicator_collection of vnfd___indicator
-    Structure vnfd___security_group_rule (
-        string id,
-        string description,
-        direction direction,
-        ether_type ether_type,
-        protocol protocol,
-        port_range_min port_range_min,
-        port_range_max port_range_max
-    )
-    Enumerated direction {
-        direction ingress,
-        direction egress,
-        direction ingress,
-        direction egress
-    }
-    Enumerated ether_type {
-        ether_type ipv4,
-        ether_type ipv6,
-        ether_type ipv4,
-        ether_type ipv6
-    }
-    Enumerated protocol {
-        protocol tcp,
-        protocol udp,
-        protocol icmp,
-        protocol tcp,
-        protocol udp,
-        protocol icmp
-    }
-    Type port_range_min extends uint16
-    Type port_range_max extends uint16
-    Collection vnfd___security_group_rule_collection of vnfd___security_group_rule
-    Collection nfv___vnfd_collection of nfv___vnfd
-    Structure nfv___nsd (
-        string id,
-        string designer,
-        string version,
-        string ^name,
-        string invariant_id,
-        @LeafRefPath : "../../nsd/id"
-        leafref_collection nested_nsd_id,
-        @LeafRefPath : "../../vnfd/id"
-        leafref_collection vnfd_id,
-        @LeafRefPath : "../../pnfd/id"
-        leafref_collection pnfd_id,
-        nsd___sapd_collection sapd,
-        nsd___virtual_link_desc_collection virtual_link_desc,
-        nsd___vnffgd_collection vnffgd,
-        string_collection autoscale_rule,
-        nsd___lifecycle_management_script_collection lifecycle_management_script,
-        nsd___df_collection df,
-        string signature,
-        string algorithm,
-        string certificate
-    )
-    Structure nsd___sapd (
-        string id,
-        boolean address_assignment,
-        sapd___cpd_or_virtual_link cpd_or_virtual_link
-    )
-    Structure sapd___cpd_or_virtual_link (
-        cpd_or_virtual_link___virtual_link_desc virtual_link_desc,
-        cpd_or_virtual_link___associated_cpd_id associated_cpd_id
-    )
-    Structure cpd_or_virtual_link___virtual_link_desc (
-        @LeafRefPath : "../../virtual-link-desc/id"
-        leafref virtual_link_desc
-    )
-    Structure cpd_or_virtual_link___associated_cpd_id (
-        associated_cpd_id___associated_cpd_id associated_cpd_id
-    )
-    Structure associated_cpd_id___associated_cpd_id (
-        associated_cpd_id___vnf vnf,
-        associated_cpd_id___pnf pnf,
-        associated_cpd_id___ns ns
-    )
-    Structure associated_cpd_id___vnf (
-        vnf___vnf vnf
-    )
-    Structure vnf___vnf (
-        @LeafRefPath : "../../../../../vnfd/id"
-        leafref vnfd_id,
-        @LeafRefPath : "deref(../vnfd-id)/../ext-cpd/id"
-        leafref ext_cpd_id,
-        @LeafRefPath : "deref(../vnfd-id)/../ext-cpd/id"
-        leafref cpd_id
-    )
-    Structure associated_cpd_id___pnf (
-        pnf___pnf pnf
-    )
-    Structure pnf___pnf (
-        @LeafRefPath : "../../../../../pnfd/id"
-        leafref pnfd_id,
-        @LeafRefPath : "deref(../pnfd-id)/../ext-cpd/id"
-        leafref ext_cpd_id,
-        @LeafRefPath : "deref(../pnfd-id)/../ext-cpd/id"
-        leafref pnf_cpd_id
-    )
-    Structure associated_cpd_id___ns (
-        ns___ns ns
-    )
-    Structure ns___ns (
-        @LeafRefPath : "../../../../../nsd/id"
-        leafref nsd_id,
-        @LeafRefPath : "deref(../nsd-id)/../sapd/id"
-        leafref ext_cpd_id,
-        @LeafRefPath : "deref(../nsd-id)/../sapd/id"
-        leafref sap_cpd_id
-    )
-    Collection nsd___sapd_collection of nsd___sapd
-    Structure nsd___virtual_link_desc (
-        string id,
-        virtual_link_desc___df_collection df,
-        enumeration test_access,
-        string description,
-        virtual_link_desc___connectivity_type connectivity_type,
-        string signature,
-        string algorithm,
-        string certificate
-    )
-    Structure virtual_link_desc___df (
-        string id,
-        df___qos qos,
-        enumeration service_availability_level
-    )
-    Structure df___qos (
-        latency latency,
-        packet_delay_variation packet_delay_variation,
-        decimal64 packet_loss_ratio,
-        uint32 priority
-    )
-    Collection virtual_link_desc___df_collection of virtual_link_desc___df
-    Structure virtual_link_desc___connectivity_type (
-        identityref_collection layer_protocol,
-        flow_pattern flow_pattern
-    )
-    Collection nsd___virtual_link_desc_collection of nsd___virtual_link_desc
-    Structure nsd___vnffgd (
-        string id,
-        @LeafRefPath : "../../df/vnf-profile/id"
-        leafref_collection vnf_profile_id,
-        @LeafRefPath : "../../df/pnf-profile/id"
-        leafref_collection pnf_profile_id,
-        @LeafRefPath : "../../df/ns-profile/id"
-        leafref_collection nested_ns_profile_id,
-        @LeafRefPath : "../../df/virtual-link-profile/id"
-        leafref virtual_link_profile_id,
-        vnffgd___cpd_pool_collection cpd_pool,
-        vnffgd___nfpd_collection nfpd
-    )
-    Structure vnffgd___cpd_pool (
-        string id,
-        cpd_pool___constituent_base_element_id constituent_base_element_id,
-        cpd_pool___constituent_cpd_id constituent_cpd_id
-    )
-    Structure cpd_pool___constituent_base_element_id (
-        constituent_base_element_id___vnf_profile vnf_profile,
-        constituent_base_element_id___pnf_profile pnf_profile,
-        constituent_base_element_id___ns_profile ns_profile
-    )
-    Structure constituent_base_element_id___vnf_profile (
-        vnf_profile___vnf_profile vnf_profile
-    )
-    Structure vnf_profile___vnf_profile (
-        @LeafRefPath : "../../../../../nsd/df/vnf-profile/id"
-        leafref vnf_profile_id
-    )
-    Structure constituent_base_element_id___pnf_profile (
-        pnf_profile___pnf_profile pnf_profile
-    )
-    Structure pnf_profile___pnf_profile (
-        @LeafRefPath : "../../../../../nsd/df/pnf-profile/id"
-        leafref pnf_profile_id
-    )
-    Structure constituent_base_element_id___ns_profile (
-        ns_profile___ns_profile ns_profile
-    )
-    Structure ns_profile___ns_profile (
-        @LeafRefPath : "../../../../../nsd/df/ns-profile/id"
-        leafref ns_profile_id
-    )
-    Structure cpd_pool___constituent_cpd_id (
-        constituent_cpd_id___vnf vnf,
-        constituent_cpd_id___pnf pnf,
-        constituent_cpd_id___ns ns
-    )
-    Structure constituent_cpd_id___vnf (
-        vnf___vnf vnf
-    )
-    Structure constituent_cpd_id___pnf (
-        pnf___pnf pnf
-    )
-    Structure constituent_cpd_id___ns (
-        ns___ns ns
-    )
-    Collection vnffgd___cpd_pool_collection of vnffgd___cpd_pool
-    Structure vnffgd___nfpd (
-        string id,
-        string rule,
-        nfpd___position_desc_id_collection position_desc_id
-    )
-    Structure nfpd___position_desc_id (
-        string id,
-        position_desc_id___cp_profile_id_collection cp_profile_id
-    )
-    Structure position_desc_id___cp_profile_id (
-        string id,
-        cp_profile_id___constituent_profile_elements_collection constituent_profile_elements
-    )
-    Structure cp_profile_id___constituent_profile_elements (
-        string id,
-        string cpd_id
-    )
-    Collection cp_profile_id___constituent_profile_elements_collection of cp_profile_id___constituent_profile_elements
-    Collection position_desc_id___cp_profile_id_collection of position_desc_id___cp_profile_id
-    Collection nfpd___position_desc_id_collection of nfpd___position_desc_id
-    Collection vnffgd___nfpd_collection of vnffgd___nfpd
-    Collection nsd___vnffgd_collection of nsd___vnffgd
-    Structure nsd___lifecycle_management_script (
-        string ^event,
-        string script
-    )
-    Collection nsd___lifecycle_management_script_collection of nsd___lifecycle_management_script
-    Structure nsd___df (
-        string id,
-        @LeafRefPath : "../monitored-info/id"
-        leafref flavour_key,
-        df___vnf_profile_collection vnf_profile,
-        df___pnf_profile_collection pnf_profile,
-        df___virtual_link_profile_collection virtual_link_profile,
-        df___scaling_aspect_collection scaling_aspect,
-        df___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
-        df___ns_instantiation_level_collection ns_instantiation_level,
-        @LeafRefPath : "../ns-instantiation-level/id"
-        leafref default_instantiation_level,
-        df___ns_profile_collection ns_profile,
-        df___dependencies_collection dependencies,
-        df___monitored_info_collection monitored_info
-    )
-    Structure df___vnf_profile (
-        string id,
-        @LeafRefPath : "../../../../vnfd/id"
-        leafref vnfd_id,
-        @LeafRefPath : "deref(../vnfd-id)/../df/id"
-        leafref flavour_id,
-        @LeafRefPath : "deref(../flavour-id)/../instantiation-level/id"
-        leafref instantiation_level,
-        min_number_of_instances min_number_of_instances,
-        max_number_of_instances max_number_of_instances,
-        vnf_profile___affinity_or_anti_affinity_group_collection affinity_or_anti_affinity_group,
-        vnf_profile___virtual_link_connectivity_collection virtual_link_connectivity,
-        vnf_profile___local_affinity_or_anti_affinity_rule_collection local_affinity_or_anti_affinity_rule
-    )
-    Structure vnf_profile___affinity_or_anti_affinity_group (
-        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
-        leafref id
-    )
-    Collection vnf_profile___affinity_or_anti_affinity_group_collection of vnf_profile___affinity_or_anti_affinity_group
-    Structure vnf_profile___virtual_link_connectivity (
-        @LeafRefPath : "../../../virtual-link-profile/id"
-        leafref virtual_link_profile_id,
-        virtual_link_connectivity___constituent_cpd_id_collection constituent_cpd_id
-    )
-    Structure virtual_link_connectivity___constituent_cpd_id (
-        @LeafRefPath : "../../../id"
-        leafref constituent_base_element_id,
-        @LeafRefPath : "deref(../../../nsd-id)/../sapd/id"
-        leafref constituent_cpd_id
-    )
-    Collection virtual_link_connectivity___constituent_cpd_id_collection of virtual_link_connectivity___constituent_cpd_id
-    Collection vnf_profile___virtual_link_connectivity_collection of vnf_profile___virtual_link_connectivity
-    Structure vnf_profile___local_affinity_or_anti_affinity_rule (
-        affinity_type affinity_type,
-        affinity_scope affinity_scope
-    )
-    Collection vnf_profile___local_affinity_or_anti_affinity_rule_collection of vnf_profile___local_affinity_or_anti_affinity_rule
-    Collection df___vnf_profile_collection of df___vnf_profile
-    Structure df___pnf_profile (
-        string id,
-        @LeafRefPath : "../../../../pnfd/id"
-        leafref pnfd_id,
-        pnf_profile___virtual_link_connectivity_collection virtual_link_connectivity
-    )
-    Structure pnf_profile___virtual_link_connectivity (
-        @LeafRefPath : "../../../virtual-link-profile/id"
-        leafref virtual_link_profile_id,
-        virtual_link_connectivity___constituent_cpd_id_collection constituent_cpd_id
-    )
-    Collection pnf_profile___virtual_link_connectivity_collection of pnf_profile___virtual_link_connectivity
-    Collection df___pnf_profile_collection of df___pnf_profile
-    Structure virtual_link_profile___max_bitrate_requirements (
-        root root,
-        leaf leaf
-    )
-    Structure virtual_link_profile___min_bitrate_requirements (
-        root root,
-        leaf leaf
-    )
-    Structure df___ns_instantiation_level (
-        string id,
-        string description,
-        ns_instantiation_level___vnf_to_level_mapping_collection vnf_to_level_mapping,
-        ns_instantiation_level___virtual_link_to_level_mapping_collection virtual_link_to_level_mapping,
-        ns_instantiation_level___ns_to_level_mapping_collection ns_to_level_mapping
-    )
-    Structure ns_instantiation_level___vnf_to_level_mapping (
-        @LeafRefPath : "../../../vnf-profile/id"
-        leafref vnf_profile_id,
-        number_of_instances number_of_instances
-    )
-    Collection ns_instantiation_level___vnf_to_level_mapping_collection of ns_instantiation_level___vnf_to_level_mapping
-    Structure ns_instantiation_level___virtual_link_to_level_mapping (
-        @LeafRefPath : "../../../virtual-link-profile/id"
-        leafref virtual_link_profile_id,
-        root root,
-        leaf leaf
-    )
-    Collection ns_instantiation_level___virtual_link_to_level_mapping_collection of ns_instantiation_level___virtual_link_to_level_mapping
-    Structure ns_instantiation_level___ns_to_level_mapping (
-        @LeafRefPath : "../../../ns-profile/id"
-        leafref ns_profile_id,
-        number_of_instances number_of_instances
-    )
-    Collection ns_instantiation_level___ns_to_level_mapping_collection of ns_instantiation_level___ns_to_level_mapping
-    Collection df___ns_instantiation_level_collection of df___ns_instantiation_level
-    Structure df___ns_profile (
-        string id,
-        @LeafRefPath : "../../../../nsd/id"
-        leafref nsd_id,
-        @LeafRefPath : "deref(../nsd-id)/../df/id"
-        leafref ns_df_id,
-        @LeafRefPath : "deref(../ns-df-id)/../ns-instantiation-level/id"
-        leafref instantiation_level_id,
-        min_number_of_instances min_number_of_instances,
-        max_number_of_instances max_number_of_instances,
-        ns_profile___affinity_or_anti_affinity_group_id_collection affinity_or_anti_affinity_group_id,
-        ns_profile___virtual_link_connectivity_collection virtual_link_connectivity
-    )
-    Structure ns_profile___affinity_or_anti_affinity_group_id (
-        @LeafRefPath : "../../../affinity-or-anti-affinity-group/id"
-        leafref id
-    )
-    Collection ns_profile___affinity_or_anti_affinity_group_id_collection of ns_profile___affinity_or_anti_affinity_group_id
-    Structure ns_profile___virtual_link_connectivity (
-        @LeafRefPath : "../../../virtual-link-profile/id"
-        leafref virtual_link_profile_id,
-        virtual_link_connectivity___constituent_cpd_id_collection constituent_cpd_id
-    )
-    Collection ns_profile___virtual_link_connectivity_collection of ns_profile___virtual_link_connectivity
-    Collection df___ns_profile_collection of df___ns_profile
-    Structure df___dependencies (
-        string id,
-        dependencies___primary_id primary_id,
-        dependencies___secondary_id secondary_id
-    )
-    Structure dependencies___primary_id (
-        primary_id___primary_vnf_profile primary_vnf_profile,
-        primary_id___primary_ns_profile primary_ns_profile
-    )
-    Structure primary_id___primary_vnf_profile (
-        @LeafRefPath : "../../vnf-profile/vnfd-id"
-        leafref primary_vnf_profile
-    )
-    Structure primary_id___primary_ns_profile (
-        @LeafRefPath : "../../ns-profile/nsd-id"
-        leafref primary_ns_profile
-    )
-    Structure dependencies___secondary_id (
-        secondary_id___secondary_vnf_profile secondary_vnf_profile,
-        secondary_id___secondary_ns_profile secondary_ns_profile
-    )
-    Structure secondary_id___secondary_vnf_profile (
-        @LeafRefPath : "../../vnf-profile/vnfd-id"
-        leafref secondary_vnf_profile
-    )
-    Structure secondary_id___secondary_ns_profile (
-        @LeafRefPath : "../../ns-profile/nsd-id"
-        leafref secondary_ns_profile
-    )
-    Collection df___dependencies_collection of df___dependencies
-    Structure df___monitored_info (
-        string id,
-        monitored_info___vnf_indicator_info vnf_indicator_info,
-        monitored_info___monitoring_parameter monitoring_parameter
-    )
-    Structure monitored_info___vnf_indicator_info (
-        @LeafRefPath : "../../../../../vnfd/id"
-        leafref vnfd_id,
-        @LeafRefPath : "deref(../vnfd-id)/../indicator/id"
-        leafref vnf_indicator
-    )
-    Structure monitored_info___monitoring_parameter (
-        string id,
-        string ^name,
-        string performance_metric,
-        string collection_period
-    )
-    Collection df___monitored_info_collection of df___monitored_info
-    Collection nsd___df_collection of nsd___df
-    Collection nfv___nsd_collection of nfv___nsd
-    Structure nfv___pnfd (
-        string id,
-        string function_description,
-        string provider,
-        string version,
-        string invariant_id,
-        string ^name,
-        pnfd___ext_cpd_collection ext_cpd,
-        pnfd___security_collection security,
-        string geographical_location_info,
-        pnfd___security_group_rule_collection security_group_rule
-    )
-    Structure pnfd___ext_cpd (
-        string id,
-        identityref_collection layer_protocol,
-        identityref role,
-        string description,
-        ext_cpd___protocol_collection protocol,
-        boolean trunk_mode
-    )
-    Collection pnfd___ext_cpd_collection of pnfd___ext_cpd
-    Structure pnfd___security (
-        string signature,
-        string algorithm,
-        string certificate
-    )
-    Collection pnfd___security_collection of pnfd___security
-    Structure pnfd___security_group_rule (
-        string id,
-        string description,
-        direction direction,
-        ether_type ether_type,
-        protocol protocol,
-        port_range_min port_range_min,
-        port_range_max port_range_max
-    )
-    Collection pnfd___security_group_rule_collection of pnfd___security_group_rule
-    Collection nfv___pnfd_collection of nfv___pnfd
-    Structure nsd (
-        nsd___vnfd_collection vnfd,
-        nsd___nsd_collection nsd,
-        nsd___pnfd_collection pnfd
-    )
-    Structure nsd___vnfd (
-        string id,
-        string provider,
-        string product_name,
-        string software_version,
-        string version,
-        string product_info_name,
-        string product_info_description,
-        string_collection vnfm_info,
-        string localization_language,
-        string default_localization_language,
-        vnfd___vdu_collection vdu,
-        vnfd___virtual_compute_desc_collection virtual_compute_desc,
-        vnfd___virtual_storage_desc_collection virtual_storage_desc,
-        vnfd___sw_image_desc_collection sw_image_desc,
-        vnfd___int_virtual_link_desc_collection int_virtual_link_desc,
-        vnfd___ext_cpd_collection ext_cpd,
-        vnfd___df_collection df,
-        vnfd___configurable_properties configurable_properties,
-        vnfd___modifiable_attributes modifiable_attributes,
-        vnfd___lifecycle_management_script_collection lifecycle_management_script,
-        vnfd___element_group_collection element_group,
-        vnfd___indicator_collection indicator,
-        string_collection auto_scale,
-        vnfd___security_group_rule_collection security_group_rule
-    )
-    Collection nsd___vnfd_collection of nsd___vnfd
-    Structure nsd___nsd (
-        string id,
-        string designer,
-        string version,
-        string ^name,
-        string invariant_id,
-        @LeafRefPath : "../../nsd/id"
-        leafref_collection nested_nsd_id,
-        @LeafRefPath : "../../vnfd/id"
-        leafref_collection vnfd_id,
-        @LeafRefPath : "../../pnfd/id"
-        leafref_collection pnfd_id,
-        nsd___sapd_collection sapd,
-        nsd___virtual_link_desc_collection virtual_link_desc,
-        nsd___vnffgd_collection vnffgd,
-        string_collection autoscale_rule,
-        nsd___lifecycle_management_script_collection lifecycle_management_script,
-        nsd___df_collection df,
-        string signature,
-        string algorithm,
-        string certificate
-    )
-    Collection nsd___nsd_collection of nsd___nsd
-    Structure nsd___pnfd (
-        string id,
-        string function_description,
-        string provider,
-        string version,
-        string invariant_id,
-        string ^name,
-        pnfd___ext_cpd_collection ext_cpd,
-        pnfd___security_collection security,
-        string geographical_location_info,
-        pnfd___security_group_rule_collection security_group_rule
-    )
-    Collection nsd___pnfd_collection of nsd___pnfd
-    Structure pnfd (
-        string id,
-        string function_description,
-        string provider,
-        string version,
-        string invariant_id,
-        string ^name,
-        pnfd___ext_cpd_collection ext_cpd,
-        pnfd___security_collection security,
-        string geographical_location_info,
-        pnfd___security_group_rule_collection security_group_rule
+    Type enumeration
+    Structure map_type___static_vlan_registration_entries (
+        static_vlan_registration_entries___static_vlan_registration_entries static_vlan_registration_entries
     )
-    Structure vnfd (
-        string id,
-        string provider,
-        string product_name,
-        string software_version,
-        string version,
-        string product_info_name,
-        string product_info_description,
-        string_collection vnfm_info,
-        string localization_language,
-        string default_localization_language,
-        vnfd___vdu_collection vdu,
-        vnfd___virtual_compute_desc_collection virtual_compute_desc,
-        vnfd___virtual_storage_desc_collection virtual_storage_desc,
-        vnfd___sw_image_desc_collection sw_image_desc,
-        vnfd___int_virtual_link_desc_collection int_virtual_link_desc,
-        vnfd___ext_cpd_collection ext_cpd,
-        vnfd___df_collection df,
-        vnfd___configurable_properties configurable_properties,
-        vnfd___modifiable_attributes modifiable_attributes,
-        vnfd___lifecycle_management_script_collection lifecycle_management_script,
-        vnfd___element_group_collection element_group,
-        vnfd___indicator_collection indicator,
-        string_collection auto_scale,
-        vnfd___security_group_rule_collection security_group_rule
+    Structure static_vlan_registration_entries___static_vlan_registration_entries (
+        enumeration registrar_admin_control
     )
+    Collection protocol___port_map_collection of protocol___port_map
+    Collection sports___protocol_collection of sports___protocol
 }
\ No newline at end of file