Commit 7b611165 authored by jethanandani's avatar jethanandani
Browse files

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

src/yang/etsi-nfv-vnf.yang

+90 −95
Original line number Diff line number Diff line
@@ -395,11 +395,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";
@@ -411,14 +406,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";
@@ -1269,6 +1257,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)
@@ -1279,11 +1268,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;

      }