X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fenb_load_information_notification_handler_test.go;h=a83c0f301d4ec5e37fbc8a45ee635969368256b6;hb=b3805a9d29e2c7f6f14e3fedfa1ba504f734eea9;hp=fb1fb4ec5b364b5db7ca06c094b0aef9a89772db;hpb=ffd085dd7f0654b84b163a7bfedd3fa89e7b8a71;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go
index fb1fb4e..a83c0f3 100644
--- a/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/enb_load_information_notification_handler_test.go
@@ -13,12 +13,14 @@
 // 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).
+
 
 package rmrmsghandlers
 
 import (
-	"e2mgr/logger"
 	"e2mgr/models"
 	"fmt"
 	"time"
@@ -26,13 +28,13 @@ import (
 
 const (
 	FullUperPdu  string = "004c07080004001980da0100075bde017c148003d5a8205000017c180003d5a875555403331420000012883a0003547400cd20002801ea16007c1f07c1f107c1f0781e007c80800031a02c000c88199040a00352083669190000d8908020000be0c4001ead4016e007ab50100002f8320067ab5005b8c1ead5070190c00001d637805f220000f56a081400005f020000f56a1d555400ccc508002801ea16007c1f07c1f107c1f0781e007c80800031a02c000c88199040a00352083669190000d8908020000be044001ead4016e007ab50100002f8120067ab5005b8c1ead5070190c00000"
-	FullAperPdu string = "" // TODO: populate and use it
+	FullAperPdu  string = "" // TODO: populate and use it
 	BasicUperPdu string = "004898000400190d0000074200017c148003d5a80000"
 	BasicAperPdu string = "" // TODO: populate and use it
 	GarbagePdu   string = "12312312"
 )
 
-func createNotificationRequest(ranName string, transactionId string, packedPdu string) (*models.NotificationRequest, error) {
+func createNotificationRequest(ranName string, transactionId []byte, packedPdu string) (*models.NotificationRequest, error) {
 	var packedByteSlice []byte
 
 	_, err := fmt.Sscanf(packedPdu, "%x", &packedByteSlice)
@@ -41,17 +43,17 @@ func createNotificationRequest(ranName string, transactionId string, packedPdu s
 		return nil, err
 	}
 
-	return models.NewNotificationRequest(ranName, packedByteSlice, time.Now(), transactionId), nil
+	return models.NewNotificationRequest(ranName, packedByteSlice, time.Now(), transactionId, nil), nil
 }
 
-func createNotificationRequestAndHandle(log *logger.Logger, ranName string, transactionId string, loadInformationHandler EnbLoadInformationNotificationHandler, pdu string) error {
+func createNotificationRequestAndHandle(ranName string, transactionId []byte, loadInformationHandler EnbLoadInformationNotificationHandler, pdu string) error {
 	notificationRequest, err := createNotificationRequest(ranName, transactionId, pdu)
 
 	if err != nil {
 		return err
 	}
 
-	loadInformationHandler.Handle(log, notificationRequest, nil)
+	loadInformationHandler.Handle(notificationRequest)
 	return nil
 }
 
@@ -76,7 +78,7 @@ func createNotificationRequestAndHandle(log *logger.Logger, ranName string, tran
 //	var packedExampleByteSlice []byte
 //	_, err = fmt.Sscanf(FullUperPdu, "%x", &packedExampleByteSlice)
 //	notificationRequest := models.NewNotificationRequest(inventoryName, packedExampleByteSlice, time.Now(), " 881828026419")
-//	loadInformationHandler.Handle(log, notificationRequest, nil)
+//	loadInformationHandler.Handle(log, notificationRequest)
 //
 //	writerMock.AssertNumberOfCalls(t, "SaveRanLoadInformation", 1)
 //}
@@ -102,7 +104,7 @@ func createNotificationRequestAndHandle(log *logger.Logger, ranName string, tran
 //	var packedExampleByteSlice []byte
 //	_, err = fmt.Sscanf(GarbagePdu, "%x", &packedExampleByteSlice)
 //	notificationRequest := models.NewNotificationRequest(inventoryName, packedExampleByteSlice, time.Now(), " 881828026419")
-//	loadInformationHandler.Handle(log, notificationRequest, nil)
+//	loadInformationHandler.Handle(log, notificationRequest)
 //
 //	writerMock.AssertNumberOfCalls(t, "SaveRanLoadInformation", 0)
 //}
@@ -120,13 +122,13 @@ func createNotificationRequestAndHandle(log *logger.Logger, ranName string, tran
 //	defer reader.Close()
 //	loadInformationHandler := NewEnbLoadInformationNotificationHandler(rNibWriter.GetRNibWriter)
 //
-//	err = createNotificationRequestAndHandle(log, "ranName", " 881828026419", loadInformationHandler, FullUperPdu)
+//	err = createNotificationRequestAndHandle("ranName", " 881828026419", loadInformationHandler, FullUperPdu)
 //
 //	if err != nil {
 //		t.Errorf("#setup_request_handler_test.TestLoadInformationHandlerOverrideSuccess - failed creating NotificationRequest, error: %v", err)
 //	}
 //
-//	err = createNotificationRequestAndHandle(log, "ranName", " 881828026419", loadInformationHandler, BasicUperPdu)
+//	err = createNotificationRequestAndHandle("ranName", " 881828026419", loadInformationHandler, BasicUperPdu)
 //
 //	if err != nil {
 //		t.Errorf("#setup_request_handler_test.TestLoadInformationHandlerOverrideSuccess - failed creating NotificationRequest, error: %v", err)