Commit 81fdc735 authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

Resolve oneM2M AE Resource Name Conflicts and Originator (aei) Persistence (#33, #34) 

This commit addresses issues #33 and #34 by refactoring the oneM2M Application Entity (AE) creation and interaction logic within meep-iot and meep-sss, alongside implementing missing update operations and resolving nil-pointer panics.

Resolves #33: The meep-iot service previously hardcoded the global iotPlatformId directly into the Resource Name (rn) field when creating AEs on the oneM2M CSE. This prevented multiple MEPs from registering to the same centralized CSE simultaneously, as the CSE would reject duplicate rn attributes with a 409 Conflict. The static assignment has been decoupled to support dynamic originators.

Resolves #34: The meep-sss-mgr discarded the assigned Application Entity Identifier (aei) returned by the CSE upon AE creation. Consequently, subsequent protocol operations (GET, PUT, DELETE) failed with a 403 Forbidden because they defaulted to a hardcoded "Admin" or iotPlatformId for the X-M2M-Origin header. The codebase now accurately deserializes the aei attribute, persists it inside the SensorDiscoveryInfo and IotPlatformInfo structures, and dynamically maps it to the from parameter in the SssMgrBindingProtocolContext for downstream requests.

Additional Technical Implementation Details:
- Dynamic Originator Injection: Introduced the MEEP_IOT_ORIGINATOR environment variable via Helm charts (values-template.yaml and deployment.yaml). This configuration is parsed by meep-iot.go, stored in the SbiCfg, and passed down to iot-mgr.go for overriding standard request originators when required.
- Resource Update Operations: Implemented the PUT /registered_iot_platforms/{iotPlatformId} and PUT /registered_devices/{deviceId} handlers across the server, SBI, and manager tiers (meep-iot.go, iot-sbi.go, iot-mgr.go), enabling runtime modifications to platform and device states.
- Safety and Panic Resolutions:
  - Resolved an interface conversion panic in onem2m-mgr.go:populateSensors() by validating the existence and correct type of the m2m:uril object prior to slice iteration.
  - Mitigated nil-pointer dereferences in meep-sss subscription handlers (subscriptionsPOST for Discovery, Status, and Data) by validating payload structs before assignment.
  - Hardened the meep-sss background discovery ticker with slice length validations against CustomServicesTransportInfo prior to index access.
parent 37abdb57

charts/mec-services/meep-iot/templates/deployment.yaml

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ spec: 
            - name: {{ $key }}

              value: {{ $value | quote }}

            {{- end }}

            {{- if .Values.originator }}

            - name: MEEP_IOT_ORIGINATOR

              value: {{ .Values.originator | quote }}

            {{- end }}

          {{- if .Values.codecov.enabled}}

          volumeMounts:

          - name: codecov-storage

charts/mec-services/meep-iot/values-template.yaml

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# This is a YAML-formatted file.

# Declare variables to be passed into your templates.



originator: "Admin"



deployment:

  replicas: 1

  port: 80

go-apps/meep-iot-pltf/tinyiot-in-cse/entrypoint.sh

+1 −2
Original line number Diff line number Diff line
@@ -101,13 +101,12 @@ if [ "${PLATFORM_ENABLE}" = "1" ]; then 


    for host in "mep1-meep-iot" "mep2-meep-iot" "mep3-meep-iot" "mep4-meep-iot"; do

        if getent hosts "${host}" >/dev/null 2>&1; then

            mep_prefix="${host%%-*}"

            echo "Registering with ${host}..."

            curl -k -s -X POST \

                "http://${host}/iots/v1/registered_iot_platforms" \

                -H "Content-Type: application/json" \

                -d '{

                    "iotPlatformId": "'"${CSE_BASE_RI}-${mep_prefix}"'",

                    "iotPlatformId": "'"${CSE_BASE_RI}"'",

                    "userTransportInfo": [{

                        "id": "'"${CSE_BASE_RI}"'-mqtt-01",

                        "name": "'"${CSE_BASE_RI}"'",

go-apps/meep-iot/sbi/iot-sbi.go

+34 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ type SbiCfg struct { 
	IotBroker      string

	IotTopic       string

	LocationName   string

	Originator     string

	RedisAddr      string

	InfluxAddr     string

	Locality       []string
@@ -284,7 +285,13 @@ func Init(cfg SbiCfg) (err error) { 
	}



	// Connect to IOT Manager

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

	var mgrName string

	if sbi.mepName != "" {

		mgrName = sbi.mepName + "-" + sbi.moduleName

	} else {

		mgrName = sbi.moduleName

	}

	sbi.iotMgr, err = tm.NewIotMgr(mgrName, sbi.sandboxName, cfg.Originator)

	if err != nil {

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

		return err
@@ -423,6 +430,18 @@ func RegisterIotPlatformInfo(iotPlatformInfo IotPlatformInfo) (responseData IotP 
	return iotPlatformInfo, nil

}



func UpdateIotPlatform(platformInfo IotPlatformInfo) (IotPlatformInfo, error) {

	log.Info(">>> sbi.UpdateIotPlatform: ", platformInfo)



	p := convertIotPlatformInfoToIotMgr(platformInfo)

	err := sbi.iotMgr.UpdateIotPlatform(p)

	if err != nil {

		return platformInfo, err

	}



	return platformInfo, nil

}



func DeregisterIotPlatformInfo(iotPlatformId string) (err error) {

	log.Info(">>> DeregisterIotPlatformInfo: ", iotPlatformId)
@@ -477,6 +496,19 @@ func CreateDevice(device DeviceInfo) (deviceResp DeviceInfo, err error) { 
	return deviceResp, nil

}



func UpdateDevice(device DeviceInfo) (deviceResp DeviceInfo, err error) {

	log.Info(">>> sbi.UpdateDevice: ", device)



	d := convertDeviceInfoToIotMgr(device)

	dev, err := sbi.iotMgr.UpdateDevice(d)

	if err != nil {

		return deviceResp, err

	}

	deviceResp = convertDeviceInfoFromIotMgr(dev)



	return deviceResp, nil

}



func DeleteDevice(deviceId string) (err error) {

	log.Info(">>> sbi.DeleteDevice: ", deviceId)

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

+87 −3
Original line number Diff line number Diff line
@@ -369,10 +369,17 @@ func Init() (err error) { 
	_ = rc.DBFlush(baseKey)

	log.Info("Connected to Redis DB, IOT service table")



	originator := os.Getenv("MEEP_IOT_ORIGINATOR")

	if originator == "" {

		originator = "Admin"

	}

	log.Info("MEEP_IOT_ORIGINATOR: ", originator)



	// Initialize SBI

	sbiCfg := sbi.SbiCfg{

		ModuleName:     moduleName,

		SandboxName:    sandboxName,

		Originator:     originator,

		RedisAddr:      redisAddr,

		Locality:       locality,

		ScenarioNameCb: updateStoreName,
@@ -651,8 +658,47 @@ func registerediotplatformsByIdGET(w http.ResponseWriter, r *http.Request) { 
func registerediotplatformsByIdPUT(w http.ResponseWriter, r *http.Request) {

	log.Debug(">>> registerediotplatformsByIdPUT: ", r)



	// FIXME FSCOM Todo

	errHandlerProblemDetails(w, "Not implemented yet", http.StatusBadRequest)

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")



	vars := mux.Vars(r)

	iotPlatformIdParamStr := vars["registeredIotPlatformId"]

	log.Debug("registerediotplatformsByIdPUT: iotPlatformIdParamStr: ", iotPlatformIdParamStr)



	var iotPlatformInfo IotPlatformInfo

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&iotPlatformInfo)

	if err != nil {

		log.Error(err.Error())

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

		return

	}



	if iotPlatformInfo.IotPlatformId != iotPlatformIdParamStr {

		errHandlerProblemDetails(w, "IotPlatformId in body does not match path parameter", http.StatusBadRequest)

		return

	}



	sbiIotPlatformInfo := convertIotPlatformInfoToSbi(iotPlatformInfo)

	updatedPlatform, err := sbi.UpdateIotPlatform(sbiIotPlatformInfo)

	if err != nil {

		log.Error(err.Error())

		if err.Error() == "IoT platform not found" {

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

		} else {

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

		}

		return

	}

	apiUpdatedPlatform := convertIotPlatformInfoFromSbi(updatedPlatform)



	jsonResponse, err := json.Marshal(apiUpdatedPlatform)

	if err != nil {

		log.Error(err.Error())

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

		return

	}

	fmt.Fprint(w, string(jsonResponse))

	w.WriteHeader(http.StatusOK)

}



func registerediotplatformsGET(w http.ResponseWriter, r *http.Request) {
@@ -866,7 +912,45 @@ func registereddevicesByIdPUT(w http.ResponseWriter, r *http.Request) { 


	w.Header().Set("Content-Type", "application/json; charset=UTF-8")



	errHandlerProblemDetails(w, "Not implemented yet", http.StatusBadRequest)

	vars := mux.Vars(r)

	registeredDeviceIdParamStr := vars["registeredDeviceId"]

	log.Debug("registereddevicesByIdPUT: registeredDeviceIdParamStr: ", registeredDeviceIdParamStr)



	var deviceInfo DeviceInfo

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&deviceInfo)

	if err != nil {

		log.Error(err.Error())

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

		return

	}



	if deviceInfo.DeviceId != registeredDeviceIdParamStr {

		errHandlerProblemDetails(w, "DeviceId in body does not match path parameter", http.StatusBadRequest)

		return

	}



	sbiDeviceInfo := convertDeviceInfoToSbi(deviceInfo)

	updatedDevice, err := sbi.UpdateDevice(sbiDeviceInfo)

	if err != nil {

		log.Error(err.Error())

		if err.Error() == "Device not found" {

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

		} else {

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

		}

		return

	}

	apiUpdatedDevice := convertDeviceInfoFromSbi(updatedDevice)



	jsonResponse, err := json.Marshal(apiUpdatedDevice)

	if err != nil {

		log.Error(err.Error())

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

		return

	}

	fmt.Fprint(w, string(jsonResponse))

	w.WriteHeader(http.StatusOK)

}



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