X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=icsversion%2Finternal%2Fodusliceassurance%2Fapp.go;h=d09fa719bf4311f5d785f6a1b1685f1cd3562fbc;hb=refs%2Fchanges%2F96%2F9396%2F2;hp=d313192825106d380633dbfec6b85ed85b5b62a3;hpb=16f26ec9bec7e406398340473de228706f75e97f;p=nonrtric%2Frapp%2Fransliceassurance.git

diff --git a/icsversion/internal/odusliceassurance/app.go b/icsversion/internal/odusliceassurance/app.go
index d313192..d09fa71 100644
--- a/icsversion/internal/odusliceassurance/app.go
+++ b/icsversion/internal/odusliceassurance/app.go
@@ -34,15 +34,26 @@ 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"`
+	StatusNotificationURI string      `json:"status_notification_uri"`
+}{
+	InfoTypeID:   "Performance_Measurement_Streaming",
+	JobResultURI: "",
+	JobOwner:     "O-DU Slice Assurance Usecase",
+}
+
 type App struct {
 	client *restclient.Client
 	data   *structures.SliceAssuranceMeas
@@ -54,13 +65,17 @@ 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
 
 	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()
@@ -111,18 +126,8 @@ 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.")
-	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:    "Performance_Measurement_Streaming",
-		JobResultURI:  "",
-		JobOwner:      "O-DU Slice Assurance Usecase",
-		JobDefinition: "{}",
-	}
+	log.Debug("Register job in ICS.")
+
 	putErr := a.client.Put(icsAddr+"/data-consumer/v1/info-jobs/"+jobId, jobRegistrationInfo, nil)
 	if putErr != nil {
 		http.Error(w, fmt.Sprintf("Unable to register consumer job due to: %v.", putErr), http.StatusBadRequest)