Address issue#3 in SOL 772. (d84e3787) · Commits · Miguel Angel Reina Ortega / SOL006

example-data/nfv.xml

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -11,17 +11,14 @@
	<name>Firewall VDU</name>		<name>Firewall VDU</name>
	<int-cpd>		<int-cpd>
	<id>inside</id>		<id>inside</id>
	<ext-cpd>inside</ext-cpd>
	<layer-protocol>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>
	<layer-protocol>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>
	<layer-protocol>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>
	@@ -97,17 +94,14 @@
	<name>Router VDU</name>		<name>Router VDU</name>
	<int-cpd>		<int-cpd>
	<id>left</id>		<id>left</id>
	<ext-cpd>left</ext-cpd>
	<layer-protocol>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>
	<layer-protocol>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>
	<layer-protocol>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>

src/yang/etsi-nfv-ns.yang

+10 −13

Original line number	Original line	Diff line number	Diff line
	@@ -4,10 +4,7 @@ submodule etsi-nfv-ns {
	prefix nfv;		prefix nfv;
	}		}

	import etsi-nfv-common {		include etsi-nfv-common;
	prefix common;
	}

	include etsi-nfv-vnf;		include etsi-nfv-vnf;
	include etsi-nfv-pnf;		include etsi-nfv-pnf;

	@@ -345,7 +342,7 @@ submodule etsi-nfv-ns {
	"GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc		"GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc
	information element";		information element";
	}		}
	uses common:security-parameters;		uses security-parameters;
	}		}

	list vnffgd {		list vnffgd {
	@@ -776,7 +773,7 @@ submodule etsi-nfv-ns {
	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";
	@@ -988,7 +985,7 @@ submodule etsi-nfv-ns {
	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";
	@@ -1015,7 +1012,7 @@ submodule etsi-nfv-ns {
	reference		reference
	"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile		"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
	information element";		information element";
	uses common:link-bitrate-requirements;		uses link-bitrate-requirements;
	}		}
	container min-bitrate-requirements {		container min-bitrate-requirements {
	description		description
	@@ -1024,7 +1021,7 @@ submodule etsi-nfv-ns {
	reference		reference
	"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile		"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
	information element";		information element";
	uses common:link-bitrate-requirements;		uses link-bitrate-requirements;
	}		}
	}		}

	@@ -1104,7 +1101,7 @@ submodule etsi-nfv-ns {

	leaf affinity-type {		leaf affinity-type {
	mandatory true;		mandatory true;
	type common:affinity-type;		type affinity-type;
	description		description
	"Specifies the type of relationship that the members of		"Specifies the type of relationship that the members of
	the group have: 'affinity' or 'anti-affinity.'";		the group have: 'affinity' or 'anti-affinity.'";
	@@ -1115,7 +1112,7 @@ submodule etsi-nfv-ns {

	leaf affinity-scope {		leaf affinity-scope {
	mandatory true;		mandatory true;
	type common:affinity-scope;		type affinity-scope;
	description		description
	"Specifies the scope of the affinity or anti-affinity		"Specifies the scope of the affinity or anti-affinity
	relationship e.g. a NFVI node, an NFVI PoP, etc.";		relationship e.g. a NFVI node, an NFVI PoP, etc.";
	@@ -1212,7 +1209,7 @@ submodule etsi-nfv-ns {
	VirtualLinkToLevelMapping information element";		VirtualLinkToLevelMapping information element";
	}		}

	uses common:link-bitrate-requirements;		uses link-bitrate-requirements;
	}		}

	list ns-to-level-mapping {		list ns-to-level-mapping {
	@@ -1567,7 +1564,7 @@ submodule etsi-nfv-ns {
	}		}
	}		}
	}		}
	uses common:security-parameters;		uses security-parameters;
	}		}
	}		}
	}		}

src/yang/etsi-nfv-vnf.yang

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,7 @@ submodule etsi-nfv-vnf {
	list network-interface-requirements {		list network-interface-requirements {
	key "key";		key "key";
	min-elements "1";		min-elements "1";
			max-elements "1";

	leaf key {		leaf key {
	type string;		type string;
	@@ -1148,10 +1149,12 @@ submodule etsi-nfv-vnf {
	}		}
	}		}
	leaf cpd {		leaf cpd {
			type leafref {
	path "deref(../vdu-id)/../int-cpd/id";		path "deref(../vdu-id)/../int-cpd/id";
	}		}
	}		}
	}		}
			}
	uses virtual-network-interface-requirements;		uses virtual-network-interface-requirements;
	uses cpd;		uses cpd;
	}		}