Replaced VIRTIO by PARAVIRT in descriptors and tools 57/6857/2
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 6 Nov 2018 11:37:28 +0000 (12:37 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 7 Nov 2018 01:03:12 +0000 (02:03 +0100)
Change-Id: I58013f8e4652c486a849a9e1e326025398dff801
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
23 files changed:
descriptor-packages/tools/generate_descriptor_pkg.sh
descriptor-packages/tools/validate_descriptor.py
descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml
descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
descriptor-packages/vnfd/hackfest_cloudinit_vnf/src/hackfest_cloudinit_vnfd.yaml
descriptor-packages/vnfd/hackfest_epasriov_vnf/src/hackfest_epasriov_vnfd.yaml
descriptor-packages/vnfd/hackfest_multivdu_vnf/src/hackfest_multivdu_vnfd.yaml
descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml

index 1a30cf1..336cd8f 100755 (executable)
@@ -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
 
index 010ba16..4d5f0e1 100755 (executable)
@@ -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"):
index 1d7689b..34548c0 100644 (file)
@@ -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:
index ed8900b..fc8d458 100755 (executable)
@@ -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
index 6d5da86..e4980bf 100644 (file)
@@ -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
index 25b7e83..80dc1af 100755 (executable)
@@ -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:
index 873d041..241bc0c 100644 (file)
@@ -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:
index b407a84..3c18d79 100644 (file)
@@ -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
index 4510db1..066f698 100644 (file)
@@ -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
index 9711b3c..598ee60 100644 (file)
@@ -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'
index b7a5139..d658bf5 100644 (file)
@@ -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
index 9c6f095..2642f1b 100644 (file)
@@ -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
index fb903fc..1943ffb 100644 (file)
@@ -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:
index 0639419..a2e2c1e 100644 (file)
@@ -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
index 4dfbab0..935f04e 100644 (file)
@@ -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
index d1b7840..a022a85 100644 (file)
@@ -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
index ae534a8..424eb77 100644 (file)
@@ -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
index 58cd499..7a21394 100644 (file)
@@ -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
index 02987b1..9e1388c 100644 (file)
@@ -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
index 53df870..60d2379 100644 (file)
@@ -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
index 9d56adb..a6f9fd6 100644 (file)
@@ -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
index 9935f76..bb26ba0 100644 (file)
@@ -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
index 5d0eed0..f230501 100644 (file)
@@ -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