X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=icsversion%2Finternal%2Fodusliceassurance%2Fapp.go;h=c447e5deb50ed287d59ee7554faed60c49c646ee;hb=refs%2Fchanges%2F73%2F10473%2F1;hp=0504a1302421f8f5dfefad5d0fbe7f9dcc8929e0;hpb=361894d226e2e8946a1e57bba2125a14ce84c009;p=nonrtric%2Frapp%2Fransliceassurance.git diff --git a/icsversion/internal/odusliceassurance/app.go b/icsversion/internal/odusliceassurance/app.go index 0504a13..c447e5d 100644 --- a/icsversion/internal/odusliceassurance/app.go +++ b/icsversion/internal/odusliceassurance/app.go @@ -34,25 +34,24 @@ import ( var started bool var icsAddr string var consumerPort string +var jobId string const ( THRESHOLD_TPUT = 7000 DEFAULT_DEDICATED_RATIO = 15 NEW_DEDICATED_RATIO = 25 - NODE_ID = "O-DU-1122" - jobId = "14e7bb84-a44d-44c1-90b7-6995a92ad83d" ) var jobRegistrationInfo = struct { - InfoTypeID string `json:"info_type_id"` - JobResultURI string `json:"job_result_uri"` - JobOwner string `json:"job_owner"` - JobDefinition interface{} `json:"job_definition"` + InfoTypeID string `json:"info_type_id"` + JobResultURI string `json:"job_result_uri"` + JobOwner string `json:"job_owner"` + JobDefinition interface{} `json:"job_definition"` + StatusNotificationURI string `json:"status_notification_uri"` }{ - InfoTypeID: "Performance_Measurement_Streaming", - JobResultURI: "", - JobOwner: "O-DU Slice Assurance Usecase", - JobDefinition: "{}", + InfoTypeID: "Performance_Measurement_Streaming", + JobResultURI: "", + JobOwner: "O-DU Slice Assurance Use Case", } type App struct { @@ -67,13 +66,18 @@ var sdnrConfig SdnrConfiguration func (a *App) Initialize(config *config.Configuration) { consumerPort = fmt.Sprint(config.ConsumerPort) jobRegistrationInfo.JobResultURI = config.ConsumerHost + ":" + consumerPort + jobRegistrationInfo.StatusNotificationURI = config.ConsumerHost + ":" + consumerPort + var job_definition struct{} + jobRegistrationInfo.JobDefinition = job_definition sdnrConfig = SdnrConfiguration{ SDNRAddress: config.SDNRAddress, SDNRUser: config.SDNRUser, SDNRPassword: config.SDNPassword, + NodeId: config.NodeId, } icsAddr = config.InfoCoordinatorAddress + jobId = config.JobId a.client = restclient.New(&http.Client{}, false) a.data = structures.NewSliceAssuranceMeas() @@ -124,7 +128,7 @@ func (a *App) statusHandler(w http.ResponseWriter, r *http.Request) { } func (a *App) startHandler(w http.ResponseWriter, r *http.Request) { - log.Debug("startHandler: Register job in ICS.") + log.Debug("Register job in ICS.") putErr := a.client.Put(icsAddr+"/data-consumer/v1/info-jobs/"+jobId, jobRegistrationInfo, nil) if putErr != nil {