Merge branch 'dev-v2.8.1' into 'issue#2' (6415915d) · Commits · Miguel Angel Reina Ortega / SOL006

example-data/nfv-nsd.xml

+4 −3

Original line number	Diff line number	Diff line
		<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">
		<?xml version="1.0" encoding="UTF-8"?>
		<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">
		<vnfd>
		<id>ASA</id>
		<provider>My Company</provider>
		@@ -54,7 +55,7 @@
		<min-disk>0</min-disk>
		<min-ram>2.0</min-ram>
		<size>1</size>
		<image>http://www.cisco.com/asa.qcow2</image>
		<image>http://www.mycompany.com/asa.qcow2</image>
		</sw-image-desc>
		<ext-cpd>
		<id>inside</id>
		@@ -135,4 +136,4 @@
		</ns-instantiation-level>
		</df>
		</nsd>
		</nsd>
		</nfv>

example-data/nfv-vnfd.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@
		<min-disk>0</min-disk>
		<min-ram>2.0</min-ram>
		<size>1</size>
		<image>http://www.cisco.com/asa.qcow2</image>
		<image>http://www.mycompany.com/asa.qcow2</image>
		</sw-image-desc>
		<ext-cpd>
		<id>inside</id>

example-data/nfv.xml

+35 −4

Original line number	Diff line number	Diff line
		@@ -58,12 +58,23 @@
		<size>1</size>
		<image>http://mycompany.images.com/asa.qcow2</image>
		</sw-image-desc>
		<int-virtual-link-desc>
		<id>inside-vl</id>
		<flavour>
		<id>1g</id>
		<qos>
		<latency>1</latency>
		<packet-delay-variation>1</packet-delay-variation>
		<packet-loss-ratio>0.02</packet-loss-ratio>
		</qos>
		</flavour>
		<connectivity-type>
		<layer-protocol>ethernet</layer-protocol>
		</connectivity-type>
		</int-virtual-link-desc>
		<ext-cpd>
		<id>inside</id>
		<int-cpd>
		<vdu-id>firewall</vdu-id>
		<cpd>inside</cpd>
		</int-cpd>
		<int-virtual-link-desc>inside-vl</int-virtual-link-desc>
		<layer-protocol>ethernet</layer-protocol>
		</ext-cpd>
		<ext-cpd>
		@@ -89,6 +100,26 @@
		<min-number-of-instances>1</min-number-of-instances>
		<max-number-of-instances>2</max-number-of-instances>
		</vdu-profile>
		<virtual-link-profile>
		<id>inside-vl</id>
		<flavour>1g</flavour>
		<max-bit-rate-requirements>
		<root>10</root>
		</max-bit-rate-requirements>
		<min-bit-rate-requirements>
		<root>1</root>
		</min-bit-rate-requirements>
		<virtual-link-protocol-data>
		<associated-layer-protocol>ipv4</associated-layer-protocol>
		<l3-protocol-data>
		<name>inside-network</name>
		<ip-version>ipv4</ip-version>
		<cidr>192.138.0.0/8</cidr>
		<gateway-ip>192.138.0.1</gateway-ip>
		<dhcp-enabled>true</dhcp-enabled>
		</l3-protocol-data>
		</virtual-link-protocol-data>
		</virtual-link-profile>
		<instantiation-level>
		<id>double</id>
		<vdu-level>

src/yang/etsi-nfv-common.yang

+104 −3

Original line number	Diff line number	Diff line
		@@ -9,6 +9,14 @@ submodule etsi-nfv-common {
		description
		"Common data types for ETSI data models.";

		revision 2019-10-01 {
		description
		"Version 2.7.1.

		Common data structures to support VNFD and NSD according to:
		ETSI GS NFV-IFA 014 Ed271v264
		ETSI GS NFV-IFA 011 Ed271v264";
		}
		revision 2019-04-25 {
		description
		"Initial revision
		@@ -243,6 +251,99 @@ submodule etsi-nfv-common {
		"File type of storage.";
		}

		identity forwarding-behaviour {
		description
		"Base identity for forwarding behaviour.";
		}

		identity all {
		base forwarding-behaviour;
		description
		"Traffic flows shall be forwarded simultaneously to all CP
		or SAP instances created from the referenced CP profile(s).";
		}

		identity lb {
		base forwarding-behaviour;
		description
		"Traffic flows shall be forwarded to one CP or SAP instance
		created from the referenced CP profile(s) selected based on
		a load-balancing algorithm.";
		}

		identity vip-function {
		description
		"Indicates the function the virtual IP address is used for.";
		}

		identity high-availability {
		base vip-function;
		description
		"High availability function.";
		}

		identity load-balancing {
		base vip-function;
		description
		"Load balancing function.";
		}

		identity vnic-type {
		description
		"Describes the type of the virtual network interface realizing
		the CPs instantiated from this CPD. This is used to determine
		which mechanism driver(s) to be used to bind the port. Value:
		• NORMAL
		• VIRTIO
		• DIRECT
		• BAREMETAL
		• VIRTIO-FORWARDER
		• DIRECT-PHYSICAL
		• SMART-NIC";
		}

		identity normal {
		base vnic-type;
		description
		"Normal NIC.";
		}

		identity virtio {
		base vnic-type;
		description
		"VirtIO NIC.";
		}

		identity direct {
		base vnic-type;
		description
		"Direct NIC type.";
		}

		identity bare-metal {
		base vnic-type;
		description
		"Bare metal NIC type.";
		}

		identity virtio-forwarder {
		base vnic-type;
		description
		"VirtIO Forwarder NIC type.";
		}

		identity direct-physical {
		base vnic-type;
		description
		"Direct physical NIC type.";
		}

		identity smart-nic {
		base vnic-type;
		description
		"SmartNIC or Smart NIC type.";
		}

		/*
		* Typedefs
		*/
		@@ -294,8 +395,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
		@@ -305,7 +406,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-descriptors.yang

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,13 @@ module etsi-nfv-descriptors {
		description
		"Network Function Virtualization Descriptors";

		revision 2019-10-01 {
		description
		"Version 2.7.1.

		NSD and PNFD according to ETSI GS NFV-IFA 014 Ed271v264
		VNFD according to ETSI GS NFV-IFA 011 Ed271v264.";
		}
		revision 2019-04-25 {
		description
		"Initial revision.
		@@ -24,6 +31,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