Merge branch 'bug#89' into 'master' (4a452dc8) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/complex-vnfd.xml

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,7 @@
	</checksum>		</checksum>
	<container-format>bare</container-format>		<container-format>bare</container-format>
	<disk-format>qcow2</disk-format>		<disk-format>qcow2</disk-format>
			<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://mycompany.images.com/control-plane.qcow2</image>		<image>http://mycompany.images.com/control-plane.qcow2</image>
	@@ -107,6 +108,7 @@
	</checksum>		</checksum>
	<container-format>bare</container-format>		<container-format>bare</container-format>
	<disk-format>qcow2</disk-format>		<disk-format>qcow2</disk-format>
			<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://mycompany.images.com/data-plane.qcow2</image>		<image>http://mycompany.images.com/data-plane.qcow2</image>
	@@ -202,6 +204,17 @@
	</vdu-level>		</vdu-level>
	</instantiation-level>		</instantiation-level>
	<default-instantiation-level>il-1</default-instantiation-level>		<default-instantiation-level>il-1</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>
	<affinity-or-anti-affinity-group>		<affinity-or-anti-affinity-group>
	<id>control-plane</id>		<id>control-plane</id>
	<type>anti-affinity</type>		<type>anti-affinity</type>
	@@ -262,6 +275,17 @@
	</vdu-level>		</vdu-level>
	</instantiation-level>		</instantiation-level>
	<default-instantiation-level>il-1</default-instantiation-level>		<default-instantiation-level>il-1</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>
	<affinity-or-anti-affinity-group>		<affinity-or-anti-affinity-group>
	<id>control-plane</id>		<id>control-plane</id>
	<type>anti-affinity</type>		<type>anti-affinity</type>

example-data/nfv.xml

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@
	</checksum>		</checksum>
	<container-format>bare</container-format>		<container-format>bare</container-format>
	<disk-format>qcow2</disk-format>		<disk-format>qcow2</disk-format>
			<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://mycompany.images.com/asa.qcow2</image>		<image>http://mycompany.images.com/asa.qcow2</image>
	@@ -99,6 +100,17 @@
	</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>
	<vnfd>		<vnfd>
	@@ -151,6 +163,7 @@
	</checksum>		</checksum>
	<container-format>bare</container-format>		<container-format>bare</container-format>
	<disk-format>qcow2</disk-format>		<disk-format>qcow2</disk-format>
			<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://mycompany.images.com/csr.qcow2</image>		<image>http://mycompany.images.com/csr.qcow2</image>
	@@ -201,6 +214,17 @@
	</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>
	<nsd>		<nsd>

src/yang/etsi-nfv-common.yang

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -532,7 +532,7 @@ submodule etsi-nfv-common {
	when "../type='mac-address'";		when "../type='mac-address'";
	leaf mac-address-assignment {		leaf mac-address-assignment {
	type boolean;		type boolean;
	default true;		mandatory true;
	description		description
	"Specify if the MAC address assignment is the		"Specify if the MAC address assignment is the
	responsibility of management and orchestration function		responsibility of management and orchestration function
	@@ -558,7 +558,7 @@ submodule etsi-nfv-common {
	when "../type='ip-address'";		when "../type='ip-address'";
	leaf ip-address-assignment {		leaf ip-address-assignment {
	type boolean;		type boolean;
	default "true";		mandatory true;
	description		description
	"Specify if the address assignment is the responsibility		"Specify if the address assignment is the responsibility
	of management and orchestration function or not. If it		of management and orchestration function or not. If it
	@@ -571,7 +571,7 @@ submodule etsi-nfv-common {

	leaf floating-ip-activated {		leaf floating-ip-activated {
	type boolean;		type boolean;
	default "true";		mandatory true;
	description		description
	"Specify if the floating IP scheme is activated on the CP		"Specify if the floating IP scheme is activated on the CP
	or not.";		or not.";

src/yang/etsi-nfv-ns.yang

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1345,6 +1345,7 @@ submodule etsi-nfv-ns {
	"GS NFV IFA014: Section 6.3.11.2 NsProfile information		"GS NFV IFA014: Section 6.3.11.2 NsProfile information
	element";		element";
	}		}

	leaf min-number-of-instances {		leaf min-number-of-instances {
	type uint16;		type uint16;
	default 1;		default 1;

src/yang/etsi-nfv-vnf.yang

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -545,7 +545,7 @@ submodule etsi-nfv-vnf {
	range "0..max";		range "0..max";
	}		}
	units "GB";		units "GB";
	default 1;		mandatory true;
	description		description
	"Amount of virtual memory in GB.";		"Amount of virtual memory in GB.";
	reference		reference
	@@ -741,7 +741,7 @@ submodule etsi-nfv-vnf {
	leaf size-of-storage {		leaf size-of-storage {
	type uint64;		type uint64;
	units "GB";		units "GB";
	default 0;		mandatory true;
	description		description
	"Size of virtualised storage resource (e.g. size of		"Size of virtualised storage resource (e.g. size of
	volume, in GB)";		volume, in GB)";
	@@ -959,7 +959,7 @@ submodule etsi-nfv-vnf {
	leaf min-disk {		leaf min-disk {
	type uint64;		type uint64;
	units "GB";		units "GB";
	default 0;		mandatory true;
	description		description
	"The minimal disk size requirement for this software		"The minimal disk size requirement for this software
	image. The value of the 'size of storage' attribute		image. The value of the 'size of storage' attribute
	@@ -1477,7 +1477,7 @@ submodule etsi-nfv-vnf {
	enum ipv4;		enum ipv4;
	enum ipv6;		enum ipv6;
	}		}
	default "ipv4";		mandatory true;
	description		description
	"Specifies IP version of this L3 protocol.		"Specifies IP version of this L3 protocol.
	Value:		Value:
	@@ -1796,7 +1796,7 @@ submodule etsi-nfv-vnf {

	leaf arbitrary-target-levels-supported {		leaf arbitrary-target-levels-supported {
	type boolean;		type boolean;
	default "false";		mandatory true;
	description		description
	"Signals whether scaling according to the parameter		"Signals whether scaling according to the parameter
	'scaleInfo' is supported by this VNF.";		'scaleInfo' is supported by this VNF.";
	@@ -1851,7 +1851,7 @@ submodule etsi-nfv-vnf {

	leaf min-graceful-termination {		leaf min-graceful-termination {
	type yang:timeticks;		type yang:timeticks;
	default "1";		mandatory true;
	description		description
	"Minimum timeout value for graceful termination of		"Minimum timeout value for graceful termination of
	a VNF instance.";		a VNF instance.";
	@@ -1903,7 +1903,7 @@ submodule etsi-nfv-vnf {

	leaf min-graceful-stop-timeout {		leaf min-graceful-stop-timeout {
	type yang:timeticks;		type yang:timeticks;
	default "1";		mandatory true;
	description		description
	"Minimum timeout value for graceful stop of a VNF		"Minimum timeout value for graceful stop of a VNF
	instance.";		instance.";