From 82c5f6458c830f678a3b3a2c588f0a2ae79cdf98 Mon Sep 17 00:00:00 2001 From: Preethika Date: Thu, 2 Jun 2022 10:08:02 +0000 Subject: [PATCH] issue #57 Implementation of ENH02.04. from IFA014 Signed-off-by: Preethika --- src/yang/etsi-nfv-ns.yang | 60 +++++++++++++++++++++++++++++++++++++- src/yang/etsi-nfv-pnf.yang | 14 ++++++++- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang index aa0b909..9cc125a 100644 --- a/src/yang/etsi-nfv-ns.yang +++ b/src/yang/etsi-nfv-ns.yang @@ -145,7 +145,20 @@ submodule etsi-nfv-ns { description "Identifies an NSD in a version independent manner. This attribute is invariant across versions of the network - service descriptor."; + service descriptor with no constraint on the changes + across versions."; + reference + "GS NFV IFA014: Section 6.2.2.2 Network Service Descriptor + information element"; + } + + leaf ext-invariant-id { + type string; + description + "Identifies an NSD in a version independent manner. + This attribute is invariant across versions of the + NSD that fulfil certain conditions related to the + external connectivity and management of the NS."; reference "GS NFV IFA014: Section 6.2.2.2 Network Service Descriptor information element"; @@ -805,6 +818,21 @@ submodule etsi-nfv-ns { element"; } + leaf vnfd-ext-invariant-id { + type string; + description + "Identifies a VNFD in a version independent manner. + If present it shall have the same value as the + vnfdExtInvariantId in the VNFD referenced by the + vnfdId attribute. It allows for VNF instances + during NS LCM the use of a VNFD different from the + one referenced by the vnfdId attribute, provided + they have the same vnfdExtInvariantId."; + reference + "GS NFV IFA014: Section 6.3.3.2 VnfProfile information + element"; + } + leaf flavour-id { mandatory true; type leafref { @@ -974,6 +1002,21 @@ submodule etsi-nfv-ns { element"; } + leaf pnfd-ext-invariant-id { + type string; + description + "Identifies a PNFD in a version independent manner. + If present it shall have the same value as the + pnfdExtInvariantId in the PNFD referenced by the + pnfdId attribute. It allows for PNF instances during + NS LCM the use of a PNFD different from the one + referenced by the pnfdId attribute, provided they + have the same pnfdExtInvariantId "; + reference + "GS NFV IFA014: Section 6.3.6.2 PnfProfile information + element"; + } + list virtual-link-connectivity { key "virtual-link-profile-id"; @@ -1642,6 +1685,21 @@ submodule etsi-nfv-ns { element"; } + leaf nsd-ext-invariant-id { + type string; + description + "Identifies an NSD in a version independent manner. + If present it shall have the same value as the + nsdExtInvariantId in the NSD referenced by the nsdId + attribute. It allows for nested NS instances during + NS LCM the use of an NSD different from the one + referenced by the nsdId attribute, provided they + have the same nsdExtInvariantId."; + reference + "GS NFV IFA014: Section 6.3.11.2 NsProfile information + element"; + } + leaf ns-df-id { mandatory true; type leafref { diff --git a/src/yang/etsi-nfv-pnf.yang b/src/yang/etsi-nfv-pnf.yang index 6cff84a..2bc050c 100644 --- a/src/yang/etsi-nfv-pnf.yang +++ b/src/yang/etsi-nfv-pnf.yang @@ -106,11 +106,23 @@ submodule etsi-nfv-pnf { type string; description "Identifies a PNFD in a version independent manner. This - attribute is invariant across versions of PNFD."; + attribute is invariant across versions of PNFD with no + constraint on the changes across versions."; reference "GS NFV-IFA014: Section 6.6.2, Pnfd information element"; } + leaf ext-invariant-id { + type string; + description + "Identifies a PNFD in a version independent manner. + This attribute is invariant across versions of the + PNFD that expose the same external connectivity, + i.e. same number of pnfExtCpds and same identifiers."; + reference + "GS NFV-IFA014: Section 6.6.2, Pnfd information element"; + } + leaf name { type string; description -- GitLab