Merge branch 'bug#253' into 'v2.7.1' (4b1f5e69) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-ns.yang

+19 −21

Original line number	Diff line number	Diff line
		@@ -482,14 +482,11 @@ submodule etsi-nfv-ns {
		path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
		}
		}
		}
		container pnf {
		leaf pnfd-id {
		must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
		}
		type leafref {
		path "../../../../../../pnfd/id";
		}
		}
		type leafref {
		path "/nfv:nfv/nfv:pnfd/nfv:id";
		}
		@@ -499,6 +496,7 @@ submodule etsi-nfv-ns {
		path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
		}
		}
		}
		container ns {
		leaf nsd-id {
		must ". = deref(../../nested-ns-profile-id)/" +
		@@ -525,7 +523,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

+7 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ module etsi-nfv-nsd {
		prefix nsd;

		import etsi-nfv-descriptors {
		prefix vnf;
		prefix nfv;
		}

		organization
		@@ -13,6 +13,11 @@ module etsi-nfv-nsd {
		description
		"Network Services Descriptors";

		revision 2019-10-01 {
		description
		"Revision 2.7.1.
		NSD according to ETSI GS NFV-IFA 014 Ed271v264.";
		}
		revision 2019-04-25 {
		description
		"Initial revision.
		@@ -23,7 +28,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