X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fcontrol%2Ftypes.go;h=0123357b858f3cb91add939b1df168df55a609c7;hb=refs%2Fchanges%2F57%2F6857%2F1;hp=22c44b3fd11877114f94fd74d9b0fe9057f5326c;hpb=e406a34d5547107533e65ddfbb2074e96d77b4b3;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/types.go b/pkg/control/types.go
index 22c44b3..0123357 100644
--- a/pkg/control/types.go
+++ b/pkg/control/types.go
@@ -20,71 +20,54 @@
 package control
 
 import (
-	"bytes"
-	"fmt"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"strconv"
-)
+	"time"
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RmrDatagram struct {
-	MessageType    int
-	SubscriptionId uint16
-	Payload        []byte
-}
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
+)
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type SubRouteInfo struct {
-	Command Action
-	Address string
-	Port    uint16
-	SubID   uint16
+type RequestId struct {
+	e2ap.RequestId
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type RmrEndpoint struct {
-	Addr string // xapp addr
-	Port uint16 // xapp port
+func (rid *RequestId) String() string {
+	return "reqid(" + rid.RequestId.String() + ")"
 }
 
-func (endpoint RmrEndpoint) String() string {
-	return endpoint.Addr + ":" + strconv.FormatUint(uint64(endpoint.Port), 10)
+type Sdlnterface interface {
+	Set(pairs ...interface{}) error
+	Get(keys []string) (map[string]interface{}, error)
+	GetAll() ([]string, error)
+	Remove(keys []string) error
+	RemoveAll() error
 }
 
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type Action int
+type E2SubscriptionDirectives struct {
+	// How many times E2 subscription request is retried
+	// Required: true
+	// Maximum: 10
+	// Minimum: 0
+	E2MaxTryCount int64
 
-func (act Action) String() string {
-	actions := [...]string{
-		"CREATE",
-		"MERGE",
-		"NONE",
-		"DELETE",
-	}
+	// How long time response is waited from E2 node
+	// Maximum: 10s
+	// Minimum: 1s
+	E2TimeoutTimerValue time.Duration
 
-	if act < CREATE || act > DELETE {
-		return "UNKNOWN"
-	}
-	return actions[act]
+	// Subscription needs RMR route from E2Term to xApp
+	CreateRMRRoute bool
 }
 
-//-----------------------------------------------------------------------------
-// To add own method for rmrparams
-//-----------------------------------------------------------------------------
-type RMRParams struct {
-	*xapp.RMRParams
+type ErrorInfo struct {
+	ErrorCause  string
+	ErrorSource string
+	TimeoutType string
 }
 
-func (params *RMRParams) String() string {
-	var b bytes.Buffer
-	fmt.Fprintf(&b, "Src: %s, Mtype: %s(%d), SubId: %v, Xid: %s, Meid: %v", params.Src, xapp.RicMessageTypeToName[params.Mtype], params.Mtype, params.SubId, params.Xid, params.Meid)
-	return b.String()
+func (e *ErrorInfo) SetInfo(errorCause string, errorSource string, timeoutType string) {
+	e.ErrorCause = errorCause
+	e.ErrorSource = errorSource
+	e.TimeoutType = timeoutType
 }