From 7b9c30b8b1df5d3eeabfb8e56fb496cefa6c1798 Mon Sep 17 00:00:00 2001 From: garciay Date: Mon, 17 Feb 2025 15:45:37 +0100 Subject: [PATCH] Bug fixed in meep-iot_test --- go-apps/meep-iot/sbi/iot-sbi.go | 6 ++ go-apps/meep-iot/server/meep-iot.go | 38 ++++---- go-apps/meep-iot/server/meep-iot_test.go | 95 ++++++++++++++++--- go-apps/meep-sss/api/swagger.yaml | 2 +- go-packages/meep-iot-mgr/iot-mgr.go | 7 -- .../{meep-sss => meep-sss-client}/.gitignore | 0 .../.swagger-codegen-ignore | 0 .../.swagger-codegen/VERSION | 0 .../{meep-sss => meep-sss-client}/.travis.yml | 0 .../{meep-sss => meep-sss-client}/README.md | 0 .../api/swagger.yaml | 2 +- .../api_managementn.go | 0 .../api_sensor_data_lookup.go | 0 .../api_sensor_data_subscription.go | 0 .../api_sensor_discovery_lookup.go | 0 .../api_sensor_discovery_subscription.go | 0 .../api_sensor_management.go | 0 .../api_sensor_status_lookup.go | 0 .../api_sensor_status_subscription.go | 0 .../api_status_status_subscription.go | 0 .../{meep-sss => meep-sss-client}/client.go | 0 .../configuration.go | 0 .../{meep-sss => meep-sss-client}/git_push.sh | 0 .../{meep-sss => meep-sss-client}/go.mod | 0 .../{meep-sss => meep-sss-client}/go.sum | 0 .../model_area_info.go | 0 .../model_link_type.go | 0 .../model_point.go | 0 .../model_problem_details.go | 0 .../model_sensor_characteristic.go | 0 .../model_sensor_data.go | 0 .../model_sensor_data_subscription.go | 0 ...del_sensor_discovery_event_subscription.go | 0 .../model_sensor_discovery_info.go | 0 ...l_sensor_discovery_subscription_id_body.go | 0 .../model_sensor_info.go | 0 .../model_sensor_status_info.go | 0 .../model_sensor_status_subscription.go | 0 ...odel_sensor_status_subscription_id_body.go | 0 .../model_shape_type.go | 0 .../model_status_data_subscription_id_body.go | 0 .../model_subscription_link_list.go | 0 .../model_subscription_link_list_links.go | 0 ...del_subscription_link_list_subscription.go | 0 .../model_subscription_links.go | 0 .../model_subscription_type.go | 0 .../model_subscriptions_sensor_data_body.go | 0 ...del_subscriptions_sensor_discovery_body.go | 0 .../model_subscriptions_sensor_status_body.go | 0 .../model_time_stamp.go | 0 .../model_websock_notif_config.go | 0 .../{meep-sss => meep-sss-client}/response.go | 0 go-packages/meep-sss-mgr/go.mod | 2 +- 53 files changed, 113 insertions(+), 39 deletions(-) rename go-packages/{meep-sss => meep-sss-client}/.gitignore (100%) rename go-packages/{meep-sss => meep-sss-client}/.swagger-codegen-ignore (100%) rename go-packages/{meep-sss => meep-sss-client}/.swagger-codegen/VERSION (100%) rename go-packages/{meep-sss => meep-sss-client}/.travis.yml (100%) rename go-packages/{meep-sss => meep-sss-client}/README.md (100%) rename go-packages/{meep-sss => meep-sss-client}/api/swagger.yaml (99%) rename go-packages/{meep-sss => meep-sss-client}/api_managementn.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_data_lookup.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_data_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_discovery_lookup.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_discovery_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_management.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_status_lookup.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_sensor_status_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/api_status_status_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/client.go (100%) rename go-packages/{meep-sss => meep-sss-client}/configuration.go (100%) rename go-packages/{meep-sss => meep-sss-client}/git_push.sh (100%) rename go-packages/{meep-sss => meep-sss-client}/go.mod (100%) rename go-packages/{meep-sss => meep-sss-client}/go.sum (100%) rename go-packages/{meep-sss => meep-sss-client}/model_area_info.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_link_type.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_point.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_problem_details.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_characteristic.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_data.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_data_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_discovery_event_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_discovery_info.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_discovery_subscription_id_body.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_info.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_status_info.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_status_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_sensor_status_subscription_id_body.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_shape_type.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_status_data_subscription_id_body.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscription_link_list.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscription_link_list_links.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscription_link_list_subscription.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscription_links.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscription_type.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscriptions_sensor_data_body.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscriptions_sensor_discovery_body.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_subscriptions_sensor_status_body.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_time_stamp.go (100%) rename go-packages/{meep-sss => meep-sss-client}/model_websock_notif_config.go (100%) rename go-packages/{meep-sss => meep-sss-client}/response.go (100%) diff --git a/go-apps/meep-iot/sbi/iot-sbi.go b/go-apps/meep-iot/sbi/iot-sbi.go index 0362479aa..253f899a0 100644 --- a/go-apps/meep-iot/sbi/iot-sbi.go +++ b/go-apps/meep-iot/sbi/iot-sbi.go @@ -581,6 +581,12 @@ func convertDeviceInfoToIotMgr(dev DeviceInfo) (device tm.DeviceInfo) { ClientCertificate: dev.ClientCertificate, Enabled: dev.Enabled, } + if len(dev.DeviceMetadata) != 0 { + device.DeviceMetadata = make([]tm.KeyValuePair, len(dev.DeviceMetadata)) + for i, k := range dev.DeviceMetadata { + device.DeviceMetadata[i] = tm.KeyValuePair{Key: k.Key, Value: k.Value} + } // End of 'for' statement + } // FIXME FSCOM Add missing fileds (pointers & arrays) //log.Debug("convertDeviceInfoToIotMgr: device: ", device) diff --git a/go-apps/meep-iot/server/meep-iot.go b/go-apps/meep-iot/server/meep-iot.go index 71ccb1a3c..aee94cfe5 100644 --- a/go-apps/meep-iot/server/meep-iot.go +++ b/go-apps/meep-iot/server/meep-iot.go @@ -1238,25 +1238,21 @@ func convertDeviceInfosFromSbi_with_filter(devicesList []sbi.DeviceInfo, filter } else if filter[1] == "requestedUserTransportId" { process_it = item.RequestedUserTransportId == filter[2] } // FIXME FSCOM Add support of deviceMetadata & requestedMecTrafficRule + } else if filter[0] == "neq" { + if filter[1] == "gpsi" { + process_it = item.Gpsi != filter[2] + } else if filter[1] == "Msisdn" { + process_it = item.Gpsi != filter[2] + } else if filter[1] == "deviceId" { + process_it = item.DeviceId != filter[2] + } else if filter[1] == "requestedIotPlatformId" { + process_it = item.RequestedIotPlatformId != filter[2] + } else if filter[1] == "requestedUserTransportId" { + process_it = item.RequestedUserTransportId != filter[2] + } // FIXME FSCOM Add support of deviceMetadata & requestedMecTrafficRule } if process_it { - var device = DeviceInfo{ - DeviceAuthenticationInfo: item.DeviceAuthenticationInfo, - Gpsi: item.Gpsi, - Pei: item.Pei, - Supi: item.Supi, - Msisdn: item.Msisdn, - Imei: item.Imei, - Imsi: item.Imsi, - Iccid: item.Iccid, - DeviceId: item.DeviceId, - RequestedIotPlatformId: item.RequestedIotPlatformId, - RequestedUserTransportId: item.RequestedUserTransportId, - ClientCertificate: item.ClientCertificate, - Enabled: item.Enabled, - } - // FIXME FSCOM Add missing fileds (pointers & arrays) - devices = append(devices, device) + devices = append(devices, convertDeviceInfoFromSbi(item)) } else { log.Debug("convertDeviceInfosFromSbi_with_filter: skip ", item) } @@ -1282,8 +1278,14 @@ func convertDeviceInfoToSbi(dev DeviceInfo) (device sbi.DeviceInfo) { ClientCertificate: dev.ClientCertificate, Enabled: dev.Enabled, } + if len(dev.DeviceMetadata) != 0 { + device.DeviceMetadata = make([]sbi.KeyValuePair, len(dev.DeviceMetadata)) + for i, k := range dev.DeviceMetadata { + device.DeviceMetadata[i] = sbi.KeyValuePair{Key: k.Key, Value: k.Value} + } // End of 'for' statement + } // FIXME FSCOM Add missing fileds (pointers & arrays) - //log.Debug("convertDeviceInfosFromSbi: devices: ", devices) + //log.Debug("convertDeviceInfoToSbi: devices: ", devices) return device } diff --git a/go-apps/meep-iot/server/meep-iot_test.go b/go-apps/meep-iot/server/meep-iot_test.go index c761bd6b9..174d0d1cf 100644 --- a/go-apps/meep-iot/server/meep-iot_test.go +++ b/go-apps/meep-iot/server/meep-iot_test.go @@ -25,13 +25,10 @@ import ( "net/http" "net/http/httptest" "os" - //"strconv" "strings" "testing" "time" - //meepiotmgr "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-iot-mgr" - log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger" // met "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics" mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model" @@ -1184,9 +1181,21 @@ func TestRegistereddevicesPOST(t *testing.T) { /****************************** * request body section ******************************/ + requestedIotPlatformId := iotPlatformInfo.IotPlatformId + deviceMetadata := make([]KeyValuePair, 2) + deviceMetadata[0] = KeyValuePair{ + Key: "Key1", + Value: "Value1", + } + deviceMetadata[1] = KeyValuePair{ + Key: "Key2", + Value: "Value2", + } var device = DeviceInfo{ - RequestedIotPlatformId: expected_requestedIotPlatformId, - DeviceId: expected_requestedIotPlatformId, + DeviceMetadata: deviceMetadata, + RequestedIotPlatformId: requestedIotPlatformId, + DeviceId: requestedIotPlatformId, + Imsi: "12345", Enabled: true, } fmt.Println("Create a device: ", device) @@ -1375,9 +1384,9 @@ func TestRegistereddevicesGET_withFiltering(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - // Filter on RequestedUserTransportId and its complement + // Filter on DeviceId and its complement queryParam := make(map[string]string) - queryParam["filter"] = "(eq," + expected_devices[2].RequestedUserTransportId + ", requestedUserTransportId)" + queryParam["filter"] = "(eq,deviceId," + expected_devices[1].DeviceId + ")" // Only DeviceId 1 rr, err := sendRequest(http.MethodGet, "/registered_devices", nil, nil, queryParam, nil, http.StatusOK, RegistereddevicesGET) if err != nil { t.Fatalf(err.Error()) @@ -1389,10 +1398,72 @@ func TestRegistereddevicesGET_withFiltering(t *testing.T) { t.Fatalf(err.Error()) } fmt.Println("Respone: resp: ", resp) - if len(resp) != 1 { + if len(resp) != 1 { // Only DeviceId 1 + t.Errorf("Response length mismatch") + } + if !validate_device_info(resp[0], expected_devices[1]) { + t.Errorf("Response mismatch") + } + queryParam["filter"] = "(neq,deviceId," + expected_devices[1].DeviceId + ")" // DeviceId 1 is excluded + rr, err = sendRequest(http.MethodGet, "/registered_devices", nil, nil, queryParam, nil, http.StatusOK, RegistereddevicesGET) + if err != nil { + t.Fatalf(err.Error()) + } + fmt.Println("Respone: rr: ", rr) + resp = nil + err = json.Unmarshal([]byte(rr), &resp) + if err != nil { + t.Fatalf(err.Error()) + } + fmt.Println("Respone: resp: ", resp) + if len(resp) != 2 { + t.Errorf("Response length mismatch") + } + if !validate_device_info(resp[0], expected_devices[0]) && !validate_device_info(resp[0], expected_devices[2]) { // DeviceId 1 is excluded + t.Errorf("Response mismatch") + } + if !validate_device_info(resp[1], expected_devices[0]) && !validate_device_info(resp[1], expected_devices[2]) { // DeviceId 1 is excluded + t.Errorf("Response mismatch") + } + + // Filter on RequestedUserTransportId and its complement + queryParam["filter"] = "(eq,requestedUserTransportId," + expected_devices[2].RequestedUserTransportId + ")" // Only DeviceId 2 + rr, err = sendRequest(http.MethodGet, "/registered_devices", nil, nil, queryParam, nil, http.StatusOK, RegistereddevicesGET) + if err != nil { + t.Fatalf(err.Error()) + } + fmt.Println("Respone: rr: ", rr) + resp = nil + err = json.Unmarshal([]byte(rr), &resp) + if err != nil { + t.Fatalf(err.Error()) + } + fmt.Println("Respone: resp: ", resp) + if len(resp) != 1 { // Only DeviceId 2 t.Errorf("Response length mismatch") } - if !validate_device_info(resp[0], expected_device[2]) { + if !validate_device_info(resp[0], expected_devices[2]) { + t.Errorf("Response mismatch") + } + queryParam["filter"] = "(neq,requestedUserTransportId," + expected_devices[2].RequestedUserTransportId + ")" // DeviceId 2 is excluded + rr, err = sendRequest(http.MethodGet, "/registered_devices", nil, nil, queryParam, nil, http.StatusOK, RegistereddevicesGET) + if err != nil { + t.Fatalf(err.Error()) + } + fmt.Println("Respone: rr: ", rr) + resp = nil + err = json.Unmarshal([]byte(rr), &resp) + if err != nil { + t.Fatalf(err.Error()) + } + fmt.Println("Respone: resp: ", resp) + if len(resp) != 2 { + t.Errorf("Response length mismatch") + } + if !validate_device_info(resp[0], expected_devices[0]) && !validate_device_info(resp[0], expected_devices[1]) { // DeviceId 2 is excluded + t.Errorf("Response mismatch") + } + if !validate_device_info(resp[1], expected_devices[0]) && !validate_device_info(resp[1], expected_devices[1]) { // DeviceId 2 is excluded t.Errorf("Response mismatch") } @@ -1400,7 +1471,6 @@ func TestRegistereddevicesGET_withFiltering(t *testing.T) { /****************************** * back to initial state section ******************************/ - _ = delete_device(expected_device.DeviceId) _ = delete_registered_iot_platforms(iotPlatformInfo.IotPlatformId) terminateScenario() } @@ -1626,7 +1696,7 @@ func create_device(iotPlatformInfo IotPlatformInfo) (device DeviceInfo, err erro return device, nil } -func create_set_device(iotPlatformInfo IotPlatformInfo) (devices []DeviceInfo, err error) { +func create_set_of_devices(iotPlatformInfo IotPlatformInfo) (devices []DeviceInfo, err error) { requestedIotPlatformId := iotPlatformInfo.IotPlatformId deviceMetadata := make([]KeyValuePair, 2) deviceMetadata[0] = KeyValuePair{ @@ -1696,6 +1766,9 @@ func delete_device(deviceId string) (err error) { } func validate_device_info(expected_device DeviceInfo, received_deviceResp DeviceInfo) bool { + fmt.Println(">>> validate_device_info: expected_device: ", expected_device) + fmt.Println(">>> validate_device_info: received_deviceResp: ", received_deviceResp) + if expected_device.DeviceId != received_deviceResp.DeviceId { fmt.Println("received_deviceResp.DeviceId != DeviceId") return false diff --git a/go-apps/meep-sss/api/swagger.yaml b/go-apps/meep-sss/api/swagger.yaml index 881127365..e996e3457 100644 --- a/go-apps/meep-sss/api/swagger.yaml +++ b/go-apps/meep-sss/api/swagger.yaml @@ -1025,7 +1025,7 @@ paths: $ref: '#/components/schemas/ProblemDetails' put: tags: - - managementn + - management summary: The PUT method is used to update the value of the characteristics that can be set on a sensor or on a group of sensors description: "This method shall support the URI query parameters, request and\ diff --git a/go-packages/meep-iot-mgr/iot-mgr.go b/go-packages/meep-iot-mgr/iot-mgr.go index 601c463fd..c025c5197 100644 --- a/go-packages/meep-iot-mgr/iot-mgr.go +++ b/go-packages/meep-iot-mgr/iot-mgr.go @@ -88,13 +88,6 @@ type ImplSpecificInfo struct { DownlinkTopics []string } -// ETSI GS MEC 046 V3.1.1 (2024-04) Clause 6.2.1 Type: SensorDiscoveryInfo -type SensorCharacteristic struct { - CharacteristicName string - CharacteristicValue string - CharacteristicUnitOfMeasure *string -} - type TrafficRuleDescriptor struct { TrafficRuleId string FilterType string diff --git a/go-packages/meep-sss/.gitignore b/go-packages/meep-sss-client/.gitignore similarity index 100% rename from go-packages/meep-sss/.gitignore rename to go-packages/meep-sss-client/.gitignore diff --git a/go-packages/meep-sss/.swagger-codegen-ignore b/go-packages/meep-sss-client/.swagger-codegen-ignore similarity index 100% rename from go-packages/meep-sss/.swagger-codegen-ignore rename to go-packages/meep-sss-client/.swagger-codegen-ignore diff --git a/go-packages/meep-sss/.swagger-codegen/VERSION b/go-packages/meep-sss-client/.swagger-codegen/VERSION similarity index 100% rename from go-packages/meep-sss/.swagger-codegen/VERSION rename to go-packages/meep-sss-client/.swagger-codegen/VERSION diff --git a/go-packages/meep-sss/.travis.yml b/go-packages/meep-sss-client/.travis.yml similarity index 100% rename from go-packages/meep-sss/.travis.yml rename to go-packages/meep-sss-client/.travis.yml diff --git a/go-packages/meep-sss/README.md b/go-packages/meep-sss-client/README.md similarity index 100% rename from go-packages/meep-sss/README.md rename to go-packages/meep-sss-client/README.md diff --git a/go-packages/meep-sss/api/swagger.yaml b/go-packages/meep-sss-client/api/swagger.yaml similarity index 99% rename from go-packages/meep-sss/api/swagger.yaml rename to go-packages/meep-sss-client/api/swagger.yaml index 881127365..e996e3457 100644 --- a/go-packages/meep-sss/api/swagger.yaml +++ b/go-packages/meep-sss-client/api/swagger.yaml @@ -1025,7 +1025,7 @@ paths: $ref: '#/components/schemas/ProblemDetails' put: tags: - - managementn + - management summary: The PUT method is used to update the value of the characteristics that can be set on a sensor or on a group of sensors description: "This method shall support the URI query parameters, request and\ diff --git a/go-packages/meep-sss/api_managementn.go b/go-packages/meep-sss-client/api_managementn.go similarity index 100% rename from go-packages/meep-sss/api_managementn.go rename to go-packages/meep-sss-client/api_managementn.go diff --git a/go-packages/meep-sss/api_sensor_data_lookup.go b/go-packages/meep-sss-client/api_sensor_data_lookup.go similarity index 100% rename from go-packages/meep-sss/api_sensor_data_lookup.go rename to go-packages/meep-sss-client/api_sensor_data_lookup.go diff --git a/go-packages/meep-sss/api_sensor_data_subscription.go b/go-packages/meep-sss-client/api_sensor_data_subscription.go similarity index 100% rename from go-packages/meep-sss/api_sensor_data_subscription.go rename to go-packages/meep-sss-client/api_sensor_data_subscription.go diff --git a/go-packages/meep-sss/api_sensor_discovery_lookup.go b/go-packages/meep-sss-client/api_sensor_discovery_lookup.go similarity index 100% rename from go-packages/meep-sss/api_sensor_discovery_lookup.go rename to go-packages/meep-sss-client/api_sensor_discovery_lookup.go diff --git a/go-packages/meep-sss/api_sensor_discovery_subscription.go b/go-packages/meep-sss-client/api_sensor_discovery_subscription.go similarity index 100% rename from go-packages/meep-sss/api_sensor_discovery_subscription.go rename to go-packages/meep-sss-client/api_sensor_discovery_subscription.go diff --git a/go-packages/meep-sss/api_sensor_management.go b/go-packages/meep-sss-client/api_sensor_management.go similarity index 100% rename from go-packages/meep-sss/api_sensor_management.go rename to go-packages/meep-sss-client/api_sensor_management.go diff --git a/go-packages/meep-sss/api_sensor_status_lookup.go b/go-packages/meep-sss-client/api_sensor_status_lookup.go similarity index 100% rename from go-packages/meep-sss/api_sensor_status_lookup.go rename to go-packages/meep-sss-client/api_sensor_status_lookup.go diff --git a/go-packages/meep-sss/api_sensor_status_subscription.go b/go-packages/meep-sss-client/api_sensor_status_subscription.go similarity index 100% rename from go-packages/meep-sss/api_sensor_status_subscription.go rename to go-packages/meep-sss-client/api_sensor_status_subscription.go diff --git a/go-packages/meep-sss/api_status_status_subscription.go b/go-packages/meep-sss-client/api_status_status_subscription.go similarity index 100% rename from go-packages/meep-sss/api_status_status_subscription.go rename to go-packages/meep-sss-client/api_status_status_subscription.go diff --git a/go-packages/meep-sss/client.go b/go-packages/meep-sss-client/client.go similarity index 100% rename from go-packages/meep-sss/client.go rename to go-packages/meep-sss-client/client.go diff --git a/go-packages/meep-sss/configuration.go b/go-packages/meep-sss-client/configuration.go similarity index 100% rename from go-packages/meep-sss/configuration.go rename to go-packages/meep-sss-client/configuration.go diff --git a/go-packages/meep-sss/git_push.sh b/go-packages/meep-sss-client/git_push.sh similarity index 100% rename from go-packages/meep-sss/git_push.sh rename to go-packages/meep-sss-client/git_push.sh diff --git a/go-packages/meep-sss/go.mod b/go-packages/meep-sss-client/go.mod similarity index 100% rename from go-packages/meep-sss/go.mod rename to go-packages/meep-sss-client/go.mod diff --git a/go-packages/meep-sss/go.sum b/go-packages/meep-sss-client/go.sum similarity index 100% rename from go-packages/meep-sss/go.sum rename to go-packages/meep-sss-client/go.sum diff --git a/go-packages/meep-sss/model_area_info.go b/go-packages/meep-sss-client/model_area_info.go similarity index 100% rename from go-packages/meep-sss/model_area_info.go rename to go-packages/meep-sss-client/model_area_info.go diff --git a/go-packages/meep-sss/model_link_type.go b/go-packages/meep-sss-client/model_link_type.go similarity index 100% rename from go-packages/meep-sss/model_link_type.go rename to go-packages/meep-sss-client/model_link_type.go diff --git a/go-packages/meep-sss/model_point.go b/go-packages/meep-sss-client/model_point.go similarity index 100% rename from go-packages/meep-sss/model_point.go rename to go-packages/meep-sss-client/model_point.go diff --git a/go-packages/meep-sss/model_problem_details.go b/go-packages/meep-sss-client/model_problem_details.go similarity index 100% rename from go-packages/meep-sss/model_problem_details.go rename to go-packages/meep-sss-client/model_problem_details.go diff --git a/go-packages/meep-sss/model_sensor_characteristic.go b/go-packages/meep-sss-client/model_sensor_characteristic.go similarity index 100% rename from go-packages/meep-sss/model_sensor_characteristic.go rename to go-packages/meep-sss-client/model_sensor_characteristic.go diff --git a/go-packages/meep-sss/model_sensor_data.go b/go-packages/meep-sss-client/model_sensor_data.go similarity index 100% rename from go-packages/meep-sss/model_sensor_data.go rename to go-packages/meep-sss-client/model_sensor_data.go diff --git a/go-packages/meep-sss/model_sensor_data_subscription.go b/go-packages/meep-sss-client/model_sensor_data_subscription.go similarity index 100% rename from go-packages/meep-sss/model_sensor_data_subscription.go rename to go-packages/meep-sss-client/model_sensor_data_subscription.go diff --git a/go-packages/meep-sss/model_sensor_discovery_event_subscription.go b/go-packages/meep-sss-client/model_sensor_discovery_event_subscription.go similarity index 100% rename from go-packages/meep-sss/model_sensor_discovery_event_subscription.go rename to go-packages/meep-sss-client/model_sensor_discovery_event_subscription.go diff --git a/go-packages/meep-sss/model_sensor_discovery_info.go b/go-packages/meep-sss-client/model_sensor_discovery_info.go similarity index 100% rename from go-packages/meep-sss/model_sensor_discovery_info.go rename to go-packages/meep-sss-client/model_sensor_discovery_info.go diff --git a/go-packages/meep-sss/model_sensor_discovery_subscription_id_body.go b/go-packages/meep-sss-client/model_sensor_discovery_subscription_id_body.go similarity index 100% rename from go-packages/meep-sss/model_sensor_discovery_subscription_id_body.go rename to go-packages/meep-sss-client/model_sensor_discovery_subscription_id_body.go diff --git a/go-packages/meep-sss/model_sensor_info.go b/go-packages/meep-sss-client/model_sensor_info.go similarity index 100% rename from go-packages/meep-sss/model_sensor_info.go rename to go-packages/meep-sss-client/model_sensor_info.go diff --git a/go-packages/meep-sss/model_sensor_status_info.go b/go-packages/meep-sss-client/model_sensor_status_info.go similarity index 100% rename from go-packages/meep-sss/model_sensor_status_info.go rename to go-packages/meep-sss-client/model_sensor_status_info.go diff --git a/go-packages/meep-sss/model_sensor_status_subscription.go b/go-packages/meep-sss-client/model_sensor_status_subscription.go similarity index 100% rename from go-packages/meep-sss/model_sensor_status_subscription.go rename to go-packages/meep-sss-client/model_sensor_status_subscription.go diff --git a/go-packages/meep-sss/model_sensor_status_subscription_id_body.go b/go-packages/meep-sss-client/model_sensor_status_subscription_id_body.go similarity index 100% rename from go-packages/meep-sss/model_sensor_status_subscription_id_body.go rename to go-packages/meep-sss-client/model_sensor_status_subscription_id_body.go diff --git a/go-packages/meep-sss/model_shape_type.go b/go-packages/meep-sss-client/model_shape_type.go similarity index 100% rename from go-packages/meep-sss/model_shape_type.go rename to go-packages/meep-sss-client/model_shape_type.go diff --git a/go-packages/meep-sss/model_status_data_subscription_id_body.go b/go-packages/meep-sss-client/model_status_data_subscription_id_body.go similarity index 100% rename from go-packages/meep-sss/model_status_data_subscription_id_body.go rename to go-packages/meep-sss-client/model_status_data_subscription_id_body.go diff --git a/go-packages/meep-sss/model_subscription_link_list.go b/go-packages/meep-sss-client/model_subscription_link_list.go similarity index 100% rename from go-packages/meep-sss/model_subscription_link_list.go rename to go-packages/meep-sss-client/model_subscription_link_list.go diff --git a/go-packages/meep-sss/model_subscription_link_list_links.go b/go-packages/meep-sss-client/model_subscription_link_list_links.go similarity index 100% rename from go-packages/meep-sss/model_subscription_link_list_links.go rename to go-packages/meep-sss-client/model_subscription_link_list_links.go diff --git a/go-packages/meep-sss/model_subscription_link_list_subscription.go b/go-packages/meep-sss-client/model_subscription_link_list_subscription.go similarity index 100% rename from go-packages/meep-sss/model_subscription_link_list_subscription.go rename to go-packages/meep-sss-client/model_subscription_link_list_subscription.go diff --git a/go-packages/meep-sss/model_subscription_links.go b/go-packages/meep-sss-client/model_subscription_links.go similarity index 100% rename from go-packages/meep-sss/model_subscription_links.go rename to go-packages/meep-sss-client/model_subscription_links.go diff --git a/go-packages/meep-sss/model_subscription_type.go b/go-packages/meep-sss-client/model_subscription_type.go similarity index 100% rename from go-packages/meep-sss/model_subscription_type.go rename to go-packages/meep-sss-client/model_subscription_type.go diff --git a/go-packages/meep-sss/model_subscriptions_sensor_data_body.go b/go-packages/meep-sss-client/model_subscriptions_sensor_data_body.go similarity index 100% rename from go-packages/meep-sss/model_subscriptions_sensor_data_body.go rename to go-packages/meep-sss-client/model_subscriptions_sensor_data_body.go diff --git a/go-packages/meep-sss/model_subscriptions_sensor_discovery_body.go b/go-packages/meep-sss-client/model_subscriptions_sensor_discovery_body.go similarity index 100% rename from go-packages/meep-sss/model_subscriptions_sensor_discovery_body.go rename to go-packages/meep-sss-client/model_subscriptions_sensor_discovery_body.go diff --git a/go-packages/meep-sss/model_subscriptions_sensor_status_body.go b/go-packages/meep-sss-client/model_subscriptions_sensor_status_body.go similarity index 100% rename from go-packages/meep-sss/model_subscriptions_sensor_status_body.go rename to go-packages/meep-sss-client/model_subscriptions_sensor_status_body.go diff --git a/go-packages/meep-sss/model_time_stamp.go b/go-packages/meep-sss-client/model_time_stamp.go similarity index 100% rename from go-packages/meep-sss/model_time_stamp.go rename to go-packages/meep-sss-client/model_time_stamp.go diff --git a/go-packages/meep-sss/model_websock_notif_config.go b/go-packages/meep-sss-client/model_websock_notif_config.go similarity index 100% rename from go-packages/meep-sss/model_websock_notif_config.go rename to go-packages/meep-sss-client/model_websock_notif_config.go diff --git a/go-packages/meep-sss/response.go b/go-packages/meep-sss-client/response.go similarity index 100% rename from go-packages/meep-sss/response.go rename to go-packages/meep-sss-client/response.go diff --git a/go-packages/meep-sss-mgr/go.mod b/go-packages/meep-sss-mgr/go.mod index ba299dc71..59f0675ff 100644 --- a/go-packages/meep-sss-mgr/go.mod +++ b/go-packages/meep-sss-mgr/go.mod @@ -1,4 +1,4 @@ -module github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-onem2m-mgr +module github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sss-mgr go 1.16 -- GitLab