Removed VPORT in all VNFDs and generate_descriptor_pkg.sh

Change-Id: I8c8102d6b16b8001762fcd3650db8cc688006ece
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh
index 336cd8f..0d1c39d 100755 (executable)
--- 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 34548c0..b49e42b 100644 (file)
--- 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 fc8d458..2ee60f7 100755 (executable)
--- 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 e4980bf..16b4989 100644 (file)
--- 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 80dc1af..38e8a68 100755 (executable)
--- 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 241bc0c..0161482 100644 (file)
--- 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 4051eb3..998c2d8 100644 (file)
--- 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 066f698..818c62a 100644 (file)
--- 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 598ee60..f039389 100644 (file)
--- 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 d658bf5..e8981ff 100644 (file)
--- 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 2642f1b..ad9bdd5 100644 (file)
--- 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 1943ffb..27b2247 100644 (file)
--- 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 a2e2c1e..d73baf6 100644 (file)
--- 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 935f04e..f824f20 100644 (file)
--- 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 a022a85..cd11155 100644 (file)
--- 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 424eb77..2374281 100644 (file)
--- 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 7a21394..a36904e 100644 (file)
--- 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 9e1388c..43f3ac9 100644 (file)
--- 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 6957e18..c2f3561 100644 (file)
--- 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 60d2379..ba7ab11 100644 (file)
--- 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 a6f9fd6..5b95440 100644 (file)
--- 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 bb26ba0..0a7f30f 100644 (file)
--- 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 f230501..e246a04 100644 (file)
--- 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
+