Fix default values (29b957e3) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/nfv.xml

+36 −4

Original line number	Original line	Diff line number	Diff line
	@@ -48,14 +48,26 @@
	</sw-image-desc>		</sw-image-desc>
	<ext-cpd>		<ext-cpd>
	<id>inside</id>		<id>inside</id>
			<int-cpd>
			<vdu-id>firewall</vdu-id>
			<cpd>inside</cpd>
			</int-cpd>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>management</id>		<id>management</id>
			<int-cpd>
			<vdu-id>firewall</vdu-id>
			<cpd>management</cpd>
			</int-cpd>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>outside</id>		<id>outside</id>
			<int-cpd>
			<vdu-id>firewall</vdu-id>
			<cpd>outside</cpd>
			</int-cpd>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<df>		<df>
	@@ -131,14 +143,26 @@
	</sw-image-desc>		</sw-image-desc>
	<ext-cpd>		<ext-cpd>
	<id>left</id>		<id>left</id>
			<int-cpd>
			<vdu-id>router</vdu-id>
			<cpd>left</cpd>
			</int-cpd>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>management</id>		<id>management</id>
			<int-cpd>
			<vdu-id>router</vdu-id>
			<cpd>management</cpd>
			</int-cpd>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<ext-cpd>		<ext-cpd>
	<id>right</id>		<id>right</id>
			<int-cpd>
			<vdu-id>router</vdu-id>
			<cpd>right</cpd>
			</int-cpd>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>Ethernet</layer-protocol>
	</ext-cpd>		</ext-cpd>
	<df>		<df>
	@@ -218,7 +242,9 @@
	<virtual-link-desc>		<virtual-link-desc>
	<id>fw2dpi</id>		<id>fw2dpi</id>
	<connectivity-type>		<connectivity-type>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>
			<protocol>Ethernet</protocol>
			</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -231,7 +257,9 @@
	<virtual-link-desc>		<virtual-link-desc>
	<id>mgmt</id>		<id>mgmt</id>
	<connectivity-type>		<connectivity-type>
	<layer-protocol>IPv4</layer-protocol>		<layer-protocol>
			<protocol>IPv4</protocol>
			</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -244,7 +272,9 @@
	<virtual-link-desc>		<virtual-link-desc>
	<id>r2fw</id>		<id>r2fw</id>
	<connectivity-type>		<connectivity-type>
	<layer-protocol>Ethernet</layer-protocol>		<layer-protocol>
			<protocol>Ethernet</protocol>
			</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>normal</id>		<id>normal</id>
	@@ -467,7 +497,9 @@
	<virtual-link-desc>		<virtual-link-desc>
	<id>r2fw</id>		<id>r2fw</id>
	<connectivity-type>		<connectivity-type>
	<layer-protocol>IPv4</layer-protocol>		<layer-protocol>
			<protocol>Ethernet</protocol>
			</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>r2fw</id>		<id>r2fw</id>

src/yang/etsi-nfv-common.yang

