Getting SOL006 ready for 2.7.1 (c1f567b3) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/complex-vnfd.xml

+4 −8

Original line number	Diff line number	Diff line
		@@ -78,11 +78,11 @@
		<num-virtual-cpu>16</num-virtual-cpu>
		</virtual-cpu>
		</virtual-compute-desc>
		<virtual-storage-descriptor>
		<virtual-storage-desc>
		<id>root</id>
		<type-of-storage>root-storage</type-of-storage>
		<size-of-storage>10</size-of-storage>
		</virtual-storage-descriptor>
		</virtual-storage-desc>
		<sw-image-desc>
		<id>CP</id>
		<name>CP</name>
		@@ -116,17 +116,13 @@
		<int-virtual-link-desc>
		<id>internal-vl</id>
		<connectivity-type>
		<layer-protocol>
		<protocol>ipv4</protocol>
		</layer-protocol>
		<layer-protocol>ipv4</layer-protocol>
		</connectivity-type>
		</int-virtual-link-desc>
		<int-virtual-link-desc>
		<id>mgmt</id>
		<connectivity-type>
		<layer-protocol>
		<protocol>ipv4</protocol>
		</layer-protocol>
		<layer-protocol>ipv4</layer-protocol>
		</connectivity-type>
		</int-virtual-link-desc>
		<ext-cpd>

example-data/nfv-nsd.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@
		</checksum>
		<container-format>bare</container-format>
		<disk-format>qcow2</disk-format>
		<min-disk>1</min-disk>
		<min-ram>2.0</min-ram>
		<size>1</size>
		<image>http://www.cisco.com/asa.qcow2</image>

example-data/nfv-vnfd.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		</checksum>
		<container-format>bare</container-format>
		<disk-format>qcow2</disk-format>
		<min-disk>1</min-disk>
		<min-ram>2.0</min-ram>
		<size>1</size>
		<image>http://www.cisco.com/asa.qcow2</image>

src/yang/etsi-nfv-common.yang

+37 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,43 @@ submodule etsi-nfv-common {
		"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.";
		}

		/*
		* Typedefs
		*/

src/yang/etsi-nfv-ns.yang

+156 −161

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

		list cpd-pool {
		leaf-list nfp-position-element-id {
		type leafref {
		path "../nfpd/position-desc/element/id";
		}
		description
		"References NfpPositionElement associated with one of the
		constituent VNF Profile, PNF Profile or NS Profile of a
		nested NS.";
		reference
		"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
		element";
		}

		list nfpd {
		key "id";

		leaf id {
		type string;
		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.";
		"Identifies this nfpd information element within a
		VNFFGD.";
		reference
		"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
		element";
		}

		leaf rule {
		type string;
		description
		"Provides an NFP classification and selection rule.
		The rule may be expressed as a criteria constructed out
		of atomic assertions linked by Boolean operators AND,
		OR and NOT.";
		reference
		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
		element";
		}

		list position-desc {
		key "id";

		leaf id {
		type string;
		description
		"Identifier of this NfpPositionDesc element.";
		reference
		"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
		information element";
		}

		list element {
		key "id";

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

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

		type leafref {
		path "../../../../../nsd/id";
		path "../../../../../../../../nsd/id";
		}
		}
		leaf sap-cpd-id {
		@@ -512,130 +562,75 @@ submodule etsi-nfv-ns {
		}
		}
		description
		"A reference to the descriptor of a connection point
		attached to one of the constituent VNFs and PNFs or to
		the descriptor of a NS SAP.";
		reference
		"GS NFV IFA014: Section 6.4.4.2 CpdPool information
		element";
		}
		}

		list nfpd {
		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 {
		type string;
		description
		"Identifies this nfpd information element within a
		VNFFGD.";
		"References the VNF external CPD for a given
		VnfProfile, or the PNF external CPD for a given
		PnfProfile, or a NS SAPD for a given NsProfile
		identified by the constituentBaseElementId.";
		reference
		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
		element";
		"GS NFV IFA014: Section 6.4.8.2
		CpdInConstituentElement information element";
		}

		leaf rule {
		type string;
		description
		"Provides an NFP classification and selection rule.
		The rule may be expressed as a criteria constructed
		out of atomic assertions linked by Boolean operators
		AND, OR and NOT.";
		"Identifies a CPD or SAPD in the context of a profile
		of an NS constituent element.";
		reference
		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
		element";
		"GS NFV IFA014: Section 6.4.6.2 NfpPositionElement
		information element";
		}

		list position-desc-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 {
		type string;
		description
		"Identifier of this NfpPositionDesc element.";
		"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 cp-profile-id {
		key "id";

		leaf forwarding-behaviour {
		type identityref {
		base forwarding-behaviour;
		}
		description
		"References the profile of a connection point to be
		traversed by the traffic flows matching the criteria.
		This shall be a connection point attached to one of
		the constituent VNFs and PNFs of the parent VNFFG,
		or a SAP of one of the constituent nested NSs of the
		parent VNFFG.";
		"Identifies a rule to apply to forward traffic to CP or
		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
		"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
		information element";
		}

		leaf id {
		leaf forwarding-behavior-input-parameters {
		type string;
		description
		"Identifier of this CpProfile information element.
		It uniquely identifies a CpProfile.";
		"Provides input parameters to configure the forwarding
		behaviour (e.g. identifies a load balancing
		algorithm).";
		reference
		"GS NFV IFA014: Section 6.4.6.2 CpProfile
		"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
		information element";
		}

		list constituent-profile-elements {
		key "id";

		description
		"Specifies the constituents of the CpProfile.";
		reference
		"GS NFV IFA014: Section 6.4.6.2 CpProfile
		information element";

		leaf id {
		type string;
		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
		"GS NFV IFA014: Section 6.4.7.2
		ConstituentProfileElements information element";
		"GS NFV IFA014: Section 6.4.3.2 Nfpd information
		element";
		}

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