Feature 11038: Enhancement of Vertical Scale Feature and merge in update API

Change-Id: I4590ce891610c809ceb1885fdf297eb10787687b
Signed-off-by: rahulkumarr <rahul.k4@tataelxsi.co.in>

diff --git a/osm-openapi.yaml b/osm-openapi.yaml
index e9eaad4..736724f 100644 (file)
--- a/osm-openapi.yaml
+++ b/osm-openapi.yaml
@@ -1903,59 +1903,6 @@ paths:
           $ref: '#/components/responses/UnexpectedError'
         default:
           $ref: '#/components/responses/UnexpectedError'
-  '/nslcm/v1/ns_instances/{nsInstanceId}/verticalscale':
-    parameters:
-      - name: nsInstanceId
-        in: path
-        required: true
-        description: NS Instance ID
-        schema:
-          type: string
-    post:
-      tags:
-        - "NS instances"
-      summary: Vertical scale a NS instance
-      description:
-        Execute an verticalscale on a NS instance.
-        The NS instance must have been created and must be in INSTANTIATED state.
-      operationId: verticalscaleNSinstance
-      requestBody:
-        $ref: '#/components/requestBodies/VerticalscaleNsRequest'
-      responses:
-        '202':
-          description: Accepted
-          headers:
-            Location:
-              description: |
-                It must point to the new "NS Lifecycle Operation Occurrence"
-                resource, i.e. an URI like ".../ns_lcm_op_occs/{nsLcmOpOccId}"
-              schema:
-                type: string
-                format: uri
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '405':
-          $ref: '#/components/responses/MethodNotAllowed'
-        '406':
-          $ref: '#/components/responses/NotAcceptable'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '422':
-          $ref: '#/components/responses/UnprocessableEntity'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-        '503':
-          $ref: '#/components/responses/ServiceUnavailable'
-        '5XX':
-          $ref: '#/components/responses/UnexpectedError'
-        default:
-          $ref: '#/components/responses/UnexpectedError'
   '/nslcm/v1/ns_instances_content':
     get:
       tags:
@@ -7279,6 +7226,7 @@ components:
             - REMOVE_VNF
             - MODIFY_VNF_INFORMATION
             - OPERATE_VNF
+            - VERTICAL_SCALE
         changeVnfPackageData:
           type: object
           properties:
@@ -7324,44 +7272,23 @@ components:
             - vnfInstanceId
             - changeStateTo
           additionalProperties: false
-      required:
-        - updateType
-      additionalProperties: false
-    VerticalscaleNsRequest:
-      description: >
-        This type represents request parameters for the "Vertical Scale NS" operation.
-        This operation supports the vertical scale of an NS instance by verticalscaling
-        one or more of the VNFs that are part of this NS.
-      type: object
-      properties:
-        verticalScale:
-          type: string
-        changeVnfFlavorData:
+        verticalScaleVnf:
           type: object
           properties:
             vnfInstanceId:
               type: string
-              format: uuid
-            additionalParams:
-              type: object
-              properties:
-                vduid:
-                  type: string
-                  format: uuid
-                vduCountIndex:
-                  type: integer
-                virtualMemory:
-                  type: integer
-                sizeOfStorage:
-                  type: integer
-                numVirtualCpu:
-                  type: integer
+            vnfdId:
+              type: string
+            vduId:
+              type: string
+            countIndex:
+              type: number
           required:
             - vnfInstanceId
-            - additionalParams
-          additionalProperties: false
+            - vnfdId
+            - vduId
       required:
-        - verticalScale
+        - updateType
       additionalProperties: false
     # CreateNSinstanceContentRequest:
       # Substituted by InstantiateNsRequest
@@ -9352,14 +9279,6 @@ components:
         application/yaml:
           schema:
             $ref: '#/components/schemas/UpdateNsRequest'
-    VerticalscaleNsRequest:
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/VerticalscaleNsRequest'
-        application/yaml:
-          schema:
-            $ref: '#/components/schemas/VerticalscaleNsRequest'
     # CreateNSinstanceContentRequest:
       # Substituted by InstantiateNsRequest
     CreateNstInfoRequest: