RICPLT-2980 SubResp go asn into use

Change-Id: I966d6200c614b1f5321038b361654a8d51abc090
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 6fc7d33..0567ad6 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -263,7 +263,7 @@ func (c *Control) handleSubscriptionRequest(params *RMRParams) {
 
        c.rmrSend("SubReq to E2T", subs, trans, packedData.Buf, len(packedData.Buf))
 
-       c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.Seq), subReqTime, FirstTry, c.handleSubscriptionRequestTimer)
+       c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.GetSubId()), subReqTime, FirstTry, c.handleSubscriptionRequestTimer)
        xapp.Logger.Debug("SubReq: Debugging trans table = %v", c.tracker.transactionXappTable)
        return
 }
@@ -271,22 +271,44 @@ func (c *Control) handleSubscriptionRequest(params *RMRParams) {
 func (c *Control) handleSubscriptionResponse(params *RMRParams) {
        xapp.Logger.Info("SubResp from E2T: %s", params.String())
 
-       payloadSeqNum, err := c.e2ap.GetSubscriptionResponseSequenceNumber(params.Payload)
+       //
+       //
+       //
+       SubRespMsg, err := c.e2ap.UnpackSubscriptionResponse(params.Payload)
        if err != nil {
-               xapp.Logger.Error("SubResp: Unable to get Sequence Number from Payload. Dropping this msg. Err: %v, SubId: %v, Xid: %s, Payload %X", err, params.SubId, params.Xid, params.Payload)
+               xapp.Logger.Error("SubDelReq: %s Dropping this msg. %s", err.Error(), params.String())
                return
        }
-       xapp.Logger.Info("SubResp: Received payloadSeqNum: %v", payloadSeqNum)
 
-       subs := c.registry.GetSubscription(payloadSeqNum)
+       //
+       //
+       //
+       subs := c.registry.GetSubscription(uint16(SubRespMsg.RequestId.Seq))
+       if subs == nil && params.SubId > 0 {
+               subs = c.registry.GetSubscription(uint16(params.SubId))
+       }
+
        if subs == nil {
-               xapp.Logger.Error("SubResp: Unknown payloadSeqNum. Dropping this msg. PayloadSeqNum: %v, SubId: %v", payloadSeqNum, params.SubId)
+               xapp.Logger.Error("SubResp: Not valid subscription found payloadSeqNum: %d, SubId: %d. Dropping this msg. %s", SubRespMsg.RequestId.Seq, params.SubId, params.String())
                return
        }
+       xapp.Logger.Info("SubResp: subscription found payloadSeqNum: %d, SubId: %d", SubRespMsg.RequestId.Seq, subs.GetSubId())
 
+       //
+       //
+       //
        trans := subs.GetTransaction()
+       if trans == nil {
+               xapp.Logger.Error("SubResp: Unknown trans. Dropping this msg. SubId: %d", subs.GetSubId())
+               return
+       }
 
-       c.timerMap.StopTimer("RIC_SUB_REQ", int(payloadSeqNum))
+       trans.SubRespMsg = SubRespMsg
+
+       //
+       //
+       //
+       c.timerMap.StopTimer("RIC_SUB_REQ", int(subs.GetSubId()))
 
        responseReceived := trans.CheckResponseReceived()
        if responseReceived == true {
@@ -294,10 +316,20 @@ func (c *Control) handleSubscriptionResponse(params *RMRParams) {
                return
        }
 
+       packedData, err := c.e2ap.PackSubscriptionResponse(trans.SubRespMsg)
+       if err != nil {
+               xapp.Logger.Error("SubResp: %s for trans %s", err.Error(), trans)
+               trans.Release()
+               return
+       }
+
+       //Optimize and store packed message to be sent.
+       trans.Payload = packedData.Buf
+       trans.PayloadLen = len(packedData.Buf)
+
        subs.Confirmed()
        trans.Release()
-       c.rmrReplyToSender("SubResp to xapp", subs, trans, params.Mtype, params.Payload, params.PayloadLen)
-       xapp.Logger.Info("SubResp: SubId: %v, from address: %s. Deleting trans record", payloadSeqNum, trans.RmrEndpoint)
+       c.rmrReplyToSender("SubResp to xapp", subs, trans, 12011, trans.Payload, trans.PayloadLen)
        return
 }
 
@@ -431,10 +463,11 @@ func (c *Control) handleSubscriptionRequestTimer(strId string, nbrId int, tryCou
 }
 
 func (c *Control) handleSubscriptionDeleteRequest(params *RMRParams) {
-       var subs *Subscription
-
        xapp.Logger.Info("SubDelReq from xapp: %s", params.String())
 
+       //
+       //
+       //
        trans, err := c.tracker.TrackTransaction(NewRmrEndpoint(params.Src),
                params.Mtype,
                params.Xid,
@@ -457,7 +490,10 @@ func (c *Control) handleSubscriptionDeleteRequest(params *RMRParams) {
                return
        }
 
-       subs = c.registry.GetSubscription(uint16(trans.SubDelReqMsg.RequestId.Seq))
+       //
+       //
+       //
+       subs := c.registry.GetSubscription(uint16(trans.SubDelReqMsg.RequestId.Seq))
        if subs == nil && params.SubId > 0 {
                subs = c.registry.GetSubscription(uint16(params.SubId))
        }

diff --git a/pkg/control/e2ap.go b/pkg/control/e2ap.go
index fe71f26..e8b5417 100644 (file)
--- a/pkg/control/e2ap.go
+++ b/pkg/control/e2ap.go
@@ -39,29 +39,6 @@ var packerif e2ap.E2APPackerIf = e2ap_wrapper.NewAsn1E2Packer()
 type E2ap struct {
 }
 
-/* RICsubscriptionResponse */
-
-// Used by submgr, xapp test stub
-func (c *E2ap) GetSubscriptionResponseSequenceNumber(payload []byte) (subId uint16, err error) {
-       cptr := unsafe.Pointer(&payload[0])
-       cret := C.e2ap_get_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)))
-       if cret < 0 {
-               return 0, fmt.Errorf("e2ap wrapper is unable to get Subscirption Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", cret)
-       }
-       subId = uint16(cret)
-       return
-}
-
-// Used by e2t test stub
-func (c *E2ap) SetSubscriptionResponseSequenceNumber(payload []byte, newSubscriptionid uint16) (err error) {
-       cptr := unsafe.Pointer(&payload[0])
-       size := C.e2ap_set_ric_subscription_response_sequence_number(cptr, C.size_t(len(payload)), C.long(newSubscriptionid))
-       if size < 0 {
-               return fmt.Errorf("e2ap wrapper is unable to set Subscription Response Sequence Number due to wrong or invalid payload. Erroxappde: %v", size)
-       }
-       return
-}
-
 /* RICsubscriptionDeleteResponse */
 
 // Used by submgr, e2t test stub
@@ -182,6 +159,37 @@ func (c *E2ap) PackSubscriptionRequest(req *e2ap.E2APSubscriptionRequest) (*pack
        return packedData, nil
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (c *E2ap) UnpackSubscriptionResponse(payload []byte) (*e2ap.E2APSubscriptionResponse, error) {
+       e2SubResp := packerif.NewPackerSubscriptionResponse()
+       packedData := &packer.PackedData{}
+       packedData.Buf = payload
+       err := e2SubResp.UnPack(packedData)
+       if err != nil {
+               return nil, err
+       }
+       err, subResp := e2SubResp.Get()
+       if err != nil {
+               return nil, err
+       }
+       return subResp, nil
+}
+
+func (c *E2ap) PackSubscriptionResponse(req *e2ap.E2APSubscriptionResponse) (*packer.PackedData, error) {
+       e2SubResp := packerif.NewPackerSubscriptionResponse()
+       err := e2SubResp.Set(req)
+       if err != nil {
+               return nil, err
+       }
+       err, packedData := e2SubResp.Pack(nil)
+       if err != nil {
+               return nil, err
+       }
+       return packedData, nil
+}
+
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -193,11 +201,11 @@ func (c *E2ap) UnpackSubscriptionDeleteRequest(payload []byte) (*e2ap.E2APSubscr
        if err != nil {
                return nil, err
        }
-       err, subReq := e2SubDelReq.Get()
+       err, subDelReq := e2SubDelReq.Get()
        if err != nil {
                return nil, err
        }
-       return subReq, nil
+       return subDelReq, nil
 }
 
 func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteRequest) (*packer.PackedData, error) {
@@ -213,6 +221,24 @@ func (c *E2ap) PackSubscriptionDeleteRequest(req *e2ap.E2APSubscriptionDeleteReq
        return packedData, nil
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (c *E2ap) UnpackSubscriptionDeleteResponse(payload []byte) (*e2ap.E2APSubscriptionDeleteResponse, error) {
+       e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
+       packedData := &packer.PackedData{}
+       packedData.Buf = payload
+       err := e2SubDelResp.UnPack(packedData)
+       if err != nil {
+               return nil, err
+       }
+       err, subDelResp := e2SubDelResp.Get()
+       if err != nil {
+               return nil, err
+       }
+       return subDelResp, nil
+}
+
 func (c *E2ap) PackSubscriptionDeleteResponse(req *e2ap.E2APSubscriptionDeleteResponse) (*packer.PackedData, error) {
        e2SubDelResp := packerif.NewPackerSubscriptionDeleteResponse()
        err := e2SubDelResp.Set(req)

diff --git a/pkg/control/transaction.go b/pkg/control/transaction.go
index 40c9e4d..010cf62 100644 (file)
--- a/pkg/control/transaction.go
+++ b/pkg/control/transaction.go
@@ -50,6 +50,7 @@ type Transaction struct {
        Xid               string                              //xapp xid in req
        Meid              *xapp.RMRMeid                       //meid transaction related
        SubReqMsg         *e2ap.E2APSubscriptionRequest       //SubReq TODO: maybe own transactions per type
+       SubRespMsg        *e2ap.E2APSubscriptionResponse      //SubResp TODO: maybe own transactions per type
        SubDelReqMsg      *e2ap.E2APSubscriptionDeleteRequest //SubDelReq TODO: maybe own transactions per type
        Payload           []byte                              //packed message to optimize retransmissions
        PayloadLen        int                                 //packed message len to optimize  retransmissions