Further enhancements

[ric-plt/xapp-frame.git] / pkg / restapi / embedded_spec.go

diff --git a/pkg/restapi/embedded_spec.go b/pkg/restapi/embedded_spec.go
index 5fcc66f..b031520 100644 (file)
--- a/pkg/restapi/embedded_spec.go
+++ b/pkg/restapi/embedded_spec.go
@@ -231,7 +231,7 @@ func init() {
     "SubscriptionData": {
       "type": "object",
       "properties": {
-        "Endpoint": {
+        "ClientEndpoint": {
           "type": "array",
           "items": {
             "type": "string"
@@ -242,28 +242,44 @@ func init() {
         },
         "SubscriptionId": {
           "type": "integer"
+        },
+        "SubscriptionInstances": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubscriptionInstance"
+          }
         }
       }
     },
-    "SubscriptionDetails": {
+    "SubscriptionDetail": {
       "type": "object",
       "required": [
-        "EventTriggerList",
+        "RequestorId",
+        "InstanceId",
+        "EventTriggers",
         "ActionToBeSetupList"
       ],
       "properties": {
         "ActionToBeSetupList": {
           "$ref": "#/definitions/ActionsToBeSetup"
         },
-        "EventTriggerList": {
+        "EventTriggers": {
           "$ref": "#/definitions/EventTriggerDefinition"
+        },
+        "InstanceId": {
+          "type": "integer",
+          "maximum": 65535
+        },
+        "RequestorId": {
+          "type": "integer",
+          "maximum": 65535
         }
       }
     },
     "SubscriptionDetailsList": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/SubscriptionDetails"
+        "$ref": "#/definitions/SubscriptionDetail"
       }
     },
     "SubscriptionInstance": {
@@ -300,8 +316,6 @@ func init() {
       "required": [
         "ClientEndpoint",
         "Meid",
-        "RequestorId",
-        "InstanceId",
         "RANFunctionID",
         "SubscriptionDetails"
       ],
@@ -310,21 +324,22 @@ func init() {
           "description": "xApp service address and port",
           "type": "object",
           "properties": {
-            "Port": {
-              "description": "xApp service address port",
+            "HTTPPort": {
+              "description": "xApp HTTP service address port",
               "type": "integer",
               "maximum": 65535
             },
-            "ServiceName": {
+            "Host": {
               "description": "xApp service address name like 'service-ricxapp-xappname-http.ricxapp'",
               "type": "string"
+            },
+            "RMRPort": {
+              "description": "xApp RMR service address port",
+              "type": "integer",
+              "maximum": 65535
             }
           }
         },
-        "InstanceId": {
-          "type": "integer",
-          "maximum": 65535
-        },
         "Meid": {
           "type": "string"
         },
@@ -332,10 +347,6 @@ func init() {
           "type": "integer",
           "maximum": 4095
         },
-        "RequestorId": {
-          "type": "integer",
-          "maximum": 65535
-        },
         "SubscriptionDetails": {
           "$ref": "#/definitions/SubscriptionDetailsList"
         }
@@ -638,7 +649,7 @@ func init() {
     "SubscriptionData": {
       "type": "object",
       "properties": {
-        "Endpoint": {
+        "ClientEndpoint": {
           "type": "array",
           "items": {
             "type": "string"
@@ -649,28 +660,46 @@ func init() {
         },
         "SubscriptionId": {
           "type": "integer"
+        },
+        "SubscriptionInstances": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubscriptionInstance"
+          }
         }
       }
     },
-    "SubscriptionDetails": {
+    "SubscriptionDetail": {
       "type": "object",
       "required": [
-        "EventTriggerList",
+        "RequestorId",
+        "InstanceId",
+        "EventTriggers",
         "ActionToBeSetupList"
       ],
       "properties": {
         "ActionToBeSetupList": {
           "$ref": "#/definitions/ActionsToBeSetup"
         },
-        "EventTriggerList": {
+        "EventTriggers": {
           "$ref": "#/definitions/EventTriggerDefinition"
+        },
+        "InstanceId": {
+          "type": "integer",
+          "maximum": 65535,
+          "minimum": 0
+        },
+        "RequestorId": {
+          "type": "integer",
+          "maximum": 65535,
+          "minimum": 0
         }
       }
     },
     "SubscriptionDetailsList": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/SubscriptionDetails"
+        "$ref": "#/definitions/SubscriptionDetail"
       }
     },
     "SubscriptionInstance": {
@@ -709,8 +738,6 @@ func init() {
       "required": [
         "ClientEndpoint",
         "Meid",
-        "RequestorId",
-        "InstanceId",
         "RANFunctionID",
         "SubscriptionDetails"
       ],
@@ -719,23 +746,24 @@ func init() {
           "description": "xApp service address and port",
           "type": "object",
           "properties": {
-            "Port": {
-              "description": "xApp service address port",
+            "HTTPPort": {
+              "description": "xApp HTTP service address port",
               "type": "integer",
               "maximum": 65535,
               "minimum": 0
             },
-            "ServiceName": {
+            "Host": {
               "description": "xApp service address name like 'service-ricxapp-xappname-http.ricxapp'",
               "type": "string"
+            },
+            "RMRPort": {
+              "description": "xApp RMR service address port",
+              "type": "integer",
+              "maximum": 65535,
+              "minimum": 0
             }
           }
         },
-        "InstanceId": {
-          "type": "integer",
-          "maximum": 65535,
-          "minimum": 0
-        },
         "Meid": {
           "type": "string"
         },
@@ -744,11 +772,6 @@ func init() {
           "maximum": 4095,
           "minimum": 0
         },
-        "RequestorId": {
-          "type": "integer",
-          "maximum": 65535,
-          "minimum": 0
-        },
         "SubscriptionDetails": {
           "$ref": "#/definitions/SubscriptionDetailsList"
         }