Commit be47d2f8 authored by ramanathan's avatar ramanathan
Browse files

Merge branch 'issue#41' into 'dev-v3.5.1'

issue #41 IFA011ed351 updates related to the use of VIPs

See merge request !96
parents a662b40f d57101c3
Loading
Loading
Loading
Loading
Loading
+20 −9
Original line number Original line Diff line number Diff line
@@ -1609,8 +1609,9 @@ submodule etsi-nfv-vnf {
      key "id";
      key "id";


      leaf-list int-cpd {
      leaf-list int-cpd {
        min-elements 1;
        type leafref {
        type leafref {
          path "../../vdu/int-cpd/int-virtual-link-desc";
          path "../../vdu/int-cpd/id";
        }
        }
        description
        description
          "Reference to the internal VDU CPD which is used to
          "Reference to the internal VDU CPD which is used to
@@ -1621,17 +1622,27 @@ submodule etsi-nfv-vnf {
          "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
          "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
      }
      }


      leaf-list vnf-ext-cpd {
      leaf int-virtual-link-desc {
        type leafref {
        type leafref {
          path "../../ext-cpd/id";
          path "../../int-virtual-link-desc/id";
        }
        }
        description
        description
          "Reference to the VNF external CPD which is used to
          "Reference of the internal VLD which this VipCpd
           instantiate external CPs. These external CPs share the
           connects to";
           virtual IP addresses allocated when a VipCp instance is
           created from the VipCpd.";
        reference
        reference
          "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
          "GS NFV IFA011: Section 7.1.17.2 VipCpd information element.";
      }

      leaf dedicated-ip-address {
        type boolean;
        description
          "If set to true, it indicates that the VIP address
           shall be different from the addresses allocated to
           all of the VduCp instances associated to it.
           If set to false, the VIP address shall be the same
           as one of the VduCp instances associated to it.";
        reference
          "GS NFV IFA011: Section 7.1.17.2 VipCpd information element.";
      }
      }


      leaf vip-function {
      leaf vip-function {
@@ -1652,7 +1663,7 @@ submodule etsi-nfv-vnf {


      description
      description
        "Describes virtual IP addresses to be shared among instances
        "Describes virtual IP addresses to be shared among instances
         of connection points. See clause 7.1.x.";
         of connection points. See clause 7.1.17.";
      reference
      reference
        "GS NFV IFA011: Section 7.1.2, VNFD information element.";
        "GS NFV IFA011: Section 7.1.2, VNFD information element.";
    }
    }