Commit 20e183cc authored by Ayesha Ayub's avatar Ayesha Ayub
Browse files

resolve issues in SOL002 and SOL003

parent 9d6ca422

src/SOL002/General_Definitions/SOL002_def.yaml

+0 −1
Original line number Diff line number Diff line
@@ -427,7 +427,6 @@ definitions: 
        type: string

        enum:

          - IP_OVER_ETHERNET

          - IP_FOR_VIRTUAL_CP

      ipOverEthernet:

        description: >

          Network address data for IP over Ethernet to assign to the extCP instance. Shall be

src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml

+2 −4
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
definitions:

  Alarm:

    description: >

      The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in 

      table 7.5.2.4-1.

      The alarm data type encapsulates information about an alarm.



      If the attribute "faultType" has the value "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE", 

      the following provisions apply for the values of the attribute "faultDetails" related to
@@ -311,7 +310,6 @@ definitions: 
  FmNotificationsFilter:

    description: >

      This type represents a subscription filter related to notifications about VNF faults.

      It shall comply with the provisions defined in table 7.5.3.2-1.

      At a particular nesting level in the filter structure, the following applies: All attributes 

      shall match in order for the filter to match (logical "and" between different filter attributes). 

      If an attribute is an array, the attribute shall match if at least one of the values in the array

src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml

+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
definitions:

  VnfIndicator:

    description: >

      This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1.

      This type represents a VNF indicator value.



      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.

    type: object
@@ -51,7 +51,6 @@ definitions: 
  VnfIndicatorNotificationsFilter:

    description: >

      This type represents a subscription filter for notifications related to VNF indicators.

      It shall comply with the provisions defined in table 8.5.3.2-1. 

      At a particular nesting level in the filter structure, the following applies: 

      All attributes shall match in order for the filter to match (logical "and" between different 

      filter attributes). If an attribute is an array, the attribute shall match if at least one of

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

+13 −17
Original line number Diff line number Diff line
@@ -1013,6 +1013,8 @@ definitions: 
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVim"



  ExtManagedVirtualLinkInfo:

    description: >

      This type represents an externally-managed internal VL.

    type: object

    required:

      - id
@@ -1813,6 +1815,7 @@ definitions: 
        type: string

        enum:

          - ADDED

          - MODIFIED

          - REMOVED

      extCpInstanceId:

        description: >
@@ -1901,6 +1904,8 @@ definitions: 
          $ref: "#/definitions/VnfcInfoModifications"



  CreateVnfRequest:

    description: >

      This type represents request parameters for the "Create VNF identifier" operation.

    type: object

    required:

      - vnfdId
@@ -1927,8 +1932,7 @@ definitions: 


  ScaleVnfRequest:

    description: >

      This type represents request parameters for the "Scale VNF" operation. It shall comply with the provisions defined in

      table 5.5.2.5-1. See clause B.2 in annex B for an explanation of VNF scaling.

      This type represents request parameters for the "Scale VNF" operation.

    type: object

    required:

      - type
@@ -1967,7 +1971,6 @@ definitions: 
  ScaleVnfToLevelRequest:

    description: >

      This type represents request parameters for the "Scale VNF to Level" operation. 

      It shall comply with the provisions defined in table 5.5.2.6-1. See clause B.2 

      for an explanation of VNF scaling.



      NOTE:	Either the instantiationLevelId attribute or the scaleInfo attribute shall
@@ -2091,7 +2094,7 @@ definitions: 
  

  ExtVirtualLinkInfo:

    description: >

      This type represents information about an external VL. It shall comply with the provisions defined in table 5.5.3.2-1.

      This type represents information about an external VL.



      NOTE:	This attribute reflects the current configuration information that has resulted from merging into this attribute 

            the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of the
@@ -2132,8 +2135,7 @@ definitions: 


  VnfLinkPortInfo:

    description: >

      This type represents a link port of an internal VL of a VNF. It shall comply with the provisions 

      defined in table 5.5.3.8 1.

      This type represents a link port of an internal VL of a VNF.



      NOTE 1: Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId

              with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be
@@ -2201,7 +2203,7 @@ definitions: 
  ExtLinkPortInfo:

    description: >

      This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to 

      an NS VL. It shall comply with the provisions defined in table 5.5.3.9-1.

      an NS VL.



      NOTE 1:	The use cases UC#4 and UC#5 in clause A.4 of ETSI GS NFV-IFA 007 provide examples for such a configuration.

      NOTE 2:	The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute.
