X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Fodusliceassurance%2Fgoversion%2Finternal%2Fstructures%2Fsliceassurance.go;h=7cefcaf6c0196a37c66924c8b80e5161acdb0fe6;hb=237a4da4b9419171f774bd6a02f61bef81f1b60f;hp=c243d1853b68f96c282b7cb8da4b6bb87ac03c6c;hpb=da4ae7fc3df3c105fba7711c366d23bfbdd1e02c;p=nonrtric.git

diff --git a/test/usecases/odusliceassurance/goversion/internal/structures/sliceassurance.go b/test/usecases/odusliceassurance/goversion/internal/structures/sliceassurance.go
index c243d185..7cefcaf6 100644
--- a/test/usecases/odusliceassurance/goversion/internal/structures/sliceassurance.go
+++ b/test/usecases/odusliceassurance/goversion/internal/structures/sliceassurance.go
@@ -73,19 +73,19 @@ func (sa *SliceAssuranceMeas) AddOrUpdateMetric(meas messages.Measurement) (stri
 	var duid string
 	var sd, sst int
 
-	regex := *regexp.MustCompile(`\/network-function\/distributed-unit-functions\[id=\'(.*)\'\]/cell\[id=\'(.*)\'\]/supported-measurements\/performance-measurement-type\[\.=\'(.*)\'\]\/supported-snssai-subcounter-instances\/slice-differentiator\[\.=(\d)\]\[slice-service-type=(\d+)\]`)
+	regex := *regexp.MustCompile(`\/(.*)network-function\/distributed-unit-functions\[id=\'(.*)\'\]\/cell\[id=\'(.*)\'\]\/supported-measurements\[performance-measurement-type=\'(.*)\'\]\/supported-snssai-subcounter-instances\[slice-differentiator=\'(\d+)\'\]\[slice-service-type=\'(\d+)\'\]`)
 	res := regex.FindAllStringSubmatch(meas.MeasurementTypeInstanceReference, -1)
 
-	if res != nil && len(res[0]) == 6 {
-		duid = res[0][1]
-		sd = toInt(res[0][4])
-		sst = toInt(res[0][5])
+	if res != nil && len(res[0]) == 7 {
+		duid = res[0][2]
+		sd = toInt(res[0][5])
+		sst = toInt(res[0][6])
 
 		key := MapKey{duid, sd, sst}
 		value, check := sa.Metrics[key]
 
 		if check {
-			sa.updateMetric(key, value, res[0][3], meas.Value)
+			sa.updateMetric(key, value, res[0][4], meas.Value)
 		} else {
 			// Only add new one if value exceeds threshold
 			sa.addMetric(res, meas.Value)
@@ -98,9 +98,9 @@ func (sa *SliceAssuranceMeas) AddOrUpdateMetric(meas messages.Measurement) (stri
 
 func (sa *SliceAssuranceMeas) addMetric(res [][]string, metricValue int) {
 	if metricValue > 700 {
-		metric := NewSliceMetric(res[0][1], res[0][2], toInt(res[0][4]), toInt(res[0][5]))
+		metric := NewSliceMetric(res[0][2], res[0][3], toInt(res[0][5]), toInt(res[0][6]))
 		metric.PM[res[0][3]] = metricValue
-		key := MapKey{res[0][1], toInt(res[0][4]), toInt(res[0][5])}
+		key := MapKey{res[0][2], toInt(res[0][5]), toInt(res[0][6])}
 		sa.Metrics[key] = metric
 	}
 }