//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
-type testingControl struct {
+
+type httpRtmgrMsg struct {
+ msg *rtmgr_models.XappSubscriptionData
+ w http.ResponseWriter
+ r *http.Request
+}
+
+func (msg *httpRtmgrMsg) RetOk() {
+ msg.w.WriteHeader(200)
+}
+
+type testingHttpRtmgrControl struct {
+ desc string
+ port string
+ useChannel bool
+ msgChan chan *httpRtmgrMsg
+}
+
+func (hc *testingHttpRtmgrControl) UseChannel(flag bool) {
+ hc.useChannel = flag
+}
+
+func (hc *testingHttpRtmgrControl) WaitReq(t *testing.T) *httpRtmgrMsg {
+ xapp.Logger.Info("(%s) handle_rtmgr_req", hc.desc)
+ select {
+ case msg := <-hc.msgChan:
+ return msg
+ case <-time.After(15 * time.Second):
+ testError(t, "(%s) Not Received RTMGR Subscription message within 15 secs", hc.desc)
+ return nil
+ }
+ return nil
+}
+
+func (hc *testingHttpRtmgrControl) http_handler(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("(%s) handling Address=%s Port=%d SubscriptionID=%d", hc.desc, *req.Address, *req.Port, *req.SubscriptionID)
+ msg := &httpRtmgrMsg{
+ msg: &req,
+ w: w,
+ r: r,
+ }
+ if hc.useChannel {
+ hc.msgChan <- msg
+ } else {
+ msg.RetOk()
+ }
+}
+
+func (hc *testingHttpRtmgrControl) run() {
+ http.HandleFunc("/", hc.http_handler)
+ http.ListenAndServe("localhost:"+hc.port, nil)
+}
+
+func initTestingHttpRtmgrControl(desc string, port string) *testingHttpRtmgrControl {
+ hc := &testingHttpRtmgrControl{}
+ hc.desc = desc
+ hc.port = port
+ hc.useChannel = false
+ hc.msgChan = make(chan *httpRtmgrMsg)
+ return hc
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type testingRmrControl struct {
desc string
syncChan chan struct{}
}
-func (tc *testingControl) ReadyCB(data interface{}) {
- xapp.Logger.Info("testingControl(%s) ReadyCB", tc.desc)
+func (tc *testingRmrControl) ReadyCB(data interface{}) {
+ xapp.Logger.Info("testingRmrControl(%s) ReadyCB", tc.desc)
tc.syncChan <- struct{}{}
return
}
-func (tc *testingControl) WaitCB() {
+func (tc *testingRmrControl) WaitCB() {
<-tc.syncChan
}
-func initTestingControl(desc string, rtfile string, port string) testingControl {
- tc := testingControl{}
+func initTestingControl(desc string, rtfile string, port string) testingRmrControl {
+ tc := testingRmrControl{}
os.Setenv("RMR_SEED_RT", rtfile)
os.Setenv("RMR_SRC_ID", "localhost:"+port)
xapp.Logger.Info("Using rt file %s", os.Getenv("RMR_SEED_RT"))
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
-type testingRmrControl struct {
- testingControl
+type testingRmrStubControl struct {
+ testingRmrControl
rmrClientTest *xapp.RMRClient
+ active bool
}
-func (tc *testingRmrControl) RmrSend(params *RMRParams) (err error) {
+func (tc *testingRmrStubControl) RmrSend(params *RMRParams) (err error) {
//
//NOTE: Do this way until xapp-frame sending is improved
//
return
}
-func initTestingRmrControl(desc string, rtfile string, port string, stat string, consumer xapp.MessageConsumer) testingRmrControl {
- tc := testingRmrControl{}
- tc.testingControl = initTestingControl(desc, rtfile, port)
+func initTestingRmrControl(desc string, rtfile string, port string, stat string, consumer xapp.MessageConsumer) testingRmrStubControl {
+ tc := testingRmrStubControl{}
+ tc.active = false
+ tc.testingRmrControl = initTestingControl(desc, rtfile, port)
tc.rmrClientTest = xapp.NewRMRClientWithParams("tcp:"+port, 4096, 1, stat)
tc.rmrClientTest.SetReadyCB(tc.ReadyCB, nil)
go tc.rmrClientTest.Start(consumer)
}
type testingXappControl struct {
- testingRmrControl
+ testingRmrStubControl
testingMessageChannel
xid_seq uint64
}
params.Mbuf = nil
msg := &RMRParams{params}
+ if params.Mtype == 55555 {
+ xapp.Logger.Info("(%s) Testing message ignore %s", tc.desc, msg.String())
+ tc.active = true
+ return
+ }
+
if strings.Contains(msg.Xid, tc.desc) {
xapp.Logger.Info("(%s) Consume %s", tc.desc, msg.String())
tc.rmrConChan <- msg
func createNewXappControl(desc string, rtfile string, port string, stat string) *testingXappControl {
xappCtrl := &testingXappControl{}
- xappCtrl.testingRmrControl = initTestingRmrControl(desc, rtfile, port, stat, xappCtrl)
+ xappCtrl.testingRmrStubControl = initTestingRmrControl(desc, rtfile, port, stat, xappCtrl)
xappCtrl.testingMessageChannel = initTestingMessageChannel()
xappCtrl.xid_seq = 1
return xappCtrl
//
//-----------------------------------------------------------------------------
type testingE2termControl struct {
- testingRmrControl
+ testingRmrStubControl
testingMessageChannel
}
xapp.Rmr.Free(params.Mbuf)
params.Mbuf = nil
msg := &RMRParams{params}
+
+ if params.Mtype == 55555 {
+ xapp.Logger.Info("(%s) Testing message ignore %s", tc.desc, msg.String())
+ tc.active = true
+ return
+ }
+
xapp.Logger.Info("(%s) Consume %s", tc.desc, msg.String())
tc.rmrConChan <- msg
return
func createNewE2termControl(desc string, rtfile string, port string, stat string) *testingE2termControl {
e2termCtrl := &testingE2termControl{}
- e2termCtrl.testingRmrControl = initTestingRmrControl(desc, rtfile, port, stat, e2termCtrl)
+ e2termCtrl.testingRmrStubControl = initTestingRmrControl(desc, rtfile, port, stat, e2termCtrl)
e2termCtrl.testingMessageChannel = initTestingMessageChannel()
return e2termCtrl
}
//
//-----------------------------------------------------------------------------
type testingMainControl struct {
- testingControl
+ testingRmrControl
c *Control
}
func createNewMainControl(desc string, rtfile string, port string) *testingMainControl {
mainCtrl = &testingMainControl{}
- mainCtrl.testingControl = initTestingControl(desc, rtfile, port)
+ mainCtrl.testingRmrControl = initTestingControl(desc, rtfile, port)
mainCtrl.c = NewControl()
xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
go xapp.RunWithParams(mainCtrl.c, false)
var xappConn2 *testingXappControl
var e2termConn *testingE2termControl
var mainCtrl *testingMainControl
+var rtmgrHttp *testingHttpRtmgrControl
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)
- }()
+ rtmgrHttp = initTestingHttpRtmgrControl("RTMGRSTUB", "8989")
+ go rtmgrHttp.run()
//---------------------------------
//
mse|12022,localhost:15560|-1|localhost:14560
mse|12021,localhost:14560|-1|localhost:13660;localhost:13560
mse|12022,localhost:14560|-1|localhost:13660;localhost:13560
+mse|55555|-1|localhost:13660;localhost:13560,localhost:15560
newrt|end
`
e2termConn = createNewE2termControl("e2termstub", e2termrtfilename, "15560", "RMRE2TERMSTUB")
//---------------------------------
- // Stupid sleep to try improve robustness
- // due: http handler and rmr routes init delays
+ // Testing message sending
//---------------------------------
- <-time.After(2 * time.Second)
+ var dummyBuf []byte = make([]byte, 100)
+
+ params := &RMRParams{&xapp.RMRParams{}}
+ params.Mtype = 55555
+ params.SubId = -1
+ params.Payload = dummyBuf
+ params.PayloadLen = 100
+ params.Meid = &xapp.RMRMeid{RanName: "NONEXISTINGRAN"}
+ params.Xid = "THISISTESTFORSTUBS"
+ params.Mbuf = nil
+
+ status := false
+ i := 1
+ for ; i <= 10 && status == false; i++ {
+ xapp.Rmr.Send(params.RMRParams, false)
+ if e2termConn.active == true && xappConn1.active == true && xappConn2.active == true {
+ status = true
+ break
+ } else {
+ xapp.Logger.Info("Sleep 0.5 secs and try routes again")
+ time.Sleep(500 * time.Millisecond)
+ }
+ }
+
+ if status == false {
+ xapp.Logger.Error("Could not initialize routes")
+ os.Exit(1)
+ }
//---------------------------------
//
Code Review / ric-plt / submgr.git / blobdiff