X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frestapi%2Fembedded_spec.go;h=4506519874ac91d736fc1722308da746f60cd4bf;hb=fea604a8972776006ac5231425ea5799a93cf06c;hp=b031520f27af4807723aebbb47b2aeefcbefa4c3;hpb=9ea6c7860300c299b9fe68caaf8aff61b3ec71d2;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/restapi/embedded_spec.go b/pkg/restapi/embedded_spec.go
index b031520..4506519 100644
--- a/pkg/restapi/embedded_spec.go
+++ b/pkg/restapi/embedded_spec.go
@@ -29,7 +29,7 @@ func init() {
       "name": "Apache 2.0",
       "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "version": "0.0.1"
+    "version": "0.0.2"
   },
   "host": "hostname",
   "basePath": "/ric/v1",
@@ -156,12 +156,10 @@ func init() {
   },
   "definitions": {
     "ActionDefinition": {
-      "description": "E2SM Octet string. ActionDefinition is an OPTIONAL IE",
-      "type": "object",
-      "properties": {
-        "OctetString": {
-          "type": "string"
-        }
+      "description": "E2SM byte array. ActionDefinition is an OPTIONAL IE",
+      "type": "array",
+      "items": {
+        "type": "integer"
       }
     },
     "ActionToBeSetup": {
@@ -220,12 +218,10 @@ func init() {
       }
     },
     "EventTriggerDefinition": {
-      "description": "E2SM Octet string",
-      "type": "object",
-      "properties": {
-        "OctetString": {
-          "type": "string"
-        }
+      "description": "E2SM byte array",
+      "type": "array",
+      "items": {
+        "type": "integer"
       }
     },
     "SubscriptionData": {
@@ -254,8 +250,7 @@ func init() {
     "SubscriptionDetail": {
       "type": "object",
       "required": [
-        "RequestorId",
-        "InstanceId",
+        "XappEventInstanceId",
         "EventTriggers",
         "ActionToBeSetupList"
       ],
@@ -266,11 +261,7 @@ func init() {
         "EventTriggers": {
           "$ref": "#/definitions/EventTriggerDefinition"
         },
-        "InstanceId": {
-          "type": "integer",
-          "maximum": 65535
-        },
-        "RequestorId": {
+        "XappEventInstanceId": {
           "type": "integer",
           "maximum": 65535
         }
@@ -285,20 +276,20 @@ func init() {
     "SubscriptionInstance": {
       "type": "object",
       "required": [
-        "RequestorId",
-        "InstanceId",
+        "XappEventInstanceId",
+        "E2EventInstanceId",
         "ErrorCause"
       ],
       "properties": {
+        "E2EventInstanceId": {
+          "type": "integer",
+          "maximum": 65535
+        },
         "ErrorCause": {
           "description": "Empty string when no error.",
           "type": "string"
         },
-        "InstanceId": {
-          "type": "integer",
-          "maximum": 65535
-        },
-        "RequestorId": {
+        "XappEventInstanceId": {
           "type": "integer",
           "maximum": 65535
         }
@@ -349,6 +340,10 @@ func init() {
         },
         "SubscriptionDetails": {
           "$ref": "#/definitions/SubscriptionDetailsList"
+        },
+        "SubscriptionId": {
+          "description": "Optional subscription ID (Submgr allocates if not given)",
+          "type": "string"
         }
       }
     },
@@ -446,7 +441,7 @@ func init() {
       "name": "Apache 2.0",
       "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "version": "0.0.1"
+    "version": "0.0.2"
   },
   "host": "hostname",
   "basePath": "/ric/v1",
@@ -573,12 +568,10 @@ func init() {
   },
   "definitions": {
     "ActionDefinition": {
-      "description": "E2SM Octet string. ActionDefinition is an OPTIONAL IE",
-      "type": "object",
-      "properties": {
-        "OctetString": {
-          "type": "string"
-        }
+      "description": "E2SM byte array. ActionDefinition is an OPTIONAL IE",
+      "type": "array",
+      "items": {
+        "type": "integer"
       }
     },
     "ActionToBeSetup": {
@@ -638,12 +631,10 @@ func init() {
       }
     },
     "EventTriggerDefinition": {
-      "description": "E2SM Octet string",
-      "type": "object",
-      "properties": {
-        "OctetString": {
-          "type": "string"
-        }
+      "description": "E2SM byte array",
+      "type": "array",
+      "items": {
+        "type": "integer"
       }
     },
     "SubscriptionData": {
@@ -672,8 +663,7 @@ func init() {
     "SubscriptionDetail": {
       "type": "object",
       "required": [
-        "RequestorId",
-        "InstanceId",
+        "XappEventInstanceId",
         "EventTriggers",
         "ActionToBeSetupList"
       ],
@@ -684,12 +674,7 @@ func init() {
         "EventTriggers": {
           "$ref": "#/definitions/EventTriggerDefinition"
         },
-        "InstanceId": {
-          "type": "integer",
-          "maximum": 65535,
-          "minimum": 0
-        },
-        "RequestorId": {
+        "XappEventInstanceId": {
           "type": "integer",
           "maximum": 65535,
           "minimum": 0
@@ -705,21 +690,21 @@ func init() {
     "SubscriptionInstance": {
       "type": "object",
       "required": [
-        "RequestorId",
-        "InstanceId",
+        "XappEventInstanceId",
+        "E2EventInstanceId",
         "ErrorCause"
       ],
       "properties": {
-        "ErrorCause": {
-          "description": "Empty string when no error.",
-          "type": "string"
-        },
-        "InstanceId": {
+        "E2EventInstanceId": {
           "type": "integer",
           "maximum": 65535,
           "minimum": 0
         },
-        "RequestorId": {
+        "ErrorCause": {
+          "description": "Empty string when no error.",
+          "type": "string"
+        },
+        "XappEventInstanceId": {
           "type": "integer",
           "maximum": 65535,
           "minimum": 0
@@ -774,6 +759,32 @@ func init() {
         },
         "SubscriptionDetails": {
           "$ref": "#/definitions/SubscriptionDetailsList"
+        },
+        "SubscriptionId": {
+          "description": "Optional subscription ID (Submgr allocates if not given)",
+          "type": "string"
+        }
+      }
+    },
+    "SubscriptionParamsClientEndpoint": {
+      "description": "xApp service address and port",
+      "type": "object",
+      "properties": {
+        "HTTPPort": {
+          "description": "xApp HTTP service address port",
+          "type": "integer",
+          "maximum": 65535,
+          "minimum": 0
+        },
+        "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
         }
       }
     },