+15 −9

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

	revision 2018-06-19 {		revision 2019-03-18 {
	description		description
	"Initial revision		"Initial revision

	Common data structures to support VNFD and NSD according to:		Common data structures to support VNFD and NSD according to:
	ETSI GS NFV-IFA 014 Ed251v244		ETSI GS NFV-IFA 014 Ed261v252
	ETSI GS NFV-IFA 011 Ed251v243";		ETSI GS NFV-IFA 011 Ed261v254";
	}		}

	/*		/*
	@@ -253,14 +253,20 @@ submodule etsi-nfv-common {

	grouping connectivity-type {		grouping connectivity-type {
	container connectivity-type {		container connectivity-type {
	leaf layer-protocol {		list layer-protocol {
	mandatory true;		key "protocol";

			leaf protocol {
	type identityref {		type identityref {
	base layer-protocol;		base layer-protocol;
	}		}
			}
	description		description
	"Identifies the protocol this VL gives access to (Ethernet,		"Identifies the protocol this VL gives access to (Ethernet,
	MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).";		MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).The top layer
			protocol of the VL protocol stack shall always be provided.
			The lower layer protocols may be included when there are
			specific requirements on these layers.";
	reference		reference
	"GS NFV IFA011: Section 7.1.7.3, ConnectivityType		"GS NFV IFA011: Section 7.1.7.3, ConnectivityType
	information element.";		information element.";

src/yang/etsi-nfv-ns.yang

+11 −10

Original line number	Original line	Diff line number	Diff line
	@@ -11,14 +11,14 @@ submodule etsi-nfv-ns {
	description		description
	"Models for NS according to ETSI GS NFV-IFA 014.";		"Models for NS according to ETSI GS NFV-IFA 014.";

	revision 2017-01-20 {		revision 2019-03-18 {
	description		description
	"Initial revision		"Initial revision
	Common data structure to support NSD according to:		Common data structure to support NSD according to:
	ETSI GS NFV-IFA 011 Ed251v243";		ETSI GS NFV-IFA 011 Ed261v252";

	reference		reference
	"ETSI GS NFV-IFA 011 Ed251v243";		"ETSI GS NFV-IFA 011 Ed261v252";
	}		}

	grouping resource-handle {		grouping resource-handle {
	@@ -493,7 +493,8 @@ submodule etsi-nfv-ns {
	}		}
	container ns {		container ns {
	leaf nsd-id {		leaf nsd-id {
	must ". = deref(../../ns-profile-id)/../nsd-id" {		must ". = deref(../../nested-ns-profile-id)/" +
			"../nsd-id" {
	}		}

	type leafref {		type leafref {
	@@ -753,7 +754,7 @@ submodule etsi-nfv-ns {
	}		}

	leaf min-number-of-instances {		leaf min-number-of-instances {
	mandatory true;		default 1;
	type uint16;		type uint16;
	description		description
	"Minimum number of instances of the VNF based on this		"Minimum number of instances of the VNF based on this
	@@ -764,7 +765,7 @@ submodule etsi-nfv-ns {
	}		}

	leaf max-number-of-instances {		leaf max-number-of-instances {
	mandatory true;		default 1;
	type uint16;		type uint16;
	description		description
	"Maximum number of instances of the VNF based on this		"Maximum number of instances of the VNF based on this
	@@ -1177,7 +1178,7 @@ submodule etsi-nfv-ns {
	}		}

	leaf number-of-instances {		leaf number-of-instances {
	mandatory true;		default 1;
	type uint32;		type uint32;
	description		description
	"Specifies the number of VNF instances required for		"Specifies the number of VNF instances required for
	@@ -1237,7 +1238,7 @@ submodule etsi-nfv-ns {
	}		}

	leaf number-of-instances {		leaf number-of-instances {
	mandatory true;		default 1;
	type uint32;		type uint32;
	description		description
	"Specifies the number of nested NS instances required		"Specifies the number of nested NS instances required
	@@ -1343,7 +1344,7 @@ submodule etsi-nfv-ns {
	}		}
	leaf min-number-of-instances {		leaf min-number-of-instances {
	type uint16;		type uint16;
	mandatory true;		default 1;
	description		description
	"Minimum number of nested NS instances based on the		"Minimum number of nested NS instances based on the
	referenced NSD that is permitted to exist for this		referenced NSD that is permitted to exist for this
	@@ -1354,7 +1355,7 @@ submodule etsi-nfv-ns {
	}		}
	leaf max-number-of-instances {		leaf max-number-of-instances {
	type uint16;		type uint16;
	mandatory true;		default 1;
	description		description
	"Maximum number of nested NS instances based on the		"Maximum number of nested NS instances based on the
	referenced NSD that is permitted to exist for this		referenced NSD that is permitted to exist for this

src/yang/etsi-nfv-pnf.yang

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -12,15 +12,15 @@ submodule etsi-nfv-pnf {
	description		description
	"Models for PNFD according to GS NFV-IFA 014.";		"Models for PNFD according to GS NFV-IFA 014.";

	revision 2018-06-25 {		revision 2019-03-18 {
	description		description
	"Initial revision.		"Initial revision.

	Common data structure to support VNFD according to:		Common data structure to support VNFD according to:
	ETSI GS NFV-IFA 014 Ed251v244";		ETSI GS NFV-IFA 014 Ed261v252";

	reference		reference
	"ETSI GS NFV-IFA 014 Ed251v244";		"ETSI GS NFV-IFA 014 Ed261v252";
	}		}

	grouping pnfd {		grouping pnfd {

src/yang/etsi-nfv-vnf.yang

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1149,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;
	}		}

Admin message