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 a3aa836..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.
    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).
+

 ==================================================================================
 */
 /*
 ==================================================================================
 */
 /*


@@ -25,14 +30,15 @@
 package nbi
 
 import (
 package nbi
 
 import (

-       "testing"
-       "reflect"

        "errors"
        "errors"

-       "routing-manager/pkg/appmgr_model"
-       "github.com/go-openapi/swag"

        "net"
        "net/http"
        "net/http/httptest"
        "net"
        "net/http"
        "net/http/httptest"

+       "reflect"
+       "routing-manager/pkg/appmgr_model"
+       "testing"
+
+       "github.com/go-openapi/swag"

 )
 
 func TestGetNbi(t *testing.T) {
 )
 
 func TestGetNbi(t *testing.T) {


@@ -55,69 +61,73 @@ func TestGetNbi(t *testing.T) {
                }
        }
 }
                }
        }
 }

-

 func TestCreateSubReq(t *testing.T) {
 func TestCreateSubReq(t *testing.T) {

-       var subReq = appmgr_model.SubscriptionRequest{
-                TargetURL:  swag.String("localhost:8000/ric/v1/handles/xapp-handle/"),
-                EventType:  swag.String("all"),
-                MaxRetries: swag.Int64(5),
-                RetryTimer: swag.Int64(10),
-        }
-       subReq2 := CreateSubReq("localhost","8000")
+       var subData = appmgr_model.SubscriptionData{
+               TargetURL:  swag.String("localhost:8000/ric/v1/handles/xapp-handle/"),
+               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 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.Data.EventType) != (subReq2.Data.EventType) {
+               t.Errorf("Invalid EventType generated, got %v, want %v", subReq.Data.EventType, subReq2.Data.EventType)

        }
        }

-        if *(subReq.EventType) != *(subReq2.EventType) {
-                t.Errorf("Invalid EventType generated, got %v, want %v", *subReq.EventType, *subReq2.EventType)
-        }
-        if *(subReq.MaxRetries) != *(subReq2.MaxRetries) {
-                t.Errorf("Invalid MaxRetries generated, got %v, want %v", *subReq.MaxRetries, *subReq2.MaxRetries)
-        }
-        if *(subReq.RetryTimer) != *(subReq2.RetryTimer) {
-                t.Errorf("Invalid RetryTimer generated, got %v, want %v", *subReq.RetryTimer, *subReq2.RetryTimer)
-        }
+
+       if *(subReq.Data.MaxRetries) != *(subReq2.Data.MaxRetries) {
+               t.Errorf("Invalid MaxRetries generated, got %v, want %v", *subReq.Data.MaxRetries, *subReq2.Data.MaxRetries)
+       }
+       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) {
        b := []byte(`{"ID":"deadbeef1234567890", "Version":0, "EventType":"all"}`)
        l, err := net.Listen("tcp", "127.0.0.1:3000")
 }
 
 func TestPostSubReq(t *testing.T) {
        b := []byte(`{"ID":"deadbeef1234567890", "Version":0, "EventType":"all"}`)
        l, err := net.Listen("tcp", "127.0.0.1:3000")

-        if err != nil {
-                t.Error("Failed to create listener: " + err.Error())
-        }
-        ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-                t.Log(r.Method)
-                t.Log(r.URL)
-                if r.Method == "POST" && r.URL.String() == "/ric/v1/subscriptions" {
-                        t.Log("Sending reply")
-                        w.Header().Add("Content-Type", "application/json")
-                        w.WriteHeader(http.StatusCreated)
-                        w.Write(b)
-                }
-        }))
-        ts.Listener.Close()
-        ts.Listener = l
-
-        ts.Start()
+       if err != nil {
+               t.Error("Failed to create listener: " + err.Error())
+       }
+       ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+               t.Log(r.Method)
+               t.Log(r.URL)
+               if r.Method == "POST" && r.URL.String() == "/ric/v1/subscriptions" {
+                       t.Log("Sending reply")
+                       w.Header().Add("Content-Type", "application/json")
+                       w.WriteHeader(http.StatusCreated)
+                       w.Write(b)
+               }
+       }))
+       ts.Listener.Close()
+       ts.Listener = l
+
+       ts.Start()

        defer ts.Close()
        defer ts.Close()

-       err = PostSubReq("http://127.0.0.1:3000/ric/v1/subscription","localhost:8888")
+       err = PostSubReq("http://127.0.0.1:3000/ric/v1/subscription", "localhost:8888")

        if err != nil {
        if err != nil {

-               t.Error("Error occured: "+err.Error())
+               t.Error("Error occured: " + err.Error())

        }
 }
 
 func TestPostSubReqWithInvalidUrls(t *testing.T) {
        // invalid Xapp Manager URL
        }
 }
 
 func TestPostSubReqWithInvalidUrls(t *testing.T) {
        // invalid Xapp Manager URL

-        err := PostSubReq("http://127.0","http://localhost:8888")
-        if err == nil {
-                t.Error("Error occured: "+err.Error())
-        }
+       err := PostSubReq("http://127.0", "http://localhost:8888")
+       if err == nil {
+               t.Error("Error occured: " + err.Error())
+       }

        // invalid rest api url
        // invalid rest api url

-       err = PostSubReq("http://127.0.0.1:3000/","localhost:8888")
+       err = PostSubReq("http://127.0.0.1:3000/", "localhost:8888")

        if err == nil {
        if err == nil {

-               t.Error("Error occured: "+err.Error())
+               t.Error("Error occured: " + err.Error())

        }
 }
        }
 }

-