diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh
index 336cd8fe56fc389932b735bff63e60dc5900adde..0d1c39d5e2b4de9a5ac7370ad83e6552bf382020 100755
--- a/descriptor-packages/tools/generate_descriptor_pkg.sh
+++ b/descriptor-packages/tools/generate_descriptor_pkg.sh
@@ -256,7 +256,6 @@ EOF
         eth=$(($i))
         cat >>$desc_file <<EOF
         -   name: vnf-cp${eth}
-            type: ${CP_TYPE}
 EOF
     done
 
diff --git a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
index 34548c0dbea50cbfca23f267a382900f176aa53b..b49e42bf617db683b5dbb701830f8b56504b1987 100644
--- a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+++ b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
@@ -40,15 +40,15 @@ vnfd-catalog:
                 charm: vyos-proxy
         connection-point:
         -   name: eth0
-            type: VPORT
+
         -   name: eth1
-            type: VPORT
+
         -   name: eth2
-            type: VPORT
+
         -   name: eth3
-            type: VPORT
+
         -   name: eth4
-            type: VPORT
+
         vdu:
         -   id: VyOS-VM
             name: VyOS-VM
diff --git a/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml b/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
index fc8d458a65dc903ac6613ab3f94b62cb6767818d..2ee60f75f7a6bf3ef8eaba07539811bcea47c7cf 100755
--- a/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
@@ -45,5 +45,5 @@ vnfd-catalog:
 
         connection-point:
             -   name: eth0
-                type: VPORT
+
                 port-security-enabled: "false"
diff --git a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
index e4980bf5b4cec05e1a55f8ed28cd254d36f13f52..16b4989404d55f10bea6b6ab4788451efb8c3b0a 100644
--- a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
@@ -45,4 +45,4 @@ vnfd-catalog:
 
         connection-point:
             -   name: eth0
-                type: VPORT
+
diff --git a/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
index 80dc1afd597c43aa33dde42fbf7d06276ce559ec..38e8a68c0180cf85911e3bfa61af908fdb45cdc2 100755
--- a/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
+++ b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
@@ -2,7 +2,7 @@ vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: eth0
-            type: VPORT
+
         description: Simple VNF example with a DNS forwarder
         id: dns_forwarder
         logo: dns.jpg
diff --git a/descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml b/descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml
index 241bc0cbee7cec40a2f80837da2ae73bf80a81ad..016148297afe2d0abbdc48e287be069967f3a310 100644
--- a/descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml
@@ -9,7 +9,7 @@ vnfd:vnfd-catalog:
         version: '1.0'
         connection-point:
         -   name: vnf-cp0
-            type: VPORT
+
         mgmt-interface:
             cp: vnf-cp0
         vdu:
diff --git a/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml b/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
index 4051eb3f0dc494655d360557cb8c1ae15b2145a8..998c2d8300cf714027a71fae56449cc25495c62e 100644
--- a/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
@@ -8,7 +8,7 @@ vnfd:vnfd-catalog:
         logo: osm.png
         connection-point:
         -   name: vnf-cp0
-            type: VPORT
+
         vdu:
         -   id: hackfest_basic-VM
             name: hackfest_basic-VM
diff --git a/descriptor-packages/vnfd/hackfest_cloudinit_vnf/src/hackfest_cloudinit_vnfd.yaml b/descriptor-packages/vnfd/hackfest_cloudinit_vnf/src/hackfest_cloudinit_vnfd.yaml
index 066f69807eae251f061ec9d91fe4a09b6ddda450..818c62aaeb8b67b6fffec5bf70a3d651dbf39637 100644
--- a/descriptor-packages/vnfd/hackfest_cloudinit_vnf/src/hackfest_cloudinit_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_cloudinit_vnf/src/hackfest_cloudinit_vnfd.yaml
@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
         -   id: vnf-mgmt
             name: vnf-mgmt
             short-name: vnf-mgmt
