Fixing bug for ICS version to work properly

Issue-ID: NONRTRIC-740
Signed-off-by: ychacon <yennifer.chacon@est.tech>
Change-Id: I077b7aa74e31dc01d03eaa6e5b797afdb7a4a78a

diff --git a/icsversion/internal/odusliceassurance/app.go b/icsversion/internal/odusliceassurance/app.go
index 0504a13..852e0f3 100644 (file)
--- a/icsversion/internal/odusliceassurance/app.go
+++ b/icsversion/internal/odusliceassurance/app.go
@@ -44,15 +44,15 @@ const (
 )
 
 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 Usecase",
 }
 
 type App struct {
@@ -67,6 +67,7 @@ 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,
@@ -124,7 +125,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 {

diff --git a/icsversion/internal/restclient/client.go b/icsversion/internal/restclient/client.go
index 081ebed..45b5058 100644 (file)
--- a/icsversion/internal/restclient/client.go
+++ b/icsversion/internal/restclient/client.go
@@ -160,7 +160,7 @@ func (c *Client) newRequest(method, path string, payload interface{}, userInfo .
        }
 
        if c.verbose {
-               if reqDump, error := httputil.DumpRequest(req, true); error != nil {
+               if reqDump, error := httputil.DumpRequestOut(req, true); error != nil {
                        fmt.Println(err)
                } else {
                        fmt.Println(string(reqDump))

diff --git a/icsversion/main.go b/icsversion/main.go
index bddac04..dcf37ff 100644 (file)
--- a/icsversion/main.go
+++ b/icsversion/main.go
@@ -49,7 +49,10 @@ func main() {
        a = sliceassurance.App{}
        a.Initialize(configuration)
 
-       go a.StartServer()
+       go func() {
+               a.StartServer()
+               os.Exit(1) // If the startServer function exits, it is because there has been a failure in the server, so we exit.
+       }()
        keepConsumerAlive()
 }