Merge branch 'bug#244' into 'v2.7.1' (022fede6) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/nfv-nsd.xml

+151 −135

Original line number	Original line	Diff line number	Diff line
	<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">		<?xml version="1.0" encoding="UTF-8"?>
			<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
			<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">
	<vnfd>		<vnfd>
	<id>ASA</id>		<id>ASA</id>
	<provider>My Company</provider>		<provider>My Company</provider>
	@@ -11,15 +13,15 @@
	<name>Firewall VDU</name>		<name>Firewall VDU</name>
	<int-cpd>		<int-cpd>
	<id>inside</id>		<id>inside</id>
	<layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>		<layer-protocol>ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<int-cpd>		<int-cpd>
	<id>management</id>		<id>management</id>
	<layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>		<layer-protocol>ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<int-cpd>		<int-cpd>
	<id>outside</id>		<id>outside</id>
	<layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>		<layer-protocol>ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<virtual-compute-desc>asa-vcd</virtual-compute-desc>		<virtual-compute-desc>asa-vcd</virtual-compute-desc>
	<virtual-storage-desc>asa-vsd</virtual-storage-desc>		<virtual-storage-desc>asa-vsd</virtual-storage-desc>
	@@ -36,7 +38,7 @@
	</virtual-compute-desc>		</virtual-compute-desc>
	<virtual-storage-desc>		<virtual-storage-desc>
	<id>asa-vsd</id>		<id>asa-vsd</id>
	<type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>		<type-of-storage>root-storage</type-of-storage>
	<size-of-storage>0</size-of-storage>		<size-of-storage>0</size-of-storage>
	</virtual-storage-desc>		</virtual-storage-desc>
	<sw-image-desc>		<sw-image-desc>
	@@ -44,7 +46,7 @@
	<name>ASA image</name>		<name>ASA image</name>
	<version>1.1</version>		<version>1.1</version>
	<checksum>		<checksum>
	<algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>		<algorithm>sha-224</algorithm>
	<hash>deadbeef</hash>		<hash>deadbeef</hash>
	</checksum>		</checksum>
	<container-format>bare</container-format>		<container-format>bare</container-format>
	@@ -52,7 +54,7 @@
	<min-disk>1</min-disk>		<min-disk>1</min-disk>
	<min-ram>2.0</min-ram>		<min-ram>2.0</min-ram>
	<size>1</size>		<size>1</size>
	<image>http://www.cisco.com/asa.qcow2</image>		<image>http://mycompany.images.com/asa.qcow2</image>
	</sw-image-desc>		</sw-image-desc>
	<ext-cpd>		<ext-cpd>
	<id>inside</id>		<id>inside</id>
	@@ -60,7 +62,7 @@
	<vdu-id>firewall</vdu-id>		<vdu-id>firewall</vdu-id>
	<cpd>inside</cpd>		<cpd>inside</cpd>
	</int-cpd>		</int-cpd>
	<layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>		<layer-protocol>ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>management</id>		<id>management</id>
	@@ -68,7 +70,7 @@
	<vdu-id>firewall</vdu-id>		<vdu-id>firewall</vdu-id>
	<cpd>management</cpd>		<cpd>management</cpd>
	</int-cpd>		</int-cpd>
	<layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>		<layer-protocol>ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>outside</id>		<id>outside</id>
	@@ -76,7 +78,7 @@
	<vdu-id>firewall</vdu-id>		<vdu-id>firewall</vdu-id>
	<cpd>outside</cpd>		<cpd>outside</cpd>
	</int-cpd>		</int-cpd>
	<layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>		<layer-protocol>ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -100,8 +102,21 @@
	</vdu-level>		</vdu-level>
	</instantiation-level>		</instantiation-level>
	<default-instantiation-level>single</default-instantiation-level>		<default-instantiation-level>single</default-instantiation-level>
			<lcm-operations-configuration>
			<scale-vnf-to-level-op-config>
			<arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
			</scale-vnf-to-level-op-config>
			<terminate-vnf-op-config>
			<min-graceful-termination>1</min-graceful-termination>
			</terminate-vnf-op-config>
			<operate-vnf-op-config>
			<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
			</operate-vnf-op-config>
			</lcm-operations-configuration>
	</df>		</df>
	</vnfd>		</vnfd>
			</nfv>
			<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">
	<nsd>		<nsd>
	<id>firewall-nsd</id>		<id>firewall-nsd</id>
	<vnfd-id>ASA</vnfd-id>		<vnfd-id>ASA</vnfd-id>
	@@ -134,3 +149,4 @@
	</df>		</df>
	</nsd>		</nsd>
	</nsd>		</nsd>
			</config>

src/yang/etsi-nfv-ns.yang

