X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Swagger%2FE2Manager_API.yaml;h=1bab2f6ed6789b3da2ae2d94feb3e6b3bee3ff72;hb=8421172ad7f749e00af600b5533ec7ab3d1ff3d1;hp=ab9ae5445ac874a64fac75bb9dd7e8062a9f4a13;hpb=a0a0af06b43d30f837a8865e924f8587fb42c3f3;p=ric-plt%2Fe2mgr.git

diff --git a/Swagger/E2Manager_API.yaml b/Swagger/E2Manager_API.yaml
index ab9ae54..1bab2f6 100644
--- a/Swagger/E2Manager_API.yaml
+++ b/Swagger/E2Manager_API.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: E2 Manager Service
   description: E2 Manager Service APIs
-  version: 5.2.10
+  version: 5.2.21
 servers:
   - url: 'http://{apiRoot}/v1'
     variables:
@@ -28,7 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/GetNodebResponse'
+                $ref: '#/components/schemas/NodebResponse'
         '400':
           description: The specified RAN name is invalid
           content:
@@ -47,24 +47,17 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  '/nodeb/{ranName}/update':
-    put:
-      summary: Update GNB
+  /nodeb/enb:
+    post:
+      summary: Add eNB
       tags:
         - nodeb
-      operationId: UpdateGnb
-      parameters:
-        - name: ranName
-          in: path
-          required: true
-          description: Name of GNB RAN to update
-          schema:
-            type: string
+      operationId: AddEnb
       requestBody:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/UpdateGnbRequest'
+              $ref: '#/components/schemas/AddEnbRequest'
         required: true
       responses:
         '200':
@@ -72,7 +65,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/UpdateGnbResponse'
+                $ref: '#/components/schemas/NodebResponse'
         '400':
           description: Invalid input
           content:
@@ -85,17 +78,62 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  '/nodeb/enb':
-    post:
-      summary: Add ENB
+
+  '/nodeb/enb/{ranName}':
+    delete:
       tags:
         - nodeb
-      operationId: AddEnb
+      summary: Delete eNB
+      operationId: DeleteEnb
+      parameters:
+        - name: ranName
+          in: path
+          required: true
+          description: Name of RAN to delete
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/NodebResponse'
+        '400':
+          description: The specified RAN is not ENB
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '404':
+          description: A RAN with the specified name was not found
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '500':
+          description: Internal Error
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+    put:
+      tags:
+        - nodeb
+      summary: Update eNB
+      operationId: UpdateEnb
+      parameters:
+        - name: ranName
+          in: path
+          required: true
+          description: Name of ENB ran to update
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/AddEnbRequest'
+              $ref: '#/components/schemas/UpdateEnbRequest'
         required: true
       responses:
         '200':
@@ -103,7 +141,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/AddEnbResponse'
+                $ref: '#/components/schemas/NodebResponse'
         '400':
           description: Invalid input
           content:
@@ -116,40 +154,40 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  '/nodeb/enb/{ranName}':
-    delete:
+  '/nodeb/gnb/{ranName}':
+    put:
+      summary: Update gNB Cells
       tags:
         - nodeb
-      summary: Delete ENB
-      operationId: DeleteEnb
+      operationId: UpdateGnb
       parameters:
         - name: ranName
           in: path
           required: true
-          description: Name of RAN to delete
+          description: Name of GNB RAN to update
           schema:
             type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UpdateGnbRequest'
+        required: true
       responses:
         '200':
           description: Successful operation
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/DeleteEnbResponse'
+                $ref: '#/components/schemas/NodebResponse'
         '400':
-          description: The specified RAN is not ENB
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ErrorResponse'
-        '404':
-          description: A RAN with the specified name was not found
+          description: Invalid input
           content:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
         '500':
-          description: Internal Error
+          description: Internal error
           content:
             application/problem+json:
               schema:
@@ -174,7 +212,7 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  /nodeb/ids:
+  /nodeb/states:
     get:
       tags:
         - nodeb
@@ -256,99 +294,6 @@ paths:
                 $ref: '#/components/schemas/ErrorResponse'
 components:
   schemas:
