X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fnbi_test.go;h=29e6ee33b6c472d930150e3f2eec742e6a7f4be2;hb=6a9ce4976c1fbbcb8d4a068f81e76515c99a9d3f;hp=e309355890b85bb81e44034084e4fa5c2b2d01e7;hpb=eb2ff0d217caf158dd15424bf70f8aa79c3742b1;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/nbi_test.go b/pkg/nbi/nbi_test.go
index e309355..29e6ee3 100644
--- a/pkg/nbi/nbi_test.go
+++ b/pkg/nbi/nbi_test.go
@@ -14,6 +14,11 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+   platform project (RICP).
+
 ==================================================================================
 */
 /*
@@ -26,13 +31,14 @@ package nbi
 
 import (
 	"errors"
-	"github.com/go-openapi/swag"
 	"net"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"routing-manager/pkg/appmgr_model"
 	"testing"
+
+	"github.com/go-openapi/swag"
 )
 
 func TestGetNbi(t *testing.T) {
@@ -55,30 +61,35 @@ func TestGetNbi(t *testing.T) {
 		}
 	}
 }
-
 func TestCreateSubReq(t *testing.T) {
-	var subReq = appmgr_model.SubscriptionRequest{
+	var subData = appmgr_model.SubscriptionData{
 		TargetURL:  swag.String("localhost:8000/ric/v1/handles/xapp-handle/"),
-		EventType:  swag.String("all"),
+		EventType:  appmgr_model.EventTypeAll,
 		MaxRetries: swag.Int64(5),
 		RetryTimer: swag.Int64(10),
 	}
+	subReq := appmgr_model.SubscriptionRequest{
+		Data: &subData,
+	}
 	subReq2 := CreateSubReq("localhost", "8000")
 	if reflect.TypeOf(subReq) != reflect.TypeOf(*subReq2) {
 		t.Errorf("Invalid type, got: %v, want: %v.", reflect.TypeOf(subReq), reflect.TypeOf(*subReq2))
 	}
-	if *(subReq.TargetURL) != *(subReq2.TargetURL) {
-		t.Errorf("Invalid TargetURL generated, got %v, want %v", *subReq.TargetURL, *subReq2.TargetURL)
+	if *(subReq.Data.TargetURL) != *(subReq2.Data.TargetURL) {
+		t.Errorf("Invalid TargetURL generated, got %v, want %v", *subReq.Data.TargetURL, *subReq2.Data.TargetURL)
 	}
-	if *(subReq.EventType) != *(subReq2.EventType) {
-		t.Errorf("Invalid EventType generated, got %v, want %v", *subReq.EventType, *subReq2.EventType)
+
+	if (subReq.Data.EventType) != (subReq2.Data.EventType) {
+		t.Errorf("Invalid EventType generated, got %v, want %v", subReq.Data.EventType, subReq2.Data.EventType)
 	}
-	if *(subReq.MaxRetries) != *(subReq2.MaxRetries) {
-		t.Errorf("Invalid MaxRetries generated, got %v, want %v", *subReq.MaxRetries, *subReq2.MaxRetries)
+
+	if *(subReq.Data.MaxRetries) != *(subReq2.Data.MaxRetries) {
+		t.Errorf("Invalid MaxRetries generated, got %v, want %v", *subReq.Data.MaxRetries, *subReq2.Data.MaxRetries)
 	}
-	if *(subReq.RetryTimer) != *(subReq2.RetryTimer) {
-		t.Errorf("Invalid RetryTimer generated, got %v, want %v", *subReq.RetryTimer, *subReq2.RetryTimer)
+	if *(subReq.Data.RetryTimer) != *(subReq2.Data.RetryTimer) {
+		t.Errorf("Invalid RetryTimer generated, got %v, want %v", *subReq.Data.RetryTimer, *subReq2.Data.RetryTimer)
 	}
+
 }
 
 func TestPostSubReq(t *testing.T) {