X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pm-file-converter%2Fmain.go;h=00289512341a84bd0e4b16a1a26016b51bf084f1;hb=refs%2Fchanges%2F37%2F12337%2F1;hp=599a33bdbec7426bc393e9fc813953395bf5f47f;hpb=6e3dc81c76fc88e000b83c35282d3db823f815a3;p=nonrtric%2Fplt%2Franpm.git diff --git a/pm-file-converter/main.go b/pm-file-converter/main.go index 599a33b..0028951 100644 --- a/pm-file-converter/main.go +++ b/pm-file-converter/main.go @@ -3,7 +3,8 @@ // ========================LICENSE_START================================= // O-RAN-SC // %% -// Copyright (C) 2023: Nordix Foundation +// Copyright (C) 2023: Nordix Foundation. All rights reserved. +// Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. // %% // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,8 +22,6 @@ package main import ( "fmt" - jsoniter "github.com/json-iterator/go" - log "github.com/sirupsen/logrus" "main/common/dataTypes" "main/common/utils" "main/components/kafkacollector" @@ -33,6 +32,9 @@ import ( "sync" "syscall" "time" + + jsoniter "github.com/json-iterator/go" + log "github.com/sirupsen/logrus" ) var ics_server = os.Getenv("ICS") @@ -59,6 +61,8 @@ var writer_control = make(chan dataTypes.WriterControl, 1) const registration_delay_short = 2 const registration_delay_long = 120 +const failedMessageLabel = " - failed" + //== Variables ==// var AppState = Init @@ -155,7 +159,7 @@ func registerProducer() bool { if err != nil { log.Error("Cannot read config file: ", config_file) // NOSONAR - log.Error(registeringProducer, producer_instance_name, " - failed") + log.Error(registeringProducer, producer_instance_name, failedMessageLabel) return false } data := dataTypes.DataTypes{} @@ -163,7 +167,7 @@ func registerProducer() bool { if err != nil { log.Error("Cannot parse config file: ", config_file) // NOSONAR - log.Error(registeringProducer, producer_instance_name, " - failed") + log.Error(registeringProducer, producer_instance_name, failedMessageLabel) return false } var newTypeNames []string @@ -183,14 +187,14 @@ func registerProducer() bool { if err != nil { log.Error("Cannot create json for type: ", data.ProdDataTypes[i].ID) // NOSONAR - log.Error(registeringProducer, producer_instance_name, " - failed") + log.Error(registeringProducer, producer_instance_name, failedMessageLabel) return false } else { ok := utils.SendHttpRequest(json, http.MethodPut, "http://"+ics_server+"/data-producer/v1/info-types/"+data.ProdDataTypes[i].ID, true, creds_grant_type != "") if !ok { log.Error("Cannot register type: ", data.ProdDataTypes[i].ID) // NOSONAR - log.Error(registeringProducer, producer_instance_name, " - failed") + log.Error(registeringProducer, producer_instance_name, failedMessageLabel) return false } newTypeNames = append(newTypeNames, data.ProdDataTypes[i].ID)