Fix for bug#97 (851a4b3e) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-ns.yang

+37 −9

Original line number	Original line	Diff line number	Diff line
	@@ -434,25 +434,53 @@ submodule etsi-nfv-ns {
	key "id";		key "id";

	description		description
	"A pool of descriptors of connection points attached to		"Describes a pool of descriptors of connection points
	one of the constituent VNFs and PNFs and/or one of the		attached to one of the constituent VNFs and PNFs and/or
	SAPs of the parent NS or of a nested NS.";		one of the SAPs of the parent NS or of a nested NS.";
	reference		reference
	"GS NFV IFA014: Section 6.4.2.2 Vnffgd information		"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
	element";		element";

	leaf id {		leaf id {
	type string;		type string;
			}

			choice constituent-base-element-id {
			container vnf-profile {
			leaf vnf-profile-id {
			must ". = deref(../../vnfd-profile-id)" {
			}
			type leafref {
			path "/nfv/nsd/df/vnf-profile/id";
			}
			}
			}
			container pnf-profile {
			leaf pnf-profile-id {
			must ". = deref(../../pnfd-profile-id)" {
			}
			type leafref {
			path "/nfv/nsd/df/pnf-profile/id";
			}
			}
			}
			container ns-profile {
			leaf ns-profile-id {
			must ". = deref(../../ns-profile-id)" {
			}
			type leafref {
			path "/nfv/nsd/df/ns-profile/id";
			}
			}
			}
	description		description
	"Identifier of this CpdPool information element. It		"Reference to the profile of an NS constituent.";
	identifies a pool of descriptors of connection points
	and NS SAPs.";
	reference		reference
	"GS NFV IFA014: Section 6.4.4.2 CpdPool information		"GS NFV IFA014: Section 6.4.8 CpdInConstituentElement
	element";		information element";
	}		}

	choice cpd-id {		choice constituent-cpd-id {
	container vnf {		container vnf {
	leaf vnfd-id {		leaf vnfd-id {
	must ". = deref(../../vnfd-profile-id)/../vnfd-id" {		must ". = deref(../../vnfd-profile-id)/../vnfd-id" {