Commit ec1d9a71 authored by ramanathan's avatar ramanathan
Browse files

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

issue#34 Addressing VnfLcmOperation coordination based on IFA011ed351

See merge request !91
parents f64d644f 94a5779a
Loading
Loading
Loading
Loading
Loading
+119 −13
Original line number Original line Diff line number Diff line
@@ -2884,6 +2884,68 @@ submodule etsi-nfv-vnf {
             element";
             element";
      }
      }


      list supported-coordination-actions {
        key "vnf-lcm-operation";

        description
          "References applicable LCM coordination actions
           that can be invoked during each of the listed
           VNF LCM operations.";
        reference
          "GS NFV IFA011: Section 7.1.8.2 VnfDf information
           element";

        leaf vnf-lcm-operation {
          type enumeration {
            enum "instantiate";
            enum "scale";
            enum "scale_to_level";
            enum "change_flavour";
            enum "terminate";
            enum "heal";
            enum "operate";
            enum "change_ext_conn";
            enum "modify_info";
            enum "create_snapshot";
            enum "revert_to_snapshot";
          }
          description
            "Identifies the specific VNF LCM operation.
             Values:
             • INSTANTIATE
             • SCALE
             • SCALE_TO_LEVEL
             • CHANGE_FLAVOUR
             • TERMINATE
             • HEAL
             • OPERATE
             • CHANGE_EXT_CONN
             • MODIFY_INFO
             • CREATE_SNAPSHOT
             • REVERT_TO_SNAPSHOT.";
          reference
            "GS NFV IFA011: Section 7.1.16.3 LcmCoordinationActionMapping
             information element";
        }
        leaf coordination-action-name {
          type leafref {
            path "../../../lcm-operations-coordination/coordination-action-name";
          }
          description
            "References to the names of coordination actions that can be
             invoked during the LCM operation indicated by the
             'vnfLcmOperation' attribute.

             The related coordination actions shall either be declared
             in the VnfLcmOperationCoordination information element
             in the same VNFD, or shall be well-known standardized
             coordination action name identifiers.";
          reference
            "GS NFV IFA011: Section 7.1.16.3 LcmCoordinationActionMapping
             information element";
        }
      }

      list monitoring-parameter {
      list monitoring-parameter {
        key "id";
        key "id";


@@ -3805,13 +3867,14 @@ submodule etsi-nfv-vnf {
           information element";
           information element";
      }
      }


      leaf coordination-id {
      leaf coordination-action-name {
        type leafref {
        type leafref {
          path "../../lcm-operations-coordination/id";
          path "../../lcm-operations-coordination/coordination-action-name";
        }
        }
        description
        description
          "Reference to applicable VNF LCM operation coordination
          "Reference to applicable VNF LCM operation coordination actions
           actions.";
           that can be invoked during a VNF package change as defined by
           the 'selector' attribute.";
        reference
        reference
          "GS NFV IFA011: Section 7.1.15.2 VnfPackageChangeInfo
          "GS NFV IFA011: Section 7.1.15.2 VnfPackageChangeInfo
           information element";
           information element";
@@ -3840,13 +3903,13 @@ submodule etsi-nfv-vnf {
    }
    }


    list lcm-operations-coordination {
    list lcm-operations-coordination {
      key "id";
      key "coordination-action-name";


      leaf id {
      leaf coordination-action-name {
        type string;
        type string;
        description
        description
          "Identifies the specific VNF LCM operation coordination
          "Identifies the specific VNF LCM operation coordination
           action.";
           action.Shall be unique within the scope of VNFD";
        reference
        reference
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
           information element";
           information element";
@@ -3880,24 +3943,67 @@ submodule etsi-nfv-vnf {
      }
      }


      leaf coordination-stage {
      leaf coordination-stage {
        type enumeration {
          enum "start";
          enum "end";
        }
        description
          "Indicates whether the coordination action is invoked before
           or after all other changes performed by the VNF LCM
           operation.
           Values:
           • START:the coordination action is invoked after receiving
                   the grant and before the LCM operation performs any
                   other changes.
           • END:the coordination action is invoked after the LCM
                 operation has performed all other changes.

           This attribute shall be omitted if the coordination action
           is intended to be invoked at an intermediate stage of the
           LCM operation, i.e. neither at the start nor at the end.
           In this case, the actual instant during the LCM operation
           when invoking the coordination is determined by means outside
           the scope of the present document such as VNFM-internal logic
           or LCM script.";
        reference
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
           information element";
      }

      list input-parameter {
        key "key";

        leaf key {
          type string;
        }
        leaf value {
          type string;
          type string;
        }
        description
        description
          "Indicates the coordination stage during the VNF LCM
          "Input parameter needed by the external coordinating
           operation.";
           entity.";
        reference
        reference
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
           information element";
           information element";
      }
      }


      leaf coordination-params {
      list output-parameter {
        key "key";

        leaf key {
          type string;
          type string;
        }
        leaf value {
          type string;
        }
        description
        description
          "Input information needed by the external coordinating
          "Output parameter provided by the external coordinating
           entity.";
           entity.";
        reference
        reference
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
          "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
           information element";
           information element";
      }
      }

      description
      description
        "Provides information used for the coordination in VNF LCM
        "Provides information used for the coordination in VNF LCM
         operations.";
         operations.";