Issue #35 IFA014ed341 fix Sapd attribute associatedCpd (cf234582) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-ns.yang

+31 −22

Original line number	Original line	Diff line number	Diff line
	@@ -213,9 +213,8 @@ submodule etsi-nfv-ns {
	"GS NFV IFA014: Section 6.2.3.2 Sapd information element";		"GS NFV IFA014: Section 6.2.3.2 Sapd information element";
	}		}

	choice associated-cpd-id {		container associated-cpd {
			choice constituent-base-element-id {
	container vnf {
	leaf vnfd-id {		leaf vnfd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	@@ -223,16 +222,6 @@ submodule etsi-nfv-ns {
	}		}
	must "boolean(../../../vnfd-id[.=current()])";		must "boolean(../../../vnfd-id[.=current()])";
	}		}

	leaf ext-cpd-id {
	mandatory true;
	type leafref {
	path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
	}
	}
	}

	container pnf {
	leaf pnfd-id {		leaf pnfd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	@@ -240,30 +229,50 @@ submodule etsi-nfv-ns {
	}		}
	must "boolean(../pnfd-id[.=current()])";		must "boolean(../pnfd-id[.=current()])";
	}		}
			leaf nsd-id {
	leaf ext-cpd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";		path "../../../../nsd/id";
	}		}
			must "boolean(../nsd-id[.=current()])";
	}		}
			description
			"References the profile of an NS constituent.";
			reference
			"GS NFV IFA014: Section 6.4.8 CpdInConstituentElement information element";
	}		}
	container ns {		choice constituent-cpd-id {
	leaf nsd-id {		leaf vnf-ext-cpd {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "../../../../nsd/id";		path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
	}		}
	must "boolean(../nsd-id[.=current()])";
	}		}
			leaf pnf-ext-cpd {
	leaf ext-cpd-id {		mandatory true;
			type leafref {
			path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
			}
			}
			leaf sapd {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../nsd-id)/../sapd/id";		path "deref(../nsd-id)/../sapd/id";
	}		}
	}		}
			description
			"References the VNF external CPD for a given VnfProfile, or the PNF
			external CPD for a given PnfProfile, or an NS SAPD for a given NsProfile
			identified by the constituentBaseElementId.";
			reference
			"GS NFV IFA014: Section 6.4.8 CpdInConstituentElement information element";
	}		}
			description
			"Describes a CPD or SAPD in the context of an NS constituent element, which
			the SAPs instantiated from this SAPD are mapped to.";
			reference
			"GS NFV IFA014: Section 6.2.3 Sapd information element";

	}		}
	}		}
	}		}

Admin message