From c0a20490f2901a83366f8723437c2d4bf357a25e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 11 Oct 2018 16:26:04 +0200 Subject: [PATCH] Added PARAVIRT interface type Change-Id: I3f4b69bd1066fabe49205cc4a2c0cd254cbceef8 Signed-off-by: garciadeblas --- models/yang/vnfd-base.yang | 8 +++++--- models/yang/vnfr.yang | 4 +++- tests/test_python.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) 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 -- 2.25.1