Disable most of the resource_status_failure_handler + misc.

Change-Id: If4281212116d3e73db14caf2cc6586c27351adc0
Signed-off-by: rh362j <ronen.hasid@intl.att.com>

diff --git a/RSM/converters/resource_status_failure_unpacker.go b/RSM/converters/resource_status_failure_unpacker.go
index afaae62..d76f5f8 100644 (file)
--- a/RSM/converters/resource_status_failure_unpacker.go
+++ b/RSM/converters/resource_status_failure_unpacker.go
@@ -50,7 +50,9 @@ func convertCompleteFailureCauseInformation(completeFailureCauseInformation_List
                case C.CompleteFailureCauseInformation_ItemIEs__value_PR_CompleteFailureCauseInformation_Item:
                        item := (*C.CompleteFailureCauseInformation_Item_t)(unsafe.Pointer(&itemIE.value.choice[0]))
                        measurementInitiationResult := models.MeasurementInitiationResult{CellId: buildCellId(item.cell_ID)}
-                       convertMeasurementFailureCauses(&item.measurementFailureCause_List, &measurementInitiationResult)
+                       if err:=convertMeasurementFailureCauses(&item.measurementFailureCause_List, &measurementInitiationResult); err != nil {
+                               return nil, err
+                       }
                        measurementInitiationResults = append(measurementInitiationResults, &measurementInitiationResult)
                }
        }

diff --git a/RSM/converters/resource_status_response_unpacker.go b/RSM/converters/resource_status_response_unpacker.go
index ff2c52e..b50251b 100644 (file)
--- a/RSM/converters/resource_status_response_unpacker.go
+++ b/RSM/converters/resource_status_response_unpacker.go
@@ -90,7 +90,9 @@ func convertMeasurementInitiationResult(measurementInitiationResult_List *C.Meas
                        item := (*C.MeasurementInitiationResult_Item_t)(unsafe.Pointer(&itemIE.value.choice[0]))
                        measurementInitiationResult := models.MeasurementInitiationResult{CellId: buildCellId(item.cell_ID)}
                        if item.measurementFailureCause_List != nil {
-                               convertMeasurementFailureCauses(item.measurementFailureCause_List, &measurementInitiationResult)
+                               if err:= convertMeasurementFailureCauses(item.measurementFailureCause_List, &measurementInitiationResult); err != nil {
+                                       return nil, err
+                               }
                        }
                        measurementInitiationResults = append(measurementInitiationResults, &measurementInitiationResult)
                }

diff --git a/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go b/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go
index 924b3f7..aa79fc6 100644 (file)
--- a/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go
+++ b/RSM/handlers/rmrmsghandlers/resource_status_failure_handler.go
@@ -46,25 +46,25 @@ func (h ResourceStatusFailureHandler) Handle(request *models.RmrRequest) {
                }
                h.logger.Debugf("#ResourceStatusFailureHandler.Handle - RAN name: %s - message: %s", request.RanName, pduAsString)
        }
-       response, err := h.converter.Convert(request.Payload)
-       if err != nil {
-               h.logger.Errorf("#ResourceStatusFailureHandler.Handle - RAN name: %s - unpack failed. Error: %v", request.RanName, err)
-               return
-       }
-
-       /*The RSM creates one measurement per cell*/
-
-       if response.MeasurementInitiationResults == nil {
-               h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - ENB1_Measurement_ID: %d, ENB2_Measurement_ID: %d",
-                       request.RanName,
-                       response.ENB1_Measurement_ID,
-                       response.ENB2_Measurement_ID)
-       } else {
-               h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - ENB1_Measurement_ID: %d, ENB2_Measurement_ID: %d, CellId: %s, FailedReportCharacteristics: %x",
-                       request.RanName,
-                       response.ENB1_Measurement_ID,
-                       response.ENB2_Measurement_ID,
-                       response.MeasurementInitiationResults[0].CellId,
-                       response.MeasurementInitiationResults[0].MeasurementFailureCauses[0].MeasurementFailedReportCharacteristics)
-       }
+       //response, err := h.converter.Convert(request.Payload)
+       //if err != nil {
+       //      h.logger.Errorf("#ResourceStatusFailureHandler.Handle - RAN name: %s - unpack failed. Error: %v", request.RanName, err)
+       //      return
+       //}
+       //
+       ///*The RSM creates one measurement per cell*/
+       //
+       //if response.MeasurementInitiationResults == nil {
+       //      h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - ENB1_Measurement_ID: %d, ENB2_Measurement_ID: %d",
+       //              request.RanName,
+       //              response.ENB1_Measurement_ID,
+       //              response.ENB2_Measurement_ID)
+       //} else {
+       //      h.logger.Infof("#ResourceStatusFailureHandler.Handle - RAN name: %s - ENB1_Measurement_ID: %d, ENB2_Measurement_ID: %d, CellId: %s, FailedReportCharacteristics: %x",
+       //              request.RanName,
+       //              response.ENB1_Measurement_ID,
+       //              response.ENB2_Measurement_ID,
+       //              response.MeasurementInitiationResults[0].CellId,
+       //              response.MeasurementInitiationResults[0].MeasurementFailureCauses[0].MeasurementFailedReportCharacteristics)
+       //}
 }

diff --git a/RSM/handlers/rmrmsghandlers/resource_status_failure_handler_test.go b/RSM/handlers/rmrmsghandlers/resource_status_failure_handler_test.go
index 32e82d5..6e26bc9 100644 (file)
--- a/RSM/handlers/rmrmsghandlers/resource_status_failure_handler_test.go
+++ b/RSM/handlers/rmrmsghandlers/resource_status_failure_handler_test.go
@@ -17,36 +17,27 @@
 
 package rmrmsghandlers
 
