Commit 38473468 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in meep-iot

parent 43f9b0f1

go-apps/meep-iot/server/meep-iot.go

+9 −9
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ func registerediotplatformsByIdGET(w http.ResponseWriter, r *http.Request) { 


	vars := mux.Vars(r)

	log.Debug("registerediotplatformsByIdGET: vars: ", vars)

	iotPlatformIdParamStr := vars["registeredIotPlatformId}"]

	iotPlatformIdParamStr := vars["registeredIotPlatformId"]

	log.Debug("systeminfoByIdGET: registerediotplatformsByIdGET: ", iotPlatformIdParamStr)



	// Validate query parameters
@@ -755,23 +755,23 @@ func registerediotplatformsPOST(w http.ResponseWriter, r *http.Request) { 
				return

			}

			if v.Version == "" {

				log.Error("Mandatory Version parameter shall be absent")

				errHandlerProblemDetails(w, "Mandatory attribute Version shall be absent in the request body.", http.StatusBadRequest)

				log.Error("Mandatory Version parameter shall be present")

				errHandlerProblemDetails(w, "Mandatory attribute Version shall be present in the request body.", http.StatusBadRequest)

				return

			}

			if v.Endpoint == nil {

				log.Error("Mandatory Endpoint parameter shall be absent")

				errHandlerProblemDetails(w, "Mandatory attribute Endpoint shall be absent in the request body.", http.StatusBadRequest)

				log.Error("Mandatory Endpoint parameter shall be present")

				errHandlerProblemDetails(w, "Mandatory attribute Endpoint shall be present in the request body.", http.StatusBadRequest)

				return

			}

			if v.Security == nil {

				log.Error("Mandatory Security parameter shall be absent")

				errHandlerProblemDetails(w, "Mandatory attribute Security shall be absent in the request body.", http.StatusBadRequest)

				log.Error("Mandatory Security parameter shall be present")

				errHandlerProblemDetails(w, "Mandatory attribute Security shall be present in the request body.", http.StatusBadRequest)

				return

			}

			if v.ImplSpecificInfo == nil {

				log.Error("Mandatory ImplSpecificInfo parameter shall be absent")

				errHandlerProblemDetails(w, "Mandatory attribute ImplSpecificInfo shall be absent in the request body.", http.StatusBadRequest)

				log.Error("Mandatory ImplSpecificInfo parameter shall be present")

				errHandlerProblemDetails(w, "Mandatory attribute ImplSpecificInfo shall be present in the request body.", http.StatusBadRequest)

				return

			}

		}

go-apps/meep-iot/server/meep-iot_test.go

0 → 100644
+1419 −0

File added.

Preview size limit exceeded, changes collapsed.

go-apps/meep-sss/go.mod

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-iot-mgr v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-onem2m-mgr v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0
@@ -29,7 +29,7 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client => ../../go-packages/meep-gis-engine-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger => ../../go-packages/meep-http-logger

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-iot-mgr => ../../go-packages/meep-iot-mgr

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-onem2m-mgr => ../../go-packages/meep-onem2m-mgr

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics => ../../go-packages/meep-metrics

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model

go-apps/meep-sss/sbi/sss-sbi.go

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package sbi 
import (

	"sync"



	tm "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-iot-mgr"

	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

	mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model"

	mq "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq"

	tm "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-onem2m-mgr"

	sam "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr"

)
@@ -121,12 +121,12 @@ func Init(cfg SbiCfg) (err error) { 
	}



	// Connect to IOT Manager

	sbi.iotMgr, err = tm.NewIotMgr(sbi.moduleName, sbi.sandboxName)

	sbi.iotMgr, err = tm.NewOneM2MMgr(sbi.moduleName, sbi.sandboxName)

	if err != nil {

		log.Error("Failed connection to IOT Manager: ", err)

		log.Error("Failed connection to OneM2M Manager: ", err)

		return err

	}

	log.Info("Connected to IOT Manager")

	log.Info("Connected to OneM2M Manager")



	// Initialize service

	processActiveScenarioUpdate()

go-apps/meep-sss/server/meep-sss.go

+3 −1
Original line number Diff line number Diff line
@@ -565,7 +565,9 @@ func sensorDiscoveryLookupGET(w http.ResponseWriter, r *http.Request) { 
	log.Debug("sensorDiscoveryLookupGET: type(q[sensorCharacteristicList][0]): ", reflect.TypeOf(q["sensorCharacteristicList"][0]))

	//q: map[geographicalArea:[[object Object]] sensorCharacteristicList:[[object Object]] sensorPropertyList:[string1,string2] type:[string]]","time":"2025-02-04T08:35:35Z"}



	w.WriteHeader(http.StatusOK)

	//w.WriteHeader(http.StatusOK)

	err := errors.New("Not implemented")

	errHandlerProblemDetails(w, err.Error(), http.StatusNotImplemented)

}



func sensorDiscoverySubscriptionGET(w http.ResponseWriter, r *http.Request) {