Merge branch 'bug#254' into 'v2.7.1' (6957f8e1) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-descriptors.yang

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ module etsi-nfv-descriptors {
		container nfv {
		list vnfd {
		key "id";

		description
		"A VNF Descriptor (VNFD) is a deployment template which
		describes a VNF in terms of deployment and operational

src/yang/etsi-nfv-ns.yang

+5 −1

Original line number	Diff line number	Diff line
		@@ -451,6 +451,7 @@ submodule etsi-nfv-ns {
		}
		}
		}

		container pnf-profile {
		leaf pnf-profile-id {
		must ". = deref(../../pnfd-profile-id)" {
		@@ -460,6 +461,7 @@ submodule etsi-nfv-ns {
		}
		}
		}

		container ns-profile {
		leaf ns-profile-id {
		must ". = deref(../../ns-profile-id)" {
		@@ -491,6 +493,7 @@ submodule etsi-nfv-ns {
		}
		}
		}

		container pnf {
		leaf pnfd-id {
		must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
		@@ -505,6 +508,7 @@ submodule etsi-nfv-ns {
		}
		}
		}

		container ns {
		leaf nsd-id {
		must ". = deref(../../nested-ns-profile-id)/" +

src/yang/etsi-nfv-vnf.yang

+137 −0

Original line number	Diff line number	Diff line
		@@ -2629,6 +2629,143 @@ submodule etsi-nfv-vnf {
		information element";
		}

		container vnfm-interface-info {
		leaf interface-name {
		type string {
		pattern 'vnf-[lcm\|pm\|fm]';
		}
		description
		"Identifies an interface produced by the VNFM.";
		}

		container details {
		container uri-components {
		leaf scheme {
		type inet:uri;
		description
		"Corresponds to the scheme component of a URI, as
		per IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}

		container authority {
		leaf userinfo {
		type string;
		description
		"Corresponds to the userinfo field of the authority
		component of a URI, as per IETF RFC 3986.

		For HTTP and HTTPS URIs, the provisions in
		sections 2.7.1 and 2.7.2 of IETF RFC 7230 apply,
		respectively.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}

		leaf host {
		type inet:host;
		description
		"Corresponds to the host field of the authority
		component of a URI, as per IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}

		leaf port {
		type inet:port-number;
		description
		"Corresponds to the port field of the authority
		component of a URI, as per IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}
		description
		"Corresponds to the authority component of a URI,
		as per IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}

		leaf path {
		type string;
		description
		"Corresponds to the path component of a URI, as per
		IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}

		leaf query {
		type string;
		description
		"Corresponds to the query component of a URI, as per
		IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}

		leaf fragment {
		type string;
		description
		"Corresponds to the fragment component of a URI, as per
		IETF RFC 3986.";
		reference
		"RFC 3986: URI Generic Syntax.";
		}
		description
		"Provides components to build a Uniform Resource
		Identifier (URI) where to access the interface end
		point.";
		}

		leaf-list interface-specific-data {
		type string;
		description
		"Provides additional details that are specific to the
		type of interface considered.";
		}
		description
		"Provide additional data to access the interface
		endpoint (e.g. API URI prefix).";
		}

		leaf credentials {
		type string;
		description
		"Provides credential enabling access to the interface.";
		}
		description
		"Contains information enabling access to the NFV-MANO
		interfaces produced by the VNFM (e.g. URIs and
		credentials).";
		reference
		"GS NFV IFA011: Section 7.1.12 VnfConfigurableProperties
		information element";
		}

		container vnfm-oauth-server-info {
		description
		"Contains information to enable discovery of the
		authorization server protecting access to
		VNFM interfaces.";
		reference
		"GS NFV IFA011: Section 7.1.12 VnfConfigurableProperties
		information element";
		}

		container vnf-oauth-server-info {
		description
		"Contains information to enable discovery of the
		authorization server to validate the access tokens
		provided by the VNFM when the VNFM accesses the VNF
		interfaces, if that functionality (token introspection) is
		supported by the authorization server.";
		reference
		"GS NFV IFA011: Section 7.1.12 VnfConfigurableProperties
		information element";
		}

		list additional-configurable-property {
		key "key";

Admin message