-            type: VPORT
+
         -   id: vnf-data
             name: vnf-data
             short-name: vnf-data
-            type: VPORT
+
         mgmt-interface:
             cp: vnf-mgmt
         internal-vld:
@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
             -   id: mgmtVM-internal
                 name: mgmtVM-internal
                 short-name: mgmtVM-internal
-                type: VPORT
+
             cloud-init-file: cloud-config.txt
         -   id: dataVM
             name: dataVM
@@ -78,5 +78,5 @@ vnfd:vnfd-catalog:
             -   id: dataVM-internal
                 name: dataVM-internal
                 short-name: dataVM-internal
-                type: VPORT
+
 
diff --git a/descriptor-packages/vnfd/hackfest_epasriov_vnf/src/hackfest_epasriov_vnfd.yaml b/descriptor-packages/vnfd/hackfest_epasriov_vnf/src/hackfest_epasriov_vnfd.yaml
index 598ee607384326e508215e6e52d158a4ece2ed56..f03938925a2f25a2464a4df6dba7bab59d586614 100644
--- a/descriptor-packages/vnfd/hackfest_epasriov_vnf/src/hackfest_epasriov_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_epasriov_vnf/src/hackfest_epasriov_vnfd.yaml
@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
         -   id: vnf-mgmt
             name: vnf-mgmt
             short-name: vnf-mgmt
-            type: VPORT
+
         -   id: vnf-data
             name: vnf-data
             short-name: vnf-data
-            type: VPORT
+
         mgmt-interface:
             cp: vnf-mgmt
         internal-vld:
@@ -60,7 +60,7 @@ vnfd:vnfd-catalog:
             -   id: mgmtVM-internal
                 name: mgmtVM-internal
                 short-name: mgmtVM-internal
-                type: VPORT
+
             cloud-init-file: cloud-config.txt
         -   id: dataVM
             name: dataVM
@@ -96,5 +96,5 @@ vnfd:vnfd-catalog:
             -   id: dataVM-internal
                 name: dataVM-internal
                 short-name: dataVM-internal
-                type: VPORT
+
 
diff --git a/descriptor-packages/vnfd/hackfest_multivdu_vnf/src/hackfest_multivdu_vnfd.yaml b/descriptor-packages/vnfd/hackfest_multivdu_vnf/src/hackfest_multivdu_vnfd.yaml
index d658bf5d8711b5094fb806182c8866d84a462382..e8981ff238f6c4c7f3b0337842345855d49bbb78 100644
--- a/descriptor-packages/vnfd/hackfest_multivdu_vnf/src/hackfest_multivdu_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_multivdu_vnf/src/hackfest_multivdu_vnfd.yaml
@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
         -   id: vnf-mgmt
             name: vnf-mgmt
             short-name: vnf-mgmt
-            type: VPORT
+
         -   id: vnf-data
             name: vnf-data
             short-name: vnf-data
-            type: VPORT
+
         mgmt-interface:
             cp: vnf-mgmt
         internal-vld:
@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
             -   id: mgmtVM-internal
                 name: mgmtVM-internal
                 short-name: mgmtVM-internal
-                type: VPORT
+
         -   id: dataVM
             name: dataVM
             image: US1604
@@ -77,5 +77,5 @@ vnfd:vnfd-catalog:
             -   id: dataVM-internal
                 name: dataVM-internal
                 short-name: dataVM-internal
-                type: VPORT
+
 
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
index 2642f1bd2904e41bac6eddcc09be919a1ed37534..ad9bdd5c315022ab5b3fc1b49b781d500128c012 100644
--- a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
         -   id: vnf-mgmt
             name: vnf-mgmt
             short-name: vnf-mgmt
-            type: VPORT
+
         -   id: vnf-data
             name: vnf-data
             short-name: vnf-data
