Merge branch 'develop_v20b' into 'develop'

Updated to GS version 2.0.11

See merge request !6

MecAppSupportApi.json

@@ -10,7 +10,7 @@
   ],
   "info": {
     "title": "MEC Application Support API",
-    "version": "2.0.9",
+    "version": "2.0.11",
     "description": "The ETSI MEC ISG MEC011 MEC Application Support API described using OpenAPI",
     "license": {
       "name": "ETSI Forge copyright notice",
@@ -339,6 +339,9 @@
           "204": {
             "description": "No Content"
           },
+          "400": {
+            "$ref": "#/components/responses/Error.400"
+          },
           "401": {
             "$ref": "#/components/responses/Error.401"
           },
@@ -354,6 +357,9 @@
           "429": {
             "$ref": "#/components/responses/Error.429"
           }
+        },
+        "requestBody": {
+          "$ref": "#/components/requestBodies/ApplicationsConfirmTermination"
         }
       }
     },
@@ -409,6 +415,18 @@
       "Empty": {
         "description": "Empty schema"
       },
+      "AppTerminationConfirmation": {
+        "description": "This type represents the information that the MEC application instance provides to the MEC platform when informing it that the application has completed its application level related terminate/stop actions, e.g. retention of application state in the case of stop.",
+        "type": "object",
+        "required": [
+          "operationAction"
+        ],
+        "properties": {
+          "operationAction": {
+            "$ref": "#/components/schemas/OperationActionType"
+          }
+        }
+      },
       "AppTerminationNotification.Links": {
         "description": "Object containing hyperlinks related to the resource.",
         "type": "object",
@@ -440,6 +458,7 @@
         "type": "object",
         "required": [
           "notificationType",
+          "operationAction",
           "maxGracefulTimeout",
           "_links"
         ],
@@ -447,6 +466,9 @@
           "notificationType": {
             "$ref": "#/components/schemas/AppTerminationNotification.NotificationType"
           },
+          "operationAction": {
+            "$ref": "#/components/schemas/OperationActionType"
+          },
           "maxGracefulTimeout": {
             "$ref": "#/components/schemas/AppTerminationNotification.MaxGracefulTimeout"
           },
@@ -712,6 +734,15 @@
           }
         }
       },
+      "OperationActionType": {
+        "description": "Operation that is being performed on the MEC application instance.",
+        "type": "string",
+        "enum": [
+          "STOPPING",
+          "TERMINATING"
+        ],
+        "example": "TERMINATING"
+      },
       "ProblemDetails": {
         "type": "object",
         "properties": {
@@ -1073,10 +1104,10 @@
         "enum": [
           "DROP",
           "FORWARD_DECAPSULATED",
-          "FORWARD_AS_IS",
+          "FORWARD_ENCAPSULATED",
           "PASSTHROUGH",
           "DUPLICATE_DECAPSULATED",
-          "DUPLICATE_AS_IS"
+          "DUPLICATE_ENCAPSULATED"
         ],
         "example": "DROP"
       },
@@ -1285,7 +1316,7 @@
         }
       },
       "ApplicationsSubscriptions.201": {
-        "description": "Entity body in the request contains a subscription to the MEC service availability notifications that is to be created.",
+        "description": "Entity body in the request contains a subscription to the  MEC service availability notifications that is to be created.",
         "headers": {
           "location": {
             "description": "The resource URI of the created resource",
@@ -1485,6 +1516,15 @@
       }
     },
     "requestBodies": {
+      "ApplicationsConfirmTermination": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/AppTerminationConfirmation"
+            }
+          }
+        }
+      },
       "ApplicationsDnsRule": {
         "content": {
           "application/json": {

MecAppSupportApi.yaml

@@ -4,7 +4,7 @@ servers:
   - url: 'https://127.0.0.1:8081/mec_app_support/v1'
 info:
   title: MEC Application Support API
-  version: 2.0.9
+  version: 2.0.11
   description: The ETSI MEC ISG MEC011 MEC Application Support API described using OpenAPI
   license:
     name: ETSI Forge copyright notice
@@ -231,6 +231,8 @@ paths:
       responses:
         '204':
           description: No Content
+        '400':
+          $ref: '#/components/responses/Error.400'
         '401':
           $ref: '#/components/responses/Error.401'
         '403':
@@ -241,6 +243,8 @@ paths:
           $ref: '#/components/responses/Error.409'
         '429':
           $ref: '#/components/responses/Error.429'
+      requestBody:
+        $ref: '#/components/requestBodies/ApplicationsConfirmTermination'
   '/timing/timing_caps':
     get:
       description: >-
@@ -279,6 +283,15 @@ components:
   schemas:
     Empty:
       description: Empty schema
+    AppTerminationConfirmation:
+      description: >-
+        This type represents the information that the MEC application instance provides to the MEC platform when informing it that the application has completed its application level related terminate/stop actions, e.g. retention of application state in the case of stop.
+      type: object
+      required:
+        - operationAction
+      properties:
+        operationAction:
+          $ref: '#/components/schemas/OperationActionType'
     AppTerminationNotification.Links:
       description: >-
         Object containing hyperlinks related to the resource.
@@ -309,11 +322,14 @@ components:
       type: object
       required:
         - notificationType
+        - operationAction
         - maxGracefulTimeout
         - _links
       properties:
         notificationType:
           $ref: '#/components/schemas/AppTerminationNotification.NotificationType'
+        operationAction:
+          $ref: '#/components/schemas/OperationActionType'
         maxGracefulTimeout:
           $ref: '#/components/schemas/AppTerminationNotification.MaxGracefulTimeout'
         _links:
@@ -532,6 +548,13 @@ components:
       properties:
         _links:
           $ref: '#/components/schemas/MecAppSuptApiSubscriptionLinkList.Links'
+    OperationActionType:
+      description: Operation that is being performed on the MEC application instance.
+      type: string
+      enum:
+        - STOPPING
+        - TERMINATING
+      example: 'TERMINATING'
     ProblemDetails:
       type: object
       properties:
@@ -829,10 +852,10 @@ components:
       enum:
         - DROP
         - FORWARD_DECAPSULATED
-        - FORWARD_AS_IS
+        - FORWARD_ENCAPSULATED
         - PASSTHROUGH
         - DUPLICATE_DECAPSULATED
-        - DUPLICATE_AS_IS
+        - DUPLICATE_ENCAPSULATED
       example: 'DROP'
     TrafficRule.FilterType:
       description: >-
@@ -1144,6 +1167,11 @@ components:
           schema:
             $ref: '#/components/schemas/Empty'
   requestBodies:
+    ApplicationsConfirmTermination:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/AppTerminationConfirmation'
     ApplicationsDnsRule:
       content:
         application/json:

MecServiceMgmtApi.json

@@ -10,7 +10,7 @@
   ],
   "info": {
     "title": "MEC Service Management API",
-    "version": "2.0.10",
+    "version": "2.0.11",
     "description": "The ETSI MEC ISG MEC011 MEC Service Management API described using OpenAPI",
     "license": {
       "name": "ETSI Forge copyright notice",

MecServiceMgmtApi.yaml

@@ -4,7 +4,7 @@ servers:
   - url: 'https://127.0.0.1:8081/mec_service_mgmt/v1'
 info:
   title: MEC Service Management API
-  version: 2.0.10
+  version: 2.0.11
   description: The ETSI MEC ISG MEC011 MEC Service Management API described using OpenAPI
   license:
     name: ETSI Forge copyright notice