Merge branch 'bug#93' into 'master' (3a78b0d7) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/nfv.xml

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -242,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>
	@@ -255,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>
	@@ -268,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>
	@@ -491,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>IPv4</protocol>
			</layer-protocol>
	</connectivity-type>		</connectivity-type>
	<df>		<df>
	<id>r2fw</id>		<id>r2fw</id>

+16 −10

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 protocols that the VL uses (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.";

+3 −3

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 014 Ed261v252";

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

	grouping resource-handle {		grouping resource-handle {

+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 {

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -16,15 +16,15 @@ submodule etsi-nfv-vnf {
	description		description
	"Models for VNFD according to GS NFV-IFA 011.";		"Models for VNFD according to GS NFV-IFA 011.";

	revision 2018-06-19 {		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:
	VNFD according to ETSI GS NFV-IFA 011 Ed251v243";		VNFD according to ETSI GS NFV-IFA 011 Ed261v254";

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

	grouping virtual-network-interface-requirements {		grouping virtual-network-interface-requirements {