From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 11 Oct 2018 14:26:04 +0000 (+0200)
Subject: Added PARAVIRT interface type
X-Git-Tag: v5.0.0~13
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F6688%2F5;p=osm%2FIM.git

Added PARAVIRT interface type

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

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index a320ed1..ce637d2 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -95,15 +95,17 @@ module vnfd-base
         description
             "Specifies the type of virtual interface
              between VM and host.
-             VIRTIO          : Use the traditional VIRTIO interface.
+             PARAVIRT        : Use the default paravirtualized interface for the VIM (virtio, vmxnet3, etc.).
+             VIRTIO          : Deprecated! Use the traditional VIRTIO interface.
              PCI-PASSTHROUGH : Use PCI-PASSTHROUGH interface.
              SR-IOV          : Use SR-IOV interface.
              E1000           : Emulate E1000 interface.
              RTL8139         : Emulate RTL8139 interface.
              PCNET           : Emulate PCNET interface.
-             OM-MGMT         : Deprecated! Use VIRTIO instead and set the VNF management interface at vnfd:mgmt-interface:cp";
+             OM-MGMT         : Deprecated! Use PARAVIRT instead and set the VNF management interface at vnfd:mgmt-interface:cp";
 
         type enumeration {
+          enum PARAVIRT;
           enum OM-MGMT;
           enum PCI-PASSTHROUGH;
           enum SR-IOV;
@@ -112,7 +114,7 @@ module vnfd-base
           enum RTL8139;
           enum PCNET;
         }
-        default "VIRTIO";
+        default "PARAVIRT";
       }
 
       leaf vpci {
diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang
index ef2edde..8813647 100644
--- a/models/yang/vnfr.yang
+++ b/models/yang/vnfr.yang
@@ -120,10 +120,12 @@ module vnfr
         description
             "Specifies the type of virtual interface
              between VM and host.
-             VIRTIO          : Use the traditional VIRTIO interface.
+             PARAVIRT        : Use the default paravirtualized interface for the VIM (virtio, vmxnet3, etc.).
+             VIRTIO          : Deprecated! Use the traditional VIRTIO interface.
              PCI-PASSTHROUGH : Use PCI-PASSTHROUGH interface.
              SR-IOV          : Use SR-IOV interface.";
         type enumeration {
+          enum PARAVIRT;
           enum VIRTIO;
           enum PCI-PASSTHROUGH;
           enum SR-IOV;
diff --git a/tests/test_python.py b/tests/test_python.py
index f6b4f7d..874d442 100644
--- a/tests/test_python.py
+++ b/tests/test_python.py
@@ -44,7 +44,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