From da3f349dbde0aefda1ca10268e26c002924eaa04 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Thu, 30 May 2019 10:33:59 -0700 Subject: [PATCH 1/3] Add vnic-type that was missing --- example-data/complex-vnfd.xml | 12 ++++-------- example-data/nfv-nsd.xml | 1 + example-data/nfv-vnfd.xml | 1 + src/yang/etsi-nfv-common.yang | 28 ++++++++++++++++++++++++++++ src/yang/etsi-nfv-vnf.yang | 19 ++++++++++++++++++- 5 files changed, 52 insertions(+), 9 deletions(-) diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml index b10ec9f..39bbbaf 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 ba4ec2d..03423e6 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 7587240..6b76c43 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 0a1c361..a9b5a61 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -243,6 +243,34 @@ 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-PHYSICAL"; + } + + identity normal { + base vnic-type; + description + "Normal vNIC."; + } + + identity virtio { + base vnic-type; + description + "Virtual IO vNIC."; + } + + identity direct-physical { + base vnic-type; + description + "Direct physical vNIC type."; + } + /* * Typedefs */ diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 43c1109..7f753c5 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,23 @@ 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-PHYSICAL"; + reference + "GS NFV IFA011: Section 7.1.6.4, VduCpd information + element."; + } uses cpd; leaf security-group-rule-id { -- GitLab From 5c9c4b72aaa181c4dc28d3bb15ebfd15b4e38cff Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Thu, 30 May 2019 12:02:50 -0700 Subject: [PATCH 2/3] Adding additional NIC types. --- src/yang/etsi-nfv-common.yang | 36 +++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index a9b5a61..63864b7 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -250,25 +250,53 @@ submodule etsi-nfv-common { which mechanism driver(s) to be used to bind the port. Value: • NORMAL • VIRTIO - • DIRECT-PHYSICAL"; + • DIRECT + • BAREMETAL + • VIRTIO-FORWARDER + • DIRECT-PHYSICAL + • SMART-NIC"; } identity normal { base vnic-type; description - "Normal vNIC."; + "Normal NIC."; } identity virtio { base vnic-type; description - "Virtual IO vNIC."; + "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 vNIC type."; + "Direct physical NIC type."; + } + + identity smart-nic { + base vnic-type; + description + "SmartNIC or Smart NIC type."; } /* -- GitLab From 3b2d47a1076b8fb24c5b69957369d3cca6fdf2d1 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Thu, 30 May 2019 12:06:34 -0700 Subject: [PATCH 3/3] Update description. --- src/yang/etsi-nfv-vnf.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 7f753c5..b0d0e2d 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -304,7 +304,11 @@ submodule etsi-nfv-vnf { to bind the port. Value: • NORMAL • VIRTIO - • DIRECT-PHYSICAL"; + • DIRECT + • BAREMETAL + • VIRTIO-FORWARDER + • DIRECT-PHYSICAL + • SMART-NIC"; reference "GS NFV IFA011: Section 7.1.6.4, VduCpd information element."; -- GitLab