RIC-11566: Add support for Multiple E2 Nodes: CU/DU for the case having same GNBId

[ric-plt/nodeb-rnib.git] / common / utils.go

diff --git a/common/utils.go b/common/utils.go
index 1cae140..0067038 100644 (file)
--- a/common/utils.go
+++ b/common/utils.go
@@ -1,6 +1,7 @@
 //
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
+// Copyright 2023 Capgemini
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -59,7 +60,7 @@ func ValidateAndBuildNodeBNameKey(inventoryName string) (string, error) {
 /*
 ValidateAndBuildNodeBIdKey builds key according to the specified format returns the resulting string
 */
-func ValidateAndBuildNodeBIdKey(nodeType string, plmnId string, nbId string) (string, error) {
+func ValidateAndBuildNodeBIdKey(nodeType string, plmnId string, nbId string, cuupId string, duId string) (string, error) {
        if nodeType == "" {
                return "", NewValidationError("#utils.ValidateAndBuildNodeBIdKey - an empty node type received")
        }
@@ -69,8 +70,22 @@ func ValidateAndBuildNodeBIdKey(nodeType string, plmnId string, nbId string) (st
        if nbId == "" {
                return "", NewValidationError("#utils.ValidateAndBuildNodeBIdKey - an empty nbId received")
        }
+        /*Note: Deployment where CU-UP and DU are combined
+         (but do not include the CP-CP) and have a single E2 connection
+          is not supported. The combination of CU-CP, CU-UP, and DU will be
+          treated as a single gNB and expect it to have only the
+          global gNB ID in its E2 Setup ID*/
+
+       if cuupId != "" && duId != ""{
+               return fmt.Sprintf("%s:%s:%s", nodeType, plmnId, nbId), nil
+       }else if cuupId != "" {
+               return fmt.Sprintf("%s:%s:%s:%s", nodeType, plmnId, nbId, cuupId), nil
+       }else if duId != "" {
+               return fmt.Sprintf("%s:%s:%s:%s", nodeType, plmnId, nbId, duId ), nil
+       }else {
        return fmt.Sprintf("%s:%s:%s", nodeType, plmnId, nbId), nil
 }
+}
 
 /*
 ValidateAndBuildCellNamePciKey builds key according to the specified format returns the resulting string