-            type: VPORT
+
         mgmt-interface:
             cp: vnf-mgmt
         internal-vld:
@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
             -   id: mgmtVM-internal
                 name: mgmtVM-internal
                 short-name: mgmtVM-internal
-                type: VPORT
+
             cloud-init-file: cloud-config.txt
         -   id: dataVM
             name: dataVM
@@ -78,7 +78,7 @@ vnfd:vnfd-catalog:
             -   id: dataVM-internal
                 name: dataVM-internal
                 short-name: dataVM-internal
-                type: VPORT
+
         vnf-configuration:
             juju:
                 charm: simple
diff --git a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
index 1943ffb3df93ce7b54827d4daac0d7440f47943b..27b224702d353af73d1bfe422e4a0be6750eab62 100644
--- a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+++ b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
@@ -42,9 +42,9 @@ vnfd-catalog:
                 charm: clearwater-aio-proxy
         connection-point:
         -   name: eth0
-            type: VPORT
+
         -   name: eth1
-            type: VPORT
+
         vdu:
         -   id: IMS-ALLIN1_2p-VM
             name: IMS-ALLIN1_2p-VM
diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index a2e2c1eda380bb39bcd696723c98e2fe062fc865..d73baf63b0abef20ad11ce00633ba4bcbd3a963b 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -26,9 +26,9 @@ vnfd-catalog:
         description: This is an example RIFT.ware VNF
         connection-point:
         -   name: ping_vnfd/cp0
-            type: VPORT
+
         -   name: ping_vnfd/cp1
-            type: VPORT
+
         http-endpoint:
         -   path: api/v1/ping/stats
             port: '18888'
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index 935f04e056793c7aef78055976d705b6c20ffa2b..f824f203a3d0e79c13709440871e1096bd11a7e7 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -26,9 +26,9 @@ vnfd-catalog:
         description: This is an example RIFT.ware VNF
         connection-point:
         -   name: pong_vnfd/cp0
-            type: VPORT
+
         -   name: pong_vnfd/cp1
-            type: VPORT
+
         http-endpoint:
         -   path: api/v1/pong/stats
             port: '18889'
diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
index a022a857072295164e9025c27a12dbe17d4bfa36..cd1115555dcabd48d86b2eef44cde33eb915d906 100644
--- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
@@ -2,9 +2,9 @@ vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt0
-            type: VPORT
+
         -   name: west
-            type: VPORT
+
         description: A simple VNF descriptor w/ VM1 and VM2
         id: Ref_Vnf_11
         name: Ref_VNF_11
@@ -35,7 +35,7 @@ vnfd-catalog:
             internal-connection-point:
             -   name: iface11
                 id: iface11
-                type: VPORT
+
             id: Ref_VM1
             image: ref_vm1.qcow2
             name: Ref_VM1
@@ -57,7 +57,7 @@ vnfd-catalog:
             internal-connection-point:
             -   name: iface21
                 id: iface21
-                type: VPORT
+
             id: Ref_VM2
             image: ref_vm2.qcow2
             name: Ref_VM2
diff --git a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
index 424eb77c69143e1011c4cd836130920ad7d89627..23742816d4fd82b10fff4fa639d7a7f7f64f7ad3 100644
--- a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
@@ -2,11 +2,11 @@ vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt0
-            type: VPORT
+
         -   name: west
-            type: VPORT
+
         -   name: east
-            type: VPORT
+
         description: A simple VNF descriptor w/ two VDU
         id: Ref_Vnf_12
         name: Ref_Vnf_12
@@ -43,7 +43,7 @@ vnfd-catalog:
             internal-connection-point:
             -   id: iface31
                 name: iface31
-                type: VPORT
+
             name: Ref_VM3
             vm-flavor:
                 memory-mb: '2048'
@@ -71,7 +71,7 @@ vnfd-catalog:
             internal-connection-point:
             -   id: iface41
                 name: iface41
