Merge branch 'dev-v3.6.1' into master (8cb93f0a) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-common.yang

+80 −7

Original line number	Diff line number	Diff line
		@@ -16,6 +16,14 @@ submodule etsi-nfv-common {
		description
		"Common data types for ETSI data models.";

		revision 2022-03-08 {
		description
		"Version 3.6.1.

		Common data structures to support VNFD and NSD according to:
		ETSI GS NFV-IFA 014 Release 3
		ETSI GS NFV-IFA 011 Release 3.";
		}
		revision 2021-07-05 {
		description
		"Version 3.5.1.
		@@ -566,6 +574,35 @@ revision 2021-07-05 {
		information element";
		}
		}

		list min-number-of-preserved-instances {
		key "group-size";
		ordered-by user;
		must "./min-number-of-preserved-instances <= ./group-size";

		leaf group-size {
		type uint32;
		description
		"When present, it determines the size of the group for
		which the minNumberOfPreservedInstances is specified.
		Otherwise the size is not limited.";
		reference
		"GS NFV-IFA011: Section 7.1.8.21, MinNumberOfPreserved
		Instances information element";
		}

		leaf min-number-of-preserved-instances {
		type uint32 {
		range "1 .. max";
		}
		description
		"The maximum number of instances that can be impacted
		simultaneously within the group of the specified size.";
		reference
		"GS NFV-IFA011: Section 7.1.8.21, MinNumberOfPreserved
		Instances information element";
		}
		}
		}
		}

		@@ -828,12 +865,44 @@ revision 2021-07-05 {
		when "../type='ip-address'";
		leaf ip-address-assignment {
		type boolean;
		mandatory true;
		description
		"Specify if the address assignment is the responsibility
		of management and orchestration function or not. If it
		is set to True, it is the management and orchestration
		function responsibility. ";
		"Specify which mode is used for the address assignment.
		If set to True, IP configuration information shall be
		provided for the VNF by a management entity using the
		NFV MANO interfaces towards the VNFM.
		If it is set to False, the value of the
		'ipAddressAssignmentSubtype' attribute defines the
		method of IP address assignment.
		Shall be present if the 'fixedIpAddress' attribute
		is not present and should be absent otherwise.";
		reference
		"GS NFV IFA011: Section 7.1.3.4, L3AddressData
		information element.";
		}

		leaf ip-address-assignment-subtype {
		type enumeration {
		enum dynamic;
		enum vnf_pkg;
		enum external;
		}
		description
		"Method of IP address assignment in case the IP
		configuration is not provided using the NFV MANO
		interfaces towards the VNFM.
		Shall be present in case the 'ipAddressAssignment'
		attribute is set to 'False' and shall be absent
		otherwise.

		Valid values:
		DYNAMIC: the VNF gets an IP address dynamically from
		the NFVI (e.g., using DHCP)
		VNF_PKG: an IP address defined by the VNF provider is
		assigned by means included as part of the VNF package
		(e.g., LCM script)
		EXTERNAL: an IP address is provided by an external
		management entity (such as EM) directly towards the
		VNF.";
		reference
		"GS NFV IFA011: Section 7.1.3.4, L3AddressData
		information element.";
		@@ -878,7 +947,11 @@ revision 2021-07-05 {
		leaf fixed-ip-address {
		type string;
		description
		"IP address to be assigned to the CP instance.";
		"Fixed IP addresses to be assigned to the internal CP
		instance.
		This attribute enables the VNF provider to define
		fixed IP addresses for internal CP instances to be
		assigned by the VNFM or the NFVO.";
		reference
		"GS NFV IFA011: Section 7.1.3.4, L3AddressData
		information element.";

src/yang/etsi-nfv-descriptors.yang

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,14 @@ module etsi-nfv-descriptors {
		description
		"Network Function Virtualization Descriptors";

		revision 2022-03-08 {
		description
		"Version 3.6.1.

		NSD and PNFD according to ETSI GS NFV-IFA 014 Release 3
		VNFD according to ETSI GS NFV-IFA 011 Release 3.";
		}

		revision 2021-07-05 {
		description
		"Version 3.5.1.

src/yang/etsi-nfv-ns.yang

+7 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,13 @@ submodule etsi-nfv-ns {
		description
		"Models for NS according to ETSI GS NFV-IFA 014.";

		revision 2022-03-08 {
		description
		"Version 3.6.1.

		NSD according to ETSI GS NFV-IFA 014 Release 3.";
		}

		revision 2021-07-05 {
		description
		"Version 3.5.1.

src/yang/etsi-nfv-nsd.yang

+7 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,13 @@ module etsi-nfv-nsd {
		description
		"Network Services Descriptors";

		revision 2022-03-08 {
		description
		"Version 3.6.1.

		NSD according to ETSI GS NFV-IFA 014 Release 3.";
		}

		revision 2021-07-05 {
		description
		"Version 3.5.1.

src/yang/etsi-nfv-pnf.yang

+8 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,13 @@ submodule etsi-nfv-pnf {
		description
		"Models for PNFD according to GS NFV-IFA 014.";

		revision 2022-03-08 {
		description
		"Version 3.6.1.

		PNFD according to ETSI GS NFV-IFA 014 Release 3.";
		}

		revision 2021-07-05 {
		description
		"Version 3.5.1.