X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=9ec0e8411fb4474b8c71832a3529784a395280a7;hb=de457a14f98c546fdb009e9915745ef398388ddd;hp=bc1435a689b09fb27aa094fd630f29af60227d2b;hpb=4abf18056b1674fb284c4d7d753c35a3ddab37e4;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go
index bc1435a..9ec0e84 100644
--- a/pkg/control/ut_ctrl_submgr_test.go
+++ b/pkg/control/ut_ctrl_submgr_test.go
@@ -46,6 +46,8 @@ type Counter struct {
 	Value uint64
 }
 
+type CountersToBeAdded []Counter
+
 var countersBeforeMap map[string]Counter
 var toBeAddedCountersMap map[string]Counter
 
@@ -93,8 +95,15 @@ func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) {
 	go mainCtrl.c.HandleUncompletedSubscriptions(mainCtrl.c.registry.register)
 }
 
+func (mc *testingSubmgrControl) MakeTransactionNil(t *testing.T, subId uint32) {
+
+	mc.TestLog(t, "Makin transaction nil for SubId=%v", subId)
+	subs := mainCtrl.c.registry.GetSubscription(subId)
+	subs.TheTrans = nil
+}
+
 func (mc *testingSubmgrControl) SetResetTestFlag(t *testing.T, status bool) {
-	mc.TestLog(t, "ResetTestFlag set to %v=", status)
+	mc.TestLog(t, "ResetTestFlag set to %v", status)
 	mainCtrl.c.ResetTestFlag = status
 }
 
