Removed Book Keeping of RMR CTL ports. Route Distribution only on demand

[ric-plt/rtmgr.git] / pkg / nbi / nbi_test.go

diff --git a/pkg/nbi/nbi_test.go b/pkg/nbi/nbi_test.go
index e309355..29e6ee3 100644 (file)
--- 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) {