X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fusecases%2Fodusliceassurance%2Fgoversion%2Finternal%2Fsliceassurance%2Fapp.go;h=c4a4d65b7af266ea90c44eddb890d3fdb106641e;hb=5e92b2132b2300080d8a928b7d9c44906724fd78;hp=09a944824f11a68bd29d3980cdfe99b789ab2fe5;hpb=9fea4bb800369d2b56b81b315451314fa4482f8c;p=nonrtric.git diff --git a/test/usecases/odusliceassurance/goversion/internal/sliceassurance/app.go b/test/usecases/odusliceassurance/goversion/internal/sliceassurance/app.go index 09a94482..c4a4d65b 100644 --- a/test/usecases/odusliceassurance/goversion/internal/sliceassurance/app.go +++ b/test/usecases/odusliceassurance/goversion/internal/sliceassurance/app.go @@ -21,131 +21,118 @@ package sliceassurance import ( + "encoding/json" "fmt" "net/http" - "strconv" "time" + "oransc.org/usecase/oduclosedloop/internal/config" "oransc.org/usecase/oduclosedloop/internal/restclient" "oransc.org/usecase/oduclosedloop/internal/structures" "oransc.org/usecase/oduclosedloop/messages" + + log "github.com/sirupsen/logrus" ) const ( - THRESHOLD_TPUT = 700 - DEFAULT_DEDICATED_RATIO = 40 - NEW_DEDICATED_RATIO = 50 - NODE_ID = "O-DU-1211" + THRESHOLD_TPUT = 7000 + DEFAULT_DEDICATED_RATIO = 15 + NEW_DEDICATED_RATIO = 25 + NODE_ID = "O-DU-1122" ) type App struct { - Client restclient.HTTPClient - MetricsPolicies *structures.SliceAssuranceMeas + client *restclient.Client + metricsPolicies *structures.SliceAssuranceMeas } var dmaapMRUrl string -var SDNRUrl string - -func (a *App) Initialize(dmaapUrl string, sdnrUrl string) { - dmaapMRUrl = dmaapUrl - SDNRUrl = sdnrUrl - - a.Client = restclient.New(&http.Client{}) - a.MetricsPolicies = structures.NewSliceAssuranceMeas() +var sDNRUrl string +var sDNRUsername string +var sDNRPassword string + +func (a *App) Initialize(config *config.Config) { + dmaapMRUrl = config.MRHost + ":" + config.MRPort + sDNRUrl = config.SDNRAddress + sDNRUsername = config.SDNRUser + sDNRPassword = config.SDNPassword + + a.client = restclient.New(&http.Client{}, false) + a.metricsPolicies = structures.NewSliceAssuranceMeas() } func (a *App) Run(topic string, pollTime int) { for { - fmt.Printf("Polling new messages from DmaapMR\n") - var stdMessage messages.StdDefinedMessage + a.getMessagesFromDmaap(dmaapMRUrl + topic) - a.Client.Get(dmaapMRUrl+topic, &stdMessage) - - a.processMessages(stdMessage) - - exceedsThMetrics := a.checkIfThresholdIsExceed() - if len(exceedsThMetrics) > 0 { - a.updateDedicatedRatio(exceedsThMetrics) + for key := range a.metricsPolicies.Metrics { + a.getRRMInformation(key.Duid) } + a.updateDedicatedRatio() time.Sleep(time.Second * time.Duration(pollTime)) } } -func (a *App) processMessages(stdMessage messages.StdDefinedMessage) { - - for _, meas := range stdMessage.GetMeasurements() { - - fmt.Printf("New measurement: %+v\n", meas) - //Create sliceMetric and check if metric exist and update existing one or create new one - tmpSm := meas.CreateSliceMetric() - a.MetricsPolicies.AddOrUpdateMetric(tmpSm) - - //Fetch policy ratio metrics from SDNR - var duRRMPolicyRatio messages.ORanDuRestConf - a.Client.Get(getUrlForDistributedUnitFunctions(SDNRUrl, tmpSm.DUId), &duRRMPolicyRatio) - - //Get DuId and check if we have metrics for it - policyRatioDuId := duRRMPolicyRatio.DistributedUnitFunction.Id - policies := duRRMPolicyRatio.DistributedUnitFunction.RRMPolicyRatio - for _, policy := range policies { - members: - for _, member := range policy.RRMPolicyMembers { - metric := a.MetricsPolicies.GetSliceMetric(policyRatioDuId, member.SliceDifferentiator, member.SliceServiceType) - if metric != nil { - a.MetricsPolicies.AddNewPolicy(addOrUpdatePolicyRatio(metric, policy)) - break members - } - } - } - } -} +func (a *App) getMessagesFromDmaap(path string) { + log.Infof("Polling new messages from DmaapMR %v", path) -func (a *App) checkIfThresholdIsExceed() []*structures.SliceMetric { - exceedsThMetrics := make([]*structures.SliceMetric, 0) - for _, metric := range a.MetricsPolicies.Metrics { - for key, value := range metric.PM { + //Added to work with onap-Dmaap + var messageStrings []string + if error := a.client.Get(path, &messageStrings); error != nil { + log.Warn("Send of Get messages from DmaapMR failed! ", error) + } - if (value) > THRESHOLD_TPUT { - fmt.Printf("PM: [%v, %v] exceeds threshold value!\n", key, value) - exceedsThMetrics = append(exceedsThMetrics, metric) + for _, msgString := range messageStrings { + var message messages.StdDefinedMessage + if err := json.Unmarshal([]byte(msgString), &message); err == nil { + for _, meas := range message.GetMeasurements() { + log.Infof("Create sliceMetric and check if metric exist and update existing one or create new one measurement: %+v\n", meas) + //Create sliceMetric and check if metric exist and update existing one or create new one + if _, err := a.metricsPolicies.AddOrUpdateMetric(meas); err != nil { + log.Error("Metric could not be added ", err) + } } + } else { + log.Warn(err) } } - return exceedsThMetrics } -func (a *App) updateDedicatedRatio(exceedsThMetrics []*structures.SliceMetric) { - for _, m := range exceedsThMetrics { - //Check if RRMPolicyDedicatedRatio is higher than default value - policy := a.MetricsPolicies.Policies[m.RRMPolicyRatioId] +func (a *App) getRRMInformation(duid string) { + var duRRMPolicyRatio messages.ORanDuRestConf - if policy != nil && policy.PolicyDedicatedRatio <= DEFAULT_DEDICATED_RATIO { - //Send PostRequest to update DedicatedRatio - url := getUrlUpdatePolicyDedicatedRatio(SDNRUrl, m.DUId, policy.PolicyRatioId) - a.Client.Post(url, messages.GetDedicatedRatioUpdateMessage(*m, *policy, NEW_DEDICATED_RATIO), nil) - } + log.Infof("Get RRM Information from SDNR url: %v", sDNRUrl) + if error := a.client.Get(getUrlForDistributedUnitFunctions(sDNRUrl, duid), &duRRMPolicyRatio, sDNRUsername, sDNRPassword); error == nil { + prettyPrint(duRRMPolicyRatio.DistributedUnitFunction) + } else { + log.Warn("Send of Get RRM Information failed! ", error) } -} -func addOrUpdatePolicyRatio(metric *structures.SliceMetric, policy messages.RRMPolicyRatio) *structures.PolicyRatio { - if metric.RRMPolicyRatioId == "" { - metric.RRMPolicyRatioId = policy.Id - } - return &structures.PolicyRatio{ - PolicyRatioId: policy.Id, - PolicyMaxRatio: policy.RRMPolicyMaxRatio, - PolicyMinRatio: policy.RRMPolicyMinRatio, - PolicyDedicatedRatio: toInt(policy.RRMPolicyDedicatedRatio), + for _, odu := range duRRMPolicyRatio.DistributedUnitFunction { + for _, policy := range odu.RRMPolicyRatio { + log.Infof("Add or Update policy: %+v from DU id: %v", policy.Id, duid) + a.metricsPolicies.AddNewPolicy(duid, policy) + } } } -func toInt(num string) int { - res, err := strconv.Atoi(num) - if err != nil { - return -1 +func (a *App) updateDedicatedRatio() { + for _, metric := range a.metricsPolicies.Metrics { + policy, check := a.metricsPolicies.Policies[metric.RRMPolicyRatioId] + //TODO What happened if dedicated ratio is already higher that default and threshold is exceed? + if check && policy.PolicyDedicatedRatio <= DEFAULT_DEDICATED_RATIO { + log.Infof("Send Request to update DedicatedRatio for DU id: %v Policy id: %v", metric.DUId, policy.PolicyRatioId) + path := getUrlUpdatePolicyDedicatedRatio(sDNRUrl, metric.DUId, policy.PolicyRatioId) + updatePolicyMessage := policy.GetUpdateDedicatedRatioMessage(metric.SliceDiff, metric.SliceServiceType, NEW_DEDICATED_RATIO) + prettyPrint(updatePolicyMessage) + if error := a.client.Put(path, updatePolicyMessage, nil, sDNRUsername, sDNRPassword); error == nil { + log.Infof("Policy Dedicated Ratio for PolicyId: %v was updated to %v", policy.PolicyRatioId, NEW_DEDICATED_RATIO) + } else { + log.Warn("Send of Put Request to update DedicatedRatio failed! ", error) + } + } } - return res } func getUrlForDistributedUnitFunctions(host string, duid string) string { @@ -155,3 +142,11 @@ func getUrlForDistributedUnitFunctions(host string, duid string) string { func getUrlUpdatePolicyDedicatedRatio(host string, duid string, policyid string) string { return host + "/rests/data/network-topology:network-topology/topology=topology-netconf/node=" + NODE_ID + "/yang-ext:mount/o-ran-sc-du-hello-world:network-function/distributed-unit-functions=" + duid + "/radio-resource-management-policy-ratio=" + policyid } + +func prettyPrint(jsonStruct interface{}) { + b, err := json.MarshalIndent(jsonStruct, "", " ") + if err != nil { + fmt.Println("error:", err) + } + fmt.Print(string(b)) +}