Commit 40c65745 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Fix for bug#90

parent c570c31b

src/yang/etsi-nfv-vnf.yang

+90 −95
Original line number Original line Diff line number Diff line
@@ -394,11 +394,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";
@@ -410,14 +405,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";
@@ -1268,6 +1256,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)
@@ -1278,11 +1267,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;

      }

      }