-    AddEnbRequest:
-      type: object
-      required:
-        - ranName
-        - globalNbId
-        - enb
-      properties:
-        ranName:
-          type: string
-        globalNbId:
-          properties:
-            nbId:
-              type: string
-            plmnId:
-              type: string
-        ip:
-          type: string
-        port:
-          type: integer
-        enb:
-          $ref: '#/components/schemas/Enb'
-      additionalProperties: false
-
-    AddEnbResponse:
-      properties:
-        connectionStatus:
-          oneOf:
-            - type: string
-            - type: integer
-        failureType:
-          oneOf:
-            - type: string
-            - type: integer
-        globalNbId:
-          properties:
-            nbId:
-              type: string
-            plmnId:
-              type: string
-          additionalProperties: false
-          type: object
-        enb:
-          $ref: '#/components/schemas/Enb'
-        ip:
-          type: string
-        nodeType:
-          oneOf:
-            - type: string
-            - type: integer
-        port:
-          type: integer
-        ranName:
-          type: string
-        setupFailure:
-          $ref: '#/components/schemas/SetupFailure'
-      additionalProperties: false
-      type: object
-
-    DeleteEnbResponse:
-      properties:
-        connectionStatus:
-          oneOf:
-            - type: string
-            - type: integer
-        failureType:
-          oneOf:
-            - type: string
-            - type: integer
-        globalNbId:
-          properties:
-            nbId:
-              type: string
-            plmnId:
-              type: string
-          additionalProperties: false
-          type: object
-        enb:
-          $ref: '#/components/schemas/Enb'
-        ip:
-          type: string
-        nodeType:
-          oneOf:
-            - type: string
-            - type: integer
-        port:
-          type: integer
-        ranName:
-          type: string
-        setupFailure:
-          $ref: '#/components/schemas/SetupFailure'
-      additionalProperties: false
-      type: object
-
     UpdateGnbRequest:
       type: object
       required:
@@ -357,40 +302,14 @@ components:
         servedNrCells:
           $ref: '#/components/schemas/ServedNrCells'
       additionalProperties: false
-    UpdateGnbResponse:
+    UpdateEnbRequest:
+      type: object
+      required:
+        - enb
       properties:
-        connectionStatus:
-          oneOf:
-            - type: string
-            - type: integer
-        failureType:
-          oneOf:
-            - type: string
-            - type: integer
-        globalNbId:
-          properties:
-            nbId:
-              type: string
-            plmnId:
-              type: string
-          additionalProperties: false
-          type: object
-        gnb:
-          $ref: '#/components/schemas/Gnb'
-        ip:
-          type: string
-        nodeType:
-          oneOf:
-            - type: string
-            - type: integer
-        port:
-          type: integer
-        ranName:
-          type: string
-        setupFailure:
-          $ref: '#/components/schemas/SetupFailure'
+        enb:
+          $ref: '#/components/schemas/Enb'
       additionalProperties: false
-      type: object
     SetConfiguration:
       type: object
       required:
@@ -411,41 +330,6 @@ components:
         inventoryName:
           type: string
       type: object
-    GetNodebResponse:
-      properties:
-        connectionStatus:
-          oneOf:
-            - type: string
-            - type: integer
-        enb:
-          $ref: '#/components/schemas/Enb'
-        failureType:
-          oneOf:
-            - type: string
-            - type: integer
-        globalNbId:
-          properties:
-            nbId:
-              type: string
-            plmnId:
-              type: string
-          type: object
-        gnb:
-          $ref: '#/components/schemas/Gnb'
-        ip:
-          type: string
-        nodeType:
-          oneOf:
-            - type: string
-            - type: integer
-        port:
-          type: integer
-        ranName:
-          type: string
-        setupFailure:
-          $ref: '#/components/schemas/SetupFailure'
-      additionalProperties: false
-      type: object
     ErrorResponse:
       type: object
       required:
@@ -673,6 +557,10 @@ components:
       type: object
     Gnb:
       properties:
+        gnbType:
+          oneOf:
+            - type: string
+            - type: integer
         servedNrCells:
           $ref: '#/components/schemas/ServedNrCells'
         ranFunctions:
@@ -1081,6 +969,28 @@ components:
             - type: integer
       additionalProperties: false
       type: object
+    AddEnbRequest:
+      type: object
+      required:
+        - ranName
+        - globalNbId
+        - enb
+      properties:
+        ranName:
+          type: string
+        globalNbId:
+          properties:
+            nbId:
+              type: string
+            plmnId:
+              type: string
+        ip:
+          type: string
+        port:
+          type: integer
+        enb:
+          $ref: '#/components/schemas/Enb'
+      additionalProperties: false
     AdditionalCellInformation:
       properties:
         cellLatitude:
@@ -1100,3 +1010,40 @@ components:
         sectorId:
           type: integer
       type: object
+    NodebResponse:
+      properties:
+        connectionStatus:
+          oneOf:
+            - type: string
+            - type: integer
+        enb:
+          $ref: '#/components/schemas/Enb'
+        failureType:
+          oneOf:
+            - type: string
+            - type: integer
+        globalNbId:
+          properties:
+            nbId:
+              type: string
+            plmnId:
+              type: string
+          type: object
+        gnb:
+          $ref: '#/components/schemas/Gnb'
+        ip:
+          type: string
+        nodeType:
+          oneOf:
+            - type: string
+            - type: integer
+        port:
+          type: integer
+        ranName:
+          type: string
+        setupFailure:
+          $ref: '#/components/schemas/SetupFailure'
+        setupFromNetwork:
+          type: boolean
+      additionalProperties: false
+      type: object