Commit 90f0993a authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Merge branch 'v2.7.1' into 'bug#251'

# Conflicts:
#   src/yang/etsi-nfv-nsd.yang
parents 63a46a21 4b1f5e69
Pipeline #1575 passed with stage
in 0 seconds
......@@ -426,7 +426,7 @@ submodule etsi-nfv-ns {
list nfp-position-element {
key "id";
min-elements 1;
min-elements 1;
leaf id {
type string;
......@@ -476,18 +476,19 @@ submodule etsi-nfv-ns {
CpdInConstituentElement information element";
}
choice constituent-cpd-id {
container vnf {
leaf vnfd-id {
must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
}
type leafref {
path "/nfv:nfv/nfv:vnfd/nfv:id";
choice constituent-cpd-id {
container vnf {
leaf vnfd-id {
must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
}
type leafref {
path "/nfv:nfv/nfv:vnfd/nfv:id";
}
}
}
leaf cpd-id {
type leafref {
path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
leaf cpd-id {
type leafref {
path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
}
}
}
container pnf {
......@@ -495,16 +496,13 @@ submodule etsi-nfv-ns {
must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
}
type leafref {
path "../../../../../../pnfd/id";
path "/nfv:nfv/nfv:pnfd/nfv:id";
}
}
type leafref {
path "/nfv:nfv/nfv:pnfd/nfv:id";
}
}
leaf pnf-cpd-id {
type leafref {
path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
leaf pnf-cpd-id {
type leafref {
path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
}
}
}
container ns {
......@@ -533,7 +531,7 @@ submodule etsi-nfv-ns {
CpdInConstituentElement information element";
}
description
"Identifies a CPD or SAPD in the context of a profile
"Specifies a CPD or SAPD in the context of a profile
of an NS constituent element.";
reference
"GS NFV IFA014: Section 6.4.6.2 NfpPositionElement
......
......@@ -4,7 +4,7 @@ module etsi-nfv-nsd {
prefix nsd;
import etsi-nfv-descriptors {
prefix vnf;
prefix nfv;
}
organization
......@@ -31,7 +31,7 @@ module etsi-nfv-nsd {
list nsd {
key "id";
max-elements 1;
uses vnf:nsd;
uses nfv:nsd;
description
"The NSD information element is a deployment template whose
instances are used by the NFVO for the lifecycle management
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment