Commit 7b611165 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Merge branch 'bug#90' into 'master'

Bug#90 - VduCpd should point to VnfVirtualLinkDesc and Vnfd ExtCpd should be a choice

See merge request !5
parents 3d201d3e 40c65745
Pipeline #276 failed with stage
in 0 seconds
...@@ -395,11 +395,6 @@ submodule etsi-nfv-vnf { ...@@ -395,11 +395,6 @@ submodule etsi-nfv-vnf {
reference reference
"GS NFV IFA011: Section 7.1.6.2, Vdu information element"; "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 { leaf int-virtual-link-desc {
type leafref { type leafref {
path "../../../nfv:int-virtual-link-desc/nfv:id"; path "../../../nfv:int-virtual-link-desc/nfv:id";
...@@ -411,14 +406,7 @@ submodule etsi-nfv-vnf { ...@@ -411,14 +406,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.4, VduCpd information "GS NFV IFA011: Section 7.1.6.4, VduCpd information
element"; element";
} }
leaf ext-cpd {
description
"Connect to an external connection point";
type leafref {
path "../../../nfv:ext-cpd/nfv:id";
}
}
}
leaf bitrate-requirement { leaf bitrate-requirement {
type uint64; type uint64;
units "Mbps"; units "Mbps";
...@@ -1269,6 +1257,7 @@ submodule etsi-nfv-vnf { ...@@ -1269,6 +1257,7 @@ submodule etsi-nfv-vnf {
reference reference
"GS NFV IFA011: Section 7.1.2, VNFD information element."; "GS NFV IFA011: Section 7.1.2, VNFD information element.";
choice cp-connection {
leaf int-virtual-link-desc { leaf int-virtual-link-desc {
description description
"Reference to the internal Virtual Link Descriptor (VLD) "Reference to the internal Virtual Link Descriptor (VLD)
...@@ -1279,11 +1268,17 @@ submodule etsi-nfv-vnf { ...@@ -1279,11 +1268,17 @@ submodule etsi-nfv-vnf {
path "../../nfv:int-virtual-link-desc/nfv:id"; path "../../nfv:int-virtual-link-desc/nfv:id";
} }
} }
/* container int-cpd {
intCpd leaf vdu-id {
we reference from the VDU's CP to the ext-CP instead of the type leafref {
ext-CP to the VDU's CP. path "../../../vdu/id";
*/ }
}
leaf cpd {
path "deref(../vdu-id)/../int-cpd/id";
}
}
}
uses virtual-network-interface-requirements; uses virtual-network-interface-requirements;
uses vnf-cpd; uses vnf-cpd;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment