Merge branch 'namespace' into 'master' (3d201d3e) · Commits · Miguel Angel Reina Ortega / SOL006

example-data/nfv.xml

+500 −502

Original line number	Original line	Diff line number	Diff line
	<config xmlns="http://tail-f.com/ns/config/1.0">
	<nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">		<nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">
	<vnfd>		<vnfd>
	<id>ASA</id>		<id>ASA</id>
	<provider>Cisco</provider>		<provider>My Company</provider>
	<product-name>Cisco ASAv</product-name>		<product-name>My Company ASAv</product-name>
	<software-version>9.8</software-version>		<software-version>9.8</software-version>
	<version>9.8 </version>		<version>9.8 </version>
	<vnfm-info>ESC</vnfm-info>		<vnfm-info>My Company Vnfm</vnfm-info>
	<vdu>		<vdu>
	<id>firewall</id>		<id>firewall</id>
	<name>Firewall VDU</name>		<name>Firewall VDU</name>
	<int-cpd>		<int-cpd>
	<id>inside</id>		<id>inside</id>
	<ext-cpd>inside</ext-cpd>		<ext-cpd>inside</ext-cpd>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<int-cpd>		<int-cpd>
	<id>management</id>		<id>management</id>
	<ext-cpd>management</ext-cpd>		<ext-cpd>management</ext-cpd>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<int-cpd>		<int-cpd>
	<id>outside</id>		<id>outside</id>
	<ext-cpd>outside</ext-cpd>		<ext-cpd>outside</ext-cpd>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common: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>
	@@ -52,15 +51,15 @@
	</sw-image-desc>		</sw-image-desc>
	<ext-cpd>		<ext-cpd>
	<id>inside</id>		<id>inside</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>management</id>		<id>management</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>outside</id>		<id>outside</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -88,28 +87,28 @@
	</vnfd>		</vnfd>
	<vnfd>		<vnfd>
	<id>CSR</id>		<id>CSR</id>
	<provider>Cisco</provider>		<provider>My Company</provider>
	<product-name>Cisco CSR 1000v</product-name>		<product-name>My Company CSR 1000v</product-name>
	<software-version>3.16</software-version>		<software-version>3.16</software-version>
	<version>3.16</version>		<version>3.16</version>
	<vnfm-info>ESC</vnfm-info>		<vnfm-info>My Company Vnfm</vnfm-info>
	<vdu>		<vdu>
	<id>router</id>		<id>router</id>
	<name>Router VDU</name>		<name>Router VDU</name>
	<int-cpd>		<int-cpd>
	<id>left</id>		<id>left</id>
	<ext-cpd>left</ext-cpd>		<ext-cpd>left</ext-cpd>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<int-cpd>		<int-cpd>
	<id>management</id>		<id>management</id>
	<ext-cpd>management</ext-cpd>		<ext-cpd>management</ext-cpd>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<int-cpd>		<int-cpd>
	<id>right</id>		<id>right</id>
	<ext-cpd>right</ext-cpd>		<ext-cpd>right</ext-cpd>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</int-cpd>		</int-cpd>
	<virtual-compute-desc>csr-vcd</virtual-compute-desc>		<virtual-compute-desc>csr-vcd</virtual-compute-desc>
	<virtual-storage-desc>csr-vsd</virtual-storage-desc>		<virtual-storage-desc>csr-vsd</virtual-storage-desc>
	@@ -138,15 +137,15 @@
	</sw-image-desc>		</sw-image-desc>
	<ext-cpd>		<ext-cpd>
	<id>left</id>		<id>left</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>management</id>		<id>management</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>right</id>		<id>right</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -226,7 +225,7 @@
	<id>fw2dpi</id>		<id>fw2dpi</id>
	<version>1.0</version>		<version>1.0</version>
	<connectivity-type>		<connectivity-type>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -240,7 +239,7 @@
	<id>mgmt</id>		<id>mgmt</id>
	<version>1.0</version>		<version>1.0</version>
	<connectivity-type>		<connectivity-type>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:IPv4</layer-protocol>		<layer-protocol>IPv4</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -254,7 +253,7 @@
	<id>r2fw</id>		<id>r2fw</id>
	<version>1.0</version>		<version>1.0</version>
	<connectivity-type>		<connectivity-type>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -448,7 +447,7 @@
	<id>r2fw</id>		<id>r2fw</id>
	<version>1.0</version>		<version>1.0</version>
	<connectivity-type>		<connectivity-type>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:IPv4</layer-protocol>		<layer-protocol>IPv4</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>r2fw</id>		<id>r2fw</id>
	@@ -513,8 +512,7 @@
	<version>1.0</version>		<version>1.0</version>
	<ext-cpd>		<ext-cpd>
	<id>outside</id>		<id>outside</id>
	<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	</pnfd>		</pnfd>
	</nfv>		</nfv>
	</config>

