import (
"encoding/json"
"fmt"
+ xfmodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
+ "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+ "github.com/go-openapi/swag"
+ "github.com/spf13/viper"
"io/ioutil"
"net"
"net/http"
"routing-manager/pkg/models"
"routing-manager/pkg/rpe"
"routing-manager/pkg/rtmgr"
+ "routing-manager/pkg/sbi"
"routing-manager/pkg/sdl"
"routing-manager/pkg/stub"
+ "sync"
"testing"
"time"
- "sync"
- "github.com/go-openapi/swag"
)
var BasicXAppLists = []byte(`[
var InvalidSubResp = []byte(`{"Version":0, "EventType":all}`)
+type Consumer struct{}
+
+func (m Consumer) Consume(params *xapp.RMRParams) (err error) {
+ xapp.Sdl.Store("myKey", params.Payload)
+ return nil
+}
+
+// Test cases
+func TestMain(m *testing.M) {
+ go xapp.RunWithParams(Consumer{}, viper.GetBool("db.waitForSdl"))
+ time.Sleep(time.Duration(5) * time.Second)
+ code := m.Run()
+ os.Exit(code)
+}
+
func TestValidateXappCallbackData_1(t *testing.T) {
data := models.XappCallbackData{
XApps: *swag.String("[]"),
}
}
-func TestValidateXappCallbackDataInvalid (t *testing.T) {
+func TestValidateXappCallbackDataInvalid(t *testing.T) {
data := models.XappCallbackData{}
err := validateXappCallbackData(&data)
t.Log(err)
}
-
func TestValidateXappSubscriptionsData(t *testing.T) {
ep := make(map[string]*rtmgr.Endpoint)
Port: &p,
SubscriptionID: swag.Int32(123456)}
err = validateXappSubscriptionData(&data1)
- t.Log(err)
//Validate E2tData
data2 := models.E2tData{
}
/*err = validateE2tData(&data2)*/
- e2tchannel := make(chan *models.E2tData, 10)
- _ = createNewE2tHandleHandlerImpl(e2tchannel, &data2)
- defer close(e2tchannel)
+ //e2tchannel := make(chan *models.E2tData, 10)
+ _ = createNewE2tHandleHandlerImpl(&data2)
+ //defer close(e2tchannel)
//test case for provideXappSubscriptionHandleImp
- datachannel := make(chan *models.XappSubscriptionData, 10)
- _ = provideXappSubscriptionHandleImpl(datachannel, &data1)
- defer close(datachannel)
+ //datachannel := make(chan *models.XappSubscriptionData, 10)
+ sdlEngine, _ = sdl.GetSdl("file")
+ sbiEngine, _ = sbi.GetSbi("rmrpush")
+ rpeEngine, _ = rpe.GetRpe("rmrpush")
+ _ = provideXappSubscriptionHandleImpl(&data1)
+ //defer close(datachannel)
//test case for deleteXappSubscriptionHandleImpl
- _ = deleteXappSubscriptionHandleImpl(datachannel, &data1)
+ _ = deleteXappSubscriptionHandleImpl(&data1)
data3 := models.XappSubscriptionData{
Address: swag.String("10.55.55.5"),
Port: &p,
SubscriptionID: swag.Int32(123456)}
//test case for deleteXappSubscriptionHandleImpl
- _ = deleteXappSubscriptionHandleImpl(datachannel, &data3)
+ _ = deleteXappSubscriptionHandleImpl(&data3)
+ data4 := models.XappSubscriptionData{
+ Address: swag.String("1.5.5.5"),
+ Port: &p,
+ SubscriptionID: swag.Int32(1236)}
+ _ = deleteXappSubscriptionHandleImpl(&data4)
+
}
func TestValidateE2tDataEmpty(t *testing.T) {
data := models.E2tData{
E2TAddress: swag.String(""),
}
- err := validateE2tData(&data)
+ err, _ := validateE2tData(&data)
t.Log(err)
}
data := models.E2tData{
E2TAddress: swag.String("e2t.1com:1234"),
}
- err := validateE2tData(&data)
+ err, _ := validateE2tData(&data)
t.Log(err)
}
data := models.E2tData{
E2TAddress: swag.String("10.101.01.1"),
}
- err := validateE2tData(&data)
+ err, _ := validateE2tData(&data)
t.Log(err)
}
E2TAddress: swag.String("10.101.01.1:8098"),
}
-
- err := validateE2tData(&data)
+ err, _ := validateE2tData(&data)
t.Log(err)
+ _ = createNewE2tHandleHandlerImpl(&data)
+
}
func TestValidateE2tDatavalidEndpointPresent(t *testing.T) {
// insert endpoint for testing purpose
uuid := "10.101.01.1:8098"
ep := &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
- err := validateE2tData(&data)
+ err, _ := validateE2tData(&data)
t.Log(err)
- // delete endpoint for at end of test case
- delete(rtmgr.Eps, uuid);
+ // delete endpoint for at end of test case
+ delete(rtmgr.Eps, uuid)
}
-
func TestValidateDeleteE2tData(t *testing.T) {
-// test-1
+ // test-1
data := models.E2tDeleteData{
E2TAddress: swag.String(""),
}
err := validateDeleteE2tData(&data)
- if (err.Error() != "E2TAddress is empty!!!") {
+ if err.Error() != "E2TAddress is empty!!!" {
t.Log(err)
}
-
-// test-2
+ // test-2
data = models.E2tDeleteData{
E2TAddress: swag.String("10.101.01.1:8098"),
}
err = validateDeleteE2tData(&data)
- if (err != nil ) {
+ if err != nil {
t.Log(err)
}
-// test-3
-//################ Create End Point dummy entry
+ // test-3
+ //################ Create End Point dummy entry
uuid := "10.101.01.1:8098"
ep := &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
-//#####################
+ //#####################
data = models.E2tDeleteData{
E2TAddress: swag.String("10.101.01.1:8098"),
}
err = validateDeleteE2tData(&data)
- if (err != nil ) {
+ if err != nil {
t.Log(err)
}
- // delete endpoint for at end of test case
-//################ Delete End Point dummy entry
- delete(rtmgr.Eps, uuid);
-//#####################
+ // delete endpoint for at end of test case
+ //################ Delete End Point dummy entry
+ delete(rtmgr.Eps, uuid)
+ //#####################
-// test-4
+ // test-4
-//################ Create End Point dummy entry
+ //################ Create End Point dummy entry
uuid = "10.101.01.1:9991"
ep = &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
uuid = "10.101.01.1:9992"
ep = &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
-//#####################
+ //#####################
data = models.E2tDeleteData{
E2TAddress: swag.String("10.101.01:8098"),
}
err = validateDeleteE2tData(&data)
- if (err != nil ) {
+ if err != nil {
t.Log(err)
}
-//################ Delete End Point dummy entry
- delete(rtmgr.Eps, "10.101.01.1:9991")
- delete(rtmgr.Eps, "10.101.01.1:9992")
-//#####################
+ //################ Delete End Point dummy entry
+ delete(rtmgr.Eps, "10.101.01.1:9991")
+ delete(rtmgr.Eps, "10.101.01.1:9992")
+ //#####################
-// test-5
+ // test-5
data = models.E2tDeleteData{
E2TAddress: swag.String("10.101.01:8098"),
}
err = validateDeleteE2tData(&data)
- if ( err.Error() != "E2T Delete - RanAssocList E2TAddress is not a proper format like ip:port, 10.101.01.19991") {
+ if err.Error() != "E2T Delete - RanAssocList E2TAddress is not a proper format like ip:port, 10.101.01.19991" {
t.Log(err)
}
}
-
func TestValidateE2TAddressRANListData(t *testing.T) {
data := models.RanE2tMap{
- {
- E2TAddress: swag.String(""),
- },
+ {
+ E2TAddress: swag.String(""),
+ },
}
err := validateE2TAddressRANListData(data)
- if (err != nil ) {
+ if err != nil {
t.Log(err)
}
data = models.RanE2tMap{
- {
- E2TAddress: swag.String("10.101.01.1:8098"),
- },
+ {
+ E2TAddress: swag.String("10.101.01.1:8098"),
+ },
}
err = validateE2TAddressRANListData(data)
- if (err != nil ) {
+ if err != nil {
t.Log(err)
}
func TestAssociateRanToE2THandlerImpl(t *testing.T) {
- associateranchan := make(chan models.RanE2tMap, 10)
data := models.RanE2tMap{
- {
- E2TAddress: swag.String("10.101.01.1:8098"),
- },
+ {
+ E2TAddress: swag.String("10.101.01.1:8098"),
+ },
}
- err := associateRanToE2THandlerImpl(associateranchan, data)
- if (err != nil ) {
+ err := associateRanToE2THandlerImpl(data)
+ if err != nil {
t.Log(err)
}
-//################ Create End Point dummy entry
+ //################ Create End Point dummy entry
uuid := "10.101.01.1:8098"
ep := &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
-//#####################
+ //#####################
data = models.RanE2tMap{
- {
- E2TAddress: swag.String("10.101.01.1:8098"),
- },
+ {
+ E2TAddress: swag.String("10.101.01.1:8098"),
+ },
}
- err = associateRanToE2THandlerImpl(associateranchan, data)
- if (err != nil ) {
+ err = associateRanToE2THandlerImpl(data)
+ if err != nil {
t.Log(err)
}
- data1 := <-associateranchan
- fmt.Println(data1)
-//################ Delete End Point dummy entry
- delete(rtmgr.Eps, uuid);
-//#####################
+ //################ Delete End Point dummy entry
+ delete(rtmgr.Eps, uuid)
+ //#####################
}
func TestDisassociateRanToE2THandlerImpl(t *testing.T) {
- disassranchan := make(chan models.RanE2tMap, 10)
-
data := models.RanE2tMap{
- {
- E2TAddress: swag.String("10.101.01.1:8098"),
- },
+ {
+ E2TAddress: swag.String("10.101.01.1:8098"),
+ },
}
- err := disassociateRanToE2THandlerImpl(disassranchan, data)
- if (err != nil ) {
+ err := disassociateRanToE2THandlerImpl(data)
+ if err != nil {
t.Log(err)
}
-//################ Create End Point dummy entry
+ //################ Create End Point dummy entry
uuid := "10.101.01.1:8098"
ep := &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
-//#####################
+ //#####################
data = models.RanE2tMap{
- {
- E2TAddress: swag.String("10.101.01.1:8098"),
- },
+ {
+ E2TAddress: swag.String("10.101.01.1:8098"),
+ },
}
- err = disassociateRanToE2THandlerImpl(disassranchan, data)
- if (err != nil ) {
+ err = disassociateRanToE2THandlerImpl(data)
+ if err != nil {
t.Log(err)
}
- data1 := <-disassranchan
- fmt.Println(data1)
-//################ Delete End Point dummy entry
- delete(rtmgr.Eps, uuid);
-//#####################
+ //################ Delete End Point dummy entry
+ delete(rtmgr.Eps, uuid)
+ //#####################
}
func TestDeleteE2tHandleHandlerImpl(t *testing.T) {
- e2tdelchan := make(chan *models.E2tDeleteData, 10)
data := models.E2tDeleteData{
E2TAddress: swag.String(""),
}
- err := deleteE2tHandleHandlerImpl(e2tdelchan, &data)
- if (err != nil ) {
+ err := deleteE2tHandleHandlerImpl(&data)
+ if err != nil {
t.Log(err)
}
-//################ Create End Point dummy entry
+ //################ Create End Point dummy entry
uuid := "10.101.01.1:8098"
ep := &rtmgr.Endpoint{
- Uuid: uuid,
+ Uuid: uuid,
}
rtmgr.Eps[uuid] = ep
-//#####################
+ //#####################
data = models.E2tDeleteData{
E2TAddress: swag.String("10.101.01.1:8098"),
}
- err = deleteE2tHandleHandlerImpl(e2tdelchan, &data)
- if (err != nil ) {
+ err = deleteE2tHandleHandlerImpl(&data)
+ if err != nil {
t.Log(err)
}
- data1 := <-e2tdelchan
-
- fmt.Println(data1)
-//################ Delete End Point dummy entry
- delete(rtmgr.Eps, uuid);
-//#####################
+ //################ Delete End Point dummy entry
+ delete(rtmgr.Eps, uuid)
+ //#####################
}
func TestSubscriptionExists(t *testing.T) {
t.Log(yes_no)
}
-
func TestHttpInstance(t *testing.T) {
sdlEngine, _ := sdl.GetSdl("file")
rpeEngine, _ := rpe.GetRpe("rmrpush")
+ sbiEngine, _ := sbi.GetSbi("rmrpush")
httpinstance := NewHttpRestful()
err := httpinstance.Terminate()
t.Log(err)
+ fmt.Printf("sbiEngine = %v", sbiEngine)
- triggerSBI := make(chan bool)
createMockPlatformComponents()
//ts := createMockAppmgrWithData("127.0.0.1:3000", BasicXAppLists, nil)
//ts.Start()
//defer ts.Close()
var m sync.Mutex
- err = httpinstance.Initialize(XMURL, "httpgetter", "rt.json", "config.json", E2MURL, sdlEngine, rpeEngine, triggerSBI, &m)
+ err = httpinstance.Initialize(XMURL, "httpgetter", "rt.json", "config.json", E2MURL, sdlEngine, rpeEngine, &m)
}
-func TestXappCallbackDataChannelwithdata(t *testing.T) {
+func TestXappCallbackWithData(t *testing.T) {
data := models.XappCallbackData{
XApps: *swag.String("[]"),
Version: *swag.Int64(1),
Event: *swag.String("someevent"),
ID: *swag.String("123456")}
- datach := make(chan *models.XappCallbackData, 1)
- go func() { _, _ = recvXappCallbackData(datach) }()
- defer close(datach)
- datach <- &data
+ _, _ = recvXappCallbackData(&data)
}
-func TestXappCallbackDataChannelNodata(t *testing.T) {
- datach := make(chan *models.XappCallbackData, 1)
- go func() { _, _ = recvXappCallbackData(datach) }()
- defer close(datach)
+
+func TestXappCallbackNodata(t *testing.T) {
+ //data := *models.XappCallbackData
+ _, _ = recvXappCallbackData(nil)
}
-func TestE2TChannelwithData(t *testing.T) {
+func TestE2TwithData(t *testing.T) {
data2 := models.E2tData{
- E2TAddress: swag.String("1.2.3.4"),
- RanNamelist: []string{"ran1","ran2"},
+ E2TAddress: swag.String("1.2.3.4"),
+ RanNamelist: []string{"ran1", "ran2"},
}
- dataChannel := make(chan *models.E2tData, 10)
- go func() { _, _,_ = recvNewE2Tdata(dataChannel) }()
- defer close(dataChannel)
- dataChannel <- &data2
+ _, _, _ = recvNewE2Tdata(&data2)
}
-func TestE2TChannelwithNoData(t *testing.T) {
- dataChannel := make(chan *models.E2tData, 10)
- go func() { _, _ ,_= recvNewE2Tdata(dataChannel) }()
- defer close(dataChannel)
+func TestE2TwithNoData(t *testing.T) {
+ _, _, _ = recvNewE2Tdata(nil)
}
func TestProvideXappSubscriptionHandleImpl(t *testing.T) {
Address: swag.String("10.0.0.0"),
Port: &p,
SubscriptionID: swag.Int32(1234)}
- datachannel := make(chan *models.XappSubscriptionData, 10)
- go func() { _ = provideXappSubscriptionHandleImpl(datachannel, &data) }()
- defer close(datachannel)
- datachannel <- &data
-
- //subdel test
+ _ = provideXappSubscriptionHandleImpl(&data)
}
func createMockAppmgrWithData(url string, g []byte, p []byte, t []byte) *httptest.Server {
_ = ioutil.WriteFile(filename, file, 644)
}
-func TestRecvXappCallbackData(t *testing.T) {
- data := models.XappCallbackData{
- XApps: *swag.String("[]"),
- Version: *swag.Int64(1),
- Event: *swag.String("any"),
- ID: *swag.String("123456"),
- }
-
- ch := make(chan *models.XappCallbackData)
- defer close(ch)
- httpRestful := NewHttpRestful()
- go func() { ch <- &data }()
- time.Sleep(1 * time.Second)
- t.Log(string(len(ch)))
- xappList, err := httpRestful.RecvXappCallbackData(ch)
- if err != nil {
- t.Error("Receive failed: " + err.Error())
- } else {
- if xappList == nil {
- t.Error("Expected an XApp notification list")
- } else {
- t.Log("whatever")
- }
- }
-}
-
func TestProvideXappHandleHandlerImpl(t *testing.T) {
- datach := make(chan *models.XappCallbackData, 10)
- defer close(datach)
data := models.XappCallbackData{
XApps: *swag.String("[]"),
Version: *swag.Int64(1),
Event: *swag.String("someevent"),
ID: *swag.String("123456")}
- var httpRestful, _ = GetNbi("httpRESTful")
- err := httpRestful.(*HttpRestful).ProvideXappHandleHandlerImpl(datach, &data)
- if err != nil {
- t.Error("Error occured: " + err.Error())
- } else {
- recv := <-datach
- if recv == nil {
- t.Error("Something gone wrong: " + err.Error())
- } else {
- if recv != &data {
- t.Error("Malformed data on channel")
- }
- }
- }
+ err := provideXappHandleHandlerImpl(&data)
//Empty XappCallbackdata
data1 := models.XappCallbackData{}
- err = httpRestful.(*HttpRestful).ProvideXappHandleHandlerImpl(datach, &data1)
+ err = provideXappHandleHandlerImpl(&data1)
+ t.Log(err)
}
func TestValidateXappCallbackData(t *testing.T) {
}
}
-
func TestRetrieveStartupDataTimeout(t *testing.T) {
sdlEngine, _ := sdl.GetSdl("file")
createMockPlatformComponents()
sdlEngine, _ := sdl.GetSdl("file")
var httpRestful, _ = GetNbi("httpRESTful")
createMockPlatformComponents()
- err := httpRestful.(*HttpRestful).RetrieveStartupData(XMURL, "httpgetter", "rt.json", "config.json", E2MURL, sdlEngine)
+ httpRestful.(*HttpRestful).RetrieveStartupData(XMURL, "httpgetter", "rt.json", "config.json", E2MURL, sdlEngine)
//err := retrieveStartupData(XMURL, "httpgetter", "rt.json", "config.json", sdlEngine)
- if err != nil {
+ /*if err != nil {
t.Error("Cannot retrieve startup data: " + err.Error())
- }
+ }*/
os.Remove("rt.json")
os.Remove("config.json")
}
}
func TestInvalidarguments(t *testing.T) {
- _ = PostSubReq("\n","nbifinterface")
- _ = PostSubReq("xmurl","\n")
+ _ = PostSubReq("\n", "nbifinterface")
+ _ = PostSubReq("xmurl", "\n")
+}
+
+func TestInitEngine(t *testing.T) {
+ initRtmgr()
+}
+
+func TestUpdateXappSubscription(t *testing.T) {
+ ep := make(map[string]*rtmgr.Endpoint)
+ ep["dummy"] = &rtmgr.Endpoint{Uuid: "10.0.0.1:0", Name: "E2TERM", XAppType: "app1", Ip: "10.1.1.1", Port: 1234, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: true, Keepalive: true}
+
+ rtmgr.Eps = ep
+
+ p := uint16(1234)
+ xapp := models.XappElement{
+ Address: swag.String("10.1.1.1"),
+ Port: &p,
+ }
+
+ var b models.XappList
+ b = append(b, &xapp)
+ _ = updateXappSubscriptionHandleImpl(&b, 10)
+
+ //Test case when subscriptions already exist
+ data := models.XappSubscriptionData{
+ Address: swag.String("10.0.0.0"),
+ Port: &p,
+ SubscriptionID: swag.Int32(12345)}
+
+ rtmgr.Subs = *stub.ValidSubscriptions
+
+ subscriptionExists(&data)
+ addSubscription(&rtmgr.Subs, &data)
+ _ = updateXappSubscriptionHandleImpl(&b, 10)
+
+}
+
+func TestDumpDebugdata(t *testing.T) {
+ _, _ = dumpDebugData()
+}
+
+func TestManagerRequest(t *testing.T) {
+ var params xapp.RMRParams
+ var rmrmeid xapp.RMRMeid
+ sdlEngine, _ = sdl.GetSdl("file")
+ sbiEngine, _ = sbi.GetSbi("rmrpush")
+ rpeEngine, _ = rpe.GetRpe("rmrpush")
+ rmrmeid.RanName = "gnb1"
+ c := Control{make(chan *xapp.RMRParams)}
+ params.Payload = []byte{1, 2, 3, 4}
+ params.Mtype = 1234
+ params.SubId = -1
+ params.Meid = &rmrmeid
+ params.Src = "sender"
+ params.PayloadLen = 4
+ c.handleUpdateToRoutingManagerRequest(¶ms)
+}
+
+func TestRecievermr(t *testing.T) {
+ var params xapp.RMRParams
+ var rmrmeid xapp.RMRMeid
+ sdlEngine, _ = sdl.GetSdl("file")
+ sbiEngine, _ = sbi.GetSbi("rmrpush")
+ rpeEngine, _ = rpe.GetRpe("rmrpush")
+ rmrmeid.RanName = "gnb1"
+
+ params.Payload = []byte{1, 2, 3, 4}
+ params.SubId = -1
+ params.Meid = &rmrmeid
+ params.Src = "sender"
+ params.PayloadLen = 4
+
+ c := Control{make(chan *xapp.RMRParams)}
+ params.Mtype = xapp.RICMessageTypes["RMRRM_REQ_TABLE"]
+ c.recievermr(¶ms)
+ params.Mtype = xapp.RICMessageTypes["RMRRM_TABLE_STATE"]
+ c.recievermr(¶ms)
+ params.Mtype = 1234
+ c.recievermr(¶ms)
+
+ rtmgr.Rtmgr_ready = true
+ params.Mtype = xapp.RICMessageTypes["RMRRM_REQ_TABLE"]
+ c.recievermr(¶ms)
+ time.Sleep(time.Duration(5) * time.Second)
+}
+
+func TestAddDelRmr(t *testing.T) {
+ sdlEngine, _ = sdl.GetSdl("file")
+ sbiEngine, _ = sbi.GetSbi("rmrpush")
+ rpeEngine, _ = rpe.GetRpe("rmrpush")
+ var routelist models.Routelist
+ mtype := uint32(1234)
+ tendpoint := "goofle.com"
+ listofroutes := models.AddRmrRoute{SubscriptionID: 0, SenderEndPoint: "nokia.com", MessageType: &mtype, TargetEndPoint: &tendpoint}
+ listofroutes2 := models.AddRmrRoute{SubscriptionID: 1, SenderEndPoint: "", MessageType: &mtype, TargetEndPoint: &tendpoint}
+ listofroutes3 := models.AddRmrRoute{MessageType: &mtype, TargetEndPoint: &tendpoint}
+ adddelrmrroute(routelist, false)
+ routelist = append(routelist, &listofroutes)
+ routelist = append(routelist, &listofroutes2)
+ routelist = append(routelist, &listofroutes3)
+ routelist = append(routelist, &listofroutes3)
+ adddelrmrroute(routelist, true)
+
+ adddelrmrroute(routelist, false)
+}
+
+func TestPopulateSubscription(t *testing.T) {
+ var sublist xfmodel.SubscriptionList
+
+ subdata := xfmodel.SubscriptionData{Endpoint: []string{"xapp1.com:3800"}, SubscriptionID: -1, Meid: ""}
+ subdata2 := xfmodel.SubscriptionData{Endpoint: []string{"xapp2.com:3800"}, SubscriptionID: 11, Meid: ""}
+ subdata3 := xfmodel.SubscriptionData{Endpoint: []string{"xapp3.com:3800"}, SubscriptionID: 221, Meid: ""}
+ sublist = append(sublist, &subdata)
+ sublist = append(sublist, &subdata2)
+ sublist = append(sublist, &subdata3)
+
+ PopulateSubscription(sublist)
+
}