From: garciadeblas Date: Tue, 6 Nov 2018 11:37:28 +0000 (+0100) Subject: Replaced VIRTIO by PARAVIRT in descriptors and tools X-Git-Tag: v5.0.0~30 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c54f48af9f2b1eab04580d189180a55dc2dd5515;p=osm%2Fdevops.git Replaced VIRTIO by PARAVIRT in descriptors and tools Change-Id: I58013f8e4652c486a849a9e1e326025398dff801 Signed-off-by: garciadeblas --- diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh index 1a30cf1e..336cd8fe 100755 --- a/descriptor-packages/tools/generate_descriptor_pkg.sh +++ b/descriptor-packages/tools/generate_descriptor_pkg.sh @@ -61,7 +61,7 @@ DEBUG=false ARCHIVE=false CREATE_NSD=false VENDOR='OSM' -INTF_TYPE='VIRTIO' +INTF_TYPE='PARAVIRT' VCPU=2 MEMORY=4096 STORAGE=10 @@ -98,8 +98,8 @@ Usage: --vendor : Vendor name for descriptor. Default OSM - --interface-type : Interface type [VIRTIO|SR-IOV|PCI-PASSTHROUGH|E1000] - Default VIRTIO + --interface-type : Interface type [PARAVIRT|SR-IOV|PCI-PASSTHROUGH|E1000] + Default PARAVIRT VM Flavour options: @@ -137,7 +137,7 @@ EOF CP_TYPE='VPORT' function get_cp_type() { case ${INTF_TYPE} in - VIRTIO ) CP_TYPE='VPORT';; + PARAVIRT ) CP_TYPE='VPORT';; SR-IOV ) CP_TYPE='VPORT';; PCI-PASSTHROUGH ) CP_TYPE='VPORT';; OM-MGMT ) CP_TYPE='VPORT';; @@ -230,7 +230,7 @@ EOF - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-cp0 EOF diff --git a/descriptor-packages/tools/validate_descriptor.py b/descriptor-packages/tools/validate_descriptor.py index 010ba16f..4d5f0e1f 100755 --- a/descriptor-packages/tools/validate_descriptor.py +++ b/descriptor-packages/tools/validate_descriptor.py @@ -126,12 +126,12 @@ if __name__=="__main__": for external_interface in external_interface_list: if external_interface.get("virtual-interface", {}).get("type") == "OM-MGMT": raise KeyError( - "Wrong 'Virtual-interface type': Deprecated 'OM-MGMT' value. Please, use 'VIRTIO' instead") + "Wrong 'Virtual-interface type': Deprecated 'OM-MGMT' value. Please, use 'PARAVIRT' instead") interface_list = vdu.pop("interface", ()) for interface in interface_list: if interface.get("virtual-interface", {}).get("type") == "OM-MGMT": raise KeyError( - "Wrong 'Virtual-interface type': Deprecated 'OM-MGMT' value. Please, use 'VIRTIO' instead") + "Wrong 'Virtual-interface type': Deprecated 'OM-MGMT' value. Please, use 'PARAVIRT' instead") if vnfd.get("mgmt-interface"): mgmt_iface = True if vnfd["mgmt-interface"].get("vdu-id"): diff --git a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml index 1d7689b4..34548c0d 100644 --- a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml +++ b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml @@ -64,35 +64,35 @@ vnfd-catalog: type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0a.0 external-connection-point-ref: eth0 - name: eth1 type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0b.0 external-connection-point-ref: eth1 - name: eth2 type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0c.0 external-connection-point-ref: eth2 - name: eth3 type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0d.0 external-connection-point-ref: eth3 - name: eth4 type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0e.0 external-connection-point-ref: eth4 guest-epa: 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 ed8900b8..fc8d458a 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 @@ -38,7 +38,7 @@ vnfd-catalog: - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT bandwidth: '0' vpci: 0000:00:0a.0 external-connection-point-ref: eth0 diff --git a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml index 6d5da86f..e4980bf5 100644 --- a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml +++ b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml @@ -38,7 +38,7 @@ vnfd-catalog: - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT bandwidth: '0' vpci: 0000:00:0a.0 external-connection-point-ref: eth0 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 25b7e839..80dc1afd 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 @@ -19,7 +19,7 @@ vnfd-catalog: type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0a.0 external-connection-point-ref: eth0 guest-epa: 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 873d0412..241bc0cb 100644 --- a/descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml +++ b/descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml @@ -26,7 +26,7 @@ vnfd:vnfd-catalog: - name: vdu-eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-cp0 cloud-init-file: cloud-config.txt vnf-configuration: 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 b407a849..3c18d793 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 @@ -22,7 +22,7 @@ vnfd:vnfd-catalog: - name: vdu-eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-cp0 mgmt-interface: cp: vnf-cp0 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 4510db1a..066f6980 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 @@ -39,13 +39,13 @@ vnfd:vnfd-catalog: position: '1' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-mgmt - name: mgmtVM-eth1 position: '2' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: mgmtVM-internal internal-connection-point: - id: mgmtVM-internal @@ -66,13 +66,13 @@ vnfd:vnfd-catalog: position: '1' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: dataVM-internal - name: dataVM-xe0 position: '2' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-data internal-connection-point: - id: dataVM-internal 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 9711b3c9..598ee607 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 @@ -48,13 +48,13 @@ vnfd:vnfd-catalog: position: '1' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-mgmt - name: mgmtVM-eth1 position: '2' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: mgmtVM-internal internal-connection-point: - id: mgmtVM-internal @@ -84,7 +84,7 @@ vnfd:vnfd-catalog: position: '1' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: dataVM-internal - name: xe0 position: '2' 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 b7a51397..d658bf5d 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 @@ -39,13 +39,13 @@ vnfd:vnfd-catalog: position: '1' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-mgmt - name: mgmtVM-eth1 position: '2' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: mgmtVM-internal internal-connection-point: - id: mgmtVM-internal @@ -65,13 +65,13 @@ vnfd:vnfd-catalog: position: '1' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: dataVM-internal - name: dataVM-xe0 position: '2' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-data internal-connection-point: - id: dataVM-internal 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 9c6f095c..2642f1bd 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 @@ -39,13 +39,13 @@ vnfd:vnfd-catalog: position: '1' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-mgmt - name: mgmtVM-eth1 position: '2' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: mgmtVM-internal internal-connection-point: - id: mgmtVM-internal @@ -66,13 +66,13 @@ vnfd:vnfd-catalog: position: '1' type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: dataVM-internal - name: dataVM-xe0 position: '2' type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: vnf-data internal-connection-point: - id: dataVM-internal 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 fb903fcd..1943ffb3 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 @@ -60,14 +60,14 @@ vnfd-catalog: type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0a.0 external-connection-point-ref: eth0 - name: eth1 type: EXTERNAL virtual-interface: bandwidth: '0' - type: VIRTIO + type: PARAVIRT vpci: 0000:00:0b.0 external-connection-point-ref: eth1 guest-epa: diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml index 0639419e..a2e2c1ed 100644 --- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml +++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml @@ -52,13 +52,13 @@ vnfd-catalog: position: 0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: ping_vnfd/cp0 - name: eth1 position: 1 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: ping_vnfd/cp1 id: iovdu_0 image: Fedora-x86_64-20-20131211.1-sda-ping.qcow2 diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml index 4dfbab05..935f04e0 100644 --- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml +++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml @@ -52,13 +52,13 @@ vnfd-catalog: position: 0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: pong_vnfd/cp0 - name: eth1 position: 1 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: pong_vnfd/cp1 id: iovdu_0 image: Fedora-x86_64-20-20131211.1-sda-pong.qcow2 diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml index d1b78400..a022a857 100644 --- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml +++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml @@ -25,12 +25,12 @@ vnfd-catalog: - name: iface10 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: mgmt0 - name: iface11 type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: iface11 internal-connection-point: - name: iface11 @@ -47,12 +47,12 @@ vnfd-catalog: - name: iface22 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: west - name: iface21 type: INTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT internal-connection-point-ref: iface21 internal-connection-point: - name: iface21 diff --git a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml index ae534a8b..424eb77c 100644 --- a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml +++ b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml @@ -28,13 +28,13 @@ vnfd-catalog: - name: iface30 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: mgmt0 - name: iface31 type: INTERNAL internal-connection-point-ref: iface31 virtual-interface: - type: VIRTIO + type: PARAVIRT guest-epa: cpu-pinning-policy: DEDICATED mempage-size: "LARGE" @@ -64,7 +64,7 @@ vnfd-catalog: type: INTERNAL internal-connection-point-ref: iface41 virtual-interface: - type: VIRTIO + type: PARAVIRT guest-epa: cpu-pinning-policy: DEDICATED id: e526e diff --git a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml index 58cd499f..7a21394f 100644 --- a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml +++ b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml @@ -16,12 +16,12 @@ vnfd-catalog: - name: iface50 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: mgmt - name: iface51 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: data id: ref_vm21 image: ref_vm21.qcow2 diff --git a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml index 02987b16..9e1388c6 100644 --- a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml +++ b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml @@ -18,7 +18,7 @@ vnfd-catalog: - name: iface60 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: mgmt - name: iface61 type: EXTERNAL 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 53df870d..60d23790 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 @@ -39,7 +39,7 @@ vnfd-catalog: - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT bandwidth: '0' vpci: 0000:00:0a.0 external-connection-point-ref: eth0 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 9d56adbb..a6f9fd68 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 @@ -33,7 +33,7 @@ vnfd-catalog: - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT external-connection-point-ref: eth0 # Specify the volume # There can be multiple interfaces defined 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 9935f76f..bb26ba06 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 @@ -35,7 +35,7 @@ vnfd-catalog: - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT bandwidth: '0' vpci: 0000:00:0a.0 external-connection-point-ref: eth0 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 5d0eed02..f230501b 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 @@ -39,7 +39,7 @@ vnfd-catalog: - name: eth0 type: EXTERNAL virtual-interface: - type: VIRTIO + type: PARAVIRT bandwidth: '0' vpci: 0000:00:0a.0 external-connection-point-ref: eth0