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

Add support of subscription for MEC 046

parent 7b9c30b8

docs/meep-sss/SensorStatusSubscriptionApi.md

+3 −3
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ All URIs are relative to *https://localhost/sandboxname/sens/v1* 


Method | HTTP request | Description

------------- | ------------- | -------------

[**SensorSatusIndividualSubscriptionGET**](SensorStatusSubscriptionApi.md#SensorSatusIndividualSubscriptionGET) | **Get** /subscriptions/sensor_status/{subscriptionId} | The GET method is used to retrieve information about this subscription

[**SensorStatusIndividualSubscriptionGET**](SensorStatusSubscriptionApi.md#SensorStatusIndividualSubscriptionGET) | **Get** /subscriptions/sensor_status/{subscriptionId} | The GET method is used to retrieve information about this subscription

[**SensorStatusIndividualSubscriptionGET**](SensorStatusSubscriptionApi.md#SensorStatusIndividualSubscriptionGET) | **Get** /subscriptions/sensor_status | The GET method is used to request information about the subscriptions related to sensor status for this requestor

[**SensorStatusSubscriptionDELETE**](SensorStatusSubscriptionApi.md#SensorStatusSubscriptionDELETE) | **Delete** /subscriptions/sensor_status/{subscriptionId} | The DELETE method is used to cancel the existing subscription

[**SensorStatusSubscriptionPUT**](SensorStatusSubscriptionApi.md#SensorStatusSubscriptionPUT) | **Put** /subscriptions/sensor_status/{subscriptionId} | The PUT method is used to update the existing subscription



# **SensorSatusIndividualSubscriptionGET**

> []SensorStatusSubscription SensorSatusIndividualSubscriptionGET(ctx, subscriptionId)

# **SensorStatusIndividualSubscriptionGET**

> []SensorStatusSubscription SensorStatusIndividualSubscriptionGET(ctx, subscriptionId)

The GET method is used to retrieve information about this subscription



This method shall support the request and response data structures, and response codes, as specified in Tables 7.8.3.1-1 and 7.8.3.1-2

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

+22 −26
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2024  The AdvantEDGE Authors

 * Copyright (c) 2025  The AdvantEDGE Authors

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -547,8 +547,8 @@ func TestRegisterediotplatformsPOST(t *testing.T) { 
		Addresses: expected_adresses,

	}

	var expected_userTransportInfo = []MbTransportInfo{}

	var mb_transportInfo TransportType

	mb_transportInfo = MB_TOPIC_BASED

	//var mb_transportInfo TransportType

	mb_transportInfo := MB_TOPIC_BASED

	var security = SecurityInfo{}

	var implSpecificInfo = ImplSpecificInfo{}

	expected_userTransportInfo = append(expected_userTransportInfo, MbTransportInfo{
@@ -571,8 +571,8 @@ func TestRegisterediotplatformsPOST(t *testing.T) { 
	var expected_endPointInfo_1 = EndPointInfo{

		Addresses: expected_adresses_1,

	}

	var transportInfo TransportType

	transportInfo = REST_HTTP

	//var transportInfo TransportType

	transportInfo := REST_HTTP

	expected_customServicesTransportInfo = append(expected_customServicesTransportInfo, TransportInfo{

		Id:          "2ddb713c-2b41-4ded-a7ad-a5a047c5df13",

		Name:        "/laboai-acme-ic-cse",
@@ -700,10 +700,10 @@ func TestRegisterediotplatformsPOSTFail_1(t *testing.T) { 
	/******************************

	 * request body section

	 ******************************/

	var mb_transportInfo TransportType

	mb_transportInfo = MB_TOPIC_BASED

	var transportInfo TransportType

	transportInfo = REST_HTTP

	//var mb_transportInfo TransportType

	mb_transportInfo := MB_TOPIC_BASED

	//var transportInfo TransportType

	transportInfo := REST_HTTP

	//var security = SecurityInfo{} // Missing Security

	var implSpecificInfo = ImplSpecificInfo{}

	var adresses = []Addresses{}
@@ -793,10 +793,10 @@ func TestRegisterediotplatformsPOSTFail_2(t *testing.T) { 
	/******************************

	 * request body section

	 ******************************/

	var mb_transportInfo TransportType

	mb_transportInfo = MB_TOPIC_BASED

	var transportInfo TransportType

	transportInfo = REST_HTTP

	//var mb_transportInfo TransportType

	mb_transportInfo := MB_TOPIC_BASED

	//var transportInfo TransportType

	transportInfo := REST_HTTP

	var security = SecurityInfo{}

	//var implSpecificInfo = ImplSpecificInfo{} // Missing ImplSpecificInfo

	var adresses = []Addresses{}
@@ -887,10 +887,8 @@ func TestRegisterediotplatformsPOSTFail_3(t *testing.T) { 
	/******************************

	 * request body section

	 ******************************/

	//var mb_transportInfo TransportType // Missing TransportType

	//mb_transportInfo = MB_TOPIC_BASED

	var transportInfo TransportType

	transportInfo = REST_HTTP

	//mb_transportInfo := MB_TOPIC_BASED // Missing TransportType

	transportInfo := REST_HTTP

	var security = SecurityInfo{}

	var implSpecificInfo = ImplSpecificInfo{}

	var adresses = []Addresses{}
@@ -1544,12 +1542,10 @@ func TestRegistereddevicesByIdGET(t *testing.T) { 
}



func create_registered_iot_platforms() (resp IotPlatformInfo, err error) {

	var mb_transportInfo TransportType

	mb_transportInfo = MB_TOPIC_BASED

	mb_transportInfo := MB_TOPIC_BASED

	var security = SecurityInfo{}

	var implSpecificInfo = ImplSpecificInfo{}

	var transportInfo TransportType

	transportInfo = REST_HTTP

	transportInfo := REST_HTTP

	var adresses = []Addresses{}

	adresses = append(adresses, Addresses{

		Host: "172.29.10.56",
@@ -1638,13 +1634,13 @@ func validate_iot_platform_info(received IotPlatformInfo, expected IotPlatformIn 
	if len(received.UserTransportInfo) != len(expected.UserTransportInfo) {

		fmt.Println("len(received.UserTransportInfo) mismatch")

		return false

	} else {

		// TODO FSCOM } else {

	}



	if len(received.CustomServicesTransportInfo) != len(expected.CustomServicesTransportInfo) {

		fmt.Println("len(received.CustomServicesTransportInfo) mismatch")

		return false

	} else {

		// TODO FSCOM } else {

	}



	if received.Enabled != expected.Enabled {
@@ -1840,13 +1836,13 @@ func validate_device_info(expected_device DeviceInfo, received_deviceResp Device 
	if len(expected_device.RequestedMecTrafficRule) != len(received_deviceResp.RequestedMecTrafficRule) {

		fmt.Println("received_deviceResp.RequestedMecTrafficRule != RequestedMecTrafficRule")

		return false

	} else {

		// TODO FSCOM } else {

		// for i, val := range expected_device.RequestedMecTrafficRule {

		// } // End of 'for' statement

		// TODO To be continued

		// TODO FSCOM To be continued

		//RequestedMecTrafficRule  []TrafficRuleDescriptor

	}

	// TODO To be continued

	// TODO FSCOM To be continued



	return true

}

go-packages/meep-sss-client/README.md

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Class | Method | HTTP request | Description 
*SensorDiscoverySubscriptionApi* | [**SensorDiscoverySubscriptionPUT**](docs/SensorDiscoverySubscriptionApi.md#sensordiscoverysubscriptionput) | **Put** /subscriptions/sensor_discovery/{subscriptionId} | The POST method is used to create a new subscription to sensor discovery notifications

*SensorManagementApi* | [**SensorMgmtGET**](docs/SensorManagementApi.md#sensormgmtget) | **Get** /sensor_management | The GET method is used to receive the sensor characteristics that can be modified on specific sensors

*SensorStatusLookupApi* | [**SensorStatusLookupGET**](docs/SensorStatusLookupApi.md#sensorstatuslookupget) | **Get** /queries/sensor_status | The GET method is used to query the available status

*SensorStatusSubscriptionApi* | [**SensorSatusIndividualSubscriptionGET**](docs/SensorStatusSubscriptionApi.md#sensorsatusindividualsubscriptionget) | **Get** /subscriptions/sensor_status/{subscriptionId} | The GET method is used to retrieve information about this subscription

*SensorStatusSubscriptionApi* | [**SensorStatusIndividualSubscriptionGET**](docs/SensorStatusSubscriptionApi.md#sensorsatusindividualsubscriptionget) | **Get** /subscriptions/sensor_status/{subscriptionId} | The GET method is used to retrieve information about this subscription

*SensorStatusSubscriptionApi* | [**SensorStatusIndividualSubscriptionGET**](docs/SensorStatusSubscriptionApi.md#sensorstatusindividualsubscriptionget) | **Get** /subscriptions/sensor_status | The GET method is used to request information about the subscriptions related to sensor status for this requestor

*SensorStatusSubscriptionApi* | [**SensorStatusSubscriptionDELETE**](docs/SensorStatusSubscriptionApi.md#sensorstatussubscriptiondelete) | **Delete** /subscriptions/sensor_status/{subscriptionId} | The DELETE method is used to cancel the existing subscription

*SensorStatusSubscriptionApi* | [**SensorStatusSubscriptionPUT**](docs/SensorStatusSubscriptionApi.md#sensorstatussubscriptionput) | **Put** /subscriptions/sensor_status/{subscriptionId} | The PUT method is used to update the existing subscription

go-packages/meep-sss-client/api/swagger.yaml

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ paths: 
      summary: The GET method is used to retrieve information about this subscription

      description: "This method shall support the request and response data structures,\

        \ and response codes, as specified in Tables 7.8.3.1-1 and 7.8.3.1-2"

      operationId: SensorSatusIndividualSubscriptionGET

      operationId: SensorStatusIndividualSubscriptionGET

      parameters:

      - name: subscriptionId

        in: path

go-packages/meep-sss-client/api_sensor_status_subscription.go

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ This method shall support the request and response data structures, and response 
 * @param subscriptionId Unique identifiers of the subscription

@return []SensorStatusSubscription

*/

func (a *SensorStatusSubscriptionApiService) SensorSatusIndividualSubscriptionGET(ctx context.Context, subscriptionId string) ([]SensorStatusSubscription, *http.Response, error) {

func (a *SensorStatusSubscriptionApiService) SensorStatusIndividualSubscriptionGET(ctx context.Context, subscriptionId string) ([]SensorStatusSubscription, *http.Response, error) {

	var (

		localVarHttpMethod  = strings.ToUpper("Get")

		localVarPostBody    interface{}