Code Review
/
ric-plt
/
xapp-frame.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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": {
"SubscriptionData": {
"type": "object",
"properties": {
- "Endpoint": {
+ "
Client
Endpoint": {
"type": "array",
"items": {
"type": "string"
"type": "array",
"items": {
"type": "string"
@@
-242,28
+242,44
@@
func init() {
},
"SubscriptionId": {
"type": "integer"
},
"SubscriptionId": {
"type": "integer"
+ },
+ "SubscriptionInstances": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/SubscriptionInstance"
+ }
}
}
},
}
}
},
- "SubscriptionDetail
s
": {
+ "SubscriptionDetail": {
"type": "object",
"required": [
"type": "object",
"required": [
- "EventTriggerList",
+ "RequestorId",
+ "InstanceId",
+ "EventTriggers",
"ActionToBeSetupList"
],
"properties": {
"ActionToBeSetupList": {
"$ref": "#/definitions/ActionsToBeSetup"
},
"ActionToBeSetupList"
],
"properties": {
"ActionToBeSetupList": {
"$ref": "#/definitions/ActionsToBeSetup"
},
- "EventTrigger
List
": {
+ "EventTrigger
s
": {
"$ref": "#/definitions/EventTriggerDefinition"
"$ref": "#/definitions/EventTriggerDefinition"
+ },
+ "InstanceId": {
+ "type": "integer",
+ "maximum": 65535
+ },
+ "RequestorId": {
+ "type": "integer",
+ "maximum": 65535
}
}
},
"SubscriptionDetailsList": {
"type": "array",
"items": {
}
}
},
"SubscriptionDetailsList": {
"type": "array",
"items": {
- "$ref": "#/definitions/SubscriptionDetail
s
"
+ "$ref": "#/definitions/SubscriptionDetail"
}
},
"SubscriptionInstance": {
}
},
"SubscriptionInstance": {
@@
-300,8
+316,6
@@
func init() {
"required": [
"ClientEndpoint",
"Meid",
"required": [
"ClientEndpoint",
"Meid",
- "RequestorId",
- "InstanceId",
"RANFunctionID",
"SubscriptionDetails"
],
"RANFunctionID",
"SubscriptionDetails"
],
@@
-310,21
+324,22
@@
func init() {
"description": "xApp service address and port",
"type": "object",
"properties": {
"description": "xApp service address and port",
"type": "object",
"properties": {
- "Port": {
- "description": "xApp service address port",
+ "
HTTP
Port": {
+ "description": "xApp
HTTP
service address port",
"type": "integer",
"maximum": 65535
},
"type": "integer",
"maximum": 65535
},
- "
ServiceName
": {
+ "
Host
": {
"description": "xApp service address name like 'service-ricxapp-xappname-http.ricxapp'",
"type": "string"
"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"
},
"Meid": {
"type": "string"
},
@@
-332,10
+347,6
@@
func init() {
"type": "integer",
"maximum": 4095
},
"type": "integer",
"maximum": 4095
},
- "RequestorId": {
- "type": "integer",
- "maximum": 65535
- },
"SubscriptionDetails": {
"$ref": "#/definitions/SubscriptionDetailsList"
}
"SubscriptionDetails": {
"$ref": "#/definitions/SubscriptionDetailsList"
}
@@
-638,7
+649,7
@@
func init() {
"SubscriptionData": {
"type": "object",
"properties": {
"SubscriptionData": {
"type": "object",
"properties": {
- "Endpoint": {
+ "
Client
Endpoint": {
"type": "array",
"items": {
"type": "string"
"type": "array",
"items": {
"type": "string"
@@
-649,28
+660,46
@@
func init() {
},
"SubscriptionId": {
"type": "integer"
},
"SubscriptionId": {
"type": "integer"
+ },
+ "SubscriptionInstances": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/SubscriptionInstance"
+ }
}
}
},
}
}
},
- "SubscriptionDetail
s
": {
+ "SubscriptionDetail": {
"type": "object",
"required": [
"type": "object",
"required": [
- "EventTriggerList",
+ "RequestorId",
+ "InstanceId",
+ "EventTriggers",
"ActionToBeSetupList"
],
"properties": {
"ActionToBeSetupList": {
"$ref": "#/definitions/ActionsToBeSetup"
},
"ActionToBeSetupList"
],
"properties": {
"ActionToBeSetupList": {
"$ref": "#/definitions/ActionsToBeSetup"
},
- "EventTrigger
List
": {
+ "EventTrigger
s
": {
"$ref": "#/definitions/EventTriggerDefinition"
"$ref": "#/definitions/EventTriggerDefinition"
+ },
+ "InstanceId": {
+ "type": "integer",
+ "maximum": 65535,
+ "minimum": 0
+ },
+ "RequestorId": {
+ "type": "integer",
+ "maximum": 65535,
+ "minimum": 0
}
}
},
"SubscriptionDetailsList": {
"type": "array",
"items": {
}
}
},
"SubscriptionDetailsList": {
"type": "array",
"items": {
- "$ref": "#/definitions/SubscriptionDetail
s
"
+ "$ref": "#/definitions/SubscriptionDetail"
}
},
"SubscriptionInstance": {
}
},
"SubscriptionInstance": {
@@
-709,8
+738,6
@@
func init() {
"required": [
"ClientEndpoint",
"Meid",
"required": [
"ClientEndpoint",
"Meid",
- "RequestorId",
- "InstanceId",
"RANFunctionID",
"SubscriptionDetails"
],
"RANFunctionID",
"SubscriptionDetails"
],
@@
-719,23
+746,24
@@
func init() {
"description": "xApp service address and port",
"type": "object",
"properties": {
"description": "xApp service address and port",
"type": "object",
"properties": {
- "Port": {
- "description": "xApp service address port",
+ "
HTTP
Port": {
+ "description": "xApp
HTTP
service address port",
"type": "integer",
"maximum": 65535,
"minimum": 0
},
"type": "integer",
"maximum": 65535,
"minimum": 0
},
- "
ServiceName
": {
+ "
Host
": {
"description": "xApp service address name like 'service-ricxapp-xappname-http.ricxapp'",
"type": "string"
"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"
},
"Meid": {
"type": "string"
},
@@
-744,11
+772,6
@@
func init() {
"maximum": 4095,
"minimum": 0
},
"maximum": 4095,
"minimum": 0
},
- "RequestorId": {
- "type": "integer",
- "maximum": 65535,
- "minimum": 0
- },
"SubscriptionDetails": {
"$ref": "#/definitions/SubscriptionDetailsList"
}
"SubscriptionDetails": {
"$ref": "#/definitions/SubscriptionDetailsList"
}