X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fmain_test.go;h=dffff770d1603c497058f68ab755f548fb2eae1c;hb=refs%2Fchanges%2F97%2F2197%2F6;hp=155f92ceb9086399e540b2846532858932226082;hpb=a189c866d786c2dbde19d34d9dd2404e17b3e407;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/main_test.go b/pkg/control/main_test.go
index 155f92c..dffff77 100644
--- a/pkg/control/main_test.go
+++ b/pkg/control/main_test.go
@@ -21,7 +21,6 @@ package control
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/rtmgr_models"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
@@ -71,22 +70,23 @@ type testingRmrControl struct {
 	rmrClientTest *xapp.RMRClient
 }
 
-func (tc *testingRmrControl) RmrSend(params *xapp.RMRParams) (err error) {
+func (tc *testingRmrControl) RmrSend(params *RMRParams) (err error) {
 	//
 	//NOTE: Do this way until xapp-frame sending is improved
 	//
+	xapp.Logger.Info("(%s) RmrSend %s", tc.desc, params.String())
 	status := false
 	i := 1
 	for ; i <= 10 && status == false; i++ {
-		status = tc.rmrClientTest.SendMsg(params)
+		status = tc.rmrClientTest.SendMsg(params.RMRParams)
 		if status == false {
-			xapp.Logger.Info("rmr.Send() failed. Retry count %v, Mtype: %v, SubId: %v, Xid %s", i, params.Mtype, params.SubId, params.Xid)
+			xapp.Logger.Info("(%s) RmrSend failed. Retry count %v, %s", tc.desc, i, params.String())
 			time.Sleep(500 * time.Millisecond)
 		}
 	}
 	if status == false {
-		err = errors.New("rmr.Send() failed")
-		tc.rmrClientTest.Free(params.Mbuf)
+		err = fmt.Errorf("(%s) RmrSend failed. Retry count %v, %s", tc.desc, i, params.String())
+		xapp.Rmr.Free(params.Mbuf)
 	}
 	return
 }
@@ -105,12 +105,12 @@ func initTestingRmrControl(desc string, rtfile string, port string, stat string,
 //
 //-----------------------------------------------------------------------------
 type testingMessageChannel struct {
-	rmrConChan chan *xapp.RMRParams
+	rmrConChan chan *RMRParams
 }
 
 func initTestingMessageChannel() testingMessageChannel {
 	mc := testingMessageChannel{}
-	mc.rmrConChan = make(chan *xapp.RMRParams)
+	mc.rmrConChan = make(chan *RMRParams)
 	return mc
 }
 
@@ -148,13 +148,16 @@ func (tc *testingXappControl) newXappTransaction(xid *string, ranname string) *x
 	return trans
 }
 
-func (tc *testingXappControl) Consume(msg *xapp.RMRParams) (err error) {
+func (tc *testingXappControl) Consume(params *xapp.RMRParams) (err error) {
+	xapp.Rmr.Free(params.Mbuf)
+	params.Mbuf = nil
+	msg := &RMRParams{params}
 
 	if strings.Contains(msg.Xid, tc.desc) {
-		xapp.Logger.Info("(%s) Consume mtype=%s subid=%d xid=%s", tc.desc, xapp.RicMessageTypeToName[msg.Mtype], msg.SubId, msg.Xid)
+		xapp.Logger.Info("(%s) Consume %s", tc.desc, msg.String())
 		tc.rmrConChan <- msg
 	} else {
-		xapp.Logger.Info("(%s) Ignore mtype=%s subid=%d xid=%s, Expected xid to contain %s", tc.desc, xapp.RicMessageTypeToName[msg.Mtype], msg.SubId, msg.Xid, tc.desc)
+		xapp.Logger.Info("(%s) Ignore %s", tc.desc, msg.String())
 	}
 	return
 }
@@ -175,8 +178,11 @@ type testingE2termControl struct {
 	testingMessageChannel
 }
 
-func (tc *testingE2termControl) Consume(msg *xapp.RMRParams) (err error) {
-	xapp.Logger.Info("(%s) Consume mtype=%s subid=%d xid=%s", tc.desc, xapp.RicMessageTypeToName[msg.Mtype], msg.SubId, msg.Xid)
+func (tc *testingE2termControl) Consume(params *xapp.RMRParams) (err error) {
+	xapp.Rmr.Free(params.Mbuf)
+	params.Mbuf = nil
+	msg := &RMRParams{params}
+	xapp.Logger.Info("(%s) Consume %s", tc.desc, msg.String())
 	tc.rmrConChan <- msg
 	return
 }
@@ -245,6 +251,29 @@ var mainCtrl *testingMainControl
 func TestMain(m *testing.M) {
 	xapp.Logger.Info("TestMain start")
 
+	//---------------------------------
+	//
+	//---------------------------------
+	http_handler := func(w http.ResponseWriter, r *http.Request) {
+		var req rtmgr_models.XappSubscriptionData
+		err := json.NewDecoder(r.Body).Decode(&req)
+		if err != nil {
+			xapp.Logger.Error("%s", err.Error())
+		}
+		xapp.Logger.Info("(http handler) handling Address=%s Port=%d SubscriptionID=%d", *req.Address, *req.Port, *req.SubscriptionID)
+
+		w.WriteHeader(200)
+	}
+
+	go func() {
+		http.HandleFunc("/", http_handler)
+		http.ListenAndServe("localhost:8989", nil)
+	}()
+
+	//---------------------------------
+	//
+	//---------------------------------
+
 	//
 	//Cfg creation won't work like this as xapp-frame reads it during init.
 	//
@@ -282,28 +311,60 @@ func TestMain(m *testing.M) {
 	xapp.Logger.Info("Using cfg file %s", os.Getenv("CFG_FILE"))
 
 	//---------------------------------
+	// Static routetable for rmr
+	//
 	// NOTE: Routing table is configured so, that responses
 	//       are duplicated to xapp1 and xapp2 instances.
 	//       If XID is not matching xapp stub will just
 	//       drop message. (Messages 12011, 12012, 12021, 12022)
+	//
+	// 14560 submgr
+	// 15560 e2term stub
+	// 13560 xapp1 stub
+	// 13660 xapp2 stub
+	//
 	//---------------------------------
-	xapp.Logger.Info("### submgr main run ###")
 
-	subsrt := `newrt|start
+	allrt := `newrt|start
 mse|12010|-1|localhost:14560
 mse|12010,localhost:14560|-1|localhost:15560
 mse|12011,localhost:15560|-1|localhost:14560
-mse|12011|-1|localhost:13560;localhost:13660
 mse|12012,localhost:15560|-1|localhost:14560
-mse|12012|-1|localhost:13560;localhost:13660
+mse|12011,localhost:14560|-1|localhost:13660;localhost:13560
+mse|12012,localhost:14560|-1|localhost:13660;localhost:13560
 mse|12020|-1|localhost:14560
 mse|12020,localhost:14560|-1|localhost:15560
 mse|12021,localhost:15560|-1|localhost:14560
-mse|12021|-1|localhost:13560;localhost:13660
 mse|12022,localhost:15560|-1|localhost:14560
-mse|12022|-1|localhost:13560;localhost:13660
+mse|12021,localhost:14560|-1|localhost:13660;localhost:13560
+mse|12022,localhost:14560|-1|localhost:13660;localhost:13560
 newrt|end
 `
+
+	//---------------------------------
+	//
+	//---------------------------------
+	xapp.Logger.Info("### submgr main run ###")
+
+	subsrt := allrt
+	/*
+	   	subsrt := `newrt|start
+	   mse|12010|-1|localhost:14560
+	   mse|12010,localhost:14560|-1|localhost:15560
+	   mse|12011,localhost:15560|-1|localhost:14560
+	   mse|12011|-1|localhost:13560;localhost:13660
+	   mse|12012,localhost:15560|-1|localhost:14560
+	   mse|12012|-1|localhost:13560;localhost:13660
+	   mse|12020|-1|localhost:14560
+	   mse|12020,localhost:14560|-1|localhost:15560
+	   mse|12021,localhost:15560|-1|localhost:14560
+	   mse|12021|-1|localhost:13560;localhost:13660
+	   mse|12022,localhost:15560|-1|localhost:14560
+	   mse|12022|-1|localhost:13560;localhost:13660
+	   newrt|end
+	   `
+	*/
+
 	subrtfilename, _ := testCreateTmpFile(subsrt)
 	defer os.Remove(subrtfilename)
 	mainCtrl = createNewMainControl("main", subrtfilename, "14560")
@@ -313,15 +374,18 @@ newrt|end
 	//---------------------------------
 	xapp.Logger.Info("### xapp1 rmr run ###")
 
-	xapprt1 := `newrt|start
-mse|12010|-1|localhost:14560
-mse|12011|-1|localhost:13560
-mse|12012|-1|localhost:13560
-mse|12020|-1|localhost:14560
-mse|12021|-1|localhost:13560
-mse|12022|-1|localhost:13560
-newrt|end
-`
+	xapprt1 := allrt
+	/*
+	   	xapprt1 := `newrt|start
+	   mse|12010|-1|localhost:14560
+	   mse|12011|-1|localhost:13560
+	   mse|12012|-1|localhost:13560
+	   mse|12020|-1|localhost:14560
+	   mse|12021|-1|localhost:13560
+	   mse|12022|-1|localhost:13560
+	   newrt|end
+	   `
+	*/
 
 	xapprtfilename1, _ := testCreateTmpFile(xapprt1)
 	defer os.Remove(xapprtfilename1)
@@ -333,15 +397,18 @@ newrt|end
 
 	xapp.Logger.Info("### xapp2 rmr run ###")
 
-	xapprt2 := `newrt|start
-mse|12010|-1|localhost:14560
-mse|12011|-1|localhost:13660
-mse|12012|-1|localhost:13660
-mse|12020|-1|localhost:14560
-mse|12021|-1|localhost:13660
-mse|12022|-1|localhost:13660
-newrt|end
-`
+	xapprt2 := allrt
+	/*
+	   	xapprt2 := `newrt|start
+	   mse|12010|-1|localhost:14560
+	   mse|12011|-1|localhost:13660
+	   mse|12012|-1|localhost:13660
+	   mse|12020|-1|localhost:14560
+	   mse|12021|-1|localhost:13660
+	   mse|12022|-1|localhost:13660
+	   newrt|end
+	   `
+	*/
 
 	xapprtfilename2, _ := testCreateTmpFile(xapprt2)
 	defer os.Remove(xapprtfilename2)
@@ -352,38 +419,28 @@ newrt|end
 	//---------------------------------
 	xapp.Logger.Info("### e2term rmr run ###")
 
-	e2termrt := `newrt|start
-mse|12010|-1|localhost:15560
-mse|12011|-1|localhost:14560
-mse|12012|-1|localhost:14560
-mse|12020|-1|localhost:15560
-mse|12021|-1|localhost:14560
-mse|12022|-1|localhost:14560
-newrt|end
-`
+	e2termrt := allrt
+	/*
+	   	e2termrt := `newrt|start
+	   mse|12010|-1|localhost:15560
+	   mse|12011|-1|localhost:14560
+	   mse|12012|-1|localhost:14560
+	   mse|12020|-1|localhost:15560
+	   mse|12021|-1|localhost:14560
+	   mse|12022|-1|localhost:14560
+	   newrt|end
+	   `
+	*/
 
 	e2termrtfilename, _ := testCreateTmpFile(e2termrt)
 	defer os.Remove(e2termrtfilename)
 	e2termConn = createNewE2termControl("e2termstub", e2termrtfilename, "15560", "RMRE2TERMSTUB")
 
 	//---------------------------------
-	//
+	// Stupid sleep to try improve robustness
+	// due: http handler and rmr routes init delays
 	//---------------------------------
-	http_handler := func(w http.ResponseWriter, r *http.Request) {
-		var req rtmgr_models.XappSubscriptionData
-		err := json.NewDecoder(r.Body).Decode(&req)
-		if err != nil {
-			xapp.Logger.Error("%s", err.Error())
-		}
-		xapp.Logger.Info("(http handler) handling Address=%s Port=%d SubscriptionID=%d", *req.Address, *req.Port, *req.SubscriptionID)
-
-		w.WriteHeader(200)
-	}
-
-	go func() {
-		http.HandleFunc("/", http_handler)
-		http.ListenAndServe("localhost:8989", nil)
-	}()
+	<-time.After(2 * time.Second)
 
 	//---------------------------------
 	//