+34 −30

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,7 @@ submodule etsi-nfv-ns {

	leaf-list vnfd-id {		leaf-list vnfd-id {
	type leafref {		type leafref {
	path "../../vnfd/id";		path "/nfv:nfv/nfv:vnfd/nfv:id";
	}		}
	description		description
	"References the VNFD of a constituent VNF.";		"References the VNFD of a constituent VNF.";
	@@ -108,7 +108,7 @@ submodule etsi-nfv-ns {

	leaf-list pnfd-id {		leaf-list pnfd-id {
	type leafref {		type leafref {
	path "../../pnfd/id";		path "/nfv:nfv/nfv:pnfd/nfv:id";
	}		}
	description		description
	"References the PNFD of a constituent PNF.";		"References the PNFD of a constituent PNF.";
	@@ -164,7 +164,7 @@ submodule etsi-nfv-ns {
	leaf vnfd-id {		leaf vnfd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "../../../../vnfd/id";		path "/nfv:nfv/nfv:vnfd/nfv:id";
	}		}
	must "boolean(../../../vnfd-id[.=current()])";		must "boolean(../../../vnfd-id[.=current()])";
	}		}
	@@ -172,7 +172,7 @@ submodule etsi-nfv-ns {
	leaf ext-cpd-id {		leaf ext-cpd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../vnfd-id)/../ext-cpd/id";		path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
	}		}
	}		}
	}		}
	@@ -181,7 +181,7 @@ submodule etsi-nfv-ns {
	leaf pnfd-id {		leaf pnfd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "../../../../pnfd/id";		path "/nfv:nfv/nfv:pnfd/nfv:id";
	}		}
	must "boolean(../pnfd-id[.=current()])";		must "boolean(../pnfd-id[.=current()])";
	}		}
	@@ -189,7 +189,7 @@ submodule etsi-nfv-ns {
	leaf ext-cpd-id {		leaf ext-cpd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../pnfd-id)/../ext-cpd/id";		path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
	}		}
	}		}
	}		}
	@@ -472,13 +472,12 @@ 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 "/nfv:nfv/nfv:vnfd/nfv:id";
	}		}
	}		}
	leaf cpd-id {		leaf cpd-id {
	type leafref {		type leafref {
	path "deref(../vnfd-id)/../ext-cpd/id";		path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
	}
	}		}
	}		}
	container pnf {		container pnf {
	@@ -489,10 +488,13 @@ submodule etsi-nfv-ns {
	path "../../../../../../pnfd/id";		path "../../../../../../pnfd/id";
	}		}
	}		}
	leaf pnf-cpd-id {
	type leafref {		type leafref {
	path "deref(../pnfd-id)/../ext-cpd/id";		path "/nfv:nfv/nfv:pnfd/nfv:id";
			}
	}		}
			leaf pnf-cpd-id {
			type leafref {
			path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
	}		}
	}		}
	container ns {		container ns {
	@@ -637,6 +639,7 @@ submodule etsi-nfv-ns {
	leaf-list autoscale-rule {		leaf-list autoscale-rule {
	type string;		type string;
	}		}

	list lifecycle-management-script {		list lifecycle-management-script {
	key "event";		key "event";
	leaf event {		leaf event {
	@@ -716,7 +719,7 @@ submodule etsi-nfv-ns {
	leaf vnfd-id {		leaf vnfd-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "../../../../vnfd/id";		path "/nfv:nfv/nfv:vnfd/nfv:id";
	}		}
	description		description
	"References a VNFD.";		"References a VNFD.";
	@@ -728,7 +731,7 @@ submodule etsi-nfv-ns {
	leaf flavour-id {		leaf flavour-id {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../vnfd-id)/../df/id";		path "deref(../vnfd-id)/../nfv:df/nfv:id";
	}		}
	description		description
	"Identifies a flavour within the VNFD.";		"Identifies a flavour within the VNFD.";
	@@ -740,7 +743,8 @@ submodule etsi-nfv-ns {
	leaf instantiation-level {		leaf instantiation-level {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../flavour-id)/../instantiation-level/id";		path "deref(../flavour-id)/../nfv:instantiation-level/" +
			"nfv:id";
	}		}
	description		description
	"Identifier of the instantiation level of the VNF DF		"Identifier of the instantiation level of the VNF DF
	@@ -840,7 +844,7 @@ submodule etsi-nfv-ns {

	leaf constituent-cpd-id {		leaf constituent-cpd-id {
	type leafref {		type leafref {
	path "deref(../../../vnfd-id)/../ext-cpd/id";		path "deref(../../../vnfd-id)/../nfv:ext-cpd/nfv:id";
	}		}
	description		description
	"A reference to the descriptor of a connection point		"A reference to the descriptor of a connection point
	@@ -874,7 +878,7 @@ submodule etsi-nfv-ns {

	leaf pnfd-id {		leaf pnfd-id {
	type leafref {		type leafref {
	path "../../../../pnfd/id";		path "/nfv:nfv/nfv:pnfd/nfv:id";
	}		}
	description		description
	"References a PNFD.";		"References a PNFD.";
	@@ -930,7 +934,7 @@ submodule etsi-nfv-ns {

	leaf constituent-cpd-id {		leaf constituent-cpd-id {
	type leafref {		type leafref {
	path "deref(../../../pnfd-id)/../ext-cpd/id";		path "deref(../../../pnfd-id)/../nfv:ext-cpd/nfv:id";
	}		}
	description		description
	"A reference to the descriptor of a connection point		"A reference to the descriptor of a connection point
	@@ -1501,7 +1505,7 @@ submodule etsi-nfv-ns {
	container vnf-indicator-info {		container vnf-indicator-info {
	leaf vnfd-id {		leaf vnfd-id {
	type leafref {		type leafref {
	path "../../../../../vnfd/id";		path "/nfv:nfv/nfv:vnfd/nfv:id";
	}		}
	description		description
	"Identifies a VNFD.";		"Identifies a VNFD.";
	@@ -1513,7 +1517,7 @@ submodule etsi-nfv-ns {
	leaf vnf-indicator {		leaf vnf-indicator {
	mandatory true;		mandatory true;
	type leafref {		type leafref {
	path "deref(../vnfd-id)/../indicator/id";		path "deref(../vnfd-id)/../nfv:indicator/nfv:id";
	}		}
	description		description
	"Identifies a VNF indicator within the VNFD.";		"Identifies a VNF indicator within the VNFD.";

src/yang/etsi-nfv-nsd.yang

+0 −26

Original line number	Original line	Diff line number	Diff line
	@@ -20,19 +20,6 @@ module etsi-nfv-nsd {
	}		}

	container nsd {		container nsd {
	list vnfd {
	key "id";
	description
	"A VNF Descriptor (VNFD) is a deployment template which
	describes a VNF in terms of deployment and operational
	behaviour requirements. It also contains connectivity,
	interface and virtualised resource requirements";
	reference
	"GS NFV-IFA011: Section 7.1.2, VNFD information element";

	uses vnf:vnfd;
	}

	list nsd {		list nsd {
	key "id";		key "id";
	max-elements 1;		max-elements 1;
	@@ -45,18 +32,5 @@ module etsi-nfv-nsd {
	"GS NFV-IFA014: Section 6.2.2, Network Service Descriptor		"GS NFV-IFA014: Section 6.2.2, Network Service Descriptor
	information element";		information element";
	}		}

	list pnfd {
	key "id";

	description
	"The Pnfd information element is a deployment template
	enabling on-boarding PNFs and referencing them from an
	NSD. It focuses on connectivity aspects only.";
	reference
	"GS NFV-IFA014: Section 6.6.2, Pnfd information element.";

	uses vnf:pnfd;
	}
	}		}
	}		}

src/yang/etsi-nfv-vnf.yang

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,7 @@ submodule etsi-nfv-vnf {

	leaf int-virtual-link-desc {		leaf int-virtual-link-desc {
	type leafref {		type leafref {
	path "../../../int-virtual-link-desc/id";		path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
	}		}
	description		description
	"Reference of the internal VLD which this internal CPD		"Reference of the internal VLD which this internal CPD
	@@ -260,7 +260,7 @@ submodule etsi-nfv-vnf {

	leaf nicio-requirements {		leaf nicio-requirements {
	type leafref {		type leafref {
	path "../../../virtual-compute-desc/id";		path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/nfv:id";
	}		}
	description		description
	"This references (couples) the CPD with any logical node I/O		"This references (couples) the CPD with any logical node I/O
	@@ -1254,7 +1254,7 @@ submodule etsi-nfv-vnf {
	Descriptor (CPD) connect. Either intVirtualLinkDesc or		Descriptor (CPD) connect. Either intVirtualLinkDesc or
	intCpd shall be present.";		intCpd shall be present.";
	type leafref {		type leafref {
	path "../../int-virtual-link-desc/id";		path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
	}		}
	}		}

	@@ -1292,7 +1292,7 @@ submodule etsi-nfv-vnf {

	leaf nicio-requirements {		leaf nicio-requirements {
	type leafref {		type leafref {
	path "../../virtual-compute-desc/id";		path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/nfv:id";
	}		}
	description		description
	"This references (couples) the CPD with any logical node I/O		"This references (couples) the CPD with any logical node I/O
	@@ -1472,7 +1472,7 @@ submodule etsi-nfv-vnf {

	leaf id {		leaf id {
	type leafref {		type leafref {
	path "../../../int-virtual-link-desc/id";		path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
	}		}
	description		description
	"Uniquely identifies a Vnf VLD.";		"Uniquely identifies a Vnf VLD.";
	@@ -1484,7 +1484,7 @@ submodule etsi-nfv-vnf {
	leaf flavour {		leaf flavour {
	type leafref {		type leafref {
	path "deref(../../../ext-cpd/int-virtual-link-desc)" +		path "deref(../../../ext-cpd/int-virtual-link-desc)" +
	"/../flavour/id";		"/../nfv:flavour/nfv:id";
	}		}
	description		description
	"Identifies a flavour within the VnfVirtualLinkDesc.";		"Identifies a flavour within the VnfVirtualLinkDesc.";
	@@ -2824,7 +2824,7 @@ submodule etsi-nfv-vnf {

	leaf-list virtual-link-desc {		leaf-list virtual-link-desc {
	type leafref {		type leafref {
	path "../../int-virtual-link-desc/id";		path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";
	}		}
	description		description
	"References to VnfVirtualLinkDesc that are part of this		"References to VnfVirtualLinkDesc that are part of this

Admin message