-                type: VPORT
+
             name: Ref_VM4
         vendor: ETSI
         version: '1.0'
diff --git a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
index 7a21394f6f3cd78f715bdac89a76452987bf0e24..a36904ea3cc37f1b13c7621c4a2f00a82c6277a3 100644
--- a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
@@ -2,9 +2,9 @@ vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt
-            type: VPORT
+
         -   name: data
-            type: VPORT
+
         description: A simple VNF descriptor w/ one VDU
         id: Ref_Vnf_21
         name: Ref_Vnf_21
diff --git a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
index 9e1388c61ac94f0177b5cb6c60e9611a1f114357..43f3ac9ac41e47497e8fd5c277be9369b0ad70d4 100644
--- a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
@@ -2,11 +2,11 @@ vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt
-            type: VPORT
+
         -   name: west
-            type: VPORT
+
         -   name: east
-            type: VPORT
+
         description: A simple VNF descriptor w/ one VDU
         id: Ref_Vnf_22
         name: Ref_VNF_22
diff --git a/descriptor-packages/vnfd/simple_multi-charm_multi-vdu_vnf/src/simple_multi-charm_multi-vdu_vnfd.yaml b/descriptor-packages/vnfd/simple_multi-charm_multi-vdu_vnf/src/simple_multi-charm_multi-vdu_vnfd.yaml
index 6957e185e2f8d191224ef6dc0ff2390028d7f635..c2f3561e99b4e0877791c039ba8965df5b53c10f 100644
--- a/descriptor-packages/vnfd/simple_multi-charm_multi-vdu_vnf/src/simple_multi-charm_multi-vdu_vnfd.yaml
+++ b/descriptor-packages/vnfd/simple_multi-charm_multi-vdu_vnf/src/simple_multi-charm_multi-vdu_vnfd.yaml
@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
         -   id: vnf-mgmt
             name: vnf-mgmt
             short-name: vnf-mgmt
-            type: VPORT
+
         -   id: vnf-data
             name: vnf-data
             short-name: vnf-data
-            type: VPORT
+
         mgmt-interface:
             cp: vnf-mgmt
         internal-vld:
@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
             -   id: mgmtVM-internal
                 name: mgmtVM-internal
                 short-name: mgmtVM-internal
-                type: VPORT
+
             cloud-init-file: cloud-config.txt
             vdu-configuration:
                 juju:
@@ -103,7 +103,7 @@ vnfd:vnfd-catalog:
             -   id: dataVM-internal
                 name: dataVM-internal
                 short-name: dataVM-internal
-                type: VPORT
+
             vdu-configuration:
                 juju:
                     charm: simple
diff --git a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
index 60d23790fc2de25c092b940a618cac2423fe0271..ba7ab11482a5d5ee08ba0bd43176d4e5c0311880 100644
--- a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
@@ -46,4 +46,4 @@ vnfd-catalog:
 
         connection-point:
             -   name: eth0
-                type: VPORT
+
diff --git a/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
index a6f9fd68259165e4611d45bff757c29dd8cdff81..5b95440cc2e9bdfc7b188a158c11fdd82718a27d 100644
--- a/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
@@ -51,4 +51,4 @@ vnfd-catalog:
 
         connection-point:
             -   name: eth0
-                type: VPORT
+
diff --git a/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
index bb26ba063fa06f515ee6adf56b7165be180d9421..0a7f30f9cf4999bc8b0ce9923fd9efd6dfff96cd 100644
--- a/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
@@ -66,4 +66,4 @@ vnfd-catalog:
 
         connection-point:
             -   name: eth0
-                type: VPORT
+
diff --git a/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
index f230501b1b0477226ffd393347c43f1a383399bc..e246a0409f510df2ce6df9527ec3b328b005540e 100644
--- a/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
@@ -46,4 +46,4 @@ vnfd-catalog:
 
         connection-point:
             -   name: eth0
-                type: VPORT
+