Merge branch 'issue#16' into 'dev-v3.3.1' (67f4d948) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-common.yang

+0 −37

Original line number	Original line	Diff line number	Diff line
	@@ -537,43 +537,6 @@ submodule etsi-nfv-common {
	}		}
	}		}

	grouping local-affinity-or-anti-affinity-rule {
	list local-affinity-or-anti-affinity-rule {
	key "type scope";

	leaf type {
	type affinity-type;
	description
	"Specifies whether the rule is an affinity rule or an
	anti-affinity rule.";
	reference
	"GS NFV IFA011: Section 7.1.8.11,
	LocalAffinityOrAntiAffinityRule information element.";
	}

	leaf scope {
	type affinity-scope;
	description
	"Specifies the scope of the rule, possible values are
	'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
	reference
	"GS NFV IFA011: Section 7.1.8.11,
	LocalAffinityOrAntiAffinityRule information element.";
	}

	uses nfvi-maintenance-info {
	description
	"When present, provides information on the impact tolerance
	and rules to be observed when a group of instances based
	on the same VDU is impacted during NFVI operation and
	maintenance (e.g. NFVI resource upgrades).";
	reference
	"GS NFV IFA011: Section 7.1.8.11,
	LocalAffinityOrAntiAffinityRule information element.";
	}
	}
	}

	grouping connectivity-type {		grouping connectivity-type {
	container connectivity-type {		container connectivity-type {
	leaf-list layer-protocol {		leaf-list layer-protocol {

src/yang/etsi-nfv-ns.yang

+27 −2

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,31 @@ submodule etsi-nfv-ns {
	}		}
	}		}

			grouping ns-local-affinity-or-anti-affinity-rule {
			list local-affinity-or-anti-affinity-rule {
			key "type scope";

			leaf type {
			type affinity-type;
			description
			"Specifies whether the rule is an affinity rule or an
			anti-affinity rule.";
			reference
			"GS NFV IFA014: Section 6.3.8.2,
			LocalAffinityOrAntiAffinityRule information element.";
			}

			leaf scope {
			type affinity-scope;
			description
			"Specifies the scope of the rule, possible values are
			'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
			reference
			"GS NFV IFA014: Section 6.3.8.2,
			LocalAffinityOrAntiAffinityRule information element.";
			}
			}
			}

	grouping nsd {		grouping nsd {
	leaf id {		leaf id {
	@@ -789,7 +814,7 @@ submodule etsi-nfv-ns {
	element";		element";
	}		}

	uses local-affinity-or-anti-affinity-rule;		uses ns-local-affinity-or-anti-affinity-rule;

	leaf-list affinity-or-anti-affinity-group-id {		leaf-list affinity-or-anti-affinity-group-id {
	type leafref {		type leafref {
	@@ -996,7 +1021,7 @@ submodule etsi-nfv-ns {
	information element";		information element";
	}		}

	uses local-affinity-or-anti-affinity-rule;		uses ns-local-affinity-or-anti-affinity-rule;

	leaf-list affinity-or-anti-affinity-group-id {		leaf-list affinity-or-anti-affinity-group-id {
	type leafref {		type leafref {

src/yang/etsi-nfv-vnf.yang

+39 −2

Original line number	Original line	Diff line number	Diff line
	@@ -171,6 +171,43 @@ submodule etsi-nfv-vnf {
	}		}
	}		}

			grouping vnf-local-affinity-or-anti-affinity-rule {
			list local-affinity-or-anti-affinity-rule {
			key "type scope";

			leaf type {
			type affinity-type;
			description
			"Specifies whether the rule is an affinity rule or an
			anti-affinity rule.";
			reference
			"GS NFV IFA011: Section 7.1.8.11,
			LocalAffinityOrAntiAffinityRule information element.";
			}

			leaf scope {
			type affinity-scope;
			description
			"Specifies the scope of the rule, possible values are
			'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
			reference
			"GS NFV IFA011: Section 7.1.8.11,
			LocalAffinityOrAntiAffinityRule information element.";
			}

			uses nfvi-maintenance-info {
			description
			"When present, provides information on the impact tolerance
			and rules to be observed when a group of instances based
			on the same VDU is impacted during NFVI operation and
			maintenance (e.g. NFVI resource upgrades).";
			reference
			"GS NFV IFA011: Section 7.1.8.11,
			LocalAffinityOrAntiAffinityRule information element.";
			}
			}
			}

	grouping vnfd {		grouping vnfd {
	leaf id {		leaf id {
	type string;		type string;
	@@ -1591,7 +1628,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.8.3, VduProfile information		"GS NFV IFA011: Section 7.1.8.3, VduProfile information
	element.";		element.";
	}		}
	uses local-affinity-or-anti-affinity-rule;		uses vnf-local-affinity-or-anti-affinity-rule;

	leaf-list affinity-or-anti-affinity-group-id {		leaf-list affinity-or-anti-affinity-group-id {
	type leafref {		type leafref {
	@@ -1648,7 +1685,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile		"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
	information element.";		information element.";
	}		}
	uses local-affinity-or-anti-affinity-rule;		uses vnf-local-affinity-or-anti-affinity-rule;

	leaf-list affinity-or-anti-affinity-group-id {		leaf-list affinity-or-anti-affinity-group-id {
	type leafref {		type leafref {

Admin message