X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Fodusliceassurance%2Fgoversion%2Fmessages%2FstdVesMessage.go;h=c2c58496b61bcd9ccd6e95ad9265c2acc2c71813;hb=07a4236558e3876add50a8a080a431b5b7f366b4;hp=1ee0dcf3c75428e0e7c6fafefb972de48b1e0c33;hpb=534a1fe8136ed8d72615707008bdd6061d1df2fe;p=nonrtric.git diff --git a/test/usecases/odusliceassurance/goversion/messages/stdVesMessage.go b/test/usecases/odusliceassurance/goversion/messages/stdVesMessage.go index 1ee0dcf3..c2c58496 100644 --- a/test/usecases/odusliceassurance/goversion/messages/stdVesMessage.go +++ b/test/usecases/odusliceassurance/goversion/messages/stdVesMessage.go @@ -20,15 +20,6 @@ package messages -import ( - "fmt" - "regexp" - "strconv" - "strings" - - "oransc.org/usecase/oduclosedloop/internal/structures" -) - type StdDefinedMessage struct { Event Event `json:"event"` } @@ -63,62 +54,3 @@ type Measurement struct { func (message StdDefinedMessage) GetMeasurements() []Measurement { return message.Event.StndDefinedFields.Data.Measurements } - -func (meas Measurement) CreateSliceMetric() *structures.SliceMetric { - var pmName string - var duid, cellid string - var sd, sst int - - typeParts := strings.Split(meas.MeasurementTypeInstanceReference, "/") - for _, part := range typeParts { - if strings.Contains(part, "distributed-unit-functions") { - duid = getValueInsideQuotes(part) - - } else if strings.Contains(part, "cell[") { - cellid = getValueInsideQuotes(part) - - } else if strings.Contains(part, "performance-measurement-type") { - pmName = getValueInsideQuotes(part) - - } else if strings.Contains(part, "slice-differentiator") { - sd = getPropertyNumber(part) - - } else if strings.Contains(part, "slice-differentiator") { - res, err := strconv.Atoi(getValueInsideQuotes(part)) - if err != nil { - sst = -1 - } - sst = res - } - } - - sm := structures.NewSliceMetric(duid, cellid, sd, sst) - sm.PM[pmName] = meas.Value - return sm -} - -func getValueInsideQuotes(text string) string { - re := regexp.MustCompile(`\'(.*?)\'`) - - match := re.FindAllString(text, -1) - var res string - if len(match) == 1 { - res = strings.Trim(match[0], "'") - } - return res -} - -func getPropertyNumber(text string) int { - re := regexp.MustCompile("[0-9]+") - match := re.FindAllString(text, -1) - var res int - var err error - if len(match) == 1 { - res, err = strconv.Atoi(match[0]) - if err != nil { - fmt.Println(err) - return -1 - } - } - return res -}