Merge branch 'bug#238' into 'v2.7.1' (5e261d31) · Commits · Miguel Angel Reina Ortega / SOL006

src/yang/etsi-nfv-common.yang

+37 −0

Original line number	Original line	Diff line number	Diff line
	@@ -243,6 +243,43 @@ submodule etsi-nfv-common {
	"Ephemeral type of storage.";		"Ephemeral type of storage.";
	}		}

			identity forwarding-behaviour {
			description
			"Base identity for forwarding behaviour.";
			}

			identity all {
			base forwarding-behaviour;
			description
			"Traffic flows shall be forwarded simultaneously to all CP
			or SAP instances created from the referenced CP profile(s).";
			}

			identity lb {
			base forwarding-behaviour;
			description
			"Traffic flows shall be forwarded to one CP or SAP instance
			created from the referenced CP profile(s) selected based on
			a load-balancing algorithm.";
			}

			identity vip-function {
			description
			"Indicates the function the virtual IP address is used for.";
			}

			identity high-availability {
			base vip-function;
			description
			"High availability function.";
			}

			identity load-balancing {
			base vip-function;
			description
			"Load balancing function.";
			}

	identity vnic-type {		identity vnic-type {
	description		description
	"Describes the type of the virtual network interface realizing		"Describes the type of the virtual network interface realizing

src/yang/etsi-nfv-ns.yang

+146 −151

Original line number	Original line	Diff line number	Diff line
	@@ -415,21 +415,21 @@ submodule etsi-nfv-ns {
	element";		element";
	}		}

	list cpd-pool {		list nfp-position-element {
	key "id";		key "id";

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

	leaf id {		leaf id {
	type string;		type string;
			description
			"Identifier of this NfpPositionElemen information
			element. It uniquely identifies an
			NfpPositionElemen.";
			reference
			"GS NFV IFA014: Section 6.4.6.2 NfpPositionElement
			information element";
	}		}

			container desc {
	choice constituent-base-element-id {		choice constituent-base-element-id {
	mandatory "true";		mandatory "true";
	container vnf-profile {		container vnf-profile {
	@@ -437,7 +437,7 @@ submodule etsi-nfv-ns {
	must ". = deref(../../vnfd-profile-id)" {		must ". = deref(../../vnfd-profile-id)" {
	}		}
	type leafref {		type leafref {
	path "../../../../../nsd/df/vnf-profile/id";		path "../../../../../../nsd/df/vnf-profile/id";
	}		}
	}		}
	}		}
	@@ -446,7 +446,7 @@ submodule etsi-nfv-ns {
	must ". = deref(../../pnfd-profile-id)" {		must ". = deref(../../pnfd-profile-id)" {
	}		}
	type leafref {		type leafref {
	path "../../../../../nsd/df/pnf-profile/id";		path "../../../../../../nsd/df/pnf-profile/id";
	}		}
	}		}
	}		}
	@@ -455,15 +455,15 @@ submodule etsi-nfv-ns {
	must ". = deref(../../ns-profile-id)" {		must ". = deref(../../ns-profile-id)" {
	}		}
	type leafref {		type leafref {
	path "../../../../../nsd/df/ns-profile/id";		path "../../../../../../nsd/df/ns-profile/id";
	}		}
	}		}
	}		}
	description		description
	"Reference to the profile of an NS constituent.";		"Reference to the profile of an NS constituent.";
	reference		reference
	"GS NFV IFA014: Section 6.4.8 CpdInConstituentElement		"GS NFV IFA014: Section 6.4.8
	information element";		CpdInConstituentElement information element";
	}		}

	choice constituent-cpd-id {		choice constituent-cpd-id {
	@@ -472,7 +472,7 @@ submodule etsi-nfv-ns {
	must ". = deref(../../vnfd-profile-id)/../vnfd-id" {		must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
	}		}
	type leafref {		type leafref {
	path "../../../../../vnfd/id";		path "../../../../../../vnfd/id";
	}		}
	}		}
	leaf cpd-id {		leaf cpd-id {
	@@ -486,7 +486,7 @@ submodule etsi-nfv-ns {
	must ". = deref(../../pnfd-profile-id)/../pnfd-id" {		must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
	}		}
	type leafref {		type leafref {
	path "../../../../../pnfd/id";		path "../../../../../../pnfd/id";
	}		}
	}		}
	leaf pnf-cpd-id {		leaf pnf-cpd-id {
	@@ -502,7 +502,7 @@ submodule etsi-nfv-ns {
	}		}

	type leafref {		type leafref {
	path "../../../../../nsd/id";		path "../../../../../../nsd/id";
	}		}
	}		}
	leaf sap-cpd-id {		leaf sap-cpd-id {
	@@ -512,24 +512,33 @@ submodule etsi-nfv-ns {
	}		}
	}		}
	description		description
	"A reference to the descriptor of a connection point		"References the VNF external CPD for a given
	attached to one of the constituent VNFs and PNFs or to		VnfProfile, or the PNF external CPD for a given
	the descriptor of a NS SAP.";		PnfProfile, or a NS SAPD for a given NsProfile
			identified by the constituentBaseElementId.";
	reference		reference
	"GS NFV IFA014: Section 6.4.4.2 CpdPool information		"GS NFV IFA014: Section 6.4.8.2
	element";		CpdInConstituentElement information element";
			}
			description
			"Identifies 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
			information element";
	}		}
			description
			"One or a pair of CPDs or SAPDs. These descriptors
			shall be members of the CpdPool associated to the
			parent VNFFG.";
			reference
			"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
			information element";
	}		}

	list nfpd {		list nfpd {
	key "id";		key "id";

	description
	"The network forwarding path associated to the VNFFG.";
	reference
	"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
	element";

	leaf id {		leaf id {
	type string;		type string;
	description		description
	@@ -544,33 +553,17 @@ submodule etsi-nfv-ns {
	type string;		type string;
	description		description
	"Provides an NFP classification and selection rule.		"Provides an NFP classification and selection rule.
	The rule may be expressed as a criteria constructed		The rule may be expressed as a criteria constructed out
	out of atomic assertions linked by Boolean operators		of atomic assertions linked by Boolean operators AND,
	AND, OR and NOT.";		OR and NOT.";
	reference		reference
	"GS NFV IFA014: Section 6.4.3.2 Nfpd information		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
	element";		element";
	}		}

	list position-desc-id {		list position-desc {
	key "id";		key "id";

	description
	"Describes a position in the NFP in terms of one or
	more CP profiles and rules for distributing the
	traffic among CP and SAP instances created from the
	CPD or SAPD associated to these profiles. This shall
	be connection point profile, which is either a CPD
	associated with the VnfProfile of a constituent VNF,
	or a CPD associated with the PnfProfile of a
	constituent PNF, or a SAPD associated with the
	NsProfile of a nested NS. The related VnfProfile,
	PnfProfile and NsProfile shall be included in the
	parent VNFFGD.";
	reference
	"GS NFV IFA014: Section 6.4.3.2 Nfpd information
	element";

	leaf id {		leaf id {
	type string;		type string;
	description		description
	@@ -580,62 +573,64 @@ submodule etsi-nfv-ns {
	information element";		information element";
	}		}

	list cp-profile-id {		leaf-list nfp-position-element-id {
	key "id";		type leafref {
			path "../../../nfp-position-element/id";
			}
	description		description
	"References the profile of a connection point to be		"References NfpPositionElement associated with one of the
	traversed by the traffic flows matching the criteria.		constituent VNF Profile, PNF Profile or NS Profile of a
	This shall be a connection point attached to one of		nested NS.";
	the constituent VNFs and PNFs of the parent VNFFG,
	or a SAP of one of the constituent nested NSs of the
	parent VNFFG.";
	reference		reference
	"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc		"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
	information element";		element";
			}

	leaf id {		leaf forwarding-behaviour {
	type string;		type identityref {
			base forwarding-behaviour;
			}
	description		description
	"Identifier of this CpProfile information element.		"Identifies a rule to apply to forward traffic to CP or
	It uniquely identifies a CpProfile.";		SAP instances corresponding to the referenced CPD(s)
			and SAPD(s). The minimum list of rules to be supported
			shall include:
			• ALL = Traffic flows shall be forwarded simultaneously
			to all CP or SAP instances created from the
			referenced CP profile(s).
			• LB = Traffic flows shall be forwarded to one CP or SAP
			instance created from the referenced CP profile(s)
			selected based on a load-balancing algorithm.";
	reference		reference
	"GS NFV IFA014: Section 6.4.6.2 CpProfile		"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
	information element";		information element";
	}		}

	list constituent-profile-elements {		leaf forwarding-behavior-input-parameters {
	key "id";		type string;

	description		description
	"Specifies the constituents of the CpProfile.";		"Provides input parameters to configure the forwarding
			behaviour (e.g. identifies a load balancing
			algorithm).";
	reference		reference
	"GS NFV IFA014: Section 6.4.6.2 CpProfile		"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
	information element";		information element";
			}

	leaf id {
	type string;
	description		description
	"Specifies the constituents of the CpProfile.";		"Describes a position in the NFP in terms of one or more
			CPDs and SAPDs and rules for distributing the traffic
			among CP and SAP instances created from these CPDs
			and SAPDs.";
	reference		reference
	"GS NFV IFA014: Section 6.4.7.2		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
	ConstituentProfileElements information element";		element";
	}		}

	leaf cpd-id {
	type string;
	description		description
	"References the VNF external CPD for a given		"The network forwarding path associated to the VNFFG.";
	VnfProfile, or the PNF external CPD for a given
	PnfProfile, or a NS SAPD for a give NsProfile
	identified by the constituentBasedElementId.";
	reference		reference
	"GS NFV IFA014: Section 6.4.7.2		"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
	ConstituentProfileElements information element";		element";
	}
	}
	}
	}
	}		}
	}		}

