X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=common%2Futils.go;h=608130e01204d90e2d59772b61fb20829c7d48ce;hb=31ed7870dcc21557eeeb65cfc0752e72544a7196;hp=f7a84ad1541528c6924a4fa8443da7b971496318;hpb=286ce41c7d5049e688a40f68e4c6681a645add3d;p=ric-plt%2Fnodeb-rnib.git

diff --git a/common/utils.go b/common/utils.go
index f7a84ad..608130e 100644
--- a/common/utils.go
+++ b/common/utils.go
@@ -14,67 +14,85 @@
 // 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 common
 
 import (
-	"errors"
 	"fmt"
 )
+
 /*
 ValidateAndBuildCellIdKey builds key according to the specified format returns the resulting string
- */
-func ValidateAndBuildCellIdKey(cellId string) (string, IRNibError) {
+*/
+func ValidateAndBuildCellIdKey(cellId string) (string, error) {
 	if cellId == "" {
-		e := errors.New("#utils.ValidateAndBuildCellIdKey - an empty cell id received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildCellIdKey - an empty cell id received")
 	}
 	return fmt.Sprintf("CELL:%s", cellId), nil
 }
+
 /*
 ValidateAndBuildNrCellIdKey builds key according to the specified format returns the resulting string
- */
-func ValidateAndBuildNrCellIdKey(cellId string) (string, IRNibError) {
+*/
+func ValidateAndBuildNrCellIdKey(cellId string) (string, error) {
 	if cellId == "" {
-		e := errors.New("#utils.ValidateAndBuildNrCellIdKey - an empty cell id received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildNrCellIdKey - an empty cell id received")
 	}
 	return fmt.Sprintf("NRCELL:%s", cellId), nil
 }
+
 /*
 ValidateAndBuildNodeBNameKey builds key according to the specified format returns the resulting string
- */
-func ValidateAndBuildNodeBNameKey(inventoryName string) (string, IRNibError) {
+*/
+func ValidateAndBuildNodeBNameKey(inventoryName string) (string, error) {
 	if inventoryName == "" {
-		e := errors.New("#utils.ValidateAndBuildNodeBNameKey - an empty inventory name received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildNodeBNameKey - an empty inventory name received")
 	}
 	return fmt.Sprintf("RAN:%s", inventoryName), nil
 }
+
 /*
 ValidateAndBuildNodeBIdKey builds key according to the specified format returns the resulting string
- */
-func ValidateAndBuildNodeBIdKey(nodeType string, plmnId string, nbId string) (string, IRNibError) {
+*/
+func ValidateAndBuildNodeBIdKey(nodeType string, plmnId string, nbId string) (string, error) {
 	if nodeType == "" {
-		e := errors.New("#utils.ValidateAndBuildNodeBIdKey - an empty node type received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildNodeBIdKey - an empty node type received")
 	}
 	if plmnId == "" {
-		e := errors.New("#utils.ValidateAndBuildNodeBIdKey - an empty plmnId received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildNodeBIdKey - an empty plmnId received")
 	}
 	if nbId == "" {
-		e := errors.New("#utils.ValidateAndBuildNodeBIdKey - an empty nbId received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildNodeBIdKey - an empty nbId received")
 	}
 	return fmt.Sprintf("%s:%s:%s", nodeType, plmnId, nbId), nil
 }
+
 /*
 ValidateAndBuildCellNamePciKey builds key according to the specified format returns the resulting string
- */
-func ValidateAndBuildCellNamePciKey(inventoryName string, pci uint32) (string, IRNibError) {
+*/
+func ValidateAndBuildCellNamePciKey(inventoryName string, pci uint32) (string, error) {
 	if inventoryName == "" {
-		e := errors.New("#utils.ValidateAndBuildCellNamePciKey - an empty inventory name received")
-		return "", NewValidationError(e)
+		return "", NewValidationError("#utils.ValidateAndBuildCellNamePciKey - an empty inventory name received")
 	}
 	return fmt.Sprintf("PCI:%s:%02x", inventoryName, pci), nil
+}
+
+func ValidateAndBuildRanLoadInformationKey(inventoryName string) (string, error) {
+
+	if inventoryName == "" {
+		return "", NewValidationError("#utils.ValidateAndBuildRanLoadInformationKey - an empty inventory name received")
+	}
+
+	return fmt.Sprintf("LOAD:%s", inventoryName), nil
+}
+
+func ValidateAndBuildE2TInstanceKey(address string) (string, error) {
+
+	if address == "" {
+		return "", NewValidationError("#utils.ValidateAndBuildRanLoadInformationKey - an empty inventory name received")
+	}
+
+	return fmt.Sprintf("E2TInstance:%s", address), nil
 }
\ No newline at end of file