Merge branch 'issue#15' into 'dev-v3.3.1' (90b60142) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-ns.yang

+42 −10

Original line number	Original line	Diff line number	Diff line
	@@ -341,17 +341,16 @@ submodule etsi-nfv-ns {
	}		}

	leaf service-availability-level {		leaf service-availability-level {
	type enumeration {		type uint32;
	enum "level-1";
	enum "level-2";
	enum "level-3";
	}
	description		description
	"Specifies one of the three levels defined in ETSI		"If present, specifies the service availability level
	ETSI GS NFV-REL 001 [i.5]		for the VL instance created from this DF.
	* Level 1.
	* Level 2.		THE FOLLOWING STATEMENT IS SUBJECT TO CHANGE:
	* Level 3.";
			Either the serviceAvailabilityLevel attribute of NS DF
			or the serviceAvailabilityLevel attribute of the VL DF
			may be provided, but not both.";
	reference		reference
	"GS NFV IFA014: Section 6.5.4.2 VirtualLinkDf		"GS NFV IFA014: Section 6.5.4.2 VirtualLinkDf
	information element";		information element";
	@@ -887,6 +886,21 @@ submodule etsi-nfv-ns {
	}		}
	}		}
	}		}

			leaf service-availability-level {
			must "not(../../service-availability-level)";
			type uint32;
			description
			"If present, specifies the service availability level for
			the VNF instance created from this profile.

			Either the serviceAvailabilityLevel attribute of NS DF
			or the serviceAvailabilityLevel attribute of the
			VnfProfile may be provided, but not both.";
			reference
			"GS NFV IFA014: Section 6.3.3.2 VnfProfile information
			element";
			}
	}		}

	list pnf-profile {		list pnf-profile {
	@@ -1680,6 +1694,24 @@ submodule etsi-nfv-ns {
	reference		reference
	"GS NFV IFA014: Section 6.3.2.2 NsDf information element";		"GS NFV IFA014: Section 6.3.2.2 NsDf information element";
	}		}

			leaf service-availability-level {
			type uint32;
			description
			"If present, specifies the service availability level for
			the NS instance created from this DF.

			THE FOLLOWING STATEMENT IS SUBJECT TO CHANGE:

			Either the serviceAvailabilityLevel attribute of NS DF or
			the serviceAvailabilityLevel attribute of the NS
			constituents of the NS may be provided, but not both.
			When a SAL information is assigned to an NS, this
			information does not apply to any constituents of type
			‘nested NS’.";
			reference
			"GS NFV IFA014: Section 6.3.2.2 NsDf information element";
			}
	}		}
	uses security-parameters;		uses security-parameters;
	}		}

Admin message