Fix for bug#90 (40c65745) · Commits · NFV - Network Functions Virtualisation / SOL006

src/yang/etsi-nfv-vnf.yang

+90 −95

Original line number	Diff line number	Diff line
		@@ -394,11 +394,6 @@ submodule etsi-nfv-vnf {
		reference
		"GS NFV IFA011: Section 7.1.6.2, Vdu information element";

		choice cp-connection {
		mandatory true;
		description
		"A connection point must either connect to an internal
		virtual link or to an external connection points.";
		leaf int-virtual-link-desc {
		type leafref {
		path "../../../nfv:int-virtual-link-desc/nfv:id";
		@@ -410,14 +405,7 @@ submodule etsi-nfv-vnf {
		"GS NFV IFA011: Section 7.1.6.4, VduCpd information
		element";
		}
		leaf ext-cpd {
		description
		"Connect to an external connection point";
		type leafref {
		path "../../../nfv:ext-cpd/nfv:id";
		}
		}
		}

		leaf bitrate-requirement {
		type uint64;
		units "Mbps";
		@@ -1268,6 +1256,7 @@ submodule etsi-nfv-vnf {
		reference
		"GS NFV IFA011: Section 7.1.2, VNFD information element.";

		choice cp-connection {
		leaf int-virtual-link-desc {
		description
		"Reference to the internal Virtual Link Descriptor (VLD)
		@@ -1278,11 +1267,17 @@ submodule etsi-nfv-vnf {
		path "../../nfv:int-virtual-link-desc/nfv:id";
		}
		}
		/*
		intCpd
		we reference from the VDU's CP to the ext-CP instead of the
		ext-CP to the VDU's CP.
		*/
		container int-cpd {
		leaf vdu-id {
		type leafref {
		path "../../../vdu/id";
		}
		}
		leaf cpd {
		path "deref(../vdu-id)/../int-cpd/id";
		}
		}
		}
		uses virtual-network-interface-requirements;
		uses vnf-cpd;
		}