-import (
-       "fmt"
-       "rsm/converters"
-       "rsm/e2pdus"
-       "rsm/logger"
-       "rsm/mocks"
-       "rsm/models"
-       "testing"
-       "time"
-)
-
 // Verify UnpackX2apPduAsString() and Convert() are called
+/*
 func TestResourceStatusFailureHandlerConvertFailure(t *testing.T) {
-       logger, err := logger.InitLogger(logger.DebugLevel)
+       logger, err := logger.InitLogger(logger.InfoLevel)
        if err != nil {
                t.Errorf("#... - failed to initialize logger, error: %s", err)
        }
        payload := []byte("aaa")
        req := models.RmrRequest{RanName: "test", StartTime: time.Now(), Payload: payload, Len: len(payload)}
        converterMock := mocks.ResourceStatusFailureConverterMock{}
-       converterMock.On("UnpackX2apPduAsString", req.Payload, e2pdus.MaxAsn1CodecMessageBufferSize).Return(string(payload), nil)
+       //converterMock.On("UnpackX2apPduAsString", req.Payload, e2pdus.MaxAsn1CodecMessageBufferSize).Return(string(payload), nil)
        converterMock.On("Convert", req.Payload).Return((*models.ResourceStatusResponse)(nil), fmt.Errorf("error"))
        h := NewResourceStatusFailureHandler(logger, &converterMock)
 
        h.Handle(&req)
 
-       converterMock.AssertNumberOfCalls(t, "UnpackX2apPduAsString", 1)
+       //converterMock.AssertNumberOfCalls(t, "UnpackX2apPduAsString", 1)
        converterMock.AssertNumberOfCalls(t, "Convert", 1)
 }
 
+
 func TestResourceStatusFailureHandlerUnpackFailure(t *testing.T) {
        logger, err := logger.InitLogger(logger.DebugLevel)
        if err != nil {
@@ -67,33 +58,36 @@ func TestResourceStatusFailureHandlerUnpackFailure(t *testing.T) {
        converterMock.AssertNumberOfCalls(t, "UnpackX2apPduAsString", 1)
        converterMock.AssertNumberOfCalls(t, "Convert", 0)
 }
+*/
 
+/*
 func TestResourceStatusFailureHandler(t *testing.T) {
-       logger, err := logger.InitLogger(logger.DebugLevel)
+       logger, err := logger.InitLogger(logger.InfoLevel)
        if err != nil {
                t.Errorf("#... - failed to initialize logger, error: %s", err)
        }
        unpacker := converters.NewX2apPduUnpacker(logger, e2pdus.MaxAsn1CodecMessageBufferSize)
-       converer := converters.NewResourceStatusFailureConverter(unpacker)
+       converter := converters.NewResourceStatusFailureConverter(unpacker)
        var payload []byte
        fmt.Sscanf("400900320000040027000300000e0028000300000c00054001620044401800004540130002f8290007ab500000434006000000000740", "%x", &payload)
        req := models.RmrRequest{RanName: "test", StartTime: time.Now(), Payload: payload, Len: len(payload)}
-       h := NewResourceStatusFailureHandler(logger, converer)
+       h := NewResourceStatusFailureHandler(logger, converter)
 
        h.Handle(&req)
 }
 
 func TestResourceStatusFailureHandlerMinimalPdu(t *testing.T) {
-       logger, err := logger.InitLogger(logger.DebugLevel)
+       logger, err := logger.InitLogger(logger.InfoLevel)
        if err != nil {
                t.Errorf("#... - failed to initialize logger, error: %s", err)
        }
        unpacker := converters.NewX2apPduUnpacker(logger, e2pdus.MaxAsn1CodecMessageBufferSize)
-       converer := converters.NewResourceStatusFailureConverter(unpacker)
+       converter := converters.NewResourceStatusFailureConverter(unpacker)
        var payload []byte
        fmt.Sscanf("400900170000030027000300000000280003000049000540020a80", "%x", &payload)
        req := models.RmrRequest{RanName: "test", StartTime: time.Now(), Payload: payload, Len: len(payload)}
-       h := NewResourceStatusFailureHandler(logger, converer)
+       h := NewResourceStatusFailureHandler(logger, converter)
 
        h.Handle(&req)
 }
+*/
\ No newline at end of file

diff --git a/RSM/logger/logger.go b/RSM/logger/logger.go
index 9cc4414..883d384 100644 (file)
--- a/RSM/logger/logger.go
+++ b/RSM/logger/logger.go
@@ -94,7 +94,7 @@ func InitLogger(requested LogLevel) (*Logger, error) {
        case FatalLevel:
                logger, err = initLoggerByLevel(zapcore.FatalLevel)
        default:
-               err = fmt.Errorf("Invalid logging Level :%d", requested)
+               err = fmt.Errorf("invalid logging Level :%d", requested)
        }
        if err != nil {
                return nil, err

diff --git a/RSM/rsmdb/rsm_writer.go b/RSM/rsmdb/rsm_writer.go
index 9a87689..58c56c1 100644 (file)
--- a/RSM/rsmdb/rsm_writer.go
+++ b/RSM/rsmdb/rsm_writer.go
@@ -56,7 +56,7 @@ func (r *rsmWriterInstance) SaveRsmGeneralConfiguration(cfg *models.RsmGeneralCo
 }
 
 
-// SaveWithKeyAndMarshal marshals 
+// SaveWithKeyAndMarshal marshals the Go structure to json and saves it to the DB with key 'key'
 func (r *rsmWriterInstance) SaveWithKeyAndMarshal(key string, entity interface{}) error {
 
        data, err := json.Marshal(entity)