src/yang/etsi-nfv-vnf.yang

+90 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,7 @@ submodule etsi-nfv-vnf {
	}		}

	leaf support-mandatory {		leaf support-mandatory {
			status "deprecated";
	default "false";		default "false";
	type boolean;		type boolean;
	description		description
	@@ -892,6 +893,17 @@ submodule etsi-nfv-vnf {
	information element.";		information element.";
	}		}

			leaf provider {
			type string;
			description
			"The provider of this software image. If not present the
			provider of the software image is assumed to be same as
			the VNF provider.";
			reference
			"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
			information element.";
			}

	container checksum {		container checksum {

	leaf algorithm {		leaf algorithm {
	@@ -1259,7 +1271,23 @@ submodule etsi-nfv-vnf {
	}		}
	}		}
	}		}

			leaf vip-cpd {
			type leafref {
			path "../../vip-cpd/id";
			}
			description
			"Reference to the VIP CPD which is used to instantiate CPs
			to hold virtual IP addresses. These CPs are, in turn,
			exposed as external CPs defined by this external CPD.
			One and only one of the following attributes shall be
			present: intVirtualLinkDesc or intCpd or vipCpd .";
			reference
			"GS NFV-IFA011: Section 7.1.3.2, VnfExtCpd information
			element";
			}
	}		}

	uses virtual-network-interface-requirements;		uses virtual-network-interface-requirements;

	leaf nicio-requirements {		leaf nicio-requirements {
	@@ -1291,6 +1319,55 @@ submodule etsi-nfv-vnf {
	}		}
	}		}

			list vip-cpd {
			key "id";

			leaf-list int-cpd {
			type leafref {
			path "../../vdu/int-cpd/int-virtual-link-desc";
			}
			description
			"Reference to the internal VDU CPD which is used to
			instantiate internal CPs. These internal CPs share the
			virtual IP addresses allocated when a VipCp instance
			is created from the VipCpd.";
			reference
			"GS NFV IFA011: Section 7.1.x, VipCpd information element.";
			}

			leaf-list vnf-ext-cpd {
			type leafref {
			path "../../ext-cpd/id";
			}
			description
			"Reference to the VNF external CPD which is used to
			instantiate external CPs. These external CPs share the
			virtual IP addresses allocated when a VipCp instance is
			created from the VipCpd.";
			reference
			"GS NFV IFA011: Section 7.1.x, VipCpd information element.";
			}

			leaf vip-function {
			type identityref {
			base vip-function;
			}
			description
			"It indicates the function the virtual IP address is used
			for. Permitted values: high availability, load balancing.";
			reference
			"GS NFV IFA011: Section 7.1.x, VipCpd information element.";
			}

			uses cpd;

			description
			"Describes virtual IP addresses to be shared among instances
			of connection points. See clause 7.1.x.";
			reference
			"GS NFV IFA011: Section 7.1.2, VNFD information element.";
			}

	list df {		list df {
	must "default-instantiation-level or " +		must "default-instantiation-level or " +
	"count(instantiation-level) = 1";		"count(instantiation-level) = 1";
	@@ -1556,6 +1633,19 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.8.14,		"GS NFV IFA011: Section 7.1.8.14,
	L2ProtocolData information element.";		L2ProtocolData information element.";
	}		}

			leaf segmentation-id {
			type string;
			description
			"If present, specifies a specific virtualised network
			segment, which depends on the network type. For e.g.,
			VLAN ID for VLAN network type and tunnel ID for
			GRE/VXLAN network types.";
			reference
			"GS NFV IFA011: Section 7.1.8.14,
			L2ProtocolData information element.";
			}

	description		description
	"Specifies the L2 protocol data for this virtual link.		"Specifies the L2 protocol data for this virtual link.
	Shall be present when the associatedLayerProtocol		Shall be present when the associatedLayerProtocol