Merge branch 'bug#247' into 'v2.7.1' (2f4f6fe9) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-common.yang

+3 −3

Original line number	Diff line number	Diff line
		@@ -387,8 +387,8 @@ submodule etsi-nfv-common {

		grouping local-affinity-or-anti-affinity-rule {
		list local-affinity-or-anti-affinity-rule {
		key "affinity-type affinity-scope";
		leaf affinity-type {
		key "type scope";
		leaf type {
		type affinity-type;
		description
		"Specifies whether the rule is an affinity rule or an
		@@ -398,7 +398,7 @@ submodule etsi-nfv-common {
		LocalAffinityOrAntiAffinityRule information element.";
		}

		leaf affinity-scope {
		leaf scope {
		type affinity-scope;
		description
		"Specifies the scope of the rule, possible values are

src/yang/etsi-nfv-ns.yang

+72 −5

Original line number	Diff line number	Diff line
		@@ -418,6 +418,8 @@ submodule etsi-nfv-ns {
		list nfp-position-element {
		key "id";

		min-elements 1;

		leaf id {
		type string;
		description
		@@ -566,6 +568,8 @@ submodule etsi-nfv-ns {
		list position-desc {
		key "id";

		min-elements 1;

		leaf id {
		type string;
		description
		@@ -580,12 +584,10 @@ submodule etsi-nfv-ns {
		path "../../../nfp-position-element/id";
		}
		description
		"References NfpPositionElement associated with one of the
		constituent VNF Profile, PNF Profile or NS Profile of a
		nested NS.";
		"Reference to one or a pair of CPDs or SAPDs.";
		reference
		"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
		element";
		"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
		information element";
		}

		leaf forwarding-behaviour {
		@@ -1282,6 +1284,71 @@ submodule etsi-nfv-ns {
		"GS NFV IFA014: Section 6.3.2.2 NsDf information element";
		}

		container ns-lcm-additional-params {
		container instantiate {
		list params {
		key "key";

		leaf key {
		type string;
		}

		leaf value {
		type string;
		}
		description
		"Array of KVP requirements for additional parameters
		of NS to be passed when invoking the Instantiate Ns
		operation.";
		reference
		"GS NFV IFA014: Section 6.2.10.3
		InstantiateNsAdditionalParams information element";
		}
		}

		container scale {
		list params {
		key "key";

		leaf key {
		type string;
		}

		leaf value {
		type string;
		}
		description
		"Array of KVP requirements for additional parameters
		of NS to be passed when invoking the Scale Ns
		operation.";
		reference
		"GS NFV IFA014: Section 6.2.10.4
		ScaleNsAdditionalParams information element";
		}
		}

		container heal {
		list params {
		key "key";

		leaf key {
		type string;
		}

		leaf value {
		type string;
		}
		description
		"Array of KVP requirements for additional parameters
		of NS to be passed when invoking the Heal Ns
		operation.";
		reference
		"GS NFV IFA014: Section 6.2.10.5
		HealNsAdditionalParams information element";
		}
		}
		}

		list ns-profile {
		must "min-number-of-instances <= max-number-of-instances" {
		error-message

src/yang/etsi-nfv-pnf.yang

+0 −12

Original line number	Diff line number	Diff line
		@@ -92,18 +92,6 @@ submodule etsi-nfv-pnf {
		"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
		}

		list security {
		key "signature";
		uses security-parameters;
		description
		"Provides a signature to prevent tampering.
		Editor's Note: While IFA014 does specify that the PNFD
		includes a security parameter. SOL001 does not have one.
		We need to harmonize SOL001 & SOL006 on this point.";
		reference
		"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
		}

		leaf geographical-location-info {
		type string;
		description