X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmodels%2Fe2_setup_request_message_test.go;h=b50d0d7fb6707ba95de7fbdc3c0d3cba79da01b9;hb=0f06f71ca88aeedf1239fdc0f3f4cb7fa0ab9823;hp=8252c717075a5fc648173bbda73aeafc1be9be73;hpb=0234dab067e255d03eddc5c49c18cef4834546f7;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/models/e2_setup_request_message_test.go b/E2Manager/models/e2_setup_request_message_test.go
index 8252c71..b50d0d7 100644
--- a/E2Manager/models/e2_setup_request_message_test.go
+++ b/E2Manager/models/e2_setup_request_message_test.go
@@ -23,15 +23,17 @@ import (
 	"e2mgr/models"
 	"e2mgr/utils"
 	"encoding/xml"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 const (
-	e2SetupReqGnbSetupRequestXmlPath   = "../tests/resources/setupRequest/setupRequest_gnb.xml"
-	e2SetupReqEnGnbSetupRequestXmlPath = "../tests/resources/setupRequest/setupRequest_en-gNB.xml"
-	e2SetupReqEnbSetupRequestXmlPath   = "../tests/resources/setupRequest/setupRequest_enb.xml"
-	e2SetupReqNgEnbSetupRequestXmlPath = "../tests/resources/setupRequest/setupRequest_ng-eNB.xml"
+	e2SetupReqGnbSetupRequestXmlPath        = "../tests/resources/setupRequest/setupRequest_gnb.xml"
+	e2SetupReqEnGnbSetupRequestXmlPath      = "../tests/resources/setupRequest/setupRequest_en-gNB.xml"
+	e2SetupReqEnbSetupRequestXmlPath        = "../tests/resources/setupRequest/setupRequest_enb.xml"
+	e2SetupReqNgEnbSetupRequestXmlPath      = "../tests/resources/setupRequest/setupRequest_ng-eNB.xml"
+	e2SetupReqGnbSetupRequestWithOIDXmlPath = "../tests/resources/setupRequest/setupRequest_with_oid_gnb.xml"
 )
 
 func getTestE2SetupRequest(t *testing.T, reqXmlPath string) *models.E2SetupRequestMessage {
@@ -54,6 +56,35 @@ func TestExtractRanFunctionsListFromGnbRequestSuccess(t *testing.T) {
 	assert.Equal(t, uint32(1), ranFuncList[2].RanFunctionRevision)
 }
 
+func TestExtractRanFunctionsListFromGnbRequestwithOidSuccess(t *testing.T) {
+	setupRequest := getTestE2SetupRequest(t, e2SetupReqGnbSetupRequestWithOIDXmlPath)
+
+	ranFuncList := setupRequest.ExtractRanFunctionsList()
+
+	assert.Equal(t, uint32(1), ranFuncList[0].RanFunctionId)
+	assert.Equal(t, uint32(2), ranFuncList[1].RanFunctionId)
+	assert.Equal(t, uint32(3), ranFuncList[2].RanFunctionId)
+
+	assert.Equal(t, uint32(1), ranFuncList[0].RanFunctionRevision)
+	assert.Equal(t, uint32(1), ranFuncList[1].RanFunctionRevision)
+	assert.Equal(t, uint32(1), ranFuncList[2].RanFunctionRevision)
+
+	assert.Equal(t, "OID123", ranFuncList[0].RanFunctionOid)
+	assert.Equal(t, "OID124", ranFuncList[1].RanFunctionOid)
+	assert.Equal(t, "OID125", ranFuncList[2].RanFunctionOid)
+}
+
+func TestExtractE2nodeConfigSuccess(t *testing.T) {
+	setupRequest := getTestE2SetupRequest(t, e2SetupReqGnbSetupRequestWithOIDXmlPath)
+	e2nodeConfigs := setupRequest.ExtractE2NodeConfigList()
+
+	assert.Equal(t, 2, len(e2nodeConfigs))
+
+	assert.Equal(t, "nginterf1", e2nodeConfigs[0].GetE2NodeComponentInterfaceTypeNG().GetAmfName())
+	assert.Equal(t, "nginterf2", e2nodeConfigs[1].GetE2NodeComponentInterfaceTypeNG().GetAmfName())
+
+}
+
 func TestGetPlmnIdFromGnbRequestSuccess(t *testing.T) {
 	setupRequest := getTestE2SetupRequest(t, e2SetupReqGnbSetupRequestXmlPath)