diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index b10ec9f35eae5c54180a1a66505a10e1408db47b..39bbbaf03bed0b92b9fa98710adcc78be70afd2c 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -78,11 +78,11 @@
16
-
+
root
root-storage
10
-
+
CP
CP
@@ -116,17 +116,13 @@
internal-vl
-
- ipv4
-
+ ipv4
mgmt
-
- ipv4
-
+ ipv4
diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml
index ba4ec2d7b634784082a719200016af7c15ecdefa..03423e679e4915da8a7be7fccd2b929935b0e3cf 100644
--- a/example-data/nfv-nsd.xml
+++ b/example-data/nfv-nsd.xml
@@ -49,6 +49,7 @@
bare
qcow2
+ 1
2.0
1
http://www.cisco.com/asa.qcow2
diff --git a/example-data/nfv-vnfd.xml b/example-data/nfv-vnfd.xml
index 7587240efcd281a762527e1b7fa1e6a49049ee9e..6b76c43495c7e6490901dfaeaa4cdc59733d4a26 100644
--- a/example-data/nfv-vnfd.xml
+++ b/example-data/nfv-vnfd.xml
@@ -48,6 +48,7 @@
bare
qcow2
+ 1
2.0
1
http://www.cisco.com/asa.qcow2
diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 0a1c361eddba042598317e1bec71d6797a287d03..63864b7df194706168fe0c55b9d12b93935bdea5 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -243,6 +243,62 @@ submodule etsi-nfv-common {
"Ephemeral type of storage.";
}
+ identity vnic-type {
+ description
+ "Describes the type of the virtual network interface realizing
+ the CPs instantiated from this CPD. This is used to determine
+ which mechanism driver(s) to be used to bind the port. Value:
+ • NORMAL
+ • VIRTIO
+ • DIRECT
+ • BAREMETAL
+ • VIRTIO-FORWARDER
+ • DIRECT-PHYSICAL
+ • SMART-NIC";
+ }
+
+ identity normal {
+ base vnic-type;
+ description
+ "Normal NIC.";
+ }
+
+ identity virtio {
+ base vnic-type;
+ description
+ "VirtIO NIC.";
+ }
+
+ identity direct {
+ base vnic-type;
+ description
+ "Direct NIC type.";
+ }
+
+ identity bare-metal {
+ base vnic-type;
+ description
+ "Bare metal NIC type.";
+ }
+
+ identity virtio-forwarder {
+ base vnic-type;
+ description
+ "VirtIO Forwarder NIC type.";
+ }
+
+ identity direct-physical {
+ base vnic-type;
+ description
+ "Direct physical NIC type.";
+ }
+
+ identity smart-nic {
+ base vnic-type;
+ description
+ "SmartNIC or Smart NIC type.";
+ }
+
/*
* Typedefs
*/
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 43c11095fa644be600e48c843e9c5fca838e2be8..b0d0e2d696dfc1fcff41fe18531f0624add64699 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -273,7 +273,7 @@ submodule etsi-nfv-vnf {
VirtualNetworkInterfaceRequirements information element";
}
- leaf-list order {
+ leaf order {
type uint32;
description
"The order of the NIC to be assigned on the compute
@@ -292,6 +292,27 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.4, VduCpd information
element.";
}
+
+ leaf vnic-type {
+ type identityref {
+ base vnic-type;
+ }
+ description
+ "Describes the type of the virtual network interface
+ realizing the CPs instantiated from this CPD. This is
+ used to determine which mechanism driver(s) to be used
+ to bind the port. Value:
+ • NORMAL
+ • VIRTIO
+ • DIRECT
+ • BAREMETAL
+ • VIRTIO-FORWARDER
+ • DIRECT-PHYSICAL
+ • SMART-NIC";
+ reference
+ "GS NFV IFA011: Section 7.1.6.4, VduCpd information
+ element.";
+ }
uses cpd;
leaf security-group-rule-id {