X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=common%2Futils.go;fp=common%2Futils.go;h=00670381906e6c591922d23d29e4b36ae9138906;hb=f612a00100eb9e6edef95a79e0fd68a2f693f287;hp=1cae140d3e28cbdbc953ab05b79d3864afe666eb;hpb=c350fc0a4ca3fcc68fa3d59b16b2bbcb5f4a8860;p=ric-plt%2Fnodeb-rnib.git

diff --git a/common/utils.go b/common/utils.go
index 1cae140..0067038 100644
--- 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