run-test.sh

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,6 @@ cd src
	echo "Testing compilation"		echo "Testing compilation"
	CONFD_OPTS="--fail-on-warnings"		CONFD_OPTS="--fail-on-warnings"
	CONFD_OPTS=""		CONFD_OPTS=""
	confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-common.fxs etsi-nfv-common.yang
	confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang		confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang

	echo "Starting ConfD"		echo "Starting ConfD"

src/yang/etsi-nfv-common.yang

+9 −9

Original line number	Original line	Diff line number	Diff line
	module etsi-nfv-common {		submodule etsi-nfv-common {
	namespace "urn:etsi:params:xml:ns:yang:etsi-nfv-common";
	yang-version 1.1;		yang-version 1.1;
	prefix common;		belongs-to etsi-nfv {
			prefix nfv;
			}
	description		description
	"Common data types for ETSI data models.";		"Common data types for ETSI data models.";

	@@ -395,7 +395,7 @@ module etsi-nfv-common {
	leaf layer-protocol {		leaf layer-protocol {
	mandatory true;		mandatory true;
	type identityref {		type identityref {
	base common:layer-protocol;		base layer-protocol;
	}		}
	description		description
	"Identifies a protocol that the connection points		"Identifies a protocol that the connection points
	@@ -406,7 +406,7 @@ module etsi-nfv-common {
	}		}
	leaf role {		leaf role {
	type identityref {		type identityref {
	base common:cp-role;		base cp-role;
	}		}
	description		description
	"Identifies the role of the connection points		"Identifies the role of the connection points

src/yang/etsi-nfv-pnf.yang

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -7,9 +7,7 @@ submodule etsi-nfv-pnf {
	/*		/*
	* Import		* Import
	*/		*/
	import etsi-nfv-common {		include etsi-nfv-common;
	prefix common;
	}

	description		description
	"Models for PNFD according to GS NFV-IFA 014.";		"Models for PNFD according to GS NFV-IFA 014.";
	@@ -83,7 +81,7 @@ submodule etsi-nfv-pnf {
	}		}
	list ext-cpd {		list ext-cpd {
	key "id";		key "id";
	uses common:cpd;		uses cpd;
	description		description
	"Specifies the characteristics of one or more connection		"Specifies the characteristics of one or more connection
	points where to connect the PNF to a VL.";		points where to connect the PNF to a VL.";
	@@ -92,7 +90,7 @@ submodule etsi-nfv-pnf {
	}		}
	list security {		list security {
	key "signature";		key "signature";
	uses common:security-parameters;		uses security-parameters;
	description		description
	"Provides a signature to prevent tampering.		"Provides a signature to prevent tampering.
	Editor's Note: While IFA014 does specify that the PNFD		Editor's Note: While IFA014 does specify that the PNFD

src/yang/etsi-nfv-vnf.yang

+31 −32

Original line number	Original line	Diff line number	Diff line
	@@ -4,15 +4,14 @@ submodule etsi-nfv-vnf {
	prefix nfv;		prefix nfv;
	}		}

			include etsi-nfv-common;

	import ietf-inet-types {		import ietf-inet-types {
	prefix inet;		prefix inet;
	}		}
	import ietf-yang-types {		import ietf-yang-types {
	prefix yang;		prefix yang;
	}		}
	import etsi-nfv-common {
	prefix common;
	}

	description		description
	"Models for VNFD according to GS NFV-IFA 011.";		"Models for VNFD according to GS NFV-IFA 011.";
	@@ -87,10 +86,10 @@ submodule etsi-nfv-vnf {
	path "/nfv/vnfd/virtual-compute-descriptor/id";		path "/nfv/vnfd/virtual-compute-descriptor/id";
	}		}
	description		description
	"This references (couples) the CPD with any logical node		"This references (couples) the CPD with any logical node I/O
	I/O requirements (for network devices) that may have been		requirements (for network devices) that may have been
	created. Linking these attributes is necessary so that		created. Linking these attributes is necessary so that so
	I/O requirements that need to be articulated at the		that I/O requirements that need to be articulated at the
	logical node level can be associated with the network		logical node level can be associated with the network
	interface requirements associated with the CPD.";		interface requirements associated with the CPD.";
	reference		reference
	@@ -104,7 +103,7 @@ submodule etsi-nfv-vnf {
	// IFA011. A similar definition of Cpd exists in IFA014, but		// IFA011. A similar definition of Cpd exists in IFA014, but
	// that is for use with Sapd and Pnfd. Do not use this grouping		// that is for use with Sapd and Pnfd. Do not use this grouping
	// for that.		// for that.
	grouping cpd {		grouping vnf-cpd {
	description		description
	"A Cpd information element describes network		"A Cpd information element describes network
	connectivity to a compute resource or a VL.";		connectivity to a compute resource or a VL.";
	@@ -121,7 +120,7 @@ submodule etsi-nfv-vnf {
	leaf layer-protocol {		leaf layer-protocol {
	mandatory true;		mandatory true;
	type identityref {		type identityref {
	base common:layer-protocol;		base layer-protocol;
	}		}
	description		description
	"Identifies which protocol the CP uses for connectivity		"Identifies which protocol the CP uses for connectivity
	@@ -132,7 +131,7 @@ submodule etsi-nfv-vnf {
	}		}
	leaf role {		leaf role {
	type identityref {		type identityref {
	base common:cp-role;		base cp-role;
	}		}
	description		description
	"Identifies the role of the port in the context of the		"Identifies the role of the port in the context of the
	@@ -159,7 +158,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";		"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";
	leaf associated-layer-protocol {		leaf associated-layer-protocol {
	type identityref {		type identityref {
	base common:layer-protocol;		base layer-protocol;
	}		}
	description		description
	"One of the values of the attribute layerProtocol of the Cpd		"One of the values of the attribute layerProtocol of the Cpd
	@@ -173,7 +172,7 @@ submodule etsi-nfv-vnf {
	key "address-type";		key "address-type";
	leaf address-type {		leaf address-type {
	type identityref {		type identityref {
	base common:address-type;		base address-type;
	}		}
	description		description
	"Describes the type of the address to be assigned to the CP		"Describes the type of the address to be assigned to the CP
	@@ -450,7 +449,7 @@ submodule etsi-nfv-vnf {
	element.";		element.";
	}		}

	uses cpd;		uses vnf-cpd;
	}		}
	leaf virtual-compute-desc {		leaf virtual-compute-desc {
	type leafref {		type leafref {
	@@ -541,7 +540,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter		"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
	information element.";		information element.";
	}		}
	uses common:monitoring-parameter;		uses monitoring-parameter;
	}		}
	list configurable-properties {		list configurable-properties {
	key "key";		key "key";
	@@ -1225,7 +1224,7 @@ submodule etsi-nfv-vnf {
	}		}
	}		}

	uses common:connectivity-type;		uses connectivity-type;

	leaf-list test-access {		leaf-list test-access {
	type string;		type string;
	@@ -1256,7 +1255,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter		"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
	information element.";		information element.";
	}		}
	uses common:monitoring-parameter;		uses monitoring-parameter;
	}		}
	}		}

	@@ -1286,7 +1285,7 @@ submodule etsi-nfv-vnf {
	ext-CP to the VDU's CP.		ext-CP to the VDU's CP.
	*/		*/
	uses virtual-network-interface-requirements;		uses virtual-network-interface-requirements;
	uses cpd;		uses vnf-cpd;
	}		}

	list df {		list df {
	@@ -1350,7 +1349,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.8.3, VduProfile information		"GS NFV IFA011: Section 7.1.8.3, VduProfile information
	element.";		element.";
	}		}
	uses common:local-affinity-or-anti-affinity-rule;		uses local-affinity-or-anti-affinity-rule;
	list affinity-or-anti-affinity-group {		list affinity-or-anti-affinity-group {
	key "id";		key "id";
	description		description
	@@ -1385,7 +1384,7 @@ submodule etsi-nfv-vnf {
	information element.";		information element.";
	}		}
	leaf scope {		leaf scope {
	type common:affinity-scope;		type affinity-scope;
	description		description
	"Specifies the scope of the rule, possible values are		"Specifies the scope of the rule, possible values are
	'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'";		'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'";
	@@ -1425,7 +1424,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile		"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
	information element.";		information element.";
	}		}
	uses common:local-affinity-or-anti-affinity-rule;		uses local-affinity-or-anti-affinity-rule;
	list affinity-or-anti-affinity-group {		list affinity-or-anti-affinity-group {
	key "id";		key "id";
	leaf id {		leaf id {
	@@ -1559,7 +1558,7 @@ submodule etsi-nfv-vnf {
	}		}
	leaf-list supported-operation {		leaf-list supported-operation {
	type identityref {		type identityref {
	base common:supported-operation;		base supported-operation;
	}		}
	description		description
	"Indicates which operations are available for this DF via		"Indicates which operations are available for this DF via
	@@ -1782,7 +1781,7 @@ submodule etsi-nfv-vnf {

	leaf type {		leaf type {
	mandatory true;		mandatory true;
	type common:affinity-type;		type affinity-type;
	description		description
	"Specifies whether the rule is an affinity rule or an		"Specifies whether the rule is an affinity rule or an
	anti-affinity rule.";		anti-affinity rule.";
	@@ -1793,7 +1792,7 @@ submodule etsi-nfv-vnf {

	leaf scope {		leaf scope {
	mandatory true;		mandatory true;
	type common:affinity-scope;		type affinity-scope;
	description		description
	"Specifies the scope of the rule, possible values are		"Specifies the scope of the rule, possible values are
	'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";		'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
	@@ -1820,7 +1819,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.11.3 MonitoringParameter		"GS NFV IFA011: Section 7.1.11.3 MonitoringParameter
	information element";		information element";
	}		}
	uses common:monitoring-parameter;		uses monitoring-parameter;
	}		}

	list scaling-aspect {		list scaling-aspect {
	@@ -2094,7 +2093,7 @@ submodule etsi-nfv-vnf {
	"GS NFV IFA011: Section 7.1.2 VNFD information element";		"GS NFV IFA011: Section 7.1.2 VNFD information element";

	leaf event {		leaf event {
	type common:internal-lifecycle-management-script-event;		type internal-lifecycle-management-script-event;
	description		description
	"Describes VNF lifecycle event(s) or an external stimulus		"Describes VNF lifecycle event(s) or an external stimulus
	detected on a VNFM reference point.";		detected on a VNFM reference point.";