@@ -111,19 +120,19 @@ func PringSubscriptionQueryResult(resp models.SubscriptionList) {
 	for _, item := range resp {
 		fmt.Printf("item.SubscriptionID=%v\n", item.SubscriptionID)
 		fmt.Printf("item.Meid=%v\n", item.Meid)
-		fmt.Printf("item.Endpoint=%v\n", item.Endpoint)
+		fmt.Printf("item.ClientEndpoint=%v\n", item.ClientEndpoint)
 	}
 }
 
 func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool {
 	cnt := int(0)
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		cnt = len(mc.c.registry.register)
 		if cnt == 0 {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt)
 	return false
@@ -137,14 +146,14 @@ func (mc *testingSubmgrControl) get_registry_next_subid(t *testing.T) uint32 {
 
 func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, origSubId uint32, secs int) (uint32, bool) {
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		mc.c.registry.mutex.Lock()
 		currSubId := mc.c.registry.subIds[0]
 		mc.c.registry.mutex.Unlock()
 		if currSubId != origSubId {
 			return currSubId, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no subId change within %d secs", secs)
 	return 0, false
@@ -153,12 +162,12 @@ func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, or
 func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, secs int) bool {
 	var subs *Subscription
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		subs = mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	if subs != nil {
 		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String())
@@ -168,10 +177,35 @@ func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, s
 	return false
 }
 
+func (mc *testingSubmgrControl) wait_multi_subs_clean(t *testing.T, e2SubsIds []uint32, secs int) bool {
+
+	purgedSubscriptions := 0
+
+	for i := 1; i <= secs*10; i++ {
+		purgedSubscriptions = 0
+		for k := 0; k <= len(e2SubsIds); i++ {
+			subs := mc.c.registry.GetSubscription(e2SubsIds[k])
+			if subs == nil {
+				mc.TestLog(t, "(submgr) subscriber purged for esSubsId %v", e2SubsIds[k])
+				purgedSubscriptions += 1
+				if purgedSubscriptions == len(e2SubsIds) {
+					return true
+				}
+			}
+		}
+		mc.TestLog(t, "(submgr) subscriptions pending purging %v/%v after %d msecs", purgedSubscriptions, len(e2SubsIds), i+500)
+		time.Sleep(100 * time.Millisecond)
+	}
+
+	mc.TestError(t, "(submgr) no clean within %d secs: subs(N/A) - %v/%v subscriptions found still", secs, purgedSubscriptions, len(e2SubsIds))
+
+	return false
+}
+
 func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uint32, secs int) bool {
 	var trans TransactionIf
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		subs := mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
@@ -180,7 +214,7 @@ func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uin
 		if trans == nil {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	if trans != nil {
 		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String())
@@ -208,12 +242,12 @@ func (mc *testingSubmgrControl) wait_subs_entrypoint_cnt_change(t *testing.T, or
 	}
 
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		curr := subs.EpList.Size()
 		if curr != orig {
 			return curr, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no subs %d entrypoint cnt change within %d secs", origSubId, secs)
 	return 0, false
@@ -228,12 +262,12 @@ func (mc *testingSubmgrControl) get_msgcounter(t *testing.T) uint64 {
 
 func (mc *testingSubmgrControl) wait_msgcounter_change(t *testing.T, orig uint64, secs int) (uint64, bool) {
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		curr := mc.c.CntRecvMsg
 		if curr != orig {
 			return curr, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no msg counter change within %d secs", secs)
 	return 0, false
@@ -258,14 +292,15 @@ func (mc *testingSubmgrControl) GetMetrics(t *testing.T) (string, error) {
 	return string(respBody[:]), nil
 }
 
-func (mc *testingSubmgrControl) SetTimesCounterWillBeAdded(counterName string, addedValue uint64) {
+func (mc *testingSubmgrControl) CounterValuesToBeVeriefied(t *testing.T, countersToBeAdded CountersToBeAdded) {
+
 	if len(toBeAddedCountersMap) == 0 {
 		toBeAddedCountersMap = make(map[string]Counter)
 	}
-	counter := Counter{}
-	counter.Name = counterName
-	counter.Value = addedValue
-	toBeAddedCountersMap[counterName] = counter
+	for _, counter := range countersToBeAdded {
+		toBeAddedCountersMap[counter.Name] = counter
+	}
+	mc.GetCounterValuesBefore(t)
 }
 
 func (mc *testingSubmgrControl) GetCounterValuesBefore(t *testing.T) {
@@ -329,3 +364,68 @@ func (mc *testingSubmgrControl) GetCurrentCounterValues(t *testing.T, chekedCoun
 	}
 	return retCounterMap
 }
+
+func (mc *testingSubmgrControl) sendGetRequest(t *testing.T, addr string, path string) {
+
+	mc.TestLog(t, "GET http://"+addr+"%v", path)
+	req, err := http.NewRequest("GET", "http://"+addr+path, nil)
+	if err != nil {
+		mc.TestError(t, "Error reading request. %v", err)
+		return
+	}
+	req.Header.Set("Cache-Control", "no-cache")
+	client := &http.Client{Timeout: time.Second * 2}
+	resp, err := client.Do(req)
+	if err != nil {
+		mc.TestError(t, "Error reading response. %v", err)
+		return
+	}
+	defer resp.Body.Close()
+
+	mc.TestLog(t, "Response status: %v", resp.Status)
+	mc.TestLog(t, "Response Headers: %v", resp.Header)
+	if !strings.Contains(resp.Status, "200 OK") {
+		mc.TestError(t, "Wrong response status")
+		return
+	}
+
+	respBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		mc.TestError(t, "Error reading body. %v", err)
+		return
+	}
+	mc.TestLog(t, "%s", respBody)
+	return
+}
+
+func (mc *testingSubmgrControl) sendPostRequest(t *testing.T, addr string, path string) {
+
+	mc.TestLog(t, "POST http://"+addr+"%v", path)
+	req, err := http.NewRequest("POST", "http://"+addr+path, nil)
+	if err != nil {
+		mc.TestError(t, "Error reading request. %v", err)
+		return
+	}
+	client := &http.Client{Timeout: time.Second * 2}
+	resp, err := client.Do(req)
+	if err != nil {
+		mc.TestError(t, "Error reading response. %v", err)
+		return
+	}
+	defer resp.Body.Close()
+
+	mc.TestLog(t, "Response status: %v", resp.Status)
+	mc.TestLog(t, "Response Headers: %v", resp.Header)
+	if !strings.Contains(resp.Status, "200 OK") {
+		mc.TestError(t, "Wrong response status")
+		return
+	}
+
+	respBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		mc.TestError(t, "Error reading body. %v", err)
+		return
+	}
+	mc.TestLog(t, "%s", respBody)
+	return
+}