Commit c84c8653 authored by ramanathan's avatar ramanathan
Browse files

Merge branch 'issue#57' into 'dev-v4.3.1'

issue #57 Implementation of ENH02.04. from IFA014

See merge request !116
parents 8f80ec91 82c5f645
Loading
Loading
Loading
Loading
Loading
+59 −1
Original line number Diff line number Diff line
@@ -145,7 +145,20 @@ submodule etsi-nfv-ns {
      description
        "Identifies an NSD in a version independent manner. This
         attribute is invariant across versions of the network
         service descriptor.";
         service descriptor with no constraint on the changes
         across versions.";
      reference
        "GS NFV IFA014: Section 6.2.2.2 Network Service Descriptor
         information element";
    }

    leaf ext-invariant-id {
      type string;
      description
        "Identifies an NSD in a version independent manner.
         This attribute is invariant across versions of the
         NSD that fulfil certain conditions related to the
         external connectivity and management of the NS.";
      reference
        "GS NFV IFA014: Section 6.2.2.2 Network Service Descriptor
         information element";
@@ -805,6 +818,21 @@ submodule etsi-nfv-ns {
             element";
        }

        leaf vnfd-ext-invariant-id {
          type string;
          description
            "Identifies a VNFD in a version independent manner.
             If present it shall have the same value as the
             vnfdExtInvariantId in the VNFD referenced by the
             vnfdId attribute. It allows for VNF instances
             during NS LCM the use of a VNFD different from the
             one referenced by the vnfdId attribute, provided
             they have the same vnfdExtInvariantId.";
          reference
            "GS NFV IFA014: Section 6.3.3.2 VnfProfile information
             element";
        }

        leaf flavour-id {
          mandatory true;
          type leafref {
@@ -986,6 +1014,21 @@ submodule etsi-nfv-ns {
             element";
        }

        leaf pnfd-ext-invariant-id {
          type string;
          description
            "Identifies a PNFD in a version independent manner.
             If present it shall have the same value as the
             pnfdExtInvariantId in the PNFD referenced by the
             pnfdId attribute. It allows for PNF instances during
             NS LCM the use of a PNFD different from the one
             referenced by the pnfdId attribute, provided they
             have the same pnfdExtInvariantId ";
          reference
            "GS NFV IFA014: Section 6.3.6.2 PnfProfile information
             element";
        }

        list virtual-link-connectivity {
          key "virtual-link-profile-id";

@@ -1668,6 +1711,21 @@ submodule etsi-nfv-ns {
             element";
        }

        leaf nsd-ext-invariant-id {
          type string;
          description
            "Identifies an NSD in a version independent manner.
             If present it shall have the same value as the
             nsdExtInvariantId in the NSD referenced by the nsdId
             attribute. It allows for nested NS instances during
             NS LCM the use of an NSD different from the one
             referenced by the nsdId attribute, provided they
             have the same nsdExtInvariantId.";
          reference
            "GS NFV IFA014: Section 6.3.11.2 NsProfile information
             element";
        }

        leaf ns-df-id {
          mandatory true;
          type leafref {
+13 −1
Original line number Diff line number Diff line
@@ -106,7 +106,19 @@ submodule etsi-nfv-pnf {
      type string;
      description
        "Identifies a PNFD in a version independent manner. This
         attribute is invariant across versions of PNFD.";
         attribute is invariant across versions of PNFD with no
         constraint on the changes across versions.";
      reference
        "GS NFV-IFA014: Section 6.6.2, Pnfd information element";
    }

    leaf ext-invariant-id {
      type string;
      description
        "Identifies a PNFD in a version independent manner.
         This attribute is invariant across versions of the
         PNFD that expose the same external connectivity,
         i.e. same number of pnfExtCpds and same identifiers.";
      reference
        "GS NFV-IFA014: Section 6.6.2, Pnfd information element";
    }