Fix for bug#95 (6ee6373f) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/nfv.xml

+48 −12

Original line number	Diff line number	Diff line
		@@ -298,11 +298,17 @@
		<max-number-of-instances>1</max-number-of-instances>
		<virtual-link-connectivity>
		<virtual-link-profile-id>mgmt</virtual-link-profile-id>
		<cpd-id>management</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>firewall</constituent-base-element-id>
		<constituent-cpd-id>management</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		<virtual-link-connectivity>
		<virtual-link-profile-id>r2fw</virtual-link-profile-id>
		<cpd-id>outside</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>firewall</constituent-base-element-id>
		<constituent-cpd-id>outside</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</vnf-profile>
		<vnf-profile>
		@@ -314,11 +320,17 @@
		<max-number-of-instances>1</max-number-of-instances>
		<virtual-link-connectivity>
		<virtual-link-profile-id>mgmt</virtual-link-profile-id>
		<cpd-id>management</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>router</constituent-base-element-id>
		<constituent-cpd-id>management</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		<virtual-link-connectivity>
		<virtual-link-profile-id>r2fw</virtual-link-profile-id>
		<cpd-id>right</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>router</constituent-base-element-id>
		<constituent-cpd-id>right</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</vnf-profile>
		<virtual-link-profile>
		@@ -367,15 +379,24 @@
		<max-number-of-instances>1</max-number-of-instances>
		<virtual-link-connectivity>
		<virtual-link-profile-id>fw2dpi</virtual-link-profile-id>
		<cpd-id>inside</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>firewall</constituent-base-element-id>
		<constituent-cpd-id>inside</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		<virtual-link-connectivity>
		<virtual-link-profile-id>mgmt</virtual-link-profile-id>
		<cpd-id>management</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>firewall</constituent-base-element-id>
		<constituent-cpd-id>management</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		<virtual-link-connectivity>
		<virtual-link-profile-id>r2fw</virtual-link-profile-id>
		<cpd-id>outside</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>firewall</constituent-base-element-id>
		<constituent-cpd-id>outside</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</vnf-profile>
		<vnf-profile>
		@@ -387,11 +408,17 @@
		<max-number-of-instances>1</max-number-of-instances>
		<virtual-link-connectivity>
		<virtual-link-profile-id>mgmt</virtual-link-profile-id>
		<cpd-id>management</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>router</constituent-base-element-id>
		<constituent-cpd-id>management</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		<virtual-link-connectivity>
		<virtual-link-profile-id>r2fw</virtual-link-profile-id>
		<cpd-id>right</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>router</constituent-base-element-id>
		<constituent-cpd-id>right</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</vnf-profile>
		<pnf-profile>
		@@ -399,7 +426,10 @@
		<pnfd-id>physical-dpi</pnfd-id>
		<virtual-link-connectivity>
		<virtual-link-profile-id>fw2dpi</virtual-link-profile-id>
		<cpd-id>outside</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>physical-dpi</constituent-base-element-id>
		<constituent-cpd-id>outside</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</pnf-profile>
		<virtual-link-profile>
		@@ -494,7 +524,10 @@
		<max-number-of-instances>1</max-number-of-instances>
		<virtual-link-connectivity>
		<virtual-link-profile-id>r2fw</virtual-link-profile-id>
		<cpd-id>right</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>router</constituent-base-element-id>
		<constituent-cpd-id>right</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</vnf-profile>
		<virtual-link-profile>
		@@ -528,7 +561,10 @@
		<max-number-of-instances>1</max-number-of-instances>
		<virtual-link-connectivity>
		<virtual-link-profile-id>r2fw</virtual-link-profile-id>
		<cpd-id>outside</cpd-id>
		<constituent-cpd-id>
		<constituent-base-element-id>firewall</constituent-base-element-id>
		<constituent-cpd-id>outside</constituent-cpd-id>
		</constituent-cpd-id>
		</virtual-link-connectivity>
		</ns-profile>
		</df>

src/yang/etsi-nfv-ns.yang

+104 −41

