From c8dbd6025326a2ba8a7e847fb97b60368ce81ff7 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Thu, 28 Nov 2019 06:50:33 -0800 Subject: [PATCH 1/3] Issue#3 --- example-data/nfv-nsd.xml | 5 +++-- src/yang/etsi-nfv-nsd.yang | 16 ++++++++++++++++ src/yang/etsi-nfv-vnf.yang | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml index 57f7c7c..c52f36d 100644 --- a/example-data/nfv-nsd.xml +++ b/example-data/nfv-nsd.xml @@ -1,4 +1,5 @@ - + + ASA My Company @@ -133,4 +134,4 @@ - + diff --git a/src/yang/etsi-nfv-nsd.yang b/src/yang/etsi-nfv-nsd.yang index 304fc30..7185203 100644 --- a/src/yang/etsi-nfv-nsd.yang +++ b/src/yang/etsi-nfv-nsd.yang @@ -28,10 +28,26 @@ module etsi-nfv-nsd { } container nsd { + list vnfd { + key "id"; + + description + "A VNF Descriptor (VNFD) is a deployment template which + describes a VNF in terms of deployment and operational + behaviour requirements. It also contains connectivity, + interface and virtualised resource requirements"; + reference + "GS NFV-IFA011: Section 7.1.2, VNFD information element"; + + uses nfv:vnfd; + } + list nsd { key "id"; + max-elements 1; uses nfv:nsd; + description "The NSD information element is a deployment template whose instances are used by the NFVO for the lifecycle management diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 283217a..25c7bbb 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -95,6 +95,23 @@ submodule etsi-nfv-vnf { "GS NFV-IFA011: Section 7.1.6.6, VirtualNetworkInterfaceRequirements information element"; } + + leaf nic-io-requirements { + type leafref { + path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/" + + "nfv:logical-node/nfv:id"; + } + description + "This references (couples) the CPD with any logical node + I/O requirements (for network devices) that may have been + created. Linking these attributes is necessary so that I/O + requirements that need to be articulated at the logical + node level can be associated with the network interface + requirements associated with the CPD."; + reference + "GS NFV-IFA011: Section 7.1.6.6, + VirtualNetworkInterfaceRequirements information element"; + } } } -- GitLab From 8f3572d74bc5c273c369125aa6841771a40bad12 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Wed, 4 Dec 2019 15:28:20 +0900 Subject: [PATCH 2/3] Removed vnfd from within nsd. --- src/yang/etsi-nfv-nsd.yang | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/yang/etsi-nfv-nsd.yang b/src/yang/etsi-nfv-nsd.yang index 7185203..0175854 100644 --- a/src/yang/etsi-nfv-nsd.yang +++ b/src/yang/etsi-nfv-nsd.yang @@ -28,20 +28,6 @@ module etsi-nfv-nsd { } container nsd { - list vnfd { - key "id"; - - description - "A VNF Descriptor (VNFD) is a deployment template which - describes a VNF in terms of deployment and operational - behaviour requirements. It also contains connectivity, - interface and virtualised resource requirements"; - reference - "GS NFV-IFA011: Section 7.1.2, VNFD information element"; - - uses nfv:vnfd; - } - list nsd { key "id"; -- GitLab From 9abf81835d73a2363f4509a43d65be292a4e37ab Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Thu, 5 Dec 2019 06:59:36 +0900 Subject: [PATCH 3/3] Match the cardinality for logicalNodeRequirementDetail --- src/yang/etsi-nfv-vnf.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 25c7bbb..bdc9306 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -508,6 +508,7 @@ submodule etsi-nfv-vnf { list requirement-detail { key "key"; + min-elements 1; leaf key { type string; -- GitLab