@@ -2244,7 +2246,6 @@ definitions: 
  CpProtocolInfo:

    description: >

      This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. 

      It shall comply with the provisions defined in table 5.5.3.9b-1.



      NOTE:	This attribute allows to signal the addition of further types of layer and protocol in future versions of the 

            present document in a backwards-compatible way. In the current version of the present document, only IP over
@@ -2271,7 +2272,6 @@ definitions: 
  IpOverEthernetAddressInfo:

    description: >

      This type represents information about a network address that has been assigned.

      It shall comply with the provisions defined in table 5.5.3.10-1.



      NOTE 1:	At least one of "macAddress" or "ipAddresses" shall be present.

      NOTE 2:	Exactly one of "addresses" or "addressRange" shall be present.
@@ -2388,7 +2388,6 @@ definitions: 
  LifecycleChangeNotificationsFilter:

    description: >

      This type represents a subscription filter related to notifications about VNF lifecycle changes.

      It shall comply with the provisions defined in table 5.5.3.12-1. 

      At a particular nesting level in the filter structure, the following applies: All attributes shall 

      match in order for the filter to match (logical "and" between different filter attributes). 

      If an attribute is an array, the attribute shall match if at least one of the values in the array
@@ -2467,7 +2466,6 @@ definitions: 
  VnfExtCpInfo:

    description: >

      This type represents information about an external CP of a VNF.

      It shall comply with the provisions defined in table 5.5.3.17 1.



      NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId" and "associatedVnfVirtualLinkId" 

              are mutually exclusive. Exactly one shall be present.
@@ -2678,7 +2676,6 @@ definitions: 
      when changing the current VNF package. The attributes that can be included consist of those requested to 

      be modified explicitly in the "ChangeCurrentVnfPkgRequest" data structure, and additional attributes of the 

      "VnfInstance" data structure that were modified implicitly during the operation.

      The "ModificationsTriggeredByVnfPkgChange" data type shall comply with the provisions defined in table 5.5.3.21-1.



      NOTE 1:	This attribute represents the delta (semantics as per IETF RFC 7396, JSON Merge Patch) between the value 

              of the attribute at the start of the "Change current VNF package" operation and the value of the attribute
@@ -2788,8 +2785,7 @@ definitions: 


  VipCpInfo:

    description: >

      This type provides information related to virtual IP (VIP) CP. It shall comply with the provisions

      defined in table 5.5.3.28-1.

      This type provides information related to virtual IP (VIP) CP.



      NOTE 1:	It is possible that there is no associated VnfcCp because the VIP CP is available but not

      associated yet.

src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml

+5 −5
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ definitions: 
  PerformanceReport:

    description: >

      This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting 

      performance information as part of a PM job. The type shall comply with the provisions defined in table 6.5.2.10-1.

      performance information as part of a PM job.



      NOTE:	The sub-object allows to structure the measured object but is not to be confused with sub-counters which allow 

            to structure the measurement value.
@@ -289,7 +289,7 @@ definitions: 


  PmJobModifications:

    description: >

      This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1.

      This type represents modifications to a PM job.



      NOTE:	At least one of the attributes defined in this type shall be present in request bodies.

    type: object
@@ -314,7 +314,7 @@ definitions: 


  PmJobCriteria:

    description: >

      This type represents collection criteria for PM jobs. It shall comply with the provisions defined in table 6.5.3.3-1.

      This type represents collection criteria for PM jobs.



      NOTE 1:	At the end of each reportingPeriod, the API producer will inform the API consumer about availability of the 

              performance data collected for each completed collection period during this reportingPeriod.
@@ -438,7 +438,7 @@ definitions: 


  ThresholdModifications:

    description: >

      This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1.

      This type represents modifications to a threshold.



      NOTE:	At least one of the attributes defined in this type shall be present in request bodies.

    type: object
@@ -462,7 +462,7 @@ definitions: 


  ThresholdCriteria:

    description: >

      This type represents criteria that define a threshold. It shall comply with the provisions defined in table 6.5.3.4-1.

      This type represents criteria that define a threshold.



      NOTE 1:	In the present document, simple thresholds are defined. The definition of additional threshold types is left for 

              future specification.