Original line number	Diff line number	Diff line
		@@ -805,18 +805,41 @@ submodule etsi-nfv-ns {
		information element.";
		}

		leaf-list cpd-id {
		list constituent-cpd-id {
		key "constituent-base-element-id";

		description
		"Describes a connection point on a VNF/PNF or a SAP
		which connects to virtual links instantiated from
		the profile identified in the virtualLinkProfileId
		attribute.";
		reference
		"GS NFV IFA014: Section 6.3.7
		NsVirtualLinkConnectivity information element";

		leaf constituent-base-element-id {
		type leafref {
		path "deref(../../vnfd-id)/../ext-cpd/id";
		path "../../../id";
		}
		description
		"References the descriptor of a connection point on a
		VNF/PNF or a SAP which connects to virtual links
		instantiated from the profile identified in the
		virtualLinkProfileId attribute.";
		"Reference to the profile of an NS constituent.";
		reference
		"GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
		information element.";
		"GS NFV IFA014: Section 6.4.8
		CpdInConstituentElement information element";
		}

		leaf constituent-cpd-id {
		type leafref {
		path "deref(../../../vnfd-id)/../nfv:ext-cpd/nfv:id";
		}
		description
		"A reference to the descriptor of a connection point
		attached to one of the constituent VNFs and PNFs or to
		the descriptor of a NS SAP.";
		reference
		"GS NFV IFA014: Section 6.4.4.2 CpdPool information
		element";
		}
		}
		}
		}
		@@ -872,18 +895,41 @@ submodule etsi-nfv-ns {
		information element.";
		}

		leaf-list cpd-id {
		list constituent-cpd-id {
		key "constituent-base-element-id";

		description
		"Describes a connection point on a VNF/PNF or a SAP
		which connects to virtual links instantiated from
		the profile identified in the virtualLinkProfileId
		attribute.";
		reference
		"GS NFV IFA014: Section 6.3.7
		NsVirtualLinkConnectivity information element";

		leaf constituent-base-element-id {
		type leafref {
		path "deref(../../pnfd-id)/../ext-cpd/id";
		path "../../../id";
		}
		description
		"References the descriptor of a connection point on a
		VNF/PNF or a SAP which connects to virtual links
		instantiated from the profile identified in the
		virtualLinkProfileId attribute.";
		"Reference to the profile of an NS constituent.";
		reference
		"GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
		information element.";
		"GS NFV IFA014: Section 6.4.8
		CpdInConstituentElement information element";
		}

		leaf constituent-cpd-id {
		type leafref {
		path "deref(../../../pnfd-id)/../nfv:ext-cpd/nfv:id";
		}
		description
		"A reference to the descriptor of a connection point
		attached to one of the constituent VNFs and PNFs or to
		the descriptor of a NS SAP.";
		reference
		"GS NFV IFA014: Section 6.4.4.2 CpdPool information
		element";
		}
		}
		}
		}
		@@ -1338,28 +1384,45 @@ submodule etsi-nfv-ns {
		"GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
		information element.";
		}
		leaf-list cpd-id {

		list constituent-cpd-id {
		key "constituent-base-element-id";

		description
		"Describes a connection point on a VNF/PNF or a SAP
		which connects to virtual links instantiated from
		the profile identified in the virtualLinkProfileId
		attribute.";
		reference
		"GS NFV IFA014: Section 6.3.7
		NsVirtualLinkConnectivity information element";

		leaf constituent-base-element-id {
		type leafref {
		path "deref(../../nsd-id)/../sapd/id";
		path "../../../id";
		}
		description
		"References the descriptor of a connection point on a
		VNF/PNF or a SAP which connects to virtual links
		instantiated from the profile identified in the
		virtualLinkProfileId attribute.";
		"Reference to the profile of an NS constituent.";
		reference
		"GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
		information element.";
		"GS NFV IFA014: Section 6.4.8
		CpdInConstituentElement information element";
		}

		leaf constituent-cpd-id {
		type leafref {
		path "deref(../../../nsd-id)/../nfv:sapd/nfv:id";
		}
		description
		"Defines the connection information of the NS, it
		contains connection relationship between an NS SAP and
		a NS virtual Link of the composite NS.";
		"A reference to the descriptor of a connection point
		attached to one of the constituent VNFs and PNFs or to
		the descriptor of a NS SAP.";
		reference
		"GS NFV IFA014: Section 6.3.11.2 NsProfile information
		"GS NFV IFA014: Section 6.4.4.2 CpdPool information
		element";
		}
		}
		}
		}

		list dependencies {
		key "id";