From bec5eccd6d0fda7b2884b6804e55426018eea965 Mon Sep 17 00:00:00 2001 From: garciay Date: Thu, 17 Nov 2022 11:18:42 +0100 Subject: [PATCH] Merging InterDigital AdvantEDGE 'develop' branch into ETSI 'STF625_TASK4' branch - First round --- .meepctl-repocfg.yaml | 42 +- AUTHORS | 14 + charts/meep-ams/templates/deployment.yaml | 4 - .../templates/codecov-pv.yaml | 2 +- .../templates/deployment.yaml | 4 - .../meep-auth-svc/templates/deployment.yaml | 4 - .../meep-gis-engine/templates/deployment.yaml | 6 +- .../meep-loc-serv/templates/deployment.yaml | 4 - .../templates/deployment.yaml | 6 +- .../meep-mg-manager/templates/deployment.yaml | 6 +- .../meep-mon-engine/templates/deployment.yaml | 6 +- .../templates/deployment.yaml | 6 +- charts/meep-rnis/templates/deployment.yaml | 4 - .../templates/deployment.yaml | 6 +- .../meep-tc-engine/templates/deployment.yaml | 2 +- .../templates/deployment.yaml | 6 +- charts/meep-vis/values-template.yaml | 1 + config/long-term-storage-repocfg.yaml | 20 +- config/permissions-open.yaml | 2 +- config/permissions-secure.yaml | 2 +- docs/api-rnis/.openapi-generator/FILES | 6 +- docs/api-rnis/Models/CaReconfNotification.md | 1 + .../Models/CaReconfNotificationLinks.md | 9 + docs/api-rnis/Models/CaReconfSubscription.md | 4 +- .../api-rnis/Models/CellChangeNotification.md | 3 +- .../Models/CellChangeNotificationLinks.md | 9 + .../api-rnis/Models/CellChangeSubscription.md | 4 +- docs/api-rnis/Models/ExpiryNotification.md | 1 + .../Models/ExpiryNotificationLinks.md | 2 +- docs/api-rnis/Models/InlineNotification.md | 3 +- docs/api-rnis/Models/InlineSubscription.md | 4 +- docs/api-rnis/Models/MeasRepUeNotification.md | 1 + docs/api-rnis/Models/MeasRepUeSubscription.md | 4 +- docs/api-rnis/Models/MeasTaNotification.md | 1 + docs/api-rnis/Models/MeasTaSubscription.md | 4 +- docs/api-rnis/Models/NRcgi.md | 2 +- .../Models/NrMeasRepUeNotification.md | 1 + ...easRepUeNotificationNrNeighCellMeasInfo.md | 2 +- ...NrMeasRepUeNotificationServCellMeasInfo.md | 2 +- .../Models/NrMeasRepUeSubscription.md | 4 +- ...easRepUeSubscriptionFilterCriteriaNrMrs.md | 2 +- docs/api-rnis/Models/ProblemDetails.md | 4 +- docs/api-rnis/Models/RabEstNotification.md | 1 + docs/api-rnis/Models/RabEstSubscription.md | 4 +- docs/api-rnis/Models/RabModNotification.md | 1 + docs/api-rnis/Models/RabModSubscription.md | 4 +- docs/api-rnis/Models/RabRelNotification.md | 1 + docs/api-rnis/Models/RabRelSubscription.md | 4 +- docs/api-rnis/Models/S1BearerNotification.md | 1 + docs/api-rnis/Models/S1BearerSubscription.md | 4 +- .../api-rnis/Models}/TestNotification.md | 6 +- docs/api-rnis/Models/WebsockNotifConfig.md | 10 + docs/api-rnis/README.md | 6 +- examples/demo1/demo1-scenario.yaml | 6 +- .../demo1/src/demo-client/js/src/ApiClient.js | 8 +- .../demo-client/js/src/api/EdgeAppInfoApi.js | 8 +- .../js/src/api/NotificationsApi.js | 8 +- .../js/src/api/StateTransferApi.js | 8 +- .../demo-client/js/src/api/UELocationApi.js | 8 +- .../src/demo-client/js/src/api/UEStateApi.js | 8 +- .../demo1/src/demo-client/js/src/index.js | 8 +- .../src/demo-client/js/src/model/EdgeInfo.js | 8 +- .../src/model/InlineTrackingNotification.js | 8 +- .../js/src/model/MobilityGroupAppState.js | 8 +- .../js/src/model/MobilityGroupEvent.js | 8 +- .../js/src/model/SubscriptionId.js | 8 +- .../src/demo-client/js/src/model/TimeStamp.js | 8 +- .../js/src/model/TrackingNotification.js | 8 +- .../src/demo-client/js/src/model/UeState.js | 8 +- .../demo-client/js/src/model/UserEventType.js | 8 +- .../src/demo-client/js/src/model/UserInfo.js | 8 +- .../src/demo-client/js/src/model/UserList.js | 8 +- .../js/src/model/UserTrackingNotification.js | 8 +- .../src/demo-client/js/src/model/ZoneInfo.js | 8 +- .../js/test/api/EdgeAppInfoApi.spec.js | 8 +- .../js/test/api/NotificationsApi.spec.js | 8 +- .../js/test/api/StateTransferApi.spec.js | 8 +- .../js/test/api/UELocationApi.spec.js | 8 +- .../js/test/api/UEStateApi.spec.js | 8 +- .../js/test/model/EdgeInfo.spec.js | 8 +- .../model/InlineTrackingNotification.spec.js | 8 +- .../test/model/MobilityGroupAppState.spec.js | 8 +- .../js/test/model/MobilityGroupEvent.spec.js | 8 +- .../js/test/model/SubscriptionId.spec.js | 8 +- .../js/test/model/TimeStamp.spec.js | 8 +- .../test/model/TrackingNotification.spec.js | 8 +- .../demo-client/js/test/model/UeState.spec.js | 8 +- .../js/test/model/UserEventType.spec.js | 8 +- .../js/test/model/UserInfo.spec.js | 8 +- .../js/test/model/UserList.spec.js | 8 +- .../model/UserTrackingNotification.spec.js | 8 +- .../js/test/model/ZoneInfo.spec.js | 8 +- .../src/demo-frontend/src/css/demo-svc.scss | 4 +- .../demo1/src/demo-frontend/src/index.html | 6 +- .../src/demo-frontend/src/js/demo-svc.js | 11 +- examples/demo1/src/demo-server/Dockerfile | 4 +- examples/demo1/src/demo-server/go/README.md | 2 +- .../src/demo-server/go/api_edge_app_info.go | 8 +- .../src/demo-server/go/api_notifications.go | 8 +- .../src/demo-server/go/api_state_transfer.go | 8 +- .../src/demo-server/go/api_ue_location.go | 8 +- .../demo1/src/demo-server/go/api_ue_state.go | 8 +- examples/demo1/src/demo-server/go/localDB.go | 4 +- examples/demo1/src/demo-server/go/logger.go | 8 +- .../src/demo-server/go/model_edge_info.go | 8 +- .../go/model_inline_tracking_notification.go | 8 +- .../go/model_mobility_group_app_state.go | 8 +- .../go/model_mobility_group_event.go | 8 +- .../demo-server/go/model_subscription_id.go | 8 +- .../src/demo-server/go/model_time_stamp.go | 8 +- .../go/model_tracking_notification.go | 8 +- .../src/demo-server/go/model_ue_state.go | 8 +- .../demo-server/go/model_user_event_type.go | 14 +- .../src/demo-server/go/model_user_info.go | 8 +- .../src/demo-server/go/model_user_list.go | 8 +- .../go/model_user_tracking_notification.go | 8 +- .../src/demo-server/go/model_zone_info.go | 8 +- examples/demo1/src/demo-server/go/routers.go | 8 +- examples/demo1/src/demo-server/main.go | 2 +- .../iperf-proxy-client/js/src/ApiClient.js | 8 +- .../js/src/api/IperfAppInfoApi.js | 8 +- .../src/iperf-proxy-client/js/src/index.js | 8 +- .../js/src/model/IperfInfo.js | 8 +- .../js/test/api/IperfAppInfoApi.spec.js | 8 +- .../js/test/model/IperfInfo.spec.js | 8 +- examples/demo1/src/iperf-proxy/go/README.md | 2 +- .../src/iperf-proxy/go/api_iperf_app_info.go | 8 +- examples/demo1/src/iperf-proxy/go/logger.go | 8 +- .../src/iperf-proxy/go/model_iperf_info.go | 8 +- examples/demo1/src/iperf-proxy/go/routers.go | 8 +- examples/demo1/src/iperf-proxy/main.go | 2 +- examples/demo2/demo2-scenario.yaml | 6 +- examples/demo3/src/backend/Dockerfile | 2 +- examples/demo3/src/backend/api/swagger.yaml | 471 +- examples/demo3/src/backend/go.mod | 5 +- examples/demo3/src/backend/go.sum | 595 +- examples/demo3/src/backend/main.go | 6 +- examples/demo3/src/backend/server/README.md | 4 +- .../demo3/src/backend/server/api_frontend.go | 8 +- .../src/backend/server/api_notification.go | 8 +- .../demo3/src/backend/server/demo3_service.go | 113 +- examples/demo3/src/backend/server/logger.go | 8 +- .../model_adjacent_app_info_notification.go | 36 + ...app_info_notification_adjacent_app_info.go | 30 + ... => model_app_termination_notification.go} | 24 +- ...odel_app_termination_notification_links.go | 30 + .../server/model_application_context_state.go | 10 +- .../server/model_application_instance.go | 8 +- ...ion_instance_ams_link_list_subscription.go | 10 +- ...n_instance_app_termination_subscription.go | 8 +- ...pplication_instance_discovered_services.go | 8 +- ...el_application_instance_offered_service.go | 8 +- ...del_application_instance_offeredservice.go | 34 - ..._instance_ser_availability_subscription.go | 8 +- .../model_application_instance_services.go | 32 - ...odel_application_instance_subscriptions.go | 8 +- .../src/backend/server/model_associate_id.go | 12 +- .../backend/server/model_associate_id_type.go | 34 + .../server/model_communication_interface.go | 8 +- ...el_communication_interface_ip_addresses.go | 24 +- .../server/model_expiry_notification.go | 34 + ..._links.go => model_inline_notification.go} | 12 +- .../demo3/src/backend/server/model_link.go | 28 + .../src/backend/server/model_link_type.go | 14 +- .../src/backend/server/model_link_type_1.go | 29 + .../src/backend/server/model_link_type_2.go | 29 + .../model_link_type_confirm_termination.go | 29 + .../src/backend/server/model_locality_type.go | 20 +- .../model_mobility_procedure_notification.go | 24 +- ..._mobility_procedure_notification__links.go | 15 - ..._procedure_notification_target_app_info.go | 12 +- .../backend/server/model_mobility_status.go | 27 +- .../model_one_of_inline_notification.go | 26 + .../server/model_operation_action_type.go | 32 + .../backend/server/model_problem_details.go | 36 + ...model_service_availability_notification.go | 10 +- ...e_availability_notification_change_type.go | 34 + ...ability_notification_service_references.go | 18 +- .../src/backend/server/model_service_info.go | 36 - .../src/backend/server/model_service_state.go | 12 +- .../backend/server/model_service_state_1.go | 33 + .../src/backend/server/model_subscription.go | 10 +- .../src/backend/server/model_time_stamp.go | 15 +- .../demo3/src/backend/server/model_type.go | 21 - examples/demo3/src/backend/server/routers.go | 20 +- examples/demo3/src/backend/util/config.go | 18 +- examples/demo3/src/client/.babelrc | 33 + .../demo3/src/client/.swagger-codegen/VERSION | 2 +- examples/demo3/src/client/README.md | 45 +- .../docs/AdjacentAppInfoNotification.md | 12 + ...acentAppInfoNotificationAdjacentAppInfo.md | 9 + .../client/docs/AppTerminationNotification.md | 11 + .../docs/AppTerminationNotificationLinks.md | 9 + .../client/docs/ApplicationContextState.md | 11 + .../src/client/docs/ApplicationInstance.md | 18 + ...licationInstanceAmsLinkListSubscription.md | 8 + ...ationInstanceAppTerminationSubscription.md | 8 + .../ApplicationInstanceDiscoveredServices.md | 12 + .../docs/ApplicationInstanceOfferedService.md | 12 + ...tionInstanceSerAvailabilitySubscription.md | 8 + .../docs/ApplicationInstanceSubscriptions.md | 10 + examples/demo3/src/client/docs/AssociateId.md | 9 + .../demo3/src/client/docs/AssociateIdType.md | 14 + .../src/client/docs/CommunicationInterface.md | 8 + .../docs/CommunicationInterfaceIpAddresses.md | 9 + .../src/client/docs/ExpiryNotification.md | 11 + examples/demo3/src/client/docs/FrontendApi.md | 24 +- .../src/client/docs/InlineNotification.md | 7 + examples/demo3/src/client/docs/Link.md | 8 + examples/demo3/src/client/docs/LinkType.md | 8 + examples/demo3/src/client/docs/LinkType1.md | 8 + examples/demo3/src/client/docs/LinkType2.md | 8 + .../client/docs/LinkTypeConfirmTermination.md | 8 + .../demo3/src/client/docs/LocalityType.md | 18 + .../docs/MobilityProcedureNotification.md | 13 + ...ilityProcedureNotificationTargetAppInfo.md | 9 + .../demo3/src/client/docs/MobilityStatus.md | 12 + .../demo3/src/client/docs/NotificationApi.md | 66 +- .../client/docs/OneOfInlineNotification.md | 7 + .../src/client/docs/OperationActionType.md | 10 + .../demo3/src/client/docs/ProblemDetails.md | 12 + .../demo3/src/client/docs/SerInstanceId.md | 7 + examples/demo3/src/client/docs/SerName.md | 7 + .../docs/ServiceAvailabilityNotification.md | 10 + ...rviceAvailabilityNotificationChangeType.md | 14 + ...ailabilityNotificationServiceReferences.md | 12 + .../demo3/src/client/docs/ServiceState.md | 10 + .../demo3/src/client/docs/ServiceState1.md | 12 + .../demo3/src/client/docs/Subscription.md | 8 + examples/demo3/src/client/docs/TimeStamp.md | 9 + examples/demo3/src/client/git_push.sh | 52 + examples/demo3/src/client/src/ApiClient.js | 10 +- .../demo3/src/client/src/api/FrontendApi.js | 36 +- .../src/client/src/api/NotificationApi.js | 65 +- examples/demo3/src/client/src/index.js | 211 +- .../src/model/AdjacentAppInfoNotification.js | 120 + ...acentAppInfoNotificationAdjacentAppInfo.js | 97 + .../src/model/AppTerminationNotification.js | 116 + .../model/AppTerminationNotificationLinks.js | 94 + .../src/model/ApplicationContextState.js | 109 + .../client/src/model/ApplicationInstance.js | 158 + ...licationInstanceAmsLinkListSubscription.js | 85 + ...ationInstanceAppTerminationSubscription.js | 85 + .../ApplicationInstanceDiscoveredServices.js | 115 + .../ApplicationInstanceOfferedService.js | 114 + ...tionInstanceSerAvailabilitySubscription.js | 85 + .../model/ApplicationInstanceSubscriptions.js | 99 + .../demo3/src/client/src/model/AssociateId.js | 92 + .../src/client/src/model/AssociateIdType.js | 88 + .../src/model/CommunicationInterface.js | 84 + .../CommunicationInterfaceIpAddresses.js | 95 + .../client/src/model/ExpiryNotification.js | 114 + .../client/src/model/InlineNotification.js | 79 + examples/demo3/src/client/src/model/Link.js | 87 + .../demo3/src/client/src/model/LinkType.js | 88 + .../demo3/src/client/src/model/LinkType1.js | 86 + .../demo3/src/client/src/model/LinkType2.js | 86 + .../src/model/LinkTypeConfirmTermination.js | 86 + .../src/client/src/model/LocalityType.js | 100 + .../model/MobilityProcedureNotification.js | 131 + ...ilityProcedureNotificationTargetAppInfo.js | 94 + .../src/client/src/model/MobilityStatus.js | 82 + .../src/model/OneOfInlineNotification.js | 77 + .../client/src/model/OperationActionType.js | 76 + .../src/client/src/model/ProblemDetails.js | 117 + .../src/client/src/model/SerInstanceId.js | 78 + .../demo3/src/client/src/model/SerName.js | 78 + .../model/ServiceAvailabilityNotification.js | 106 + ...rviceAvailabilityNotificationChangeType.js | 88 + ...ailabilityNotificationServiceReferences.js | 121 + .../src/client/src/model/ServiceState.js | 76 + .../src/client/src/model/ServiceState1.js | 82 + .../src/client/src/model/Subscription.js | 87 + .../demo3/src/client/src/model/TimeStamp.js | 98 + .../src/client/test/api/FrontendApi.spec.js | 20 +- .../client/test/api/NotificationApi.spec.js | 28 +- .../model/AdjacentAppInfoNotification.spec.js | 90 + ...AppInfoNotificationAdjacentAppInfo.spec.js | 72 + .../model/AppTerminationNotification.spec.js | 84 + .../AppTerminationNotificationLinks.spec.js | 72 + .../model/ApplicationContextState.spec.js | 84 + .../test/model/ApplicationInstance.spec.js | 126 + ...ionInstanceAmsLinkListSubscription.spec.js | 66 + ...InstanceAppTerminationSubscription.spec.js | 66 + ...licationInstanceDiscoveredServices.spec.js | 90 + .../ApplicationInstanceOfferedService.spec.js | 90 + ...nstanceSerAvailabilitySubscription.spec.js | 66 + .../ApplicationInstanceSubscriptions.spec.js | 78 + .../src/client/test/model/AssociateId.spec.js | 72 + .../client/test/model/AssociateIdType.spec.js | 80 + .../test/model/CommunicationInterface.spec.js | 66 + .../CommunicationInterfaceIpAddresses.spec.js | 72 + .../test/model/ExpiryNotification.spec.js | 84 + .../test/model/InlineNotification.spec.js | 60 + .../demo3/src/client/test/model/Link.spec.js | 66 + .../src/client/test/model/LinkType.spec.js | 66 + .../src/client/test/model/LinkType1.spec.js | 66 + .../src/client/test/model/LinkType2.spec.js | 66 + .../model/LinkTypeConfirmTermination.spec.js | 66 + .../client/test/model/LocalityType.spec.js | 90 + .../MobilityProcedureNotification.spec.js | 96 + ...ProcedureNotificationTargetAppInfo.spec.js | 72 + .../client/test/model/MobilityStatus.spec.js | 75 + .../model/OneOfInlineNotification.spec.js | 60 + .../test/model/OperationActionType.spec.js | 70 + .../client/test/model/ProblemDetails.spec.js | 90 + .../client/test/model/SerInstanceId.spec.js | 60 + .../src/client/test/model/SerName.spec.js | 60 + .../ServiceAvailabilityNotification.spec.js | 78 + ...AvailabilityNotificationChangeType.spec.js | 80 + ...ilityNotificationServiceReferences.spec.js | 90 + .../client/test/model/ServiceState.spec.js | 70 + .../client/test/model/ServiceState1.spec.js | 75 + .../client/test/model/Subscription.spec.js | 66 + .../src/client/test/model/TimeStamp.spec.js | 72 + .../demo3/src/frontend/src/css/global.css | 16 + .../demo3/src/frontend/src/css/global.scss | 2 +- .../src/frontend/src/css/header.module.css | 16 + examples/demo3/src/frontend/src/index.html | 2 +- .../src/js/components/Layout/Header.js | 16 + .../src/js/components/Pane/Amspane.js | 18 +- .../src/js/components/Pane/AppInfo.js | 20 +- .../src/js/components/Pane/Logpane.js | 16 + .../src/frontend/src/js/components/Title.js | 16 + .../frontend/src/js/containers/Homepage.js | 28 +- .../src/frontend/src/js/demo-controller.js | 16 + .../backend/server/demo4_service.go | 2 +- go-apps/meep-ams/Dockerfile | 2 +- go-apps/meep-ams/api/swagger.yaml | 1159 ++- go-apps/meep-ams/entrypoint.sh | 10 +- go-apps/meep-ams/go.sum | 1 + go-apps/meep-ams/main.go | 2 +- go-apps/meep-ams/main_test.go | 2 +- go-apps/meep-ams/sbi/ams-sbi.go | 2 +- go-apps/meep-ams/server/README.md | 9 +- go-apps/meep-ams/server/ams.go | 28 +- go-apps/meep-ams/server/ams_test.go | 44 +- go-apps/meep-ams/server/api_amsi.go | 10 +- go-apps/meep-ams/server/api_unsupported.go | 10 +- go-apps/meep-ams/server/convert.go | 2 +- go-apps/meep-ams/server/logger.go | 10 +- .../model_adjacent_app_info_notification.go | 12 +- ...app_info_notification_adjacent_app_info.go | 12 +- .../model_adjacent_app_info_subscription.go | 14 +- ...t_app_info_subscription_filter_criteria.go | 10 +- ...el_adjacent_app_info_subscription_links.go | 10 +- .../model_adjacent_app_instance_info.go | 10 +- .../model_app_mobility_service_level.go | 16 +- .../model_app_termination_notification.go | 10 +- ...del_app_termination_notification__links.go | 10 +- go-apps/meep-ams/server/model_associate_id.go | 14 +- ...del_type.go => model_associate_id_type.go} | 24 +- .../server/model_communication_interface.go | 10 +- ...el_communication_interface_ip_addresses.go | 10 +- .../server/model_context_transfer_state.go | 18 +- .../server/model_expiry_notification.go | 12 +- ...body_1.go => model_inline_notification.go} | 13 +- ...l_body.go => model_inline_subscription.go} | 12 +- ...e_notification__links.go => model_link.go} | 12 +- go-apps/meep-ams/server/model_link_type.go | 10 +- .../server/model_mec_host_information.go | 10 +- .../model_mobility_procedure_notification.go | 12 +- ..._procedure_notification_target_app_info.go | 10 +- .../model_mobility_procedure_subscription.go | 14 +- ..._procedure_subscription_filter_criteria.go | 10 +- ...l_mobility_procedure_subscription_links.go | 10 +- .../meep-ams/server/model_mobility_status.go | 16 +- .../model_one_of_inline_notification.go | 29 + ...go => model_one_of_inline_subscription.go} | 12 +- go-apps/meep-ams/server/model_one_ofbody_1.go | 28 - go-apps/meep-ams/server/model_one_ofbody_2.go | 28 - .../server/model_operation_action_type.go | 14 +- .../meep-ams/server/model_problem_details.go | 14 +- .../server/model_registration_info.go | 10 +- ...el_registration_info_device_information.go | 10 +- ...l_registration_info_service_consumer_id.go | 10 +- .../server/model_subscription_link_list.go | 10 +- .../model_subscription_link_list_links.go | 10 +- ...del_subscription_link_list_subscription.go | 10 +- .../server/model_subscription_type.go | 23 +- .../server/model_test_notification.go | 10 +- .../server/model_test_notification__links.go | 10 +- go-apps/meep-ams/server/model_time_stamp.go | 10 +- .../server/model_websock_notif_config.go | 10 +- go-apps/meep-ams/server/routers.go | 10 +- go-apps/meep-app-enablement/Dockerfile | 2 +- .../api/app-support/swagger.yaml | 1449 ++-- .../api/service-mgmt/swagger.yaml | 110 +- go-apps/meep-app-enablement/entrypoint.sh | 10 +- go-apps/meep-app-enablement/go.sum | 1 + go-apps/meep-app-enablement/main.go | 2 +- go-apps/meep-app-enablement/main_test.go | 2 +- .../server/app-enablement.go | 2 +- .../server/app-support/README.md | 2 +- .../server/app-support/api_mec_app_support.go | 8 +- .../server/app-support/api_unsupported.go | 8 +- .../server/app-support/app-support.go | 20 +- .../server/app-support/convert.go | 2 +- .../model_app_ready_confirmation.go | 8 +- .../model_app_termination_confirmation.go | 8 +- .../model_app_termination_notification.go | 8 +- ...del_app_termination_notification_links.go} | 10 +- ...p_termination_notification_subscription.go | 10 +- .../server/app-support/model_current_time.go | 12 +- .../model_destination_interface.go | 13 +- ...el_destination_interface_interface_type.go | 34 + .../server/app-support/model_dns_rule.go | 16 +- .../model_dns_rule_ip_address_type.go | 33 + .../app-support/model_dns_rule_state.go | 33 + .../server/app-support/model_link_type.go | 8 +- .../model_link_type_confirm_termination.go | 30 + ...mec_app_supt_api_subscription_link_list.go | 8 +- ...p_supt_api_subscription_link_list_links.go | 10 +- ...api_subscription_link_list_subscription.go | 14 +- .../model_operation_action_type.go | 12 +- .../app-support/model_problem_details.go | 12 +- ...n_subscription__links.go => model_self.go} | 10 +- .../app-support/model_time_source_status.go | 33 + .../server/app-support/model_timing_caps.go | 10 +- .../model_timing_caps_ntp_servers.go | 19 +- ..._caps_ntp_servers_authentication_option.go | 34 + ...g_caps_ntp_servers_ntp_server_addr_type.go | 33 + .../model_timing_caps_ptp_masters.go | 12 +- .../model_timing_caps_time_stamp.go | 8 +- .../app-support/model_traffic_filter.go | 8 +- .../server/app-support/model_traffic_rule.go | 24 +- .../app-support/model_traffic_rule_action.go | 37 + .../model_traffic_rule_filter_type.go | 33 + .../app-support/model_traffic_rule_state.go | 33 + .../server/app-support/model_tunnel_info.go | 11 +- .../model_tunnel_info_tunnel_type.go | 33 + go-apps/meep-app-enablement/server/logger.go | 8 +- go-apps/meep-app-enablement/server/routers.go | 10 +- .../server/service-mgmt/README.md | 4 +- .../service-mgmt/api_mec_service_mgmt.go | 10 +- .../server/service-mgmt/convert.go | 2 +- .../server/service-mgmt/model_category_ref.go | 10 +- .../model_end_point_info_addresses.go | 10 +- ...odel_end_point_info_addresses_addresses.go | 10 +- .../model_end_point_info_alternative.go | 10 +- .../service-mgmt/model_end_point_info_uris.go | 10 +- .../server/service-mgmt/model_grant_type.go | 18 +- .../server/service-mgmt/model_link_type.go | 10 +- .../service-mgmt/model_locality_type.go | 22 +- .../server/service-mgmt/model_o_auth2_info.go | 10 +- .../model_one_of_service_info_post.go | 10 +- .../model_one_of_transport_info_endpoint.go | 10 +- .../service-mgmt/model_problem_details.go | 10 +- .../service-mgmt/model_security_info.go | 10 +- .../server/service-mgmt/model_self.go | 10 +- ..._availability_notification_subscription.go | 12 +- ...ication_subscription_filtering_criteria.go | 12 +- .../service-mgmt/model_serializer_type.go | 16 +- ...model_service_availability_notification.go | 10 +- ...e_availability_notification_change_type.go | 26 +- ...ability_notification_service_references.go | 14 +- .../server/service-mgmt/model_service_info.go | 10 +- ..._links.go => model_service_info__links.go} | 10 +- .../service-mgmt/model_service_info_post.go | 10 +- .../model_service_liveness_info.go | 10 +- .../model_service_liveness_info_time_stamp.go | 10 +- .../model_service_liveness_update.go | 10 +- .../service-mgmt/model_service_state.go | 16 +- .../server/service-mgmt/model_subscription.go | 10 +- .../model_subscription_link_list.go | 10 +- .../model_subscription_link_list__links.go | 10 +- ...cription_link_list__links_subscriptions.go | 10 +- .../service-mgmt/model_transport_info.go | 10 +- .../service-mgmt/model_transport_type.go | 24 +- .../server/service-mgmt/service-mgmt.go | 22 +- go-apps/meep-auth-svc/Dockerfile | 2 +- go-apps/meep-auth-svc/entrypoint.sh | 10 +- go-apps/meep-auth-svc/main.go | 6 +- go-apps/meep-auth-svc/main_test.go | 2 +- go-apps/meep-auth-svc/server/README.md | 2 +- go-apps/meep-auth-svc/server/api_auth.go | 8 +- go-apps/meep-auth-svc/server/auth-svc.go | 8 +- go-apps/meep-auth-svc/server/logger.go | 8 +- go-apps/meep-auth-svc/server/model_sandbox.go | 8 +- go-apps/meep-auth-svc/server/routers.go | 8 +- go-apps/meep-gis-engine/Dockerfile | 2 +- go-apps/meep-gis-engine/api/swagger.yaml | 60 +- go-apps/meep-gis-engine/entrypoint.sh | 10 +- go-apps/meep-gis-engine/main.go | 2 +- go-apps/meep-gis-engine/main_test.go | 2 +- go-apps/meep-gis-engine/server/README.md | 2 +- .../meep-gis-engine/server/api_automation.go | 8 +- .../server/api_geospatial_data.go | 16 +- .../meep-gis-engine/server/gis-automation.go | 18 +- go-apps/meep-gis-engine/server/gis-engine.go | 185 +- .../meep-gis-engine/server/gis-engine_test.go | 235 +- go-apps/meep-gis-engine/server/logger.go | 8 +- .../server/model_automation_state.go | 8 +- .../server/model_automation_state_list.go | 8 +- .../server/model_coordinate_power.go | 8 +- .../server/model_coordinate_power_list.go | 8 +- .../meep-gis-engine/server/model_distance.go | 8 +- .../server/model_geo_coordinate.go | 8 +- .../server/model_geo_coordinate_list.go | 8 +- .../meep-gis-engine/server/model_geo_data.go | 12 +- .../server/model_geo_data_asset.go | 12 +- .../server/model_geo_data_asset_list.go | 8 +- .../server/model_line_string.go | 8 +- go-apps/meep-gis-engine/server/model_point.go | 8 +- .../server/model_target_point.go | 8 +- .../server/model_target_range.go | 8 +- .../server/model_within_range.go | 8 +- go-apps/meep-gis-engine/server/routers.go | 20 +- go-apps/meep-loc-serv/Dockerfile | 2 +- go-apps/meep-loc-serv/api/swagger.yaml | 6051 +++++++------- go-apps/meep-loc-serv/entrypoint.sh | 10 +- go-apps/meep-loc-serv/go.sum | 1 + go-apps/meep-loc-serv/main.go | 2 +- go-apps/meep-loc-serv/main_test.go | 2 +- go-apps/meep-loc-serv/sbi/loc-serv-sbi.go | 2 +- go-apps/meep-loc-serv/server/README.md | 2 +- go-apps/meep-loc-serv/server/api_location.go | 10 +- go-apps/meep-loc-serv/server/convert.go | 28 +- go-apps/meep-loc-serv/server/loc-serv.go | 76 +- go-apps/meep-loc-serv/server/loc-serv_test.go | 42 +- go-apps/meep-loc-serv/server/logger.go | 10 +- .../server/model_access_point_info.go | 10 +- .../server/model_access_point_list.go | 10 +- .../model_app_termination_notification.go | 10 +- ...del_app_termination_notification__links.go | 10 +- .../server/model_callback_reference.go | 10 +- .../model_circle_notification_subscription.go | 10 +- .../server/model_connection_type.go | 31 +- .../server/model_distance_criteria.go | 18 +- ...odel_distance_notification_subscription.go | 10 +- .../server/model_entering_leaving_criteria.go | 14 +- .../server/model_inline_access_point_info.go | 10 +- .../server/model_inline_access_point_list.go | 10 +- ...inline_circle_notification_subscription.go | 10 +- ...line_distance_notification_subscription.go | 10 +- ...l_inline_notification_subscription_list.go | 10 +- ...line_periodic_notification_subscription.go | 10 +- .../server/model_inline_problem_details.go | 10 +- .../model_inline_problem_details_required.go | 10 +- .../model_inline_subscription_notification.go | 10 +- .../server/model_inline_terminal_distance.go | 10 +- .../server/model_inline_user_list.go | 10 +- ...model_inline_user_tracking_subscription.go | 10 +- ...odel_inline_zonal_presence_notification.go | 10 +- ...model_inline_zonal_traffic_subscription.go | 10 +- .../server/model_inline_zone_info.go | 10 +- .../server/model_inline_zone_list.go | 10 +- .../model_inline_zone_status_notification.go | 10 +- .../model_inline_zone_status_subscription.go | 10 +- go-apps/meep-loc-serv/server/model_link.go | 10 +- .../meep-loc-serv/server/model_link_type.go | 10 +- .../server/model_location_info.go | 22 +- .../server/model_location_info_velocity.go | 24 +- .../server/model_notification_format.go | 14 +- .../model_notification_subscription_list.go | 10 +- .../server/model_operation_action_type.go | 14 +- .../server/model_operation_status.go | 17 +- ...odel_periodic_notification_subscription.go | 10 +- .../server/model_problem_details.go | 14 +- .../server/model_retrieval_status.go | 16 +- .../server/model_service_error.go | 10 +- .../server/model_subscription_notification.go | 10 +- .../server/model_terminal_distance.go | 10 +- .../server/model_terminal_location.go | 10 +- .../meep-loc-serv/server/model_time_stamp.go | 10 +- .../server/model_user_event_type.go | 16 +- .../meep-loc-serv/server/model_user_info.go | 10 +- .../meep-loc-serv/server/model_user_list.go | 10 +- .../model_user_tracking_subscription.go | 10 +- .../model_zonal_presence_notification.go | 10 +- .../model_zonal_traffic_subscription.go | 10 +- .../meep-loc-serv/server/model_zone_info.go | 10 +- .../meep-loc-serv/server/model_zone_list.go | 10 +- .../server/model_zone_status_notification.go | 10 +- .../server/model_zone_status_subscription.go | 10 +- go-apps/meep-loc-serv/server/routers.go | 12 +- go-apps/meep-metrics-engine/Dockerfile | 2 +- .../meep-metrics-engine/api/v2/swagger.yaml | 317 +- go-apps/meep-metrics-engine/entrypoint.sh | 10 +- go-apps/meep-metrics-engine/go.mod | 5 +- go-apps/meep-metrics-engine/go.sum | 33 +- go-apps/meep-metrics-engine/main.go | 2 +- go-apps/meep-metrics-engine/main_test.go | 2 +- go-apps/meep-metrics-engine/server/logger.go | 6 +- go-apps/meep-metrics-engine/server/routers.go | 20 +- .../meep-metrics-engine/server/v2/README.md | 2 +- .../server/v2/api_metrics.go | 16 +- .../server/v2/api_subscriptions.go | 8 +- .../meep-metrics-engine/server/v2/convert.go | 2 +- .../meep-metrics-engine/server/v2/logger.go | 8 +- .../server/v2/metrics-engine.go | 373 +- .../server/v2/model_dataflow_metric.go | 35 + .../server/v2/model_dataflow_metric_list.go | 36 + .../server/v2/model_dataflow_metrics.go | 32 + .../server/v2/model_dataflow_query_params.go | 40 + .../server/v2/model_event_metric.go | 8 +- .../server/v2/model_event_metric_list.go | 8 +- .../server/v2/model_event_query_params.go | 8 +- .../server/v2/model_event_subscription.go | 8 +- .../v2/model_event_subscription_list.go | 8 +- .../v2/model_event_subscription_params.go | 8 +- .../v2/model_events_callback_reference.go | 8 +- .../server/v2/model_http_metric.go | 8 +- .../server/v2/model_http_metric_list.go | 8 +- .../server/v2/model_http_query_params.go | 8 +- .../v2/model_network_callback_reference.go | 8 +- .../server/v2/model_network_metric.go | 8 +- .../server/v2/model_network_metric_list.go | 8 +- .../server/v2/model_network_query_params.go | 8 +- .../server/v2/model_network_subscription.go | 8 +- .../v2/model_network_subscription_list.go | 8 +- .../v2/model_network_subscription_params.go | 8 +- .../server/v2/model_scope.go | 8 +- .../server/v2/model_seq_metric.go | 38 + .../server/v2/model_seq_metric_list.go | 37 + .../server/v2/model_seq_metrics.go | 32 + .../server/v2/model_seq_query_params.go | 40 + .../server/v2/model_tag.go | 8 +- go-apps/meep-mg-manager/Dockerfile | 2 +- go-apps/meep-mg-manager/entrypoint.sh | 10 +- go-apps/meep-mg-manager/go.sum | 1 + go-apps/meep-mg-manager/main.go | 2 +- go-apps/meep-mg-manager/main_test.go | 2 +- go-apps/meep-mg-manager/server/README.md | 2 +- .../meep-mg-manager/server/api_membership.go | 8 +- .../server/api_state_transfer.go | 8 +- go-apps/meep-mg-manager/server/logger.go | 8 +- go-apps/meep-mg-manager/server/mg-manager.go | 2 +- .../server/model_mobility_group.go | 8 +- .../server/model_mobility_group_app.go | 8 +- .../server/model_mobility_group_app_state.go | 8 +- .../server/model_mobility_group_ue.go | 8 +- go-apps/meep-mg-manager/server/routers.go | 10 +- go-apps/meep-mon-engine/Dockerfile | 2 +- go-apps/meep-mon-engine/entrypoint.sh | 10 +- go-apps/meep-mon-engine/main.go | 2 +- go-apps/meep-mon-engine/main_test.go | 2 +- go-apps/meep-mon-engine/server/README.md | 2 +- .../meep-mon-engine/server/api_pod_states.go | 8 +- go-apps/meep-mon-engine/server/logger.go | 8 +- .../server/model_pod_status.go | 8 +- .../server/model_pods_status.go | 8 +- go-apps/meep-mon-engine/server/mon-engine.go | 2 +- go-apps/meep-mon-engine/server/routers.go | 8 +- go-apps/meep-platform-ctrl/Dockerfile | 2 +- go-apps/meep-platform-ctrl/api/swagger.yaml | 22 + go-apps/meep-platform-ctrl/entrypoint.sh | 10 +- go-apps/meep-platform-ctrl/main.go | 2 +- go-apps/meep-platform-ctrl/main_test.go | 2 +- go-apps/meep-platform-ctrl/server/README.md | 2 +- .../server/api_sandbox_control.go | 8 +- .../server/api_scenario_configuration.go | 8 +- go-apps/meep-platform-ctrl/server/logger.go | 8 +- .../server/platform-ctrl.go | 2 +- .../server/platform-ctrl_test.go | 2 +- go-apps/meep-platform-ctrl/server/routers.go | 8 +- go-apps/meep-rnis/Dockerfile | 2 +- go-apps/meep-rnis/api/swagger.yaml | 94 +- go-apps/meep-rnis/entrypoint.sh | 10 +- go-apps/meep-rnis/go.sum | 1 + go-apps/meep-rnis/main.go | 2 +- go-apps/meep-rnis/main_test.go | 2 +- go-apps/meep-rnis/sbi/rnis-sbi.go | 10 +- go-apps/meep-rnis/server/README.md | 2 +- go-apps/meep-rnis/server/api_rni.go | 10 +- go-apps/meep-rnis/server/api_unsupported.go | 10 +- go-apps/meep-rnis/server/convert.go | 2 +- go-apps/meep-rnis/server/logger.go | 10 +- .../model_app_termination_notification.go | 10 +- ...del_app_termination_notification__links.go | 10 +- .../meep-rnis/server/model_associate_id.go | 10 +- .../server/model_ca_reconf_notification.go | 15 +- .../model_ca_reconf_notification__links.go | 10 +- ...ification_carrier_aggregation_meas_info.go | 17 +- ..._reconf_notification_secondary_cell_add.go | 12 +- .../server/model_ca_reconf_subscription.go | 16 +- .../model_ca_reconf_subscription__links.go | 10 +- ...conf_subscription_filter_criteria_assoc.go | 10 +- .../server/model_cell_change_notification.go | 18 +- ...del_cell_change_notification_temp_ue_id.go | 10 +- .../server/model_cell_change_subscription.go | 22 +- ...e_subscription_filter_criteria_assoc_ho.go | 10 +- go-apps/meep-rnis/server/model_ecgi.go | 11 +- .../server/model_expiry_notification.go | 14 +- .../model_expiry_notification__links.go | 10 +- .../server/model_inline_notification.go | 11 +- .../server/model_inline_subscription.go | 11 +- go-apps/meep-rnis/server/model_l2_meas.go | 10 +- .../server/model_l2_meas_cell_info.go | 14 +- .../server/model_l2_meas_cell_ue_info.go | 14 +- go-apps/meep-rnis/server/model_link_type.go | 10 +- .../server/model_meas_quantity_results_nr.go | 10 +- .../server/model_meas_rep_ue_notification.go | 15 +- ...ification_carrier_aggregation_meas_info.go | 15 +- ...ication_eutran_neighbour_cell_meas_info.go | 12 +- ...rep_ue_notification_new_radio_meas_info.go | 14 +- ...ue_notification_new_radio_meas_nei_info.go | 12 +- ...model_meas_rep_ue_notification_nr_bn_cs.go | 10 +- ...e_notification_nr_bn_cs_nr_bn_cell_info.go | 15 +- ...meas_rep_ue_notification_nr_n_cell_info.go | 15 +- .../model_meas_rep_ue_notification_nr_s_cs.go | 10 +- ..._ue_notification_nr_s_cs_nr_s_cell_info.go | 15 +- .../server/model_meas_rep_ue_subscription.go | 16 +- ..._subscription_filter_criteria_assoc_tri.go | 10 +- .../server/model_meas_ta_notification.go | 13 +- .../server/model_meas_ta_subscription.go | 16 +- .../model_nr_meas_rep_ue_notification.go | 13 +- ...notification_eutra_neigh_cell_meas_info.go | 12 +- ...odel_nr_meas_rep_ue_notification_n_cell.go | 10 +- ...ue_notification_nr_neigh_cell_meas_info.go | 12 +- ...odel_nr_meas_rep_ue_notification_s_cell.go | 12 +- ...rep_ue_notification_serv_cell_meas_info.go | 14 +- .../model_nr_meas_rep_ue_subscription.go | 16 +- ..._ue_subscription_filter_criteria_nr_mrs.go | 10 +- go-apps/meep-rnis/server/model_nrcgi.go | 13 +- .../model_one_of_inline_notification.go | 20 +- .../model_one_of_inline_subscription.go | 20 +- .../server/model_operation_action_type.go | 14 +- go-apps/meep-rnis/server/model_plmn.go | 10 +- go-apps/meep-rnis/server/model_plmn_info.go | 10 +- .../meep-rnis/server/model_problem_details.go | 10 +- .../server/model_rab_est_notification.go | 17 +- ...ab_est_notification_erab_qos_parameters.go | 10 +- ...ion_erab_qos_parameters_qos_information.go | 10 +- .../model_rab_est_notification_temp_ue_id.go | 10 +- .../server/model_rab_est_subscription.go | 20 +- ...ab_est_subscription_filter_criteria_qci.go | 10 +- go-apps/meep-rnis/server/model_rab_info.go | 10 +- .../server/model_rab_info_cell_user_info.go | 14 +- .../server/model_rab_info_erab_info.go | 10 +- .../server/model_rab_info_ue_info.go | 12 +- .../server/model_rab_mod_notification.go | 13 +- ...ab_mod_notification_erab_qos_parameters.go | 10 +- ...ion_erab_qos_parameters_qos_information.go | 10 +- .../server/model_rab_mod_subscription.go | 16 +- ...ab_mod_subscription_filter_criteria_qci.go | 10 +- .../server/model_rab_rel_notification.go | 13 +- ..._rab_rel_notification_erab_release_info.go | 10 +- .../server/model_rab_rel_subscription.go | 18 +- .../server/model_results_per_csi_rs_index.go | 10 +- .../model_results_per_csi_rs_index_list.go | 10 +- ..._rs_index_list_results_per_csi_rs_index.go | 10 +- .../server/model_results_per_ssb_index.go | 10 +- .../model_results_per_ssb_index_list.go | 10 +- ...er_ssb_index_list_results_per_ssb_index.go | 10 +- .../server/model_rs_index_results.go | 10 +- .../meep-rnis/server/model_s1_bearer_info.go | 10 +- .../server/model_s1_bearer_info_enb_info.go | 10 +- ..._s1_bearer_info_s1_bearer_info_detailed.go | 14 +- .../server/model_s1_bearer_info_s1_ue_info.go | 16 +- .../server/model_s1_bearer_info_s_gw_info.go | 10 +- .../server/model_s1_bearer_notification.go | 11 +- ...model_s1_bearer_notification_s1_ue_info.go | 10 +- .../server/model_s1_bearer_subscription.go | 18 +- ...ription_s1_bearer_subscription_criteria.go | 10 +- .../server/model_subscription_link_list.go | 10 +- .../model_subscription_link_list__links.go | 10 +- ...scription_link_list__links_subscription.go | 10 +- go-apps/meep-rnis/server/model_time_stamp.go | 10 +- go-apps/meep-rnis/server/model_trigger.go | 10 +- go-apps/meep-rnis/server/model_trigger_nr.go | 10 +- .../server/model_websock_notif_config.go | 10 +- go-apps/meep-rnis/server/rnis.go | 40 +- go-apps/meep-rnis/server/rnis_test.go | 58 +- go-apps/meep-rnis/server/routers.go | 12 +- .../meep-rnis/server/subscriptionCommon.go | 6 +- go-apps/meep-sandbox-ctrl/Dockerfile | 2 +- go-apps/meep-sandbox-ctrl/api/swagger.yaml | 22 + go-apps/meep-sandbox-ctrl/entrypoint.sh | 10 +- go-apps/meep-sandbox-ctrl/go.sum | 1 + go-apps/meep-sandbox-ctrl/main.go | 2 +- go-apps/meep-sandbox-ctrl/main_test.go | 2 +- go-apps/meep-sandbox-ctrl/server/README.md | 2 +- .../server/api_active_scenario.go | 8 +- .../server/api_applications.go | 8 +- .../server/api_connectivity.go | 8 +- .../server/api_event_replay.go | 8 +- .../meep-sandbox-ctrl/server/api_events.go | 8 +- .../meep-sandbox-ctrl/server/api_services.go | 8 +- go-apps/meep-sandbox-ctrl/server/app-ctrl.go | 2 +- go-apps/meep-sandbox-ctrl/server/logger.go | 8 +- go-apps/meep-sandbox-ctrl/server/routers.go | 8 +- .../meep-sandbox-ctrl/server/sandbox-ctrl.go | 8 +- go-apps/meep-tc-engine/Dockerfile | 2 +- go-apps/meep-tc-engine/go.mod | 3 +- go-apps/meep-tc-engine/go.sum | 144 +- go-apps/meep-tc-engine/ip-mgr.go | 2 +- go-apps/meep-tc-engine/main.go | 2 +- go-apps/meep-tc-engine/main_test.go | 2 +- go-apps/meep-tc-engine/routing-engine.go | 2 +- go-apps/meep-tc-engine/tc-engine.go | 2 +- go-apps/meep-tc-sidecar/Dockerfile | 2 +- go-apps/meep-tc-sidecar/destination.go | 2 +- go-apps/meep-tc-sidecar/error.go | 2 +- go-apps/meep-tc-sidecar/main.go | 2 +- go-apps/meep-tc-sidecar/payload.go | 2 +- go-apps/meep-tc-sidecar/pinger.go | 2 +- go-apps/meep-tc-sidecar/receiving.go | 2 +- go-apps/meep-tc-sidecar/request.go | 2 +- go-apps/meep-tc-sidecar/resolve.go | 2 +- go-apps/meep-tc-sidecar/sending.go | 2 +- go-apps/meep-tm/Dockerfile | 2 +- go-apps/meep-tm/main.go | 2 +- go-apps/meep-tm/server/bwm/bwm.go | 2 +- go-apps/meep-virt-engine/Dockerfile | 2 +- go-apps/meep-virt-engine/entrypoint.sh | 14 +- go-apps/meep-virt-engine/helm/delete.go | 2 +- go-apps/meep-virt-engine/helm/helm.go | 2 +- go-apps/meep-virt-engine/helm/install.go | 9 +- go-apps/meep-virt-engine/helm/list.go | 2 +- go-apps/meep-virt-engine/helm/status.go | 2 +- go-apps/meep-virt-engine/helm/util.go | 2 +- go-apps/meep-virt-engine/helm/worker.go | 2 +- go-apps/meep-virt-engine/main.go | 2 +- go-apps/meep-virt-engine/main_test.go | 2 +- .../meep-virt-engine/server/chart-template.go | 2 +- go-apps/meep-virt-engine/server/copy.go | 2 +- .../meep-virt-engine/server/virt-engine.go | 2 +- go-apps/meep-vis/Dockerfile | 2 +- go-apps/meep-vis/README.md | 40 - go-apps/meep-vis/api/swagger.yaml | 2747 ++----- go-apps/meep-vis/go.mod | 4 - go-apps/meep-vis/go.sum | 29 +- go-apps/meep-vis/main.go | 2 +- go-apps/meep-vis/main_test.go | 2 +- go-apps/meep-vis/sbi/vis-sbi.go | 156 +- go-apps/meep-vis/server/README.md | 4 +- go-apps/meep-vis/server/api_unsupported.go | 8 +- go-apps/meep-vis/server/api_v2xi.go | 8 +- go-apps/meep-vis/server/convert.go | 2 +- go-apps/meep-vis/server/logger.go | 8 +- .../model_app_termination_notification.go | 8 +- ...del_app_termination_notification__links.go | 8 +- go-apps/meep-vis/server/model_cell_id.go | 8 +- go-apps/meep-vis/server/model_earfcn.go | 8 +- go-apps/meep-vis/server/model_ecgi.go | 8 +- go-apps/meep-vis/server/model_fdd_info.go | 8 +- go-apps/meep-vis/server/model_link_type.go | 8 +- go-apps/meep-vis/server/model_links.go | 8 +- .../meep-vis/server/model_location_info.go | 8 +- .../server/model_location_info_geo_area.go | 8 +- go-apps/meep-vis/server/model_msg_type.go | 8 +- ...y.go => model_one_ofsubscriptions_body.go} | 10 +- ...ne_ofsubscriptions_subscription_id_body.go | 27 + .../server/model_operation_action_type.go | 12 +- .../server/model_pc5_neighbour_cell_info.go | 8 +- .../server/model_pc5_provisioning_info.go | 10 +- ...odel_pc5_provisioning_info_pro_info_pc5.go | 34 + go-apps/meep-vis/server/model_plmn.go | 8 +- .../meep-vis/server/model_predicted_qos.go | 8 +- .../server/model_predicted_qos_routes.go | 10 +- .../model_predicted_qos_routes_route_info.go | 10 +- .../meep-vis/server/model_problem_details.go | 8 +- .../server/model_prov_chg_pc5_notification.go | 8 +- .../server/model_prov_chg_pc5_subscription.go | 8 +- ...ov_chg_pc5_subscription_filter_criteria.go | 8 +- .../model_prov_chg_uu_mbms_notification.go | 8 +- .../model_prov_chg_uu_mbms_subscription.go | 8 +- ...hg_uu_mbms_subscription_filter_criteria.go | 8 +- .../model_prov_chg_uu_uni_notification.go | 8 +- .../model_prov_chg_uu_uni_subscription.go | 8 +- ...chg_uu_uni_subscription_filter_criteria.go | 8 +- .../server/model_subscription_link_list.go | 8 +- .../model_subscription_link_list_links.go | 10 +- ...cription_link_list_links_subscriptions.go} | 19 +- ..._body_1.go => model_subscriptions_body.go} | 10 +- ...odel_subscriptions_subscription_id_body.go | 27 + .../model_system_information_block_type21.go | 8 +- go-apps/meep-vis/server/model_tdd_info.go | 8 +- .../server/model_test_notification.go | 8 +- .../server/model_test_notification__links.go | 8 +- go-apps/meep-vis/server/model_time_stamp.go | 8 +- .../server/model_transmission_bandwidth.go | 8 +- ...ission_bandwidth_transmission_bandwidth.go | 8 +- .../model_uu_mbms_neighbour_cell_info.go | 8 +- .../server/model_uu_mbms_provisioning_info.go | 10 +- ...bms_provisioning_info_pro_info_uu_mbms.go} | 20 +- .../model_uu_uni_neighbour_cell_info.go | 8 +- .../model_uu_unicast_provisioning_info.go | 10 +- ...t_provisioning_info_pro_info_uu_unicast.go | 33 + .../server/model_v2x_application_server.go | 8 +- .../server/model_v2x_msg_notification.go | 8 +- .../model_v2x_msg_notification_links.go | 8 +- .../server/model_v2x_msg_publication.go | 8 +- .../server/model_v2x_msg_subscription.go | 8 +- ...el_v2x_msg_subscription_filter_criteria.go | 8 +- .../meep-vis/server/model_v2x_server_usd.go | 8 +- .../server/model_v2x_server_usd_sdp_info.go | 8 +- .../server/model_v2x_server_usd_tmgi.go | 8 +- .../server/model_websock_notif_config.go | 8 +- go-apps/meep-vis/server/routers.go | 38 +- go-apps/meep-vis/server/vis.go | 28 +- go-apps/meep-vis/server/vis_test.go | 83 +- go-apps/meep-wais/Dockerfile | 2 +- go-apps/meep-wais/go.sum | 1 + go-apps/meep-wais/main.go | 2 +- go-apps/meep-wais/main_test.go | 2 +- go-apps/meep-wais/sbi/wais-sbi.go | 14 +- go-apps/meep-wais/server/README.md | 2 +- go-apps/meep-wais/server/api_unsupported.go | 8 +- go-apps/meep-wais/server/api_wai.go | 8 +- go-apps/meep-wais/server/convert.go | 2 +- go-apps/meep-wais/server/logger.go | 6 +- .../meep-wais/server/model_ap_associated.go | 8 +- go-apps/meep-wais/server/model_ap_identity.go | 8 +- go-apps/meep-wais/server/model_ap_info.go | 8 +- go-apps/meep-wais/server/model_ap_location.go | 8 +- .../model_app_termination_notification.go | 8 +- ...del_app_termination_notification__links.go | 8 +- .../server/model_assoc_sta_notification.go | 8 +- .../server/model_assoc_sta_subscription.go | 8 +- .../model_assoc_sta_subscription__links.go | 8 +- ...soc_sta_subscription_notification_event.go | 8 +- .../meep-wais/server/model_beacon_report.go | 8 +- .../server/model_beacon_reporting_config.go | 8 +- .../server/model_beacon_request_config.go | 8 +- .../server/model_bss_capabilities.go | 8 +- go-apps/meep-wais/server/model_bss_load.go | 8 +- go-apps/meep-wais/server/model_bssid_info.go | 8 +- .../meep-wais/server/model_channel_load.go | 8 +- .../server/model_channel_load_config.go | 8 +- .../meep-wais/server/model_civic_location.go | 8 +- .../server/model_dmg_capabilities.go | 8 +- .../server/model_edmg_capabilities.go | 8 +- .../server/model_expiry_notification.go | 8 +- .../model_expiry_notification__links.go | 8 +- .../meep-wais/server/model_ext_bss_load.go | 8 +- .../meep-wais/server/model_geo_location.go | 8 +- .../meep-wais/server/model_he_capabilities.go | 8 +- .../meep-wais/server/model_ht_capabilities.go | 8 +- .../server/model_inline_notification.go | 8 +- .../server/model_inline_subscription.go | 8 +- go-apps/meep-wais/server/model_link_type.go | 8 +- .../server/model_measurement_config.go | 8 +- .../server/model_measurement_config__links.go | 8 +- .../model_measurement_config_link_list.go | 8 +- ...ent_config_link_list_measurement_config.go | 8 +- .../server/model_measurement_info.go | 8 +- .../model_measurement_report_notification.go | 8 +- .../model_measurement_report_subscription.go | 8 +- .../meep-wais/server/model_neighbor_report.go | 8 +- .../server/model_neighbor_report_config.go | 8 +- go-apps/meep-wais/server/model_o_bss_load.go | 8 +- .../model_one_of_inline_notification.go | 8 +- .../model_one_of_inline_subscription.go | 8 +- .../server/model_operation_action_type.go | 12 +- .../meep-wais/server/model_problem_details.go | 8 +- .../model_reported_beacon_frame_info.go | 8 +- .../model_reporting_reason_qo_s_counters.go | 8 +- .../model_reporting_reason_sta_counters.go | 8 +- go-apps/meep-wais/server/model_rssi.go | 8 +- .../model_sta_counter_trigger_condition.go | 8 +- .../meep-wais/server/model_sta_data_rate.go | 8 +- .../model_sta_data_rate_notification.go | 8 +- .../model_sta_data_rate_subscription.go | 8 +- ...ta_rate_subscription_notification_event.go | 8 +- .../meep-wais/server/model_sta_identity.go | 8 +- go-apps/meep-wais/server/model_sta_info.go | 8 +- .../meep-wais/server/model_sta_statistics.go | 8 +- .../server/model_sta_statistics_config.go | 8 +- .../model_sta_statistics_group2to9_data.go | 8 +- .../model_sta_statistics_group_one_data.go | 8 +- .../model_sta_statistics_group_zero_data.go | 8 +- .../server/model_subscription_link_list.go | 8 +- .../model_subscription_link_list__links.go | 8 +- ...del_subscription_link_list_subscription.go | 8 +- .../server/model_test_notification.go | 8 +- .../server/model_test_notification__links.go | 8 +- go-apps/meep-wais/server/model_time_stamp.go | 8 +- .../server/model_vht_capabilities.go | 8 +- go-apps/meep-wais/server/model_wan_metrics.go | 8 +- .../server/model_websock_notif_config.go | 8 +- .../server/model_wlan_capabilities.go | 8 +- go-apps/meep-wais/server/routers.go | 24 +- go-apps/meep-wais/server/wais.go | 2 +- go-apps/meep-wais/server/wais_test.go | 4 +- go-apps/meep-webhook/Dockerfile | 2 +- go-apps/meep-webhook/main.go | 2 +- go-apps/meep-webhook/webhook.go | 2 +- go-apps/meepctl/cmd/build.go | 2 +- go-apps/meepctl/cmd/config.go | 2 +- go-apps/meepctl/cmd/configGitdir.go | 2 +- go-apps/meepctl/cmd/configIp.go | 2 +- go-apps/meepctl/cmd/configRegistry.go | 2 +- go-apps/meepctl/cmd/delete.go | 2 +- go-apps/meepctl/cmd/deploy.go | 46 +- go-apps/meepctl/cmd/dockerize.go | 2 +- go-apps/meepctl/cmd/genmd.go | 2 +- go-apps/meepctl/cmd/lint.go | 2 +- go-apps/meepctl/cmd/replay.go | 2 +- go-apps/meepctl/cmd/replayCat.go | 2 +- go-apps/meepctl/cmd/replayExport.go | 2 +- go-apps/meepctl/cmd/replayGenerate.go | 2 +- go-apps/meepctl/cmd/replayImport.go | 2 +- go-apps/meepctl/cmd/replayLs.go | 2 +- go-apps/meepctl/cmd/replayRm.go | 2 +- go-apps/meepctl/cmd/replayStart.go | 2 +- go-apps/meepctl/cmd/replayStatus.go | 2 +- go-apps/meepctl/cmd/replayStop.go | 2 +- go-apps/meepctl/cmd/root.go | 2 +- go-apps/meepctl/cmd/test.go | 86 +- go-apps/meepctl/cmd/version.go | 4 +- go-apps/meepctl/main.go | 2 +- go-apps/meepctl/utils/config.go | 4 +- go-apps/meepctl/utils/docker.go | 2 +- go-apps/meepctl/utils/exec.go | 2 +- go-apps/meepctl/utils/format.go | 2 +- go-apps/meepctl/utils/helm.go | 2 +- .../meep-ams-client/.swagger-codegen/VERSION | 2 +- go-packages/meep-ams-client/README.md | 45 +- go-packages/meep-ams-client/api/swagger.yaml | 621 +- go-packages/meep-ams-client/api_amsi.go | 40 +- .../meep-ams-client/api_unsupported.go | 147 +- go-packages/meep-ams-client/client.go | 23 +- go-packages/meep-ams-client/configuration.go | 12 +- go-packages/meep-ams-client/convert.go | 2 +- .../docs/AdjacentAppInfoNotification.md | 3 +- ...acentAppInfoNotificationAdjacentAppInfo.md | 3 +- .../docs/AdjacentAppInfoSubscription.md | 7 +- go-packages/meep-ams-client/docs/AmsiApi.md | 19 +- .../meep-ams-client/docs/AppMobSerApi.md | 163 - .../meep-ams-client/docs/AssociateId.md | 5 +- .../docs/{Body.md => AssociateIdType.md} | 3 +- .../docs/ExpiryNotification.md | 3 +- .../docs/InlineNotification.md | 9 + .../docs/InlineSubscription.md | 9 + ...yProcedureNotificationLinks.md => Link.md} | 3 +- .../meep-ams-client/docs/LocationApi.md | 36 - .../docs/MobilityProcedureNotification.md | 3 +- .../docs/MobilityProcedureSubscription.md | 7 +- .../meep-ams-client/docs/NotificationsApi.md | 36 - .../docs/OneOfInlineNotification.md | 9 + .../docs/OneOfInlineSubscription.md | 9 + go-packages/meep-ams-client/docs/OneOfbody.md | 8 - .../meep-ams-client/docs/OneOfbody1.md | 8 - .../meep-ams-client/docs/OneOfbody2.md | 8 - .../meep-ams-client/docs/RegistrationInfo.md | 5 +- .../docs/RegistrationInfoDeviceInformation.md | 3 +- .../docs/SubscriptionLinkList.md | 3 +- .../docs/SubscriptionLinkListLinks.md | 3 +- .../docs/SubscriptionLinkListSubscription.md | 3 +- .../meep-ams-client/docs/SubscriptionsApi.md | 153 - go-packages/meep-ams-client/docs/TimeStamp.md | 5 +- .../meep-ams-client/docs/UnsupportedApi.md | 39 +- go-packages/meep-ams-client/go.sum | 7 + .../model_adjacent_app_info_notification.go | 23 +- ...app_info_notification_adjacent_app_info.go | 23 +- .../model_adjacent_app_info_subscription.go | 24 +- ...t_app_info_subscription_filter_criteria.go | 21 +- ...el_adjacent_app_info_subscription_links.go | 21 +- .../model_adjacent_app_instance_info.go | 21 +- .../model_app_mobility_service_level.go | 27 +- .../model_app_termination_notification.go | 21 +- ...del_app_termination_notification__links.go | 21 +- .../meep-ams-client/model_associate_id.go | 25 +- .../model_associate_id_type.go | 36 + .../model_communication_interface.go | 21 +- ...el_communication_interface_ip_addresses.go | 21 +- .../model_context_transfer_state.go | 29 +- .../model_expiry_notification.go | 29 +- .../model_inline_notification.go | 17 +- ...iption.go => model_inline_subscription.go} | 10 +- go-packages/meep-ams-client/model_link.go | 30 + .../meep-ams-client/model_link_type.go | 21 +- .../model_mec_host_information.go | 21 +- .../model_mobility_procedure_notification.go | 23 +- ..._mobility_procedure_notification__links.go | 15 - ..._procedure_notification_target_app_info.go | 21 +- .../model_mobility_procedure_subscription.go | 24 +- ..._procedure_subscription_filter_criteria.go | 21 +- ...l_mobility_procedure_subscription_links.go | 21 +- .../meep-ams-client/model_mobility_status.go | 27 +- .../model_one_of_inline_notification.go | 30 + .../model_one_of_inline_subscription.go | 30 + .../model_operation_action_type.go | 21 +- .../meep-ams-client/model_problem_details.go | 25 +- .../model_registration_info.go | 21 +- ...el_registration_info_device_information.go | 21 +- ...l_registration_info_service_consumer_id.go | 21 +- .../model_subscription_link_list.go | 21 +- .../model_subscription_link_list_links.go | 21 +- ...del_subscription_link_list_subscription.go | 21 +- .../model_subscription_type.go | 34 +- .../model_test_notification.go | 31 + .../model_test_notification__links.go | 30 + .../meep-ams-client/model_time_stamp.go | 21 +- go-packages/meep-ams-client/model_type.go | 21 - .../model_websock_notif_config.go | 21 +- go-packages/meep-ams-client/response.go | 10 +- go-packages/meep-app-support-client/README.md | 19 +- .../meep-app-support-client/api/swagger.yaml | 1672 ++-- .../api_mec_app_support.go | 24 +- .../api_unsupported.go | 20 +- go-packages/meep-app-support-client/client.go | 8 +- .../meep-app-support-client/configuration.go | 8 +- .../docs/AppTerminationNotification.md | 2 +- .../docs/AppTerminationNotificationLinks.md | 2 +- .../AppTerminationNotificationSubscription.md | 2 +- .../docs/CurrentTime.md | 2 +- .../docs/DestinationInterface.md | 4 +- .../docs/DestinationInterfaceInterfaceType.md | 9 + .../meep-app-support-client/docs/DnsRule.md | 4 +- .../docs/DnsRuleIpAddressType.md | 9 + .../docs/DnsRuleState.md} | 3 +- .../docs/LinkTypeConfirmTermination.md | 10 + .../docs/MecAppSupportApi.md | 16 +- .../docs/MecAppSuptApiSubscriptionLinkList.md | 2 +- .../MecAppSuptApiSubscriptionLinkListLinks.md | 2 +- ...uptApiSubscriptionLinkListSubscription.md} | 4 +- ...tificationSubscriptionLinks.md => Self.md} | 2 +- .../docs/TimeSourceStatus.md} | 3 +- .../docs/TimingCaps.md | 6 +- .../docs/TimingCapsNtpServers.md | 8 +- ...imingCapsNtpServersAuthenticationOption.md | 9 + .../TimingCapsNtpServersNtpServerAddrType.md | 9 + .../docs/TimingCapsPtpMasters.md | 4 +- .../docs/TrafficRule.md | 10 +- .../docs/TrafficRuleAction.md | 9 + .../docs/TrafficRuleFilterType.md | 9 + .../docs/TrafficRuleState.md} | 3 +- .../docs/TunnelInfo.md | 2 +- .../docs/TunnelInfoTunnelType.md | 9 + .../docs/UnsupportedApi.md | 12 +- .../model_app_ready_confirmation.go | 8 +- .../model_app_termination_confirmation.go | 8 +- .../model_app_termination_notification.go | 8 +- ...del_app_termination_notification_links.go} | 12 +- ...p_termination_notification_subscription.go | 12 +- .../model_current_time.go | 13 +- .../model_destination_interface.go | 15 +- ...el_destination_interface_interface_type.go | 35 + .../meep-app-support-client/model_dns_rule.go | 18 +- .../model_dns_rule_ip_address_type.go | 34 + .../model_dns_rule_state.go | 34 + .../model_link_type.go | 8 +- .../model_link_type_confirm_termination.go | 31 + ...mec_app_supt_api_subscription_link_list.go | 8 +- ...p_supt_api_subscription_link_list_links.go | 10 +- ...api_subscription_link_list_subscription.go | 14 +- .../model_operation_action_type.go | 8 +- .../model_problem_details.go | 8 +- ...n_subscription__links.go => model_self.go} | 10 +- .../model_time_source_status.go | 34 + .../model_timing_caps.go | 10 +- .../model_timing_caps_ntp_servers.go | 20 +- ..._caps_ntp_servers_authentication_option.go | 35 + ...g_caps_ntp_servers_ntp_server_addr_type.go | 34 + .../model_timing_caps_ptp_masters.go | 12 +- .../model_timing_caps_time_stamp.go | 8 +- .../model_traffic_filter.go | 8 +- .../model_traffic_rule.go | 27 +- .../model_traffic_rule_action.go | 38 + .../model_traffic_rule_filter_type.go | 34 + .../model_traffic_rule_state.go | 34 + .../model_tunnel_info.go | 11 +- .../model_tunnel_info_tunnel_type.go | 34 + .../meep-app-support-client/response.go | 8 +- .../meep-applications/application-store.go | 4 +- go-packages/meep-couch/db.go | 2 +- go-packages/meep-couch/db_test.go | 2 +- go-packages/meep-dai-mgr/exec.go | 2 +- go-packages/meep-dai-mgr/format.go | 2 +- go-packages/meep-data-key-mgr/data-key-mgr.go | 2 +- go-packages/meep-data-model/api/swagger.yaml | 24 +- go-packages/meep-data-model/docs/D2dConfig.md | 11 + .../meep-data-model/docs/Deployment.md | 1 + go-packages/meep-data-model/docs/GeoData.md | 2 + .../meep-data-model/model_activation_info.go | 8 +- .../meep-data-model/model_application_info.go | 8 +- .../model_cellular_domain_config.go | 8 +- .../model_cellular_poa_config.go | 8 +- .../model_connectivity_config.go | 8 +- .../meep-data-model/model_cpu_config.go | 8 +- .../meep-data-model/model_d2d_config.go | 32 + .../meep-data-model/model_deployment.go | 9 +- .../meep-data-model/model_dn_config.go | 8 +- go-packages/meep-data-model/model_domain.go | 8 +- go-packages/meep-data-model/model_domains.go | 8 +- .../meep-data-model/model_egress_service.go | 8 +- go-packages/meep-data-model/model_event.go | 8 +- .../meep-data-model/model_event_list.go | 8 +- .../meep-data-model/model_event_mobility.go | 8 +- ...el_event_network_characteristics_update.go | 8 +- .../model_event_pdu_session.go | 8 +- .../model_event_poas_in_range.go | 8 +- .../model_event_scenario_update.go | 8 +- .../meep-data-model/model_external_config.go | 8 +- go-packages/meep-data-model/model_geo_data.go | 12 +- .../meep-data-model/model_gpu_config.go | 8 +- .../meep-data-model/model_ingress_service.go | 8 +- .../meep-data-model/model_line_string.go | 8 +- .../meep-data-model/model_locality_type.go | 8 +- .../meep-data-model/model_memory_config.go | 8 +- .../model_network_characteristics.go | 8 +- .../meep-data-model/model_network_location.go | 8 +- .../model_network_locations.go | 8 +- .../meep-data-model/model_node_data_union.go | 8 +- .../model_node_service_maps.go | 8 +- .../meep-data-model/model_pdu_session.go | 8 +- .../meep-data-model/model_pdu_session_info.go | 8 +- .../meep-data-model/model_pdu_session_list.go | 8 +- .../model_physical_location.go | 8 +- .../model_physical_locations.go | 8 +- .../meep-data-model/model_poa4_g_config.go | 8 +- .../meep-data-model/model_poa5_g_config.go | 8 +- .../meep-data-model/model_poa_wifi_config.go | 8 +- go-packages/meep-data-model/model_point.go | 8 +- go-packages/meep-data-model/model_process.go | 8 +- .../meep-data-model/model_processes.go | 8 +- go-packages/meep-data-model/model_release.go | 8 +- go-packages/meep-data-model/model_replay.go | 8 +- .../meep-data-model/model_replay_event.go | 8 +- .../meep-data-model/model_replay_file_list.go | 8 +- .../meep-data-model/model_replay_info.go | 8 +- .../meep-data-model/model_replay_status.go | 8 +- go-packages/meep-data-model/model_sandbox.go | 8 +- .../meep-data-model/model_sandbox_config.go | 8 +- .../meep-data-model/model_sandbox_list.go | 8 +- go-packages/meep-data-model/model_scenario.go | 8 +- .../meep-data-model/model_scenario_config.go | 8 +- .../meep-data-model/model_scenario_list.go | 8 +- .../meep-data-model/model_scenario_node.go | 8 +- .../meep-data-model/model_service_config.go | 8 +- .../meep-data-model/model_service_info.go | 8 +- .../meep-data-model/model_service_port.go | 8 +- go-packages/meep-data-model/model_settings.go | 8 +- go-packages/meep-data-model/model_zone.go | 8 +- go-packages/meep-data-model/model_zones.go | 8 +- go-packages/meep-gc/gc.go | 2 +- go-packages/meep-gis-asset-mgr/asset-mgr.go | 551 +- .../meep-gis-asset-mgr/assets-mgr_test.go | 15 +- go-packages/meep-gis-asset-mgr/go.mod | 1 - go-packages/meep-gis-asset-mgr/go.sum | 6 +- go-packages/meep-gis-cache/convert.go | 2 +- go-packages/meep-gis-cache/gis-cache.go | 141 +- go-packages/meep-gis-engine-client/README.md | 27 +- .../meep-gis-engine-client/api/swagger.yaml | 91 +- .../meep-gis-engine-client/api_automation.go | 8 +- .../api_geospatial_data.go | 10 +- go-packages/meep-gis-engine-client/client.go | 8 +- .../meep-gis-engine-client/configuration.go | 8 +- .../meep-gis-engine-client/docs/GeoData.md | 2 + .../docs/GeoDataAsset.md | 2 + .../docs/GeospatialDataApi.md | 101 +- .../model_automation_state.go | 8 +- .../model_automation_state_list.go | 8 +- .../model_coordinate_power.go | 8 +- .../model_coordinate_power_list.go | 10 +- .../meep-gis-engine-client/model_distance.go | 8 +- .../model_geo_coordinate.go | 8 +- .../model_geo_coordinate_list.go | 10 +- .../meep-gis-engine-client/model_geo_data.go | 12 +- .../model_geo_data_asset.go | 12 +- .../model_geo_data_asset_list.go | 8 +- .../model_line_string.go | 8 +- .../meep-gis-engine-client/model_point.go | 8 +- .../model_target_point.go | 8 +- .../model_target_range.go | 8 +- .../model_within_range.go | 8 +- .../meep-gis-engine-client/response.go | 8 +- go-packages/meep-http-logger/go.mod | 2 +- go-packages/meep-http-logger/go.sum | 28 +- go-packages/meep-http-logger/httpLogger.go | 235 +- .../meep-loc-serv-client/api/swagger.yaml | 552 +- .../meep-loc-serv-client/api_location.go | 70 +- go-packages/meep-loc-serv-client/client.go | 12 +- .../meep-loc-serv-client/configuration.go | 10 +- .../meep-loc-serv-client/docs/LocationApi.md | 60 +- .../meep-loc-serv-client/docs/LocationInfo.md | 12 +- .../docs/LocationInfoVelocity.md | 12 +- .../model_access_point_info.go | 10 +- .../model_access_point_list.go | 10 +- .../model_app_termination_notification.go | 10 +- ...del_app_termination_notification__links.go | 10 +- .../model_callback_reference.go | 10 +- .../model_circle_notification_subscription.go | 10 +- .../model_connection_type.go | 10 +- .../model_distance_criteria.go | 10 +- ...odel_distance_notification_subscription.go | 10 +- .../model_entering_leaving_criteria.go | 10 +- .../model_inline_access_point_info.go | 10 +- .../model_inline_access_point_list.go | 10 +- ...inline_circle_notification_subscription.go | 10 +- ...line_distance_notification_subscription.go | 10 +- ...l_inline_notification_subscription_list.go | 10 +- ...line_periodic_notification_subscription.go | 10 +- .../model_inline_problem_details.go | 10 +- .../model_inline_problem_details_required.go | 10 +- .../model_inline_subscription_notification.go | 10 +- .../model_inline_terminal_distance.go | 10 +- .../model_inline_user_list.go | 10 +- ...model_inline_user_tracking_subscription.go | 10 +- ...odel_inline_zonal_presence_notification.go | 10 +- ...model_inline_zonal_traffic_subscription.go | 10 +- .../model_inline_zone_info.go | 10 +- .../model_inline_zone_list.go | 10 +- .../model_inline_zone_status_notification.go | 10 +- .../model_inline_zone_status_subscription.go | 10 +- .../meep-loc-serv-client/model_link.go | 10 +- .../meep-loc-serv-client/model_link_type.go | 10 +- .../model_location_info.go | 22 +- .../model_location_info_velocity.go | 24 +- .../model_notification_format.go | 10 +- .../model_notification_subscription_list.go | 10 +- .../model_operation_action_type.go | 10 +- .../model_operation_status.go | 10 +- ...odel_periodic_notification_subscription.go | 10 +- .../model_problem_details.go | 10 +- .../model_retrieval_status.go | 10 +- .../model_service_error.go | 10 +- .../model_subscription_notification.go | 10 +- .../model_terminal_distance.go | 10 +- .../model_terminal_location.go | 10 +- .../meep-loc-serv-client/model_time_stamp.go | 10 +- .../model_user_event_type.go | 10 +- .../meep-loc-serv-client/model_user_info.go | 10 +- .../meep-loc-serv-client/model_user_list.go | 10 +- .../model_user_tracking_subscription.go | 10 +- .../model_zonal_presence_notification.go | 10 +- .../model_zonal_traffic_subscription.go | 10 +- .../meep-loc-serv-client/model_zone_info.go | 10 +- .../meep-loc-serv-client/model_zone_list.go | 10 +- .../model_zone_status_notification.go | 10 +- .../model_zone_status_subscription.go | 10 +- go-packages/meep-loc-serv-client/response.go | 10 +- go-packages/meep-logger/logger.go | 2 +- .../api_notifications.go | 8 +- .../client.go | 8 +- .../configuration.go | 8 +- .../model_event_metric.go | 8 +- .../model_event_metric_list.go | 8 +- .../model_event_notification.go | 8 +- .../model_network_metric.go | 8 +- .../model_network_metric_list.go | 8 +- .../model_network_notification.go | 8 +- .../response.go | 8 +- go-packages/meep-metrics/convert.go | 2 +- go-packages/meep-metrics/events.go | 2 +- go-packages/meep-metrics/events_test.go | 2 +- go-packages/meep-metrics/gis.go | 2 +- go-packages/meep-metrics/http.go | 83 +- go-packages/meep-metrics/http_test.go | 16 +- go-packages/meep-metrics/metric-store.go | 15 +- go-packages/meep-metrics/metric-store_test.go | 10 +- go-packages/meep-metrics/network.go | 2 +- go-packages/meep-metrics/network_test.go | 4 +- go-packages/meep-metrics/prometheus.go | 2 +- go-packages/meep-metrics/sandbox.go | 2 +- go-packages/meep-metrics/sandbox_test.go | 2 +- go-packages/meep-metrics/session.go | 2 +- go-packages/meep-metrics/session_test.go | 2 +- .../meep-mg-app-client/api_state_transfer.go | 8 +- go-packages/meep-mg-app-client/client.go | 8 +- .../meep-mg-app-client/configuration.go | 8 +- .../model_mobility_group_app_state.go | 8 +- .../model_mobility_group_event.go | 8 +- go-packages/meep-mg-app-client/response.go | 8 +- .../meep-mg-manager-client/api_membership.go | 8 +- .../api_state_transfer.go | 8 +- go-packages/meep-mg-manager-client/client.go | 8 +- .../meep-mg-manager-client/configuration.go | 8 +- .../model_mobility_group.go | 8 +- .../model_mobility_group_app.go | 8 +- .../model_mobility_group_app_state.go | 8 +- .../model_mobility_group_ue.go | 8 +- .../meep-mg-manager-client/response.go | 8 +- .../model_mobility_group.go | 8 +- .../model_mobility_group_app.go | 8 +- .../model_mobility_group_app_state.go | 8 +- .../model_mobility_group_event.go | 8 +- .../model_mobility_group_service_map.go | 8 +- .../model_mobility_group_ue.go | 8 +- .../model_network_element.go | 8 +- .../model_network_element_list.go | 8 +- go-packages/meep-model/minimize.go | 12 +- go-packages/meep-model/model.go | 229 +- go-packages/meep-model/model_test.go | 34 +- go-packages/meep-model/networkGraph.go | 2 +- go-packages/meep-model/nodeContext.go | 2 +- go-packages/meep-model/nodeMap.go | 2 +- go-packages/meep-model/nodeMap_test.go | 2 +- go-packages/meep-model/validator.go | 40 +- go-packages/meep-model/validator_test.go | 10 +- go-packages/meep-mq/mq.go | 2 +- go-packages/meep-mq/mq_test.go | 2 +- go-packages/meep-net-char-mgr/algo-segment.go | 296 +- .../meep-net-char-mgr/algo-segment_test.go | 38 +- go-packages/meep-net-char-mgr/go.mod | 4 + go-packages/meep-net-char-mgr/go.sum | 137 +- go-packages/meep-net-char-mgr/net-char-mgr.go | 69 +- .../meep-net-char-mgr/net-char-mgr_test.go | 2 +- .../pdu-session-store.go | 2 +- .../pdu-session-store_test.go | 2 +- .../meep-platform-ctrl-client/README.md | 1 + .../api/swagger.yaml | 22 + .../api_sandbox_control.go | 8 +- .../api_scenario_configuration.go | 8 +- .../meep-platform-ctrl-client/client.go | 8 +- .../configuration.go | 8 +- .../docs/D2dConfig.md | 11 + .../docs/Deployment.md | 1 + .../meep-platform-ctrl-client/docs/GeoData.md | 2 + .../model_cellular_domain_config.go | 8 +- .../model_cellular_poa_config.go | 8 +- .../model_connectivity_config.go | 8 +- .../model_cpu_config.go | 8 +- .../model_d2d_config.go | 33 + .../model_deployment.go | 9 +- .../model_dn_config.go | 8 +- .../meep-platform-ctrl-client/model_domain.go | 8 +- .../model_egress_service.go | 8 +- .../model_external_config.go | 8 +- .../model_geo_data.go | 12 +- .../model_gpu_config.go | 8 +- .../model_ingress_service.go | 8 +- .../model_line_string.go | 8 +- .../model_memory_config.go | 8 +- .../model_network_characteristics.go | 8 +- .../model_network_location.go | 8 +- .../model_physical_location.go | 8 +- .../model_poa4_g_config.go | 8 +- .../model_poa5_g_config.go | 8 +- .../model_poa_wifi_config.go | 8 +- .../meep-platform-ctrl-client/model_point.go | 8 +- .../model_process.go | 8 +- .../model_sandbox.go | 8 +- .../model_sandbox_config.go | 8 +- .../model_sandbox_list.go | 8 +- .../model_scenario.go | 8 +- .../model_scenario_config.go | 8 +- .../model_scenario_list.go | 8 +- .../model_service_config.go | 8 +- .../model_service_port.go | 8 +- .../meep-platform-ctrl-client/model_zone.go | 8 +- .../meep-platform-ctrl-client/response.go | 8 +- go-packages/meep-redis/db.go | 2 +- go-packages/meep-replay-manager/replayMgr.go | 2 +- go-packages/meep-rnis-client/README.md | 1 - go-packages/meep-rnis-client/api/swagger.yaml | 7306 ++++++++++------- go-packages/meep-rnis-client/api_rni.go | 10 +- .../meep-rnis-client/api_unsupported.go | 10 +- go-packages/meep-rnis-client/client.go | 12 +- go-packages/meep-rnis-client/configuration.go | 10 +- .../docs/CaReconfSubscription.md | 3 +- .../docs/CellChangeSubscription.md | 3 +- .../docs/MeasRepUeSubscription.md | 3 +- .../docs/MeasTaSubscription.md | 3 +- .../docs/NrMeasRepUeSubscription.md | 3 +- .../docs/RabEstSubscription.md | 3 +- .../docs/RabModSubscription.md | 3 +- .../docs/RabRelSubscription.md | 3 +- go-packages/meep-rnis-client/docs/RniApi.md | 18 +- .../docs/S1BearerSubscription.md | 3 +- .../meep-rnis-client/docs/UnsupportedApi.md | 8 +- go-packages/meep-rnis-client/go.mod | 6 +- go-packages/meep-rnis-client/go.sum | 15 - .../model_app_termination_notification.go | 10 +- ...del_app_termination_notification__links.go | 10 +- .../meep-rnis-client/model_associate_id.go | 10 +- .../model_ca_reconf_notification.go | 10 +- .../model_ca_reconf_notification__links.go | 10 +- ...ification_carrier_aggregation_meas_info.go | 10 +- ..._reconf_notification_secondary_cell_add.go | 10 +- .../model_ca_reconf_subscription.go | 12 +- .../model_ca_reconf_subscription__links.go | 10 +- ...conf_subscription_filter_criteria_assoc.go | 10 +- .../model_cell_change_notification.go | 10 +- ...del_cell_change_notification_temp_ue_id.go | 10 +- .../model_cell_change_subscription.go | 12 +- ...e_subscription_filter_criteria_assoc_ho.go | 10 +- go-packages/meep-rnis-client/model_ecgi.go | 10 +- .../model_expiry_notification.go | 10 +- .../model_expiry_notification__links.go | 10 +- .../model_inline_notification.go | 10 +- .../model_inline_subscription.go | 10 +- go-packages/meep-rnis-client/model_l2_meas.go | 10 +- .../model_l2_meas_cell_info.go | 10 +- .../model_l2_meas_cell_ue_info.go | 10 +- .../meep-rnis-client/model_link_type.go | 10 +- .../model_meas_quantity_results_nr.go | 10 +- .../model_meas_rep_ue_notification.go | 10 +- ...ification_carrier_aggregation_meas_info.go | 10 +- ...ication_eutran_neighbour_cell_meas_info.go | 10 +- ...rep_ue_notification_new_radio_meas_info.go | 10 +- ...ue_notification_new_radio_meas_nei_info.go | 10 +- ...model_meas_rep_ue_notification_nr_bn_cs.go | 10 +- ...e_notification_nr_bn_cs_nr_bn_cell_info.go | 10 +- ...meas_rep_ue_notification_nr_n_cell_info.go | 10 +- .../model_meas_rep_ue_notification_nr_s_cs.go | 10 +- ..._ue_notification_nr_s_cs_nr_s_cell_info.go | 10 +- .../model_meas_rep_ue_subscription.go | 12 +- ..._subscription_filter_criteria_assoc_tri.go | 10 +- .../model_meas_ta_notification.go | 10 +- .../model_meas_ta_subscription.go | 12 +- .../model_nr_meas_rep_ue_notification.go | 10 +- ...notification_eutra_neigh_cell_meas_info.go | 10 +- ...odel_nr_meas_rep_ue_notification_n_cell.go | 10 +- ...ue_notification_nr_neigh_cell_meas_info.go | 10 +- ...odel_nr_meas_rep_ue_notification_s_cell.go | 10 +- ...rep_ue_notification_serv_cell_meas_info.go | 10 +- .../model_nr_meas_rep_ue_subscription.go | 12 +- ..._ue_subscription_filter_criteria_nr_mrs.go | 10 +- go-packages/meep-rnis-client/model_nrcgi.go | 10 +- .../model_one_of_inline_notification.go | 19 +- .../model_one_of_inline_subscription.go | 19 +- .../model_operation_action_type.go | 10 +- go-packages/meep-rnis-client/model_plmn.go | 10 +- .../meep-rnis-client/model_plmn_info.go | 10 +- .../meep-rnis-client/model_problem_details.go | 10 +- .../model_rab_est_notification.go | 10 +- ...ab_est_notification_erab_qos_parameters.go | 10 +- ...ion_erab_qos_parameters_qos_information.go | 10 +- .../model_rab_est_notification_temp_ue_id.go | 10 +- .../model_rab_est_subscription.go | 12 +- ...ab_est_subscription_filter_criteria_qci.go | 10 +- .../meep-rnis-client/model_rab_info.go | 10 +- .../model_rab_info_cell_user_info.go | 10 +- .../model_rab_info_erab_info.go | 10 +- .../model_rab_info_ue_info.go | 10 +- .../model_rab_mod_notification.go | 10 +- ...ab_mod_notification_erab_qos_parameters.go | 10 +- ...ion_erab_qos_parameters_qos_information.go | 10 +- .../model_rab_mod_subscription.go | 12 +- ...ab_mod_subscription_filter_criteria_qci.go | 10 +- .../model_rab_rel_notification.go | 10 +- ..._rab_rel_notification_erab_release_info.go | 10 +- .../model_rab_rel_subscription.go | 12 +- .../model_results_per_csi_rs_index.go | 10 +- .../model_results_per_csi_rs_index_list.go | 10 +- ..._rs_index_list_results_per_csi_rs_index.go | 10 +- .../model_results_per_ssb_index.go | 10 +- .../model_results_per_ssb_index_list.go | 10 +- ...er_ssb_index_list_results_per_ssb_index.go | 10 +- .../model_rs_index_results.go | 10 +- .../meep-rnis-client/model_s1_bearer_info.go | 10 +- .../model_s1_bearer_info_enb_info.go | 10 +- ..._s1_bearer_info_s1_bearer_info_detailed.go | 10 +- .../model_s1_bearer_info_s1_ue_info.go | 10 +- .../model_s1_bearer_info_s_gw_info.go | 10 +- .../model_s1_bearer_notification.go | 10 +- ...model_s1_bearer_notification_s1_ue_info.go | 10 +- .../model_s1_bearer_subscription.go | 12 +- ...ription_s1_bearer_subscription_criteria.go | 10 +- .../model_subscription_link_list.go | 10 +- .../model_subscription_link_list__links.go | 10 +- ...scription_link_list__links_subscription.go | 10 +- .../model_test_notification.go | 32 - .../meep-rnis-client/model_time_stamp.go | 10 +- go-packages/meep-rnis-client/model_trigger.go | 10 +- .../meep-rnis-client/model_trigger_nr.go | 10 +- .../model_websock_notif_config.go | 10 +- go-packages/meep-rnis-client/response.go | 10 +- .../meep-sandbox-ctrl-client/README.md | 1 + .../meep-sandbox-ctrl-client/api/swagger.yaml | 22 + .../api_active_scenario.go | 8 +- .../api_applications.go | 8 +- .../api_connectivity.go | 8 +- .../api_event_replay.go | 8 +- .../meep-sandbox-ctrl-client/api_events.go | 8 +- .../meep-sandbox-ctrl-client/api_services.go | 8 +- .../meep-sandbox-ctrl-client/client.go | 8 +- .../meep-sandbox-ctrl-client/configuration.go | 8 +- .../docs/D2dConfig.md | 11 + .../docs/Deployment.md | 1 + .../meep-sandbox-ctrl-client/docs/GeoData.md | 2 + .../model_activation_info.go | 8 +- .../model_application_info.go | 8 +- .../model_cellular_domain_config.go | 8 +- .../model_cellular_poa_config.go | 8 +- .../model_connectivity_config.go | 8 +- .../model_cpu_config.go | 8 +- .../model_d2d_config.go | 33 + .../model_deployment.go | 9 +- .../model_dn_config.go | 8 +- .../meep-sandbox-ctrl-client/model_domain.go | 8 +- .../meep-sandbox-ctrl-client/model_domains.go | 8 +- .../model_egress_service.go | 8 +- .../meep-sandbox-ctrl-client/model_event.go | 8 +- .../model_event_mobility.go | 8 +- ...el_event_network_characteristics_update.go | 8 +- .../model_event_pdu_session.go | 8 +- .../model_event_poas_in_range.go | 8 +- .../model_event_scenario_update.go | 8 +- .../model_external_config.go | 8 +- .../model_geo_data.go | 12 +- .../model_gpu_config.go | 8 +- .../model_ingress_service.go | 8 +- .../model_line_string.go | 8 +- .../model_memory_config.go | 8 +- .../model_network_characteristics.go | 8 +- .../model_network_location.go | 8 +- .../model_network_locations.go | 8 +- .../model_node_data_union.go | 8 +- .../model_node_service_maps.go | 8 +- .../model_pdu_session.go | 8 +- .../model_pdu_session_info.go | 8 +- .../model_pdu_session_list.go | 8 +- .../model_physical_location.go | 8 +- .../model_physical_locations.go | 8 +- .../model_poa4_g_config.go | 8 +- .../model_poa5_g_config.go | 8 +- .../model_poa_wifi_config.go | 8 +- .../meep-sandbox-ctrl-client/model_point.go | 8 +- .../meep-sandbox-ctrl-client/model_process.go | 8 +- .../model_processes.go | 8 +- .../meep-sandbox-ctrl-client/model_replay.go | 8 +- .../model_replay_event.go | 8 +- .../model_replay_file_list.go | 8 +- .../model_replay_info.go | 8 +- .../model_replay_status.go | 8 +- .../model_scenario.go | 8 +- .../model_scenario_config.go | 8 +- .../model_scenario_node.go | 8 +- .../model_service_config.go | 8 +- .../model_service_info.go | 8 +- .../model_service_port.go | 8 +- .../meep-sandbox-ctrl-client/model_zone.go | 8 +- .../meep-sandbox-ctrl-client/model_zones.go | 8 +- .../meep-sandbox-ctrl-client/response.go | 8 +- .../meep-sandbox-store/sandbox-store.go | 2 +- .../meep-sandbox-store/sandbox-store_test.go | 2 +- .../meep-service-mgmt-client/README.md | 1 + .../meep-service-mgmt-client/api/swagger.yaml | 2209 +++-- .../api_mec_service_mgmt.go | 22 +- .../meep-service-mgmt-client/client.go | 12 +- .../meep-service-mgmt-client/configuration.go | 10 +- .../docs/MecServiceMgmtApi.md | 26 +- .../docs/ProblemDetails.md | 4 +- ...rviceAvailabilityNotificationChangeType.md | 9 + ...ailabilityNotificationServiceReferences.md | 2 +- .../docs/ServiceInfo.md | 3 +- .../docs/SubscriptionLinkListLinks.md | 2 +- .../model_category_ref.go | 10 +- .../model_end_point_info_addresses.go | 10 +- ...odel_end_point_info_addresses_addresses.go | 10 +- .../model_end_point_info_alternative.go | 10 +- .../model_end_point_info_uris.go | 10 +- .../model_grant_type.go | 10 +- .../model_link_type.go | 10 +- .../model_locality_type.go | 10 +- .../model_o_auth2_info.go | 10 +- .../model_one_of_service_info_post.go | 10 +- .../model_one_of_transport_info_endpoint.go | 10 +- .../model_problem_details.go | 14 +- .../model_security_info.go | 10 +- .../meep-service-mgmt-client/model_self.go | 10 +- ..._availability_notification_subscription.go | 12 +- ...ication_subscription_filtering_criteria.go | 12 +- .../model_serializer_type.go | 10 +- ...model_service_availability_notification.go | 10 +- ...e_availability_notification_change_type.go | 18 +- ...ability_notification_service_references.go | 21 +- .../model_service_info.go | 10 +- ..._links.go => model_service_info__links.go} | 14 +- .../model_service_info_post.go | 10 +- .../model_service_liveness_info.go | 14 +- .../model_service_liveness_info_time_stamp.go | 14 +- .../model_service_liveness_update.go | 11 +- .../model_service_state.go | 10 +- .../model_subscription.go | 10 +- .../model_subscription_link_list.go | 10 +- .../model_subscription_link_list__links.go | 10 +- ...cription_link_list__links_subscriptions.go | 10 +- .../model_transport_info.go | 10 +- .../model_transport_type.go | 10 +- .../meep-service-mgmt-client/response.go | 10 +- go-packages/meep-sessions/permission-store.go | 2 +- go-packages/meep-sessions/session-mgr.go | 2 +- go-packages/meep-sessions/session-store.go | 2 +- go-packages/meep-subscriptions/go.sum | 1 + .../meep-subscriptions/subscription-mgr.go | 2 +- .../subscription-mgr_test.go | 2 +- .../meep-subscriptions/subscription.go | 4 +- go-packages/meep-subscriptions/util.go | 2 +- .../meep-swagger-api-mgr/swagger-api-mgr.go | 36 +- go-packages/meep-users/db.go | 2 +- go-packages/meep-users/db_test.go | 2 +- .../meep-vis-client/.swagger-codegen/VERSION | 2 +- go-packages/meep-vis-client/README.md | 15 +- go-packages/meep-vis-client/api/swagger.yaml | 471 +- .../meep-vis-client/api_unsupported.go | 120 +- go-packages/meep-vis-client/api_v2xi.go | 18 +- go-packages/meep-vis-client/client.go | 21 +- go-packages/meep-vis-client/configuration.go | 9 +- go-packages/meep-vis-client/docs/Body.md | 8 - go-packages/meep-vis-client/docs/Body1.md | 8 - go-packages/meep-vis-client/docs/OneOfbody.md | 8 - .../meep-vis-client/docs/OneOfbody1.md | 8 - .../docs/OneOfsubscriptionsBody.md | 9 + .../OneOfsubscriptionsSubscriptionIdBody.md | 9 + .../meep-vis-client/docs/SubscriptionsBody.md | 9 + .../docs/SubscriptionsSubscriptionIdBody.md | 9 + .../meep-vis-client/docs/UnsupportedApi.md | 24 +- go-packages/meep-vis-client/docs/V2xiApi.md | 3 +- .../model_app_termination_notification.go | 19 +- ...del_app_termination_notification__links.go | 12 +- go-packages/meep-vis-client/model_cell_id.go | 9 +- go-packages/meep-vis-client/model_earfcn.go | 9 +- go-packages/meep-vis-client/model_ecgi.go | 12 +- go-packages/meep-vis-client/model_fdd_info.go | 16 +- .../meep-vis-client/model_link_type.go | 9 +- go-packages/meep-vis-client/model_links.go | 9 +- .../meep-vis-client/model_location_info.go | 12 +- .../model_location_info_geo_area.go | 9 +- go-packages/meep-vis-client/model_msg_type.go | 9 +- ...1.go => model_one_ofsubscriptions_body.go} | 11 +- ...ne_ofsubscriptions_subscription_id_body.go | 28 + .../model_operation_action_type.go | 13 +- .../model_pc5_neighbour_cell_info.go | 15 +- .../model_pc5_provisioning_info.go | 14 +- ...odel_pc5_provisioning_info_pro_info_pc5.go | 34 + go-packages/meep-vis-client/model_plmn.go | 9 +- .../meep-vis-client/model_predicted_qos.go | 14 +- .../model_predicted_qos_routes.go | 11 +- .../model_predicted_qos_routes_route_info.go | 14 +- .../meep-vis-client/model_problem_details.go | 9 +- .../model_prov_chg_pc5_notification.go | 17 +- .../model_prov_chg_pc5_subscription.go | 20 +- ...ov_chg_pc5_subscription_filter_criteria.go | 12 +- .../model_prov_chg_uu_mbms_notification.go | 17 +- .../model_prov_chg_uu_mbms_subscription.go | 20 +- ...hg_uu_mbms_subscription_filter_criteria.go | 12 +- .../model_prov_chg_uu_uni_notification.go | 15 +- .../model_prov_chg_uu_uni_subscription.go | 20 +- ...chg_uu_uni_subscription_filter_criteria.go | 14 +- .../model_subscription_link_list.go | 9 +- .../model_subscription_link_list_links.go | 14 +- ...cription_link_list_links_subscriptions.go} | 20 +- ...el_body.go => model_subscriptions_body.go} | 11 +- ...odel_subscriptions_subscription_id_body.go | 28 + .../model_system_information_block_type21.go | 9 +- go-packages/meep-vis-client/model_tdd_info.go | 12 +- .../model_test_notification.go | 9 +- .../model_test_notification__links.go | 9 +- .../meep-vis-client/model_time_stamp.go | 9 +- .../model_transmission_bandwidth.go | 9 +- ...ission_bandwidth_transmission_bandwidth.go | 9 +- .../model_uu_mbms_neighbour_cell_info.go | 18 +- .../model_uu_mbms_provisioning_info.go | 14 +- ...bms_provisioning_info_pro_info_uu_mbms.go} | 20 +- .../model_uu_uni_neighbour_cell_info.go | 18 +- .../model_uu_unicast_provisioning_info.go | 14 +- ...t_provisioning_info_pro_info_uu_unicast.go | 33 + .../model_v2x_application_server.go | 12 +- .../model_v2x_msg_notification.go | 19 +- .../model_v2x_msg_notification_links.go | 9 +- .../model_v2x_msg_publication.go | 14 +- .../model_v2x_msg_subscription.go | 20 +- ...el_v2x_msg_subscription_filter_criteria.go | 9 +- .../meep-vis-client/model_v2x_server_usd.go | 14 +- .../model_v2x_server_usd_sdp_info.go | 12 +- .../model_v2x_server_usd_tmgi.go | 9 +- .../model_websock_notif_config.go | 9 +- go-packages/meep-vis-client/response.go | 9 +- go-packages/meep-vis-traffic-mgr/go.mod | 6 +- go-packages/meep-vis-traffic-mgr/go.sum | 14 +- .../meep-vis-traffic-mgr/traffic-mgr.go | 700 +- .../meep-vis-traffic-mgr/traffic-mgr_test.go | 230 +- ..._event.go => all_of_notification_event.go} | 6 +- .../meep-wais-client/api_unsupported.go | 8 +- go-packages/meep-wais-client/api_wai.go | 8 +- go-packages/meep-wais-client/client.go | 8 +- go-packages/meep-wais-client/configuration.go | 8 +- .../meep-wais-client/model_ap_associated.go | 8 +- .../meep-wais-client/model_ap_identity.go | 8 +- go-packages/meep-wais-client/model_ap_info.go | 8 +- .../meep-wais-client/model_ap_location.go | 8 +- .../model_app_termination_notification.go | 8 +- ...del_app_termination_notification__links.go | 8 +- .../model_assoc_sta_notification.go | 8 +- .../model_assoc_sta_subscription.go | 8 +- .../model_assoc_sta_subscription__links.go | 8 +- ...soc_sta_subscription_notification_event.go | 8 +- .../meep-wais-client/model_beacon_report.go | 8 +- .../model_beacon_reporting_config.go | 8 +- .../model_beacon_request_config.go | 8 +- .../model_bss_capabilities.go | 8 +- .../meep-wais-client/model_bss_load.go | 8 +- .../meep-wais-client/model_bssid_info.go | 8 +- .../meep-wais-client/model_channel_load.go | 8 +- .../model_channel_load_config.go | 8 +- .../meep-wais-client/model_civic_location.go | 8 +- .../model_dmg_capabilities.go | 8 +- .../model_edmg_capabilities.go | 8 +- .../model_expiry_notification.go | 8 +- .../model_expiry_notification__links.go | 8 +- .../meep-wais-client/model_ext_bss_load.go | 8 +- .../meep-wais-client/model_geo_location.go | 8 +- .../meep-wais-client/model_he_capabilities.go | 8 +- .../meep-wais-client/model_ht_capabilities.go | 8 +- .../model_inline_notification.go | 8 +- .../model_inline_subscription.go | 8 +- .../meep-wais-client/model_link_type.go | 8 +- .../model_measurement_config.go | 8 +- .../model_measurement_config__links.go | 8 +- .../model_measurement_config_link_list.go | 8 +- ...ent_config_link_list_measurement_config.go | 8 +- .../model_measurement_info.go | 8 +- .../model_measurement_report_notification.go | 8 +- .../model_measurement_report_subscription.go | 8 +- .../meep-wais-client/model_neighbor_report.go | 8 +- .../model_neighbor_report_config.go | 8 +- .../meep-wais-client/model_o_bss_load.go | 8 +- .../model_one_of_inline_notification.go | 8 +- .../model_one_of_inline_subscription.go | 8 +- .../model_operation_action_type.go | 8 +- .../meep-wais-client/model_problem_details.go | 8 +- .../model_reported_beacon_frame_info.go | 8 +- .../model_reporting_reason_qo_s_counters.go | 8 +- .../model_reporting_reason_sta_counters.go | 8 +- go-packages/meep-wais-client/model_rssi.go | 8 +- .../model_sta_counter_trigger_condition.go | 8 +- .../meep-wais-client/model_sta_data_rate.go | 8 +- .../model_sta_data_rate_notification.go | 8 +- .../model_sta_data_rate_subscription.go | 8 +- ...ta_rate_subscription_notification_event.go | 8 +- .../meep-wais-client/model_sta_identity.go | 8 +- .../meep-wais-client/model_sta_info.go | 8 +- .../meep-wais-client/model_sta_statistics.go | 8 +- .../model_sta_statistics_config.go | 8 +- .../model_sta_statistics_group2to9_data.go | 8 +- .../model_sta_statistics_group_one_data.go | 8 +- .../model_sta_statistics_group_zero_data.go | 8 +- .../model_subscription_link_list.go | 8 +- .../model_subscription_link_list__links.go | 8 +- ...del_subscription_link_list_subscription.go | 8 +- .../model_test_notification.go | 8 +- .../model_test_notification__links.go | 8 +- .../meep-wais-client/model_time_stamp.go | 8 +- .../model_vht_capabilities.go | 8 +- .../meep-wais-client/model_wan_metrics.go | 8 +- .../model_websock_notif_config.go | 8 +- .../model_wlan_capabilities.go | 8 +- go-packages/meep-wais-client/response.go | 8 +- go-packages/meep-watchdog/const.go | 2 +- go-packages/meep-watchdog/pinger.go | 2 +- go-packages/meep-watchdog/pinger_test.go | 2 +- go-packages/meep-watchdog/watchdog.go | 2 +- go-packages/meep-watchdog/watchdog_test.go | 2 +- .../meep-websocket/3gpp-ws-notif-encoder.go | 2 +- .../meep-websocket/3gpp-ws-notif-transport.go | 2 +- go-packages/meep-websocket/util.go | 2 +- go-packages/meep-websocket/websocket.go | 2 +- js-apps/meep-frontend/package-lock.json | 421 + js-apps/meep-frontend/package.json | 4 +- .../src/css/meep-controller.scss | 7 +- js-apps/meep-frontend/src/index.html | 2 +- .../components/dialogs/id-confirm-dialog.js | 2 +- .../dialogs/id-delete-sandbox-dialog.js | 2 +- .../dialogs/id-delete-scenario-dialog.js | 2 +- .../dialogs/id-deploy-scenario-dialog.js | 2 +- .../src/js/components/dialogs/id-dialog.js | 2 +- .../dialogs/id-export-scenario-dialog.js | 2 +- .../dialogs/id-new-sandbox-dialog.js | 2 +- .../dialogs/id-new-scenario-dialog.js | 2 +- .../dialogs/id-open-scenario-dialog.js | 2 +- .../dialogs/id-save-replay-dialog.js | 2 +- .../dialogs/id-save-scenario-dialog.js | 2 +- .../dialogs/id-session-terminated-dialog.js | 2 +- .../dialogs/id-sign-in-oauth-dialog.js | 2 +- .../dialogs/id-terminate-scenario-dialog.js | 2 +- .../meep-frontend/src/js/components/footer.js | 2 +- .../src/js/components/headline-bar.js | 2 +- .../helper-components/cancel-apply-pair.js | 2 +- .../helper-components/id-select-row.js | 2 +- .../components/helper-components/id-select.js | 2 +- .../helper-components/id-textfield.js | 2 +- .../components/helper-components/nc-group.js | 2 +- .../src/js/components/meep-top-bar.js | 2 +- .../cfg/cfg-network-element-container.js | 46 +- .../js/containers/cfg/cfg-page-container.js | 2 +- .../cfg/cfg-page-scenario-buttons.js | 2 +- .../src/js/containers/cfg/cfg-table.js | 2 +- .../exec/dashboard-cfg-detail-pane.js | 419 +- .../js/containers/exec/dashboard-cfg-pane.js | 226 +- .../js/containers/exec/dashboard-container.js | 160 +- .../containers/exec/event-automation-pane.js | 2 +- .../src/js/containers/exec/event-container.js | 2 +- .../js/containers/exec/event-creation-pane.js | 2 +- .../js/containers/exec/event-replay-pane.js | 2 +- .../js/containers/exec/exec-page-container.js | 95 +- .../exec/exec-page-sandbox-buttons.js | 2 +- .../exec/exec-page-scenario-buttons.js | 2 +- .../src/js/containers/exec/exec-table.js | 2 +- .../js/containers/exec/mobility-event-pane.js | 2 +- .../network-characteristics-event-pane.js | 2 +- .../containers/exec/pdu-session-event-pane.js | 2 +- .../exec/scenario-update-event-pane.js | 2 +- .../js/containers/home/home-page-container.js | 2 +- .../src/js/containers/idc-dataflow.js | 119 + .../src/js/containers/idc-map.js | 119 +- .../src/js/containers/idc-seq.js | 134 + .../src/js/containers/idc-vis.js | 2 +- .../src/js/containers/meep-container.js | 312 +- .../js/containers/monitor/list-edit-pane.js | 2 +- .../monitor/monitor-page-container.js | 2 +- .../settings/settings-page-container.js | 2 +- .../src/js/containers/stream-graph.html | 2 +- .../meep-frontend/src/js/meep-constants.js | 17 +- .../meep-frontend/src/js/meep-controller.js | 2 +- .../exec-displayed-scenario-middleware.js | 2 +- .../src/js/state/cfg/api-results.js | 2 +- .../src/js/state/cfg/element-configuration.js | 2 +- .../meep-frontend/src/js/state/cfg/index.js | 2 +- .../src/js/state/cfg/map-reducer.js | 2 +- .../src/js/state/cfg/scenario-reducer.js | 2 +- .../src/js/state/cfg/state-reducer.js | 2 +- .../src/js/state/cfg/table-reducer.js | 2 +- .../src/js/state/cfg/type-reducer.js | 2 +- .../src/js/state/cfg/vis-reducer.js | 2 +- .../src/js/state/exec/api-results.js | 2 +- .../state/exec/app-instance-table-reducer.js | 2 +- .../src/js/state/exec/dataflow-reducer.js | 62 + .../state/exec/displayed-scenario-reducer.js | 2 +- .../js/state/exec/element-configuration.js | 2 +- .../meep-frontend/src/js/state/exec/index.js | 8 +- .../src/js/state/exec/map-reducer.js | 2 +- .../src/js/state/exec/scenario-reducer.js | 2 +- .../state/exec/selected-scenario-element.js | 2 +- .../src/js/state/exec/seq-reducer.js | 74 + .../src/js/state/exec/state-reducer.js | 2 +- .../src/js/state/exec/table-reducer.js | 2 +- .../src/js/state/exec/type-reducer.js | 2 +- .../src/js/state/exec/vis-reducer.js | 2 +- .../src/js/state/meep-reducer.js | 2 +- .../src/js/state/monitor/index.js | 2 +- .../src/js/state/settings/index.js | 2 +- .../meep-frontend/src/js/state/ui/index.js | 76 +- .../src/js/util/dashboard-utils.js | 41 + .../meep-frontend/src/js/util/elem-utils.js | 14 +- .../meep-frontend/src/js/util/functional.js | 2 +- .../meep-frontend/src/js/util/meta-keys.js | 6 +- .../meep-frontend/src/js/util/object-util.js | 8 +- js-apps/meep-frontend/src/js/util/persist.js | 2 +- .../src/js/util/scenario-utils.js | 34 +- .../src/js/util/string-manipulation.js | 2 +- .../meep-frontend/src/js/util/table-utils.js | 2 +- js-apps/meep-frontend/src/js/util/validate.js | 24 +- .../helper-components/id-select.test.js | 2 +- .../cfg/cfg-network-element-container.test.js | 2 +- .../test/js/state/reducers.test.js | 2 +- .../meep-frontend/test/setup/setupEnzyme.js | 2 +- .../meep-auth-svc-client/src/ApiClient.js | 8 +- .../meep-auth-svc-client/src/api/AuthApi.js | 8 +- js-packages/meep-auth-svc-client/src/index.js | 8 +- .../meep-auth-svc-client/src/model/Sandbox.js | 8 +- .../test/api/AuthApi.spec.js | 8 +- .../test/model/Sandbox.spec.js | 8 +- js-packages/meep-gis-engine-client/README.md | 5 + .../docs/CoordinatePower.md | 12 + .../docs/CoordinatePowerList.md | 8 + .../docs/GeoCoordinate.md | 9 + .../docs/GeoCoordinateList.md | 8 + .../meep-gis-engine-client/docs/GeoData.md | 2 + .../docs/GeospatialDataApi.md | 47 + .../meep-gis-engine-client/src/ApiClient.js | 8 +- .../src/api/AutomationApi.js | 8 +- .../src/api/GeospatialDataApi.js | 63 +- .../meep-gis-engine-client/src/index.js | 34 +- .../src/model/AutomationState.js | 8 +- .../src/model/AutomationStateList.js | 8 +- .../src/model/CoordinatePower.js | 129 + .../src/model/CoordinatePowerList.js | 86 + .../src/model/Distance.js | 8 +- .../src/model/GeoCoordinate.js | 95 + .../src/model/GeoCoordinateList.js | 86 + .../src/model/GeoData.js | 22 +- .../src/model/GeoDataAsset.js | 18 +- .../src/model/GeoDataAssetList.js | 8 +- .../src/model/LineString.js | 8 +- .../meep-gis-engine-client/src/model/Point.js | 8 +- .../src/model/TargetPoint.js | 8 +- .../src/model/TargetRange.js | 8 +- .../src/model/WithinRange.js | 8 +- .../test/api/AutomationApi.spec.js | 8 +- .../test/api/GeospatialDataApi.spec.js | 93 +- .../test/model/AutomationState.spec.js | 8 +- .../test/model/AutomationStateList.spec.js | 8 +- .../test/model/CoordinatePower.spec.js | 91 + .../test/model/CoordinatePowerList.spec.js | 67 + .../test/model/Distance.spec.js | 8 +- .../test/model/GeoCoordinate.spec.js | 73 + .../test/model/GeoCoordinateList.spec.js | 67 + .../test/model/GeoData.spec.js | 20 +- .../test/model/GeoDataAsset.spec.js | 8 +- .../test/model/GeoDataAssetList.spec.js | 8 +- .../test/model/LineString.spec.js | 8 +- .../test/model/Point.spec.js | 8 +- .../test/model/TargetPoint.spec.js | 8 +- .../test/model/TargetRange.spec.js | 8 +- .../test/model/WithinRange.spec.js | 8 +- .../meep-metrics-engine-client/README.md | 14 +- .../docs/DataflowMetric.md | 9 + .../docs/DataflowMetricList.md | 10 + .../docs/DataflowMetrics.md | 9 + .../docs/DataflowQueryParams.md | 31 + .../docs/MetricsApi.md | 94 + .../docs/SeqMetric.md | 10 + .../docs/SeqMetricList.md | 10 + .../docs/SeqMetrics.md | 9 + .../docs/SeqQueryParams.md | 33 + .../src/ApiClient.js | 8 +- .../src/api/MetricsApi.js | 108 +- .../src/api/SubscriptionsApi.js | 8 +- .../meep-metrics-engine-client/src/index.js | 54 +- .../src/model/DataflowMetric.js | 95 + .../src/model/DataflowMetricList.js | 101 + .../src/model/DataflowMetrics.js | 93 + .../src/model/DataflowQueryParams.js | 144 + .../src/model/EventMetric.js | 8 +- .../src/model/EventMetricList.js | 8 +- .../src/model/EventQueryParams.js | 8 +- .../src/model/EventSubscription.js | 8 +- .../src/model/EventSubscriptionList.js | 8 +- .../src/model/EventSubscriptionParams.js | 8 +- .../src/model/EventsCallbackReference.js | 8 +- .../src/model/HttpMetric.js | 8 +- .../src/model/HttpMetricList.js | 8 +- .../src/model/HttpQueryParams.js | 8 +- .../src/model/NetworkCallbackReference.js | 8 +- .../src/model/NetworkMetric.js | 8 +- .../src/model/NetworkMetricList.js | 8 +- .../src/model/NetworkQueryParams.js | 8 +- .../src/model/NetworkSubscription.js | 8 +- .../src/model/NetworkSubscriptionList.js | 8 +- .../src/model/NetworkSubscriptionParams.js | 8 +- .../src/model/Scope.js | 8 +- .../src/model/SeqMetric.js | 103 + .../src/model/SeqMetricList.js | 102 + .../src/model/SeqMetrics.js | 93 + .../src/model/SeqQueryParams.js | 150 + .../src/model/Tag.js | 8 +- .../test/api/MetricsApi.spec.js | 124 +- .../test/api/SubscriptionsApi.spec.js | 8 +- .../test/model/DataflowMetric.spec.js | 73 + .../test/model/DataflowMetricList.spec.js | 79 + .../test/model/DataflowMetrics.spec.js | 73 + .../test/model/DataflowQueryParams.spec.js | 85 + .../test/model/EventMetric.spec.js | 8 +- .../test/model/EventMetricList.spec.js | 8 +- .../test/model/EventQueryParams.spec.js | 8 +- .../test/model/EventSubscription.spec.js | 8 +- .../test/model/EventSubscriptionList.spec.js | 8 +- .../model/EventSubscriptionParams.spec.js | 8 +- .../model/EventsCallbackReference.spec.js | 8 +- .../test/model/HttpMetric.spec.js | 8 +- .../test/model/HttpMetricList.spec.js | 8 +- .../test/model/HttpQueryParams.spec.js | 8 +- .../model/NetworkCallbackReference.spec.js | 8 +- .../test/model/NetworkMetric.spec.js | 8 +- .../test/model/NetworkMetricList.spec.js | 8 +- .../test/model/NetworkQueryParams.spec.js | 8 +- .../test/model/NetworkSubscription.spec.js | 8 +- .../model/NetworkSubscriptionList.spec.js | 8 +- .../model/NetworkSubscriptionParams.spec.js | 8 +- .../test/model/Scope.spec.js | 8 +- .../test/model/SeqMetric.spec.js | 79 + .../test/model/SeqMetricList.spec.js | 79 + .../test/model/SeqMetrics.spec.js | 73 + .../test/model/SeqQueryParams.spec.js | 85 + .../test/model/Tag.spec.js | 8 +- .../meep-mon-engine-client/src/ApiClient.js | 8 +- .../src/api/PodStatesApi.js | 8 +- .../meep-mon-engine-client/src/index.js | 8 +- .../src/model/PodStatus.js | 8 +- .../src/model/PodsStatus.js | 8 +- .../test/api/PodStatesApi.spec.js | 8 +- .../test/model/PodStatus.spec.js | 8 +- .../test/model/PodsStatus.spec.js | 8 +- .../meep-platform-ctrl-client/README.md | 1 + .../docs/D2dConfig.md | 9 + .../docs/Deployment.md | 1 + .../meep-platform-ctrl-client/docs/GeoData.md | 2 + .../src/ApiClient.js | 8 +- .../src/api/SandboxControlApi.js | 8 +- .../src/api/ScenarioConfigurationApi.js | 8 +- .../meep-platform-ctrl-client/src/index.js | 19 +- .../src/model/CellularDomainConfig.js | 8 +- .../src/model/CellularPoaConfig.js | 8 +- .../src/model/ConnectivityConfig.js | 8 +- .../src/model/CpuConfig.js | 8 +- .../src/model/D2dConfig.js | 95 + .../src/model/DNConfig.js | 8 +- .../src/model/Deployment.js | 23 +- .../src/model/Domain.js | 8 +- .../src/model/EgressService.js | 8 +- .../src/model/ExternalConfig.js | 8 +- .../src/model/GeoData.js | 22 +- .../src/model/GpuConfig.js | 8 +- .../src/model/IngressService.js | 8 +- .../src/model/LineString.js | 8 +- .../src/model/MemoryConfig.js | 8 +- .../src/model/NetworkCharacteristics.js | 8 +- .../src/model/NetworkLocation.js | 8 +- .../src/model/PhysicalLocation.js | 8 +- .../src/model/Poa4GConfig.js | 8 +- .../src/model/Poa5GConfig.js | 8 +- .../src/model/PoaWifiConfig.js | 8 +- .../src/model/Point.js | 8 +- .../src/model/Process.js | 8 +- .../src/model/Sandbox.js | 8 +- .../src/model/SandboxConfig.js | 8 +- .../src/model/SandboxList.js | 8 +- .../src/model/Scenario.js | 8 +- .../src/model/ScenarioConfig.js | 8 +- .../src/model/ScenarioList.js | 8 +- .../src/model/ServiceConfig.js | 8 +- .../src/model/ServicePort.js | 8 +- .../src/model/Zone.js | 8 +- .../test/api/SandboxControlApi.spec.js | 8 +- .../test/api/ScenarioConfigurationApi.spec.js | 112 +- .../test/model/CellularDomainConfig.spec.js | 8 +- .../test/model/CellularPoaConfig.spec.js | 8 +- .../test/model/ConnectivityConfig.spec.js | 8 +- .../test/model/CpuConfig.spec.js | 8 +- .../test/model/D2dConfig.spec.js | 73 + .../test/model/DNConfig.spec.js | 8 +- .../test/model/Deployment.spec.js | 14 +- .../test/model/Domain.spec.js | 8 +- .../test/model/EgressService.spec.js | 8 +- .../test/model/ExternalConfig.spec.js | 8 +- .../test/model/GeoData.spec.js | 20 +- .../test/model/GpuConfig.spec.js | 8 +- .../test/model/IngressService.spec.js | 8 +- .../test/model/LineString.spec.js | 8 +- .../test/model/MemoryConfig.spec.js | 8 +- .../test/model/NetworkCharacteristics.spec.js | 8 +- .../test/model/NetworkLocation.spec.js | 8 +- .../test/model/PhysicalLocation.spec.js | 8 +- .../test/model/Poa4GConfig.spec.js | 8 +- .../test/model/Poa5GConfig.spec.js | 8 +- .../test/model/PoaWifiConfig.spec.js | 8 +- .../test/model/Point.spec.js | 8 +- .../test/model/Process.spec.js | 8 +- .../test/model/Sandbox.spec.js | 8 +- .../test/model/SandboxConfig.spec.js | 8 +- .../test/model/SandboxList.spec.js | 8 +- .../test/model/Scenario.spec.js | 8 +- .../test/model/ScenarioConfig.spec.js | 8 +- .../test/model/ScenarioList.spec.js | 8 +- .../test/model/ServiceConfig.spec.js | 8 +- .../test/model/ServicePort.spec.js | 8 +- .../test/model/Zone.spec.js | 8 +- .../meep-sandbox-ctrl-client/README.md | 1 + .../docs/D2dConfig.md | 9 + .../docs/Deployment.md | 1 + .../meep-sandbox-ctrl-client/docs/GeoData.md | 2 + .../meep-sandbox-ctrl-client/src/ApiClient.js | 8 +- .../src/api/ActiveScenarioApi.js | 8 +- .../src/api/ApplicationsApi.js | 8 +- .../src/api/ConnectivityApi.js | 8 +- .../src/api/EventReplayApi.js | 8 +- .../src/api/EventsApi.js | 8 +- .../src/api/ServicesApi.js | 8 +- .../meep-sandbox-ctrl-client/src/index.js | 19 +- .../src/model/ActivationInfo.js | 8 +- .../src/model/ApplicationInfo.js | 8 +- .../src/model/CellularDomainConfig.js | 8 +- .../src/model/CellularPoaConfig.js | 8 +- .../src/model/ConnectivityConfig.js | 8 +- .../src/model/CpuConfig.js | 8 +- .../src/model/D2dConfig.js | 95 + .../src/model/DNConfig.js | 8 +- .../src/model/Deployment.js | 23 +- .../src/model/Domain.js | 8 +- .../src/model/Domains.js | 8 +- .../src/model/EgressService.js | 8 +- .../src/model/Event.js | 8 +- .../src/model/EventMobility.js | 8 +- .../EventNetworkCharacteristicsUpdate.js | 8 +- .../src/model/EventPduSession.js | 8 +- .../src/model/EventPoasInRange.js | 8 +- .../src/model/EventScenarioUpdate.js | 8 +- .../src/model/ExternalConfig.js | 8 +- .../src/model/GeoData.js | 22 +- .../src/model/GpuConfig.js | 8 +- .../src/model/IngressService.js | 8 +- .../src/model/LineString.js | 8 +- .../src/model/MemoryConfig.js | 8 +- .../src/model/NetworkCharacteristics.js | 8 +- .../src/model/NetworkLocation.js | 8 +- .../src/model/NetworkLocations.js | 8 +- .../src/model/NodeDataUnion.js | 8 +- .../src/model/NodeServiceMaps.js | 8 +- .../src/model/PDUSession.js | 8 +- .../src/model/PDUSessionInfo.js | 8 +- .../src/model/PDUSessionList.js | 8 +- .../src/model/PhysicalLocation.js | 8 +- .../src/model/PhysicalLocations.js | 8 +- .../src/model/Poa4GConfig.js | 8 +- .../src/model/Poa5GConfig.js | 8 +- .../src/model/PoaWifiConfig.js | 8 +- .../src/model/Point.js | 8 +- .../src/model/Process.js | 8 +- .../src/model/Processes.js | 8 +- .../src/model/Replay.js | 8 +- .../src/model/ReplayEvent.js | 8 +- .../src/model/ReplayFileList.js | 8 +- .../src/model/ReplayInfo.js | 8 +- .../src/model/ReplayStatus.js | 8 +- .../src/model/Scenario.js | 8 +- .../src/model/ScenarioConfig.js | 8 +- .../src/model/ScenarioNode.js | 8 +- .../src/model/ServiceConfig.js | 8 +- .../src/model/ServiceInfo.js | 8 +- .../src/model/ServicePort.js | 8 +- .../src/model/Zone.js | 8 +- .../src/model/Zones.js | 8 +- .../test/api/ActiveScenarioApi.spec.js | 193 +- .../test/api/ApplicationsApi.spec.js | 8 +- .../test/api/ConnectivityApi.spec.js | 8 +- .../test/api/EventReplayApi.spec.js | 30 +- .../test/api/EventsApi.spec.js | 10 +- .../test/api/ServicesApi.spec.js | 8 +- .../test/model/ActivationInfo.spec.js | 8 +- .../test/model/ApplicationInfo.spec.js | 8 +- .../test/model/CellularDomainConfig.spec.js | 8 +- .../test/model/CellularPoaConfig.spec.js | 8 +- .../test/model/ConnectivityConfig.spec.js | 8 +- .../test/model/CpuConfig.spec.js | 8 +- .../test/model/D2dConfig.spec.js | 73 + .../test/model/DNConfig.spec.js | 8 +- .../test/model/Deployment.spec.js | 14 +- .../test/model/Domain.spec.js | 8 +- .../test/model/Domains.spec.js | 8 +- .../test/model/EgressService.spec.js | 8 +- .../test/model/Event.spec.js | 8 +- .../test/model/EventMobility.spec.js | 8 +- .../EventNetworkCharacteristicsUpdate.spec.js | 8 +- .../test/model/EventPduSession.spec.js | 8 +- .../test/model/EventPoasInRange.spec.js | 8 +- .../test/model/EventScenarioUpdate.spec.js | 8 +- .../test/model/ExternalConfig.spec.js | 8 +- .../test/model/GeoData.spec.js | 20 +- .../test/model/GpuConfig.spec.js | 8 +- .../test/model/IngressService.spec.js | 8 +- .../test/model/LineString.spec.js | 8 +- .../test/model/MemoryConfig.spec.js | 8 +- .../test/model/NetworkCharacteristics.spec.js | 8 +- .../test/model/NetworkLocation.spec.js | 8 +- .../test/model/NetworkLocations.spec.js | 8 +- .../test/model/NodeDataUnion.spec.js | 8 +- .../test/model/NodeServiceMaps.spec.js | 8 +- .../test/model/PDUSession.spec.js | 8 +- .../test/model/PDUSessionInfo.spec.js | 8 +- .../test/model/PDUSessionList.spec.js | 8 +- .../test/model/PhysicalLocation.spec.js | 8 +- .../test/model/PhysicalLocations.spec.js | 8 +- .../test/model/Poa4GConfig.spec.js | 8 +- .../test/model/Poa5GConfig.spec.js | 8 +- .../test/model/PoaWifiConfig.spec.js | 8 +- .../test/model/Point.spec.js | 8 +- .../test/model/Process.spec.js | 8 +- .../test/model/Processes.spec.js | 8 +- .../test/model/Replay.spec.js | 8 +- .../test/model/ReplayEvent.spec.js | 8 +- .../test/model/ReplayFileList.spec.js | 8 +- .../test/model/ReplayInfo.spec.js | 8 +- .../test/model/ReplayStatus.spec.js | 8 +- .../test/model/Scenario.spec.js | 8 +- .../test/model/ScenarioConfig.spec.js | 8 +- .../test/model/ScenarioNode.spec.js | 8 +- .../test/model/ServiceConfig.spec.js | 8 +- .../test/model/ServiceInfo.spec.js | 8 +- .../test/model/ServicePort.spec.js | 8 +- .../test/model/Zone.spec.js | 8 +- .../test/model/Zones.spec.js | 8 +- scripts/K99advantedge | 0 scripts/build_all.sh | 0 test/.gitignore | 5 +- .../integration/tests/meep-settings-spec.js | 2 +- .../integration/tests/scenario-cfg-spec.js | 2 +- .../scenario-exec-spec-mob-event-demo-app.js | 6 +- .../integration/tests/scenario-exec-spec.js | 6 +- .../tests/scenario-monitor-spec.js | 2 +- test/cypress/integration/util/util.js | 2 +- test/run-ut.sh | 7 +- test/start-ut-env.sh | 11 +- test/stop-ut-env.sh | 11 +- test/system/app-enablement_test.go | 6 +- test/system/go.mod | 11 +- test/system/go.sum | 379 +- test/system/loc-serv_test.go | 2 +- test/system/loopTest.sh | 5 +- test/system/rnis_test.go | 6 +- test/system/systemTest.go | 2 +- test/system/vis_test.go | 2 +- test/system/wais_test.go | 2 +- test/system/zsystemTest_test.go | 2 +- 2289 files changed, 40376 insertions(+), 24406 deletions(-) create mode 100644 AUTHORS create mode 100644 docs/api-rnis/Models/CaReconfNotificationLinks.md create mode 100644 docs/api-rnis/Models/CellChangeNotificationLinks.md rename {go-packages/meep-rnis-client/docs => docs/api-rnis/Models}/TestNotification.md (56%) create mode 100644 docs/api-rnis/Models/WebsockNotifConfig.md create mode 100644 examples/demo3/src/backend/server/model_adjacent_app_info_notification.go create mode 100644 examples/demo3/src/backend/server/model_adjacent_app_info_notification_adjacent_app_info.go rename examples/demo3/src/backend/server/{model_app_termination_subscription.go => model_app_termination_notification.go} (50%) create mode 100644 examples/demo3/src/backend/server/model_app_termination_notification_links.go delete mode 100644 examples/demo3/src/backend/server/model_application_instance_offeredservice.go delete mode 100644 examples/demo3/src/backend/server/model_application_instance_services.go create mode 100644 examples/demo3/src/backend/server/model_associate_id_type.go create mode 100644 examples/demo3/src/backend/server/model_expiry_notification.go rename examples/demo3/src/backend/server/{model_app_termination_subscription__links.go => model_inline_notification.go} (65%) create mode 100644 examples/demo3/src/backend/server/model_link.go create mode 100644 examples/demo3/src/backend/server/model_link_type_1.go create mode 100644 examples/demo3/src/backend/server/model_link_type_2.go create mode 100644 examples/demo3/src/backend/server/model_link_type_confirm_termination.go delete mode 100644 examples/demo3/src/backend/server/model_mobility_procedure_notification__links.go create mode 100644 examples/demo3/src/backend/server/model_one_of_inline_notification.go create mode 100644 examples/demo3/src/backend/server/model_operation_action_type.go create mode 100644 examples/demo3/src/backend/server/model_problem_details.go create mode 100644 examples/demo3/src/backend/server/model_service_availability_notification_change_type.go delete mode 100644 examples/demo3/src/backend/server/model_service_info.go create mode 100644 examples/demo3/src/backend/server/model_service_state_1.go delete mode 100644 examples/demo3/src/backend/server/model_type.go create mode 100644 examples/demo3/src/client/.babelrc create mode 100644 examples/demo3/src/client/docs/AdjacentAppInfoNotification.md create mode 100644 examples/demo3/src/client/docs/AdjacentAppInfoNotificationAdjacentAppInfo.md create mode 100644 examples/demo3/src/client/docs/AppTerminationNotification.md create mode 100644 examples/demo3/src/client/docs/AppTerminationNotificationLinks.md create mode 100644 examples/demo3/src/client/docs/ApplicationContextState.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstance.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstanceAmsLinkListSubscription.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstanceAppTerminationSubscription.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstanceDiscoveredServices.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstanceOfferedService.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstanceSerAvailabilitySubscription.md create mode 100644 examples/demo3/src/client/docs/ApplicationInstanceSubscriptions.md create mode 100644 examples/demo3/src/client/docs/AssociateId.md create mode 100644 examples/demo3/src/client/docs/AssociateIdType.md create mode 100644 examples/demo3/src/client/docs/CommunicationInterface.md create mode 100644 examples/demo3/src/client/docs/CommunicationInterfaceIpAddresses.md create mode 100644 examples/demo3/src/client/docs/ExpiryNotification.md create mode 100644 examples/demo3/src/client/docs/InlineNotification.md create mode 100644 examples/demo3/src/client/docs/Link.md create mode 100644 examples/demo3/src/client/docs/LinkType.md create mode 100644 examples/demo3/src/client/docs/LinkType1.md create mode 100644 examples/demo3/src/client/docs/LinkType2.md create mode 100644 examples/demo3/src/client/docs/LinkTypeConfirmTermination.md create mode 100644 examples/demo3/src/client/docs/LocalityType.md create mode 100644 examples/demo3/src/client/docs/MobilityProcedureNotification.md create mode 100644 examples/demo3/src/client/docs/MobilityProcedureNotificationTargetAppInfo.md create mode 100644 examples/demo3/src/client/docs/MobilityStatus.md create mode 100644 examples/demo3/src/client/docs/OneOfInlineNotification.md create mode 100644 examples/demo3/src/client/docs/OperationActionType.md create mode 100644 examples/demo3/src/client/docs/ProblemDetails.md create mode 100644 examples/demo3/src/client/docs/SerInstanceId.md create mode 100644 examples/demo3/src/client/docs/SerName.md create mode 100644 examples/demo3/src/client/docs/ServiceAvailabilityNotification.md create mode 100644 examples/demo3/src/client/docs/ServiceAvailabilityNotificationChangeType.md create mode 100644 examples/demo3/src/client/docs/ServiceAvailabilityNotificationServiceReferences.md create mode 100644 examples/demo3/src/client/docs/ServiceState.md create mode 100644 examples/demo3/src/client/docs/ServiceState1.md create mode 100644 examples/demo3/src/client/docs/Subscription.md create mode 100644 examples/demo3/src/client/docs/TimeStamp.md create mode 100644 examples/demo3/src/client/git_push.sh create mode 100644 examples/demo3/src/client/src/model/AdjacentAppInfoNotification.js create mode 100644 examples/demo3/src/client/src/model/AdjacentAppInfoNotificationAdjacentAppInfo.js create mode 100644 examples/demo3/src/client/src/model/AppTerminationNotification.js create mode 100644 examples/demo3/src/client/src/model/AppTerminationNotificationLinks.js create mode 100644 examples/demo3/src/client/src/model/ApplicationContextState.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstance.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstanceAmsLinkListSubscription.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstanceAppTerminationSubscription.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstanceDiscoveredServices.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstanceOfferedService.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstanceSerAvailabilitySubscription.js create mode 100644 examples/demo3/src/client/src/model/ApplicationInstanceSubscriptions.js create mode 100644 examples/demo3/src/client/src/model/AssociateId.js create mode 100644 examples/demo3/src/client/src/model/AssociateIdType.js create mode 100644 examples/demo3/src/client/src/model/CommunicationInterface.js create mode 100644 examples/demo3/src/client/src/model/CommunicationInterfaceIpAddresses.js create mode 100644 examples/demo3/src/client/src/model/ExpiryNotification.js create mode 100644 examples/demo3/src/client/src/model/InlineNotification.js create mode 100644 examples/demo3/src/client/src/model/Link.js create mode 100644 examples/demo3/src/client/src/model/LinkType.js create mode 100644 examples/demo3/src/client/src/model/LinkType1.js create mode 100644 examples/demo3/src/client/src/model/LinkType2.js create mode 100644 examples/demo3/src/client/src/model/LinkTypeConfirmTermination.js create mode 100644 examples/demo3/src/client/src/model/LocalityType.js create mode 100644 examples/demo3/src/client/src/model/MobilityProcedureNotification.js create mode 100644 examples/demo3/src/client/src/model/MobilityProcedureNotificationTargetAppInfo.js create mode 100644 examples/demo3/src/client/src/model/MobilityStatus.js create mode 100644 examples/demo3/src/client/src/model/OneOfInlineNotification.js create mode 100644 examples/demo3/src/client/src/model/OperationActionType.js create mode 100644 examples/demo3/src/client/src/model/ProblemDetails.js create mode 100644 examples/demo3/src/client/src/model/SerInstanceId.js create mode 100644 examples/demo3/src/client/src/model/SerName.js create mode 100644 examples/demo3/src/client/src/model/ServiceAvailabilityNotification.js create mode 100644 examples/demo3/src/client/src/model/ServiceAvailabilityNotificationChangeType.js create mode 100644 examples/demo3/src/client/src/model/ServiceAvailabilityNotificationServiceReferences.js create mode 100644 examples/demo3/src/client/src/model/ServiceState.js create mode 100644 examples/demo3/src/client/src/model/ServiceState1.js create mode 100644 examples/demo3/src/client/src/model/Subscription.js create mode 100644 examples/demo3/src/client/src/model/TimeStamp.js create mode 100644 examples/demo3/src/client/test/model/AdjacentAppInfoNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/AdjacentAppInfoNotificationAdjacentAppInfo.spec.js create mode 100644 examples/demo3/src/client/test/model/AppTerminationNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/AppTerminationNotificationLinks.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationContextState.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstance.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstanceAmsLinkListSubscription.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstanceAppTerminationSubscription.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstanceDiscoveredServices.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstanceOfferedService.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstanceSerAvailabilitySubscription.spec.js create mode 100644 examples/demo3/src/client/test/model/ApplicationInstanceSubscriptions.spec.js create mode 100644 examples/demo3/src/client/test/model/AssociateId.spec.js create mode 100644 examples/demo3/src/client/test/model/AssociateIdType.spec.js create mode 100644 examples/demo3/src/client/test/model/CommunicationInterface.spec.js create mode 100644 examples/demo3/src/client/test/model/CommunicationInterfaceIpAddresses.spec.js create mode 100644 examples/demo3/src/client/test/model/ExpiryNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/InlineNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/Link.spec.js create mode 100644 examples/demo3/src/client/test/model/LinkType.spec.js create mode 100644 examples/demo3/src/client/test/model/LinkType1.spec.js create mode 100644 examples/demo3/src/client/test/model/LinkType2.spec.js create mode 100644 examples/demo3/src/client/test/model/LinkTypeConfirmTermination.spec.js create mode 100644 examples/demo3/src/client/test/model/LocalityType.spec.js create mode 100644 examples/demo3/src/client/test/model/MobilityProcedureNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/MobilityProcedureNotificationTargetAppInfo.spec.js create mode 100644 examples/demo3/src/client/test/model/MobilityStatus.spec.js create mode 100644 examples/demo3/src/client/test/model/OneOfInlineNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/OperationActionType.spec.js create mode 100644 examples/demo3/src/client/test/model/ProblemDetails.spec.js create mode 100644 examples/demo3/src/client/test/model/SerInstanceId.spec.js create mode 100644 examples/demo3/src/client/test/model/SerName.spec.js create mode 100644 examples/demo3/src/client/test/model/ServiceAvailabilityNotification.spec.js create mode 100644 examples/demo3/src/client/test/model/ServiceAvailabilityNotificationChangeType.spec.js create mode 100644 examples/demo3/src/client/test/model/ServiceAvailabilityNotificationServiceReferences.spec.js create mode 100644 examples/demo3/src/client/test/model/ServiceState.spec.js create mode 100644 examples/demo3/src/client/test/model/ServiceState1.spec.js create mode 100644 examples/demo3/src/client/test/model/Subscription.spec.js create mode 100644 examples/demo3/src/client/test/model/TimeStamp.spec.js rename go-apps/meep-ams/server/{model_type.go => model_associate_id_type.go} (59%) rename go-apps/meep-ams/server/{model_body_1.go => model_inline_notification.go} (73%) rename go-apps/meep-ams/server/{model_body.go => model_inline_subscription.go} (74%) rename go-apps/meep-ams/server/{model_mobility_procedure_notification__links.go => model_link.go} (75%) create mode 100644 go-apps/meep-ams/server/model_one_of_inline_notification.go rename go-apps/meep-ams/server/{model_one_ofbody.go => model_one_of_inline_subscription.go} (75%) delete mode 100644 go-apps/meep-ams/server/model_one_ofbody_1.go delete mode 100644 go-apps/meep-ams/server/model_one_ofbody_2.go rename go-apps/meep-app-enablement/server/app-support/{model_app_termination_notification__links.go => model_app_termination_notification_links.go} (81%) create mode 100644 go-apps/meep-app-enablement/server/app-support/model_destination_interface_interface_type.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_dns_rule_ip_address_type.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_dns_rule_state.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_link_type_confirm_termination.go rename go-apps/meep-app-enablement/server/app-support/{model_app_termination_notification_subscription__links.go => model_self.go} (81%) create mode 100644 go-apps/meep-app-enablement/server/app-support/model_time_source_status.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_timing_caps_ntp_servers_authentication_option.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_timing_caps_ntp_servers_ntp_server_addr_type.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_traffic_rule_action.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_traffic_rule_filter_type.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_traffic_rule_state.go create mode 100644 go-apps/meep-app-enablement/server/app-support/model_tunnel_info_tunnel_type.go rename go-apps/meep-app-enablement/server/service-mgmt/{model_service_info_links.go => model_service_info__links.go} (82%) create mode 100644 go-apps/meep-metrics-engine/server/v2/model_dataflow_metric.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_dataflow_metric_list.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_dataflow_metrics.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_dataflow_query_params.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_seq_metric.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_seq_metric_list.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_seq_metrics.go create mode 100644 go-apps/meep-metrics-engine/server/v2/model_seq_query_params.go delete mode 100644 go-apps/meep-vis/README.md rename go-apps/meep-vis/server/{model_body.go => model_one_ofsubscriptions_body.go} (82%) create mode 100644 go-apps/meep-vis/server/model_one_ofsubscriptions_subscription_id_body.go create mode 100644 go-apps/meep-vis/server/model_pc5_provisioning_info_pro_info_pc5.go rename go-apps/meep-vis/server/{model_one_ofbody_1.go => model_subscription_link_list_links_subscriptions.go} (66%) rename go-apps/meep-vis/server/{model_body_1.go => model_subscriptions_body.go} (82%) create mode 100644 go-apps/meep-vis/server/model_subscriptions_subscription_id_body.go rename go-apps/meep-vis/server/{model_one_ofbody.go => model_uu_mbms_provisioning_info_pro_info_uu_mbms.go} (65%) create mode 100644 go-apps/meep-vis/server/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go delete mode 100644 go-packages/meep-ams-client/docs/AppMobSerApi.md rename go-packages/meep-ams-client/docs/{Body.md => AssociateIdType.md} (93%) create mode 100644 go-packages/meep-ams-client/docs/InlineNotification.md create mode 100644 go-packages/meep-ams-client/docs/InlineSubscription.md rename go-packages/meep-ams-client/docs/{MobilityProcedureNotificationLinks.md => Link.md} (90%) delete mode 100644 go-packages/meep-ams-client/docs/LocationApi.md delete mode 100644 go-packages/meep-ams-client/docs/NotificationsApi.md create mode 100644 go-packages/meep-ams-client/docs/OneOfInlineNotification.md create mode 100644 go-packages/meep-ams-client/docs/OneOfInlineSubscription.md delete mode 100644 go-packages/meep-ams-client/docs/OneOfbody.md delete mode 100644 go-packages/meep-ams-client/docs/OneOfbody1.md delete mode 100644 go-packages/meep-ams-client/docs/OneOfbody2.md delete mode 100644 go-packages/meep-ams-client/docs/SubscriptionsApi.md create mode 100644 go-packages/meep-ams-client/model_associate_id_type.go rename go-apps/meep-ams/server/model_body_2.go => go-packages/meep-ams-client/model_inline_notification.go (71%) rename go-packages/meep-ams-client/{model_InlineSubscription.go => model_inline_subscription.go} (87%) create mode 100644 go-packages/meep-ams-client/model_link.go delete mode 100644 go-packages/meep-ams-client/model_mobility_procedure_notification__links.go create mode 100644 go-packages/meep-ams-client/model_one_of_inline_notification.go create mode 100644 go-packages/meep-ams-client/model_one_of_inline_subscription.go create mode 100644 go-packages/meep-ams-client/model_test_notification.go create mode 100644 go-packages/meep-ams-client/model_test_notification__links.go delete mode 100644 go-packages/meep-ams-client/model_type.go create mode 100644 go-packages/meep-app-support-client/docs/DestinationInterfaceInterfaceType.md create mode 100644 go-packages/meep-app-support-client/docs/DnsRuleIpAddressType.md rename go-packages/{meep-ams-client/docs/ModelType.md => meep-app-support-client/docs/DnsRuleState.md} (94%) create mode 100644 go-packages/meep-app-support-client/docs/LinkTypeConfirmTermination.md rename go-packages/meep-app-support-client/docs/{MecAppSuptApiSubscriptionLinkListLinksSubscriptions.md => MecAppSuptApiSubscriptionLinkListSubscription.md} (56%) rename go-packages/meep-app-support-client/docs/{AppTerminationNotificationSubscriptionLinks.md => Self.md} (88%) rename go-packages/{meep-ams-client/docs/Body1.md => meep-app-support-client/docs/TimeSourceStatus.md} (93%) create mode 100644 go-packages/meep-app-support-client/docs/TimingCapsNtpServersAuthenticationOption.md create mode 100644 go-packages/meep-app-support-client/docs/TimingCapsNtpServersNtpServerAddrType.md create mode 100644 go-packages/meep-app-support-client/docs/TrafficRuleAction.md create mode 100644 go-packages/meep-app-support-client/docs/TrafficRuleFilterType.md rename go-packages/{meep-ams-client/docs/Body2.md => meep-app-support-client/docs/TrafficRuleState.md} (93%) create mode 100644 go-packages/meep-app-support-client/docs/TunnelInfoTunnelType.md rename go-packages/meep-app-support-client/{model_app_termination_notification__links.go => model_app_termination_notification_links.go} (77%) create mode 100644 go-packages/meep-app-support-client/model_destination_interface_interface_type.go create mode 100644 go-packages/meep-app-support-client/model_dns_rule_ip_address_type.go create mode 100644 go-packages/meep-app-support-client/model_dns_rule_state.go create mode 100644 go-packages/meep-app-support-client/model_link_type_confirm_termination.go rename go-packages/meep-app-support-client/{model_app_termination_notification_subscription__links.go => model_self.go} (81%) create mode 100644 go-packages/meep-app-support-client/model_time_source_status.go create mode 100644 go-packages/meep-app-support-client/model_timing_caps_ntp_servers_authentication_option.go create mode 100644 go-packages/meep-app-support-client/model_timing_caps_ntp_servers_ntp_server_addr_type.go create mode 100644 go-packages/meep-app-support-client/model_traffic_rule_action.go create mode 100644 go-packages/meep-app-support-client/model_traffic_rule_filter_type.go create mode 100644 go-packages/meep-app-support-client/model_traffic_rule_state.go create mode 100644 go-packages/meep-app-support-client/model_tunnel_info_tunnel_type.go create mode 100644 go-packages/meep-data-model/docs/D2dConfig.md create mode 100644 go-packages/meep-data-model/model_d2d_config.go create mode 100644 go-packages/meep-platform-ctrl-client/docs/D2dConfig.md create mode 100644 go-packages/meep-platform-ctrl-client/model_d2d_config.go delete mode 100644 go-packages/meep-rnis-client/go.sum delete mode 100644 go-packages/meep-rnis-client/model_test_notification.go create mode 100644 go-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md create mode 100644 go-packages/meep-sandbox-ctrl-client/model_d2d_config.go create mode 100644 go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationChangeType.md rename go-packages/meep-service-mgmt-client/{model_service_info_links.go => model_service_info__links.go} (80%) delete mode 100644 go-packages/meep-vis-client/docs/Body.md delete mode 100644 go-packages/meep-vis-client/docs/Body1.md delete mode 100644 go-packages/meep-vis-client/docs/OneOfbody.md delete mode 100644 go-packages/meep-vis-client/docs/OneOfbody1.md create mode 100644 go-packages/meep-vis-client/docs/OneOfsubscriptionsBody.md create mode 100644 go-packages/meep-vis-client/docs/OneOfsubscriptionsSubscriptionIdBody.md create mode 100644 go-packages/meep-vis-client/docs/SubscriptionsBody.md create mode 100644 go-packages/meep-vis-client/docs/SubscriptionsSubscriptionIdBody.md rename go-packages/meep-vis-client/{model_body_1.go => model_one_ofsubscriptions_body.go} (82%) create mode 100644 go-packages/meep-vis-client/model_one_ofsubscriptions_subscription_id_body.go create mode 100644 go-packages/meep-vis-client/model_pc5_provisioning_info_pro_info_pc5.go rename go-packages/meep-vis-client/{model_one_ofbody.go => model_subscription_link_list_links_subscriptions.go} (66%) rename go-packages/meep-vis-client/{model_body.go => model_subscriptions_body.go} (82%) create mode 100644 go-packages/meep-vis-client/model_subscriptions_subscription_id_body.go rename go-packages/meep-vis-client/{model_one_ofbody_1.go => model_uu_mbms_provisioning_info_pro_info_uu_mbms.go} (65%) create mode 100644 go-packages/meep-vis-client/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go rename go-packages/meep-wais-client/{model_all_of_notification_event.go => all_of_notification_event.go} (93%) create mode 100644 js-apps/meep-frontend/src/js/containers/idc-dataflow.js create mode 100644 js-apps/meep-frontend/src/js/containers/idc-seq.js create mode 100644 js-apps/meep-frontend/src/js/state/exec/dataflow-reducer.js create mode 100644 js-apps/meep-frontend/src/js/state/exec/seq-reducer.js create mode 100644 js-apps/meep-frontend/src/js/util/dashboard-utils.js create mode 100644 js-packages/meep-gis-engine-client/docs/CoordinatePower.md create mode 100644 js-packages/meep-gis-engine-client/docs/CoordinatePowerList.md create mode 100644 js-packages/meep-gis-engine-client/docs/GeoCoordinate.md create mode 100644 js-packages/meep-gis-engine-client/docs/GeoCoordinateList.md create mode 100644 js-packages/meep-gis-engine-client/src/model/CoordinatePower.js create mode 100644 js-packages/meep-gis-engine-client/src/model/CoordinatePowerList.js create mode 100644 js-packages/meep-gis-engine-client/src/model/GeoCoordinate.js create mode 100644 js-packages/meep-gis-engine-client/src/model/GeoCoordinateList.js create mode 100644 js-packages/meep-gis-engine-client/test/model/CoordinatePower.spec.js create mode 100644 js-packages/meep-gis-engine-client/test/model/CoordinatePowerList.spec.js create mode 100644 js-packages/meep-gis-engine-client/test/model/GeoCoordinate.spec.js create mode 100644 js-packages/meep-gis-engine-client/test/model/GeoCoordinateList.spec.js create mode 100644 js-packages/meep-metrics-engine-client/docs/DataflowMetric.md create mode 100644 js-packages/meep-metrics-engine-client/docs/DataflowMetricList.md create mode 100644 js-packages/meep-metrics-engine-client/docs/DataflowMetrics.md create mode 100644 js-packages/meep-metrics-engine-client/docs/DataflowQueryParams.md create mode 100644 js-packages/meep-metrics-engine-client/docs/SeqMetric.md create mode 100644 js-packages/meep-metrics-engine-client/docs/SeqMetricList.md create mode 100644 js-packages/meep-metrics-engine-client/docs/SeqMetrics.md create mode 100644 js-packages/meep-metrics-engine-client/docs/SeqQueryParams.md create mode 100644 js-packages/meep-metrics-engine-client/src/model/DataflowMetric.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/DataflowMetricList.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/DataflowMetrics.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/DataflowQueryParams.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/SeqMetric.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/SeqMetricList.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/SeqMetrics.js create mode 100644 js-packages/meep-metrics-engine-client/src/model/SeqQueryParams.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/DataflowMetric.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/DataflowMetricList.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/DataflowMetrics.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/DataflowQueryParams.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/SeqMetric.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/SeqMetricList.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/SeqMetrics.spec.js create mode 100644 js-packages/meep-metrics-engine-client/test/model/SeqQueryParams.spec.js create mode 100644 js-packages/meep-platform-ctrl-client/docs/D2dConfig.md create mode 100644 js-packages/meep-platform-ctrl-client/src/model/D2dConfig.js create mode 100644 js-packages/meep-platform-ctrl-client/test/model/D2dConfig.spec.js create mode 100644 js-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md create mode 100644 js-packages/meep-sandbox-ctrl-client/src/model/D2dConfig.js create mode 100644 js-packages/meep-sandbox-ctrl-client/test/model/D2dConfig.spec.js mode change 100755 => 100644 scripts/K99advantedge mode change 100755 => 100644 scripts/build_all.sh diff --git a/.meepctl-repocfg.yaml b/.meepctl-repocfg.yaml index 544837131..65c547e4b 100644 --- a/.meepctl-repocfg.yaml +++ b/.meepctl-repocfg.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022 InterDigital Communications, Inc +# Copyright (c) 2022 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. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: 1.8.1 +version: 1.8.2 repo: name: AdvantEDGE @@ -38,7 +38,7 @@ repo: # platform ingress configuration ingress: # host name - host: mec-platform.etsi.org + host: my-platform-fqdn # enable https only (redirect http requests to https port) https-only: false # bind to host ports (true) or node ports (false) @@ -48,9 +48,9 @@ repo: # https config https-port: 443 # certificate authority (none|self-signed|lets-encrypt) default: none - ca: lets-encrypt + ca: self-signed # lets-encrypt production server (true) or staging server (false) - le-server-prod: true + le-server-prod: false # authentication & authorization config auth: @@ -73,7 +73,7 @@ repo: # access token url token-url: https://github.com/login/oauth/access_token # OAuth redirect URI - redirect-uri: https://mec-platform.etsi.org/auth/v1/authorize + redirect-uri: https://my-platform-fqdn/auth/v1/authorize # OAuth k8s secret (data: client-id, secret) secret: meep-oauth-github # GitLab OAuth provider config @@ -85,7 +85,7 @@ repo: # access token url token-url: https://gitlab.com/oauth/token # OAuth redirect URI - redirect-uri: https://mec-platform.etsi.org/auth/v1/authorize + redirect-uri: https://my-platform-fqdn/auth/v1/authorize # GitLab api url # api-url: https://gitlab.com # OAuth k8s secret (data: client-id, secret) @@ -450,6 +450,7 @@ repo: meep-mon-engine-api: js-packages/meep-mon-engine-client meep-gis-engine-api: js-packages/meep-gis-engine-client meep-auth-svc-client: js-packages/meep-auth-svc-client + meep-metrics-engine-api: js-packages/meep-metrics-engine-client #------------------------------ # Sandbox Subsystem @@ -889,7 +890,7 @@ repo: # enable meepctl dockerize -> deps are never dockerized dockerize: false # enable meepctl deploy/delete - deploy: true + deploy: false # location of deployment chart chart: charts/cert-manager # user supplied value file located @ .meep/user/values (use below file name) @@ -1214,6 +1215,16 @@ repo: src: go-packages/meep-users # supports linting lint: true + meep-vis-client: + # location of source code + src: go-packages/meep-vis-client + # supports linting + lint: false + meep-vis-traffic-mgr: + # location of source code + src: go-packages/meep-vis-traffic-mgr + # supports linting + lint: true meep-wais-client: # location of source code src: go-packages/meep-wais-client @@ -1229,11 +1240,6 @@ repo: src: go-packages/meep-websocket # supports linting lint: true - meep-vis-client: - # location of source code - src: go-packages/meep-vis-client - # supports linting - lint: false meep-dai-client: # location of source code src: go-packages/meep-dai-client @@ -1242,11 +1248,6 @@ repo: # Javascript Packages js-packages: - meep-app-support-client: - # location of source code - src: js-packages/meep-app-support-client - # supports linting - lint: false meep-auth-svc-client: # location of source code src: js-packages/meep-auth-svc-client @@ -1277,8 +1278,3 @@ repo: src: js-packages/meep-sandbox-ctrl-client # supports linting lint: false - meep-service-mgmt-client: - # location of source code - src: js-packages/meep-service-mgmt-client - # supports linting - lint: false diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..9631e83ca --- /dev/null +++ b/AUTHORS @@ -0,0 +1,14 @@ +# This is the list of AdvantEDGE's significant contributors per release. +# +# This does not necessarily list everyone who has contributed code, +# especially since many employees of one corporation may be contributing. +# To see the full list of contributors, see the revision history in +# source control. + +[v1.0.0 - v1.8.1] +InterDigital Communications Inc + +[v1.9.0] +InterDigital Communications Inc +xFlow Research (Pvt.) Inc. +FSCOM diff --git a/charts/meep-ams/templates/deployment.yaml b/charts/meep-ams/templates/deployment.yaml index 5e5292e3f..b8a3777fb 100644 --- a/charts/meep-ams/templates/deployment.yaml +++ b/charts/meep-ams/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-ams" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-ams.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} diff --git a/charts/meep-app-enablement/templates/codecov-pv.yaml b/charts/meep-app-enablement/templates/codecov-pv.yaml index 9dce19e1b..3595ef7b4 100644 --- a/charts/meep-app-enablement/templates/codecov-pv.yaml +++ b/charts/meep-app-enablement/templates/codecov-pv.yaml @@ -11,7 +11,7 @@ spec: - ReadWriteOnce persistentVolumeReclaimPolicy: Retain hostPath: - path: "/home/englab/.meep/codecov/meep-app-enablement" + path: {{ .Values.codecov.location }} --- kind: StorageClass diff --git a/charts/meep-app-enablement/templates/deployment.yaml b/charts/meep-app-enablement/templates/deployment.yaml index 6e1b1c500..72e00a103 100644 --- a/charts/meep-app-enablement/templates/deployment.yaml +++ b/charts/meep-app-enablement/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-app-enablement" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-app-enablement.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} diff --git a/charts/meep-auth-svc/templates/deployment.yaml b/charts/meep-auth-svc/templates/deployment.yaml index 6a17a800c..6051e741b 100644 --- a/charts/meep-auth-svc/templates/deployment.yaml +++ b/charts/meep-auth-svc/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-auth-svc" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-auth-svc.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} diff --git a/charts/meep-gis-engine/templates/deployment.yaml b/charts/meep-gis-engine/templates/deployment.yaml index 38ab0cfe1..ada865266 100644 --- a/charts/meep-gis-engine/templates/deployment.yaml +++ b/charts/meep-gis-engine/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-gis-engine" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-gis-engine.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -42,7 +38,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- if .Values.codecov.enabled}} volumeMounts: diff --git a/charts/meep-loc-serv/templates/deployment.yaml b/charts/meep-loc-serv/templates/deployment.yaml index df9d9df47..62d79fe28 100644 --- a/charts/meep-loc-serv/templates/deployment.yaml +++ b/charts/meep-loc-serv/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-loc-serv" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-loc-serv.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} diff --git a/charts/meep-metrics-engine/templates/deployment.yaml b/charts/meep-metrics-engine/templates/deployment.yaml index 9c7127800..ecd10599f 100644 --- a/charts/meep-metrics-engine/templates/deployment.yaml +++ b/charts/meep-metrics-engine/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-metrics-engine" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-metrics-engine.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -42,7 +38,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- if .Values.codecov.enabled}} volumeMounts: diff --git a/charts/meep-mg-manager/templates/deployment.yaml b/charts/meep-mg-manager/templates/deployment.yaml index 22629144f..a8fd94d90 100644 --- a/charts/meep-mg-manager/templates/deployment.yaml +++ b/charts/meep-mg-manager/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-mg-manager" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-mg-manager.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -42,7 +38,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- if .Values.codecov.enabled}} volumeMounts: diff --git a/charts/meep-mon-engine/templates/deployment.yaml b/charts/meep-mon-engine/templates/deployment.yaml index f7e192847..cf763264a 100644 --- a/charts/meep-mon-engine/templates/deployment.yaml +++ b/charts/meep-mon-engine/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-mon-engine" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-mon-engine.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -42,7 +38,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- range $key, $value := .Values.image.envSecret }} - name: {{ $key }} diff --git a/charts/meep-platform-ctrl/templates/deployment.yaml b/charts/meep-platform-ctrl/templates/deployment.yaml index 3d44f5571..85b6b88c9 100644 --- a/charts/meep-platform-ctrl/templates/deployment.yaml +++ b/charts/meep-platform-ctrl/templates/deployment.yaml @@ -36,10 +36,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-platform-ctrl" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-platform-ctrl.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -47,7 +43,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote}} {{- end }} {{- range $key, $value := .Values.image.envSecret }} - name: {{ $key }} diff --git a/charts/meep-rnis/templates/deployment.yaml b/charts/meep-rnis/templates/deployment.yaml index f5a3f0d68..b630428ee 100644 --- a/charts/meep-rnis/templates/deployment.yaml +++ b/charts/meep-rnis/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-rnis" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-rnis.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} diff --git a/charts/meep-sandbox-ctrl/templates/deployment.yaml b/charts/meep-sandbox-ctrl/templates/deployment.yaml index 242a4c55b..4d11c2225 100644 --- a/charts/meep-sandbox-ctrl/templates/deployment.yaml +++ b/charts/meep-sandbox-ctrl/templates/deployment.yaml @@ -31,10 +31,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-sandbox-ctrl" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-sandbox-ctrl.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -42,7 +38,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- if .Values.user.swagger.enabled}} - name: USER_SWAGGER diff --git a/charts/meep-tc-engine/templates/deployment.yaml b/charts/meep-tc-engine/templates/deployment.yaml index 625a3eeb4..679083eec 100644 --- a/charts/meep-tc-engine/templates/deployment.yaml +++ b/charts/meep-tc-engine/templates/deployment.yaml @@ -42,7 +42,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- if .Values.codecov.enabled}} volumeMounts: diff --git a/charts/meep-virt-engine/templates/deployment.yaml b/charts/meep-virt-engine/templates/deployment.yaml index 7e98c5e0b..34eb0862e 100644 --- a/charts/meep-virt-engine/templates/deployment.yaml +++ b/charts/meep-virt-engine/templates/deployment.yaml @@ -41,10 +41,6 @@ spec: containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - {{- if .Values.codecov.enabled}} - command: [ "/meep-virt-engine" ] - args: [ "-test.coverprofile=/codecov/codecov-meep-virt-engine.out", "__DEVEL--code-cov" ] - {{- end}} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: {{ .Values.deployment.port }} @@ -52,7 +48,7 @@ spec: env: {{- range $key, $value := .Values.image.env }} - name: {{ $key }} - value: {{ $value }} + value: {{ $value | quote }} {{- end }} {{- range $key, $value := .Values.image.envSecret }} - name: {{ $key }} diff --git a/charts/meep-vis/values-template.yaml b/charts/meep-vis/values-template.yaml index 9ade544cc..1e5663fa3 100644 --- a/charts/meep-vis/values-template.yaml +++ b/charts/meep-vis/values-template.yaml @@ -30,6 +30,7 @@ image: {{- else if eq .AppEnablement "global" }} MEEP_APP_ENABLEMENT: meep-app-enablement {{- end }} + MEEP_PREDICT_MODEL_SUPPORTED: "" {{- range .Env}} {{.}} {{- end}} diff --git a/config/long-term-storage-repocfg.yaml b/config/long-term-storage-repocfg.yaml index 572a35f3b..b0b697dd3 100644 --- a/config/long-term-storage-repocfg.yaml +++ b/config/long-term-storage-repocfg.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. @@ -11,8 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -version: 1.8.1 +version: 1.8.2 repo: name: AdvantEDGE @@ -1221,6 +1220,16 @@ repo: src: go-packages/meep-users # supports linting lint: true + meep-vis-client: + # location of source code + src: go-packages/meep-vis-client + # supports linting + lint: false + meep-vis-traffic-mgr: + # location of source code + src: go-packages/meep-vis-traffic-mgr + # supports linting + lint: true meep-wais-client: # location of source code src: go-packages/meep-wais-client @@ -1236,11 +1245,6 @@ repo: src: go-packages/meep-websocket # supports linting lint: true - meep-vis-client: - # location of source code - src: go-packages/meep-vis-client - # supports linting - lint: false # Javascript Packages js-packages: diff --git a/config/permissions-open.yaml b/config/permissions-open.yaml index 555b2e81c..e1b2910c8 100644 --- a/config/permissions-open.yaml +++ b/config/permissions-open.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 InterDigital Communications, Inc +# Copyright (c) 2022 InterDigital Communications, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/permissions-secure.yaml b/config/permissions-secure.yaml index 553e59392..661f68f7c 100644 --- a/config/permissions-secure.yaml +++ b/config/permissions-secure.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 InterDigital Communications, Inc +# Copyright (c) 2022 InterDigital Communications, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docs/api-rnis/.openapi-generator/FILES b/docs/api-rnis/.openapi-generator/FILES index 0dec0038a..e8b3fc86a 100644 --- a/docs/api-rnis/.openapi-generator/FILES +++ b/docs/api-rnis/.openapi-generator/FILES @@ -6,11 +6,13 @@ Models/AppTerminationNotificationLinks.md Models/AssociateId.md Models/CaReconfNotification.md Models/CaReconfNotificationCarrierAggregationMeasInfo.md +Models/CaReconfNotificationLinks.md Models/CaReconfNotificationSecondaryCellAdd.md Models/CaReconfSubscription.md Models/CaReconfSubscriptionFilterCriteriaAssoc.md Models/CaReconfSubscriptionLinks.md Models/CellChangeNotification.md +Models/CellChangeNotificationLinks.md Models/CellChangeNotificationTempUeId.md Models/CellChangeSubscription.md Models/CellChangeSubscriptionFilterCriteriaAssocHo.md @@ -38,7 +40,6 @@ Models/MeasRepUeSubscription.md Models/MeasRepUeSubscriptionFilterCriteriaAssocTri.md Models/MeasTaNotification.md Models/MeasTaSubscription.md -Models/NRcgi.md Models/NrMeasRepUeNotification.md Models/NrMeasRepUeNotificationEutraNeighCellMeasInfo.md Models/NrMeasRepUeNotificationNCell.md @@ -47,6 +48,7 @@ Models/NrMeasRepUeNotificationSCell.md Models/NrMeasRepUeNotificationServCellMeasInfo.md Models/NrMeasRepUeSubscription.md Models/NrMeasRepUeSubscriptionFilterCriteriaNrMrs.md +Models/Nrcgi.md Models/OperationActionType.md Models/Plmn.md Models/PlmnInfo.md @@ -88,7 +90,9 @@ Models/S1BearerSubscriptionS1BearerSubscriptionCriteria.md Models/SubscriptionLinkList.md Models/SubscriptionLinkListLinks.md Models/SubscriptionLinkListLinksSubscription.md +Models/TestNotification.md Models/TimeStamp.md Models/Trigger.md Models/TriggerNr.md +Models/WebsockNotifConfig.md README.md diff --git a/docs/api-rnis/Models/CaReconfNotification.md b/docs/api-rnis/Models/CaReconfNotification.md index 3a24fa334..9d4607369 100644 --- a/docs/api-rnis/Models/CaReconfNotification.md +++ b/docs/api-rnis/Models/CaReconfNotification.md @@ -10,6 +10,7 @@ Name | Type | Description | Notes **secondaryCellAdd** | [**List**](CaReconfNotification_secondaryCellAdd.md) | | [optional] [default to null] **secondaryCellRemove** | [**List**](CaReconfNotification_secondaryCellAdd.md) | | [optional] [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**\_links** | [**CaReconfNotification__links**](CaReconfNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/CaReconfNotificationLinks.md b/docs/api-rnis/Models/CaReconfNotificationLinks.md new file mode 100644 index 000000000..9a55760c7 --- /dev/null +++ b/docs/api-rnis/Models/CaReconfNotificationLinks.md @@ -0,0 +1,9 @@ +# CaReconfNotificationLinks +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**subscription** | [**LinkType**](LinkType.md) | | [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/docs/api-rnis/Models/CaReconfSubscription.md b/docs/api-rnis/Models/CaReconfSubscription.md index a6440bd7f..8c7013d1c 100644 --- a/docs/api-rnis/Models/CaReconfSubscription.md +++ b/docs/api-rnis/Models/CaReconfSubscription.md @@ -4,7 +4,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **filterCriteriaAssoc** | [**CaReconfSubscription_filterCriteriaAssoc**](CaReconfSubscription_filterCriteriaAssoc.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"CaReconfSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/CellChangeNotification.md b/docs/api-rnis/Models/CellChangeNotification.md index bf922fd9f..8fc6e2305 100644 --- a/docs/api-rnis/Models/CellChangeNotification.md +++ b/docs/api-rnis/Models/CellChangeNotification.md @@ -9,7 +9,8 @@ Name | Type | Description | Notes **srcEcgi** | [**Ecgi**](Ecgi.md) | | [default to null] **tempUeId** | [**CellChangeNotification_tempUeId**](CellChangeNotification_tempUeId.md) | | [optional] [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] -**trgEcgi** | [**List**](Ecgi.md) | E-UTRAN Cell Global Identifier of the target cell. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. | [default to null] +**trgEcgi** | [**List**](Ecgi.md) | E-UTRAN Cell Global Identifier of the target cell. See note. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. | [default to null] +**\_links** | [**CellChangeNotification__links**](CellChangeNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/CellChangeNotificationLinks.md b/docs/api-rnis/Models/CellChangeNotificationLinks.md new file mode 100644 index 000000000..2d5df4732 --- /dev/null +++ b/docs/api-rnis/Models/CellChangeNotificationLinks.md @@ -0,0 +1,9 @@ +# CellChangeNotificationLinks +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**subscription** | [**LinkType**](LinkType.md) | | [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/docs/api-rnis/Models/CellChangeSubscription.md b/docs/api-rnis/Models/CellChangeSubscription.md index 2e5202a48..eda7f4e3e 100644 --- a/docs/api-rnis/Models/CellChangeSubscription.md +++ b/docs/api-rnis/Models/CellChangeSubscription.md @@ -4,8 +4,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumerto receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **filterCriteriaAssocHo** | [**CellChangeSubscription_filterCriteriaAssocHo**](CellChangeSubscription_filterCriteriaAssocHo.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"CellChangeSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/ExpiryNotification.md b/docs/api-rnis/Models/ExpiryNotification.md index 128552397..56759122b 100644 --- a/docs/api-rnis/Models/ExpiryNotification.md +++ b/docs/api-rnis/Models/ExpiryNotification.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes **\_links** | [**ExpiryNotification__links**](ExpiryNotification__links.md) | | [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**notificationType** | [**String**](string.md) | Shall be set to \"ExpiryNotification\" | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/ExpiryNotificationLinks.md b/docs/api-rnis/Models/ExpiryNotificationLinks.md index 95ba6c423..38d350de3 100644 --- a/docs/api-rnis/Models/ExpiryNotificationLinks.md +++ b/docs/api-rnis/Models/ExpiryNotificationLinks.md @@ -3,7 +3,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**self** | [**URI**](URI.md) | Self referring URI. This shall be included in the response from the RNIS. The URI shall be unique within the RNI API as it acts as an ID for the subscription. | [default to null] +**subscription** | [**LinkType**](LinkType.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/InlineNotification.md b/docs/api-rnis/Models/InlineNotification.md index 2ab949184..f021da110 100644 --- a/docs/api-rnis/Models/InlineNotification.md +++ b/docs/api-rnis/Models/InlineNotification.md @@ -9,7 +9,8 @@ Name | Type | Description | Notes **srcEcgi** | [**Ecgi**](Ecgi.md) | | [default to null] **tempUeId** | [**RabEstNotification_tempUeId**](RabEstNotification_tempUeId.md) | | [optional] [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] -**trgEcgi** | [**List**](Ecgi.md) | E-UTRAN Cell Global Identifier of the target cell. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. | [default to null] +**trgEcgi** | [**List**](Ecgi.md) | E-UTRAN Cell Global Identifier of the target cell. See note. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. | [default to null] +**\_links** | [**CaReconfNotification__links**](CaReconfNotification__links.md) | | [default to null] **ecgi** | [**Ecgi**](Ecgi.md) | | [default to null] **erabId** | [**Integer**](integer.md) | The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. | [default to null] **erabQosParameters** | [**RabModNotification_erabQosParameters**](RabModNotification_erabQosParameters.md) | | [optional] [default to null] diff --git a/docs/api-rnis/Models/InlineSubscription.md b/docs/api-rnis/Models/InlineSubscription.md index c2847738d..5cab5ee7c 100644 --- a/docs/api-rnis/Models/InlineSubscription.md +++ b/docs/api-rnis/Models/InlineSubscription.md @@ -4,8 +4,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **filterCriteriaAssocHo** | [**CellChangeSubscription_filterCriteriaAssocHo**](CellChangeSubscription_filterCriteriaAssocHo.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"S1BearerSubscription\". | [default to null] **filterCriteriaQci** | [**RabModSubscription_filterCriteriaQci**](RabModSubscription_filterCriteriaQci.md) | | [default to null] diff --git a/docs/api-rnis/Models/MeasRepUeNotification.md b/docs/api-rnis/Models/MeasRepUeNotification.md index d2831848c..b1b428a17 100644 --- a/docs/api-rnis/Models/MeasRepUeNotification.md +++ b/docs/api-rnis/Models/MeasRepUeNotification.md @@ -18,6 +18,7 @@ Name | Type | Description | Notes **sinr** | [**Integer**](integer.md) | Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS 136 133 [i.16]. | [optional] [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **trigger** | [**Trigger**](Trigger.md) | | [default to null] +**\_links** | [**CellChangeNotification__links**](CellChangeNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/MeasRepUeSubscription.md b/docs/api-rnis/Models/MeasRepUeSubscription.md index 519d1b633..03328138f 100644 --- a/docs/api-rnis/Models/MeasRepUeSubscription.md +++ b/docs/api-rnis/Models/MeasRepUeSubscription.md @@ -4,7 +4,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **filterCriteriaAssocTri** | [**MeasRepUeSubscription_filterCriteriaAssocTri**](MeasRepUeSubscription_filterCriteriaAssocTri.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"MeasRepUeSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/MeasTaNotification.md b/docs/api-rnis/Models/MeasTaNotification.md index e17fba36e..b130b3392 100644 --- a/docs/api-rnis/Models/MeasTaNotification.md +++ b/docs/api-rnis/Models/MeasTaNotification.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **notificationType** | [**String**](string.md) | Shall be set to \"MeasTaNotification\". | [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **timingAdvance** | [**Integer**](integer.md) | The timing advance as defined in ETSI TS 136 214 [i.5]. | [default to null] +**\_links** | [**CellChangeNotification__links**](CellChangeNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/MeasTaSubscription.md b/docs/api-rnis/Models/MeasTaSubscription.md index f4b4af989..2fba0623a 100644 --- a/docs/api-rnis/Models/MeasTaSubscription.md +++ b/docs/api-rnis/Models/MeasTaSubscription.md @@ -4,7 +4,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **filterCriteriaAssoc** | [**CaReconfSubscription_filterCriteriaAssoc**](CaReconfSubscription_filterCriteriaAssoc.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"MeasTaSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/NRcgi.md b/docs/api-rnis/Models/NRcgi.md index 3fa422efb..90ede0c67 100644 --- a/docs/api-rnis/Models/NRcgi.md +++ b/docs/api-rnis/Models/NRcgi.md @@ -1,4 +1,4 @@ -# NRcgi +# Nrcgi ## Properties Name | Type | Description | Notes diff --git a/docs/api-rnis/Models/NrMeasRepUeNotification.md b/docs/api-rnis/Models/NrMeasRepUeNotification.md index e82350746..241b4e857 100644 --- a/docs/api-rnis/Models/NrMeasRepUeNotification.md +++ b/docs/api-rnis/Models/NrMeasRepUeNotification.md @@ -10,6 +10,7 @@ Name | Type | Description | Notes **servCellMeasInfo** | [**List**](NrMeasRepUeNotification_servCellMeasInfo.md) | This parameter can be repeated to contain information of all the serving cells up to N. | [optional] [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **triggerNr** | [**TriggerNr**](TriggerNr.md) | | [default to null] +**\_links** | [**CaReconfNotification__links**](CaReconfNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/NrMeasRepUeNotificationNrNeighCellMeasInfo.md b/docs/api-rnis/Models/NrMeasRepUeNotificationNrNeighCellMeasInfo.md index 9f41db57f..1aa0c2ae7 100644 --- a/docs/api-rnis/Models/NrMeasRepUeNotificationNrNeighCellMeasInfo.md +++ b/docs/api-rnis/Models/NrMeasRepUeNotificationNrNeighCellMeasInfo.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **measQuantityResultsCsiRsCell** | [**MeasQuantityResultsNr**](MeasQuantityResultsNr.md) | | [optional] [default to null] **measQuantityResultsSsbCell** | [**MeasQuantityResultsNr**](MeasQuantityResultsNr.md) | | [optional] [default to null] -**nrcgi** | [**String**](string.md) | String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. | [optional] [default to null] +**nrcgi** | [**Nrcgi**](Nrcgi.md) | | [optional] [default to null] **rsIndexResults** | [**RsIndexResults**](RsIndexResults.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/NrMeasRepUeNotificationServCellMeasInfo.md b/docs/api-rnis/Models/NrMeasRepUeNotificationServCellMeasInfo.md index 411f5dc3f..c66ecd52b 100644 --- a/docs/api-rnis/Models/NrMeasRepUeNotificationServCellMeasInfo.md +++ b/docs/api-rnis/Models/NrMeasRepUeNotificationServCellMeasInfo.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **nCell** | [**NrMeasRepUeNotification_nCell**](NrMeasRepUeNotification_nCell.md) | | [optional] [default to null] -**nrcgi** | [**NRcgi**](NRcgi.md) | | [optional] [default to null] +**nrcgi** | [**Nrcgi**](Nrcgi.md) | | [optional] [default to null] **sCell** | [**NrMeasRepUeNotification_sCell**](NrMeasRepUeNotification_sCell.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/NrMeasRepUeSubscription.md b/docs/api-rnis/Models/NrMeasRepUeSubscription.md index cb1f7323a..25b38a504 100644 --- a/docs/api-rnis/Models/NrMeasRepUeSubscription.md +++ b/docs/api-rnis/Models/NrMeasRepUeSubscription.md @@ -4,7 +4,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **filterCriteriaNrMrs** | [**NrMeasRepUeSubscription_filterCriteriaNrMrs**](NrMeasRepUeSubscription_filterCriteriaNrMrs.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"NrMeasRepUeSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/NrMeasRepUeSubscriptionFilterCriteriaNrMrs.md b/docs/api-rnis/Models/NrMeasRepUeSubscriptionFilterCriteriaNrMrs.md index 4cc7005f3..087e250c2 100644 --- a/docs/api-rnis/Models/NrMeasRepUeSubscriptionFilterCriteriaNrMrs.md +++ b/docs/api-rnis/Models/NrMeasRepUeSubscriptionFilterCriteriaNrMrs.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **appInstanceId** | [**String**](string.md) | Unique identifier for the MEC application instance. | [optional] [default to null] **associateId** | [**List**](AssociateId.md) | 0 to N identifiers to associate the information for a specific UE or flow. | [optional] [default to null] -**nrcgi** | [**List**](NRcgi.md) | NR Cell Global Identier. | [optional] [default to null] +**nrcgi** | [**List**](Nrcgi.md) | NR Cell Global Identier. | [optional] [default to null] **triggerNr** | [**List**](TriggerNr.md) | Corresponds to a specific 5G UE Measurement Report trigger. | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/ProblemDetails.md b/docs/api-rnis/Models/ProblemDetails.md index 840b6dc7f..e0529489b 100644 --- a/docs/api-rnis/Models/ProblemDetails.md +++ b/docs/api-rnis/Models/ProblemDetails.md @@ -3,9 +3,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**detail** | [**String**](string.md) | A human-readable explanation specific to this occurrence of the problem | [optional] [default to null] +**detail** | [**String**](string.md) | A human-readable explanation specific to this occurrence of the problem | [default to null] **instance** | [**URI**](URI.md) | A URI reference that identifies the specific occurrence of the problem | [optional] [default to null] -**status** | [**Integer**](integer.md) | The HTTP status code for this occurrence of the problem | [optional] [default to null] +**status** | [**Integer**](integer.md) | The HTTP status code for this occurrence of the problem | [default to null] **title** | [**String**](string.md) | A short, human-readable summary of the problem type | [optional] [default to null] **type** | [**URI**](URI.md) | A URI reference according to IETF RFC 3986 that identifies the problem type | [optional] [default to null] diff --git a/docs/api-rnis/Models/RabEstNotification.md b/docs/api-rnis/Models/RabEstNotification.md index 4b708fa61..ab48ffac3 100644 --- a/docs/api-rnis/Models/RabEstNotification.md +++ b/docs/api-rnis/Models/RabEstNotification.md @@ -9,6 +9,7 @@ Name | Type | Description | Notes **erabQosParameters** | [**RabEstNotification_erabQosParameters**](RabEstNotification_erabQosParameters.md) | | [optional] [default to null] **notificationType** | [**String**](string.md) | Shall be set to \"RabEstNotification\". | [default to null] **tempUeId** | [**RabEstNotification_tempUeId**](RabEstNotification_tempUeId.md) | | [optional] [default to null] +**\_links** | [**CellChangeNotification__links**](CellChangeNotification__links.md) | | [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/RabEstSubscription.md b/docs/api-rnis/Models/RabEstSubscription.md index 7afcfe7c4..a0822fb86 100644 --- a/docs/api-rnis/Models/RabEstSubscription.md +++ b/docs/api-rnis/Models/RabEstSubscription.md @@ -4,8 +4,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **filterCriteriaQci** | [**RabEstSubscription_filterCriteriaQci**](RabEstSubscription_filterCriteriaQci.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"RabEstSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/RabModNotification.md b/docs/api-rnis/Models/RabModNotification.md index 63e7e5969..c29e00f40 100644 --- a/docs/api-rnis/Models/RabModNotification.md +++ b/docs/api-rnis/Models/RabModNotification.md @@ -9,6 +9,7 @@ Name | Type | Description | Notes **erabQosParameters** | [**RabModNotification_erabQosParameters**](RabModNotification_erabQosParameters.md) | | [optional] [default to null] **notificationType** | [**String**](string.md) | Shall be set to \"RabModNotification\". | [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**\_links** | [**CellChangeNotification__links**](CellChangeNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/RabModSubscription.md b/docs/api-rnis/Models/RabModSubscription.md index ac1b3c444..eeefb4e67 100644 --- a/docs/api-rnis/Models/RabModSubscription.md +++ b/docs/api-rnis/Models/RabModSubscription.md @@ -4,7 +4,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **filterCriteriaQci** | [**RabModSubscription_filterCriteriaQci**](RabModSubscription_filterCriteriaQci.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"RabModSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/RabRelNotification.md b/docs/api-rnis/Models/RabRelNotification.md index 7b75e4e83..ebc56e653 100644 --- a/docs/api-rnis/Models/RabRelNotification.md +++ b/docs/api-rnis/Models/RabRelNotification.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **erabReleaseInfo** | [**RabRelNotification_erabReleaseInfo**](RabRelNotification_erabReleaseInfo.md) | | [default to null] **notificationType** | [**String**](string.md) | Shall be set to \"RabRelNotification\". | [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**\_links** | [**CellChangeNotification__links**](CellChangeNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/RabRelSubscription.md b/docs/api-rnis/Models/RabRelSubscription.md index a394657a0..76ffa4f6c 100644 --- a/docs/api-rnis/Models/RabRelSubscription.md +++ b/docs/api-rnis/Models/RabRelSubscription.md @@ -4,7 +4,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **filterCriteriaQci** | [**RabModSubscription_filterCriteriaQci**](RabModSubscription_filterCriteriaQci.md) | | [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"RabRelSubscription\". | [default to null] diff --git a/docs/api-rnis/Models/S1BearerNotification.md b/docs/api-rnis/Models/S1BearerNotification.md index b73cd2c22..373cd23f4 100644 --- a/docs/api-rnis/Models/S1BearerNotification.md +++ b/docs/api-rnis/Models/S1BearerNotification.md @@ -7,6 +7,7 @@ Name | Type | Description | Notes **s1Event** | [**Integer**](integer.md) | The subscribed event that triggered this notification in S1BearerSubscription. | [default to null] **s1UeInfo** | [**S1BearerNotification_s1UeInfo**](S1BearerNotification_s1UeInfo.md) | | [default to null] **timeStamp** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] +**\_links** | [**CaReconfNotification__links**](CaReconfNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/S1BearerSubscription.md b/docs/api-rnis/Models/S1BearerSubscription.md index adc6c7412..b534b7a09 100644 --- a/docs/api-rnis/Models/S1BearerSubscription.md +++ b/docs/api-rnis/Models/S1BearerSubscription.md @@ -5,7 +5,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **S1BearerSubscriptionCriteria** | [**S1BearerSubscription_S1BearerSubscriptionCriteria**](S1BearerSubscription_S1BearerSubscriptionCriteria.md) | | [default to null] **\_links** | [**CaReconfSubscription__links**](CaReconfSubscription__links.md) | | [optional] [default to null] -**callbackReference** | [**URI**](URI.md) | URI selected by the service consumer, to receive notifications on the subscribed RNIS information. This shall be included in the request and response. | [default to null] +**callbackReference** | [**URI**](URI.md) | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**websockNotifConfig** | [**WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] +**requestTestNotification** | [**Boolean**](boolean.md) | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **eventType** | [**List**](integer.md) | Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: <p>0 = RESERVED. <p>1 = S1_BEARER_ESTABLISH. <p>2 = S1_BEARER_MODIFY. <p>3 = S1_BEARER_RELEASE. | [default to null] **expiryDeadline** | [**TimeStamp**](TimeStamp.md) | | [optional] [default to null] **subscriptionType** | [**String**](string.md) | Shall be set to \"S1BearerSubscription\". | [default to null] diff --git a/go-packages/meep-rnis-client/docs/TestNotification.md b/docs/api-rnis/Models/TestNotification.md similarity index 56% rename from go-packages/meep-rnis-client/docs/TestNotification.md rename to docs/api-rnis/Models/TestNotification.md index ff204dd4f..60573ced1 100644 --- a/go-packages/meep-rnis-client/docs/TestNotification.md +++ b/docs/api-rnis/Models/TestNotification.md @@ -1,10 +1,10 @@ # TestNotification - ## Properties + Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**NotificationType** | **string** | Shall be set to \"RabEstNotification\". | [default to null] -**Links** | [***CaReconfNotificationLinks**](CaReconfNotification__links.md) | | [default to null] +**notificationType** | [**String**](string.md) | Shall be set to \"RabEstNotification\". | [default to null] +**\_links** | [**CaReconfNotification__links**](CaReconfNotification__links.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/api-rnis/Models/WebsockNotifConfig.md b/docs/api-rnis/Models/WebsockNotifConfig.md new file mode 100644 index 000000000..1c1432453 --- /dev/null +++ b/docs/api-rnis/Models/WebsockNotifConfig.md @@ -0,0 +1,10 @@ +# WebsockNotifConfig +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**websocketUri** | [**URI**](URI.md) | Set by RNIS to indicate to the service consumer the Websocket URI to be used for delivering notifications. | [optional] [default to null] +**requestWebsocketUri** | [**Boolean**](boolean.md) | Set to true by the service consumer to indicate that Websocket delivery is requested. | [optional] [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/docs/api-rnis/README.md b/docs/api-rnis/README.md index 0275ff567..91950da22 100644 --- a/docs/api-rnis/README.md +++ b/docs/api-rnis/README.md @@ -27,11 +27,13 @@ Class | Method | HTTP request | Description - [AssociateId](./Models/AssociateId.md) - [CaReconfNotification](./Models/CaReconfNotification.md) - [CaReconfNotificationCarrierAggregationMeasInfo](./Models/CaReconfNotificationCarrierAggregationMeasInfo.md) + - [CaReconfNotificationLinks](./Models/CaReconfNotificationLinks.md) - [CaReconfNotificationSecondaryCellAdd](./Models/CaReconfNotificationSecondaryCellAdd.md) - [CaReconfSubscription](./Models/CaReconfSubscription.md) - [CaReconfSubscriptionFilterCriteriaAssoc](./Models/CaReconfSubscriptionFilterCriteriaAssoc.md) - [CaReconfSubscriptionLinks](./Models/CaReconfSubscriptionLinks.md) - [CellChangeNotification](./Models/CellChangeNotification.md) + - [CellChangeNotificationLinks](./Models/CellChangeNotificationLinks.md) - [CellChangeNotificationTempUeId](./Models/CellChangeNotificationTempUeId.md) - [CellChangeSubscription](./Models/CellChangeSubscription.md) - [CellChangeSubscriptionFilterCriteriaAssocHo](./Models/CellChangeSubscriptionFilterCriteriaAssocHo.md) @@ -59,7 +61,6 @@ Class | Method | HTTP request | Description - [MeasRepUeSubscriptionFilterCriteriaAssocTri](./Models/MeasRepUeSubscriptionFilterCriteriaAssocTri.md) - [MeasTaNotification](./Models/MeasTaNotification.md) - [MeasTaSubscription](./Models/MeasTaSubscription.md) - - [NRcgi](./Models/NRcgi.md) - [NrMeasRepUeNotification](./Models/NrMeasRepUeNotification.md) - [NrMeasRepUeNotificationEutraNeighCellMeasInfo](./Models/NrMeasRepUeNotificationEutraNeighCellMeasInfo.md) - [NrMeasRepUeNotificationNCell](./Models/NrMeasRepUeNotificationNCell.md) @@ -68,6 +69,7 @@ Class | Method | HTTP request | Description - [NrMeasRepUeNotificationServCellMeasInfo](./Models/NrMeasRepUeNotificationServCellMeasInfo.md) - [NrMeasRepUeSubscription](./Models/NrMeasRepUeSubscription.md) - [NrMeasRepUeSubscriptionFilterCriteriaNrMrs](./Models/NrMeasRepUeSubscriptionFilterCriteriaNrMrs.md) + - [Nrcgi](./Models/Nrcgi.md) - [OperationActionType](./Models/OperationActionType.md) - [Plmn](./Models/Plmn.md) - [PlmnInfo](./Models/PlmnInfo.md) @@ -109,9 +111,11 @@ Class | Method | HTTP request | Description - [SubscriptionLinkList](./Models/SubscriptionLinkList.md) - [SubscriptionLinkListLinks](./Models/SubscriptionLinkListLinks.md) - [SubscriptionLinkListLinksSubscription](./Models/SubscriptionLinkListLinksSubscription.md) + - [TestNotification](./Models/TestNotification.md) - [TimeStamp](./Models/TimeStamp.md) - [Trigger](./Models/Trigger.md) - [TriggerNr](./Models/TriggerNr.md) + - [WebsockNotifConfig](./Models/WebsockNotifConfig.md) diff --git a/examples/demo1/demo1-scenario.yaml b/examples/demo1/demo1-scenario.yaml index be16dad41..dda177060 100755 --- a/examples/demo1/demo1-scenario.yaml +++ b/examples/demo1/demo1-scenario.yaml @@ -1,4 +1,4 @@ -version: 1.7.0 +version: 1.8.1 name: demo1 deployment: netChar: @@ -530,14 +530,14 @@ deployment: name: ue1-iperf type: UE-APP image: 'meep-docker-registry:30001/iperf-client' - commandArguments: '-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;' + commandArguments: '-c, export; sleep 5; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;' commandExe: /bin/bash netChar: - latencyDistribution: Normal throughputDl: 1000 throughputUl: 1000 latency: null latencyVariation: null + latencyDistribution: null throughput: null packetLoss: null isExternal: null diff --git a/examples/demo1/src/demo-client/js/src/ApiClient.js b/examples/demo1/src/demo-client/js/src/ApiClient.js index 6e7389500..e0868d032 100644 --- a/examples/demo1/src/demo-client/js/src/ApiClient.js +++ b/examples/demo1/src/demo-client/js/src/ApiClient.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/api/EdgeAppInfoApi.js b/examples/demo1/src/demo-client/js/src/api/EdgeAppInfoApi.js index 46a47b80f..faad96add 100644 --- a/examples/demo1/src/demo-client/js/src/api/EdgeAppInfoApi.js +++ b/examples/demo1/src/demo-client/js/src/api/EdgeAppInfoApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/api/NotificationsApi.js b/examples/demo1/src/demo-client/js/src/api/NotificationsApi.js index 991032783..a94d2836b 100644 --- a/examples/demo1/src/demo-client/js/src/api/NotificationsApi.js +++ b/examples/demo1/src/demo-client/js/src/api/NotificationsApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/api/StateTransferApi.js b/examples/demo1/src/demo-client/js/src/api/StateTransferApi.js index c19d60255..4a910d862 100644 --- a/examples/demo1/src/demo-client/js/src/api/StateTransferApi.js +++ b/examples/demo1/src/demo-client/js/src/api/StateTransferApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/api/UELocationApi.js b/examples/demo1/src/demo-client/js/src/api/UELocationApi.js index ff7e352d8..1436f45a9 100644 --- a/examples/demo1/src/demo-client/js/src/api/UELocationApi.js +++ b/examples/demo1/src/demo-client/js/src/api/UELocationApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/api/UEStateApi.js b/examples/demo1/src/demo-client/js/src/api/UEStateApi.js index b007fd6f2..3ca5f6689 100644 --- a/examples/demo1/src/demo-client/js/src/api/UEStateApi.js +++ b/examples/demo1/src/demo-client/js/src/api/UEStateApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/index.js b/examples/demo1/src/demo-client/js/src/index.js index 21c728f91..b3727e6c8 100644 --- a/examples/demo1/src/demo-client/js/src/index.js +++ b/examples/demo1/src/demo-client/js/src/index.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/EdgeInfo.js b/examples/demo1/src/demo-client/js/src/model/EdgeInfo.js index 10313192c..6d2a12588 100644 --- a/examples/demo1/src/demo-client/js/src/model/EdgeInfo.js +++ b/examples/demo1/src/demo-client/js/src/model/EdgeInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/InlineTrackingNotification.js b/examples/demo1/src/demo-client/js/src/model/InlineTrackingNotification.js index 8d5cefc89..2bd15cedd 100644 --- a/examples/demo1/src/demo-client/js/src/model/InlineTrackingNotification.js +++ b/examples/demo1/src/demo-client/js/src/model/InlineTrackingNotification.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/MobilityGroupAppState.js b/examples/demo1/src/demo-client/js/src/model/MobilityGroupAppState.js index 3b4c671e9..a2ac1b7c4 100644 --- a/examples/demo1/src/demo-client/js/src/model/MobilityGroupAppState.js +++ b/examples/demo1/src/demo-client/js/src/model/MobilityGroupAppState.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/MobilityGroupEvent.js b/examples/demo1/src/demo-client/js/src/model/MobilityGroupEvent.js index 57c770cd5..68c016b77 100644 --- a/examples/demo1/src/demo-client/js/src/model/MobilityGroupEvent.js +++ b/examples/demo1/src/demo-client/js/src/model/MobilityGroupEvent.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/SubscriptionId.js b/examples/demo1/src/demo-client/js/src/model/SubscriptionId.js index 746d31d0f..75285323b 100644 --- a/examples/demo1/src/demo-client/js/src/model/SubscriptionId.js +++ b/examples/demo1/src/demo-client/js/src/model/SubscriptionId.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/TimeStamp.js b/examples/demo1/src/demo-client/js/src/model/TimeStamp.js index 37b383513..52b1126d5 100644 --- a/examples/demo1/src/demo-client/js/src/model/TimeStamp.js +++ b/examples/demo1/src/demo-client/js/src/model/TimeStamp.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/TrackingNotification.js b/examples/demo1/src/demo-client/js/src/model/TrackingNotification.js index 80452e7d8..ed724a82e 100644 --- a/examples/demo1/src/demo-client/js/src/model/TrackingNotification.js +++ b/examples/demo1/src/demo-client/js/src/model/TrackingNotification.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/UeState.js b/examples/demo1/src/demo-client/js/src/model/UeState.js index 548bea021..a699b9a7c 100644 --- a/examples/demo1/src/demo-client/js/src/model/UeState.js +++ b/examples/demo1/src/demo-client/js/src/model/UeState.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/UserEventType.js b/examples/demo1/src/demo-client/js/src/model/UserEventType.js index fd9a547d1..8a7b019e1 100644 --- a/examples/demo1/src/demo-client/js/src/model/UserEventType.js +++ b/examples/demo1/src/demo-client/js/src/model/UserEventType.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/UserInfo.js b/examples/demo1/src/demo-client/js/src/model/UserInfo.js index 264e311c5..ecb367b05 100644 --- a/examples/demo1/src/demo-client/js/src/model/UserInfo.js +++ b/examples/demo1/src/demo-client/js/src/model/UserInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/UserList.js b/examples/demo1/src/demo-client/js/src/model/UserList.js index bf330b12d..1b2aa04ee 100644 --- a/examples/demo1/src/demo-client/js/src/model/UserList.js +++ b/examples/demo1/src/demo-client/js/src/model/UserList.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/UserTrackingNotification.js b/examples/demo1/src/demo-client/js/src/model/UserTrackingNotification.js index 3af3a46d4..0268cea7f 100644 --- a/examples/demo1/src/demo-client/js/src/model/UserTrackingNotification.js +++ b/examples/demo1/src/demo-client/js/src/model/UserTrackingNotification.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/src/model/ZoneInfo.js b/examples/demo1/src/demo-client/js/src/model/ZoneInfo.js index 2c46eac31..5b062fdff 100644 --- a/examples/demo1/src/demo-client/js/src/model/ZoneInfo.js +++ b/examples/demo1/src/demo-client/js/src/model/ZoneInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/api/EdgeAppInfoApi.spec.js b/examples/demo1/src/demo-client/js/test/api/EdgeAppInfoApi.spec.js index 0b4190b84..4790d1f1d 100644 --- a/examples/demo1/src/demo-client/js/test/api/EdgeAppInfoApi.spec.js +++ b/examples/demo1/src/demo-client/js/test/api/EdgeAppInfoApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/api/NotificationsApi.spec.js b/examples/demo1/src/demo-client/js/test/api/NotificationsApi.spec.js index a6a952855..5e5099457 100644 --- a/examples/demo1/src/demo-client/js/test/api/NotificationsApi.spec.js +++ b/examples/demo1/src/demo-client/js/test/api/NotificationsApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/api/StateTransferApi.spec.js b/examples/demo1/src/demo-client/js/test/api/StateTransferApi.spec.js index e629352b6..b7c6c82c7 100644 --- a/examples/demo1/src/demo-client/js/test/api/StateTransferApi.spec.js +++ b/examples/demo1/src/demo-client/js/test/api/StateTransferApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/api/UELocationApi.spec.js b/examples/demo1/src/demo-client/js/test/api/UELocationApi.spec.js index 02a022d04..221274751 100644 --- a/examples/demo1/src/demo-client/js/test/api/UELocationApi.spec.js +++ b/examples/demo1/src/demo-client/js/test/api/UELocationApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/api/UEStateApi.spec.js b/examples/demo1/src/demo-client/js/test/api/UEStateApi.spec.js index e8dd1bd04..8a101087b 100644 --- a/examples/demo1/src/demo-client/js/test/api/UEStateApi.spec.js +++ b/examples/demo1/src/demo-client/js/test/api/UEStateApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/EdgeInfo.spec.js b/examples/demo1/src/demo-client/js/test/model/EdgeInfo.spec.js index e51fc10b6..88657320a 100644 --- a/examples/demo1/src/demo-client/js/test/model/EdgeInfo.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/EdgeInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/InlineTrackingNotification.spec.js b/examples/demo1/src/demo-client/js/test/model/InlineTrackingNotification.spec.js index 8dc306082..ec93a67e6 100644 --- a/examples/demo1/src/demo-client/js/test/model/InlineTrackingNotification.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/InlineTrackingNotification.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/MobilityGroupAppState.spec.js b/examples/demo1/src/demo-client/js/test/model/MobilityGroupAppState.spec.js index c60ecdd21..6c0388f65 100644 --- a/examples/demo1/src/demo-client/js/test/model/MobilityGroupAppState.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/MobilityGroupAppState.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/MobilityGroupEvent.spec.js b/examples/demo1/src/demo-client/js/test/model/MobilityGroupEvent.spec.js index 411c2c757..b78397059 100644 --- a/examples/demo1/src/demo-client/js/test/model/MobilityGroupEvent.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/MobilityGroupEvent.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/SubscriptionId.spec.js b/examples/demo1/src/demo-client/js/test/model/SubscriptionId.spec.js index 00ea5d61b..73e9523fa 100644 --- a/examples/demo1/src/demo-client/js/test/model/SubscriptionId.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/SubscriptionId.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/TimeStamp.spec.js b/examples/demo1/src/demo-client/js/test/model/TimeStamp.spec.js index 34aa2c560..b7a2871ca 100644 --- a/examples/demo1/src/demo-client/js/test/model/TimeStamp.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/TimeStamp.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/TrackingNotification.spec.js b/examples/demo1/src/demo-client/js/test/model/TrackingNotification.spec.js index 6930c6147..e60f184e0 100644 --- a/examples/demo1/src/demo-client/js/test/model/TrackingNotification.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/TrackingNotification.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/UeState.spec.js b/examples/demo1/src/demo-client/js/test/model/UeState.spec.js index 4dd49e658..2916ca71a 100644 --- a/examples/demo1/src/demo-client/js/test/model/UeState.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/UeState.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/UserEventType.spec.js b/examples/demo1/src/demo-client/js/test/model/UserEventType.spec.js index 34d65a81d..9227215fa 100644 --- a/examples/demo1/src/demo-client/js/test/model/UserEventType.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/UserEventType.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/UserInfo.spec.js b/examples/demo1/src/demo-client/js/test/model/UserInfo.spec.js index 187b4d07c..20b8d0e2f 100644 --- a/examples/demo1/src/demo-client/js/test/model/UserInfo.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/UserInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/UserList.spec.js b/examples/demo1/src/demo-client/js/test/model/UserList.spec.js index 6daca083c..bfe94ed61 100644 --- a/examples/demo1/src/demo-client/js/test/model/UserList.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/UserList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/UserTrackingNotification.spec.js b/examples/demo1/src/demo-client/js/test/model/UserTrackingNotification.spec.js index bc0e4d0f0..716a95113 100644 --- a/examples/demo1/src/demo-client/js/test/model/UserTrackingNotification.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/UserTrackingNotification.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-client/js/test/model/ZoneInfo.spec.js b/examples/demo1/src/demo-client/js/test/model/ZoneInfo.spec.js index 08ac53b20..f6fc9edfd 100644 --- a/examples/demo1/src/demo-client/js/test/model/ZoneInfo.spec.js +++ b/examples/demo1/src/demo-client/js/test/model/ZoneInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/examples/demo1/src/demo-frontend/src/css/demo-svc.scss b/examples/demo1/src/demo-frontend/src/css/demo-svc.scss index e5b604bcb..0550680a4 100755 --- a/examples/demo1/src/demo-frontend/src/css/demo-svc.scss +++ b/examples/demo1/src/demo-frontend/src/css/demo-svc.scss @@ -1,11 +1,11 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/demo1/src/demo-frontend/src/index.html b/examples/demo1/src/demo-frontend/src/index.html index f26dabb6c..7f4db64ab 100755 --- a/examples/demo1/src/demo-frontend/src/index.html +++ b/examples/demo1/src/demo-frontend/src/index.html @@ -1,6 +1,6 @@  Bob" + - time: "2019-11-24T12:45:00-5:00" + mermaid: "Alice --> Bob" + name: "dataflow metrics" + DataflowMetricList: + type: "object" + properties: + name: + type: "string" + example: "dataflow metrics" + description: "Response name" + columns: + type: "array" + description: "columns included in response based on queried values" + items: + type: "string" + description: "Queried value" + values: + type: "array" + items: + $ref: "#/definitions/DataflowMetric" + example: + columns: + - "columns" + - "columns" + values: + - time: "2019-11-24T12:45:00-5:00" + mermaid: "Alice --> Bob" + - time: "2019-11-24T12:45:00-5:00" + mermaid: "Alice --> Bob" + name: "dataflow metrics" + DataflowMetric: + type: "object" + properties: + time: + type: "string" + example: "2019-11-24T12:45:00-5:00" + description: "Time of interaction" + mermaid: + type: "string" + example: "Alice --> Bob" + description: "Mermaid formatted dataflow logs" + description: "dataflow diagram logs" + example: + time: "2019-11-24T12:45:00-5:00" + mermaid: "Alice --> Bob" HttpQueryParams: type: "object" properties: @@ -319,37 +605,6 @@ definitions: value: "meep-loc-serv" - name: "direction" value: "RX" - Tag: - type: "object" - properties: - name: - type: "string" - example: "src" - description: "Tag name" - value: - type: "string" - example: "ue1-iperf" - description: "Tag value" - description: "Filtering query parameter" - example: - name: "src" - value: "ue1-iperf" - Scope: - type: "object" - properties: - limit: - type: "integer" - example: 60 - description: "Maximum number of points in the response" - duration: - type: "string" - example: "10s" - description: "Length of time range (specify s for seconds, m for minutes,\ - \ d for days)" - description: "Query scope (time / number of points)" - example: - duration: "10s" - limit: 60 HttpMetricList: type: "object" properties: diff --git a/go-apps/meep-metrics-engine/entrypoint.sh b/go-apps/meep-metrics-engine/entrypoint.sh index 46d36babf..77de1811c 100644 --- a/go-apps/meep-metrics-engine/entrypoint.sh +++ b/go-apps/meep-metrics-engine/entrypoint.sh @@ -4,6 +4,7 @@ set -e echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" if [[ ! -z "${MEEP_MEP_NAME}" ]]; then svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}" @@ -38,4 +39,11 @@ for file in /user-api/*; do done # Start service -exec /meep-metrics-engine +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-metrics-engine-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + exec /meep-metrics-engine -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-metrics-engine +fi diff --git a/go-apps/meep-metrics-engine/go.mod b/go-apps/meep-metrics-engine/go.mod index dd3efb12e..5dd52233c 100644 --- a/go-apps/meep-metrics-engine/go.mod +++ b/go-apps/meep-metrics-engine/go.mod @@ -12,12 +12,10 @@ require ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0 + github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0 - github.com/fortytw2/leaktest v1.3.0 // indirect github.com/gorilla/handlers v1.4.0 github.com/gorilla/mux v1.8.0 - github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect - github.com/olivere/elastic v6.2.21+incompatible // indirect github.com/prometheus/client_golang v1.9.0 ) @@ -31,5 +29,6 @@ replace ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis + github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client => ../../go-packages/meep-sandbox-ctrl-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr => ../../go-packages/meep-swagger-api-mgr ) diff --git a/go-apps/meep-metrics-engine/go.sum b/go-apps/meep-metrics-engine/go.sum index b77f54de4..9b174472b 100644 --- a/go-apps/meep-metrics-engine/go.sum +++ b/go-apps/meep-metrics-engine/go.sum @@ -2,22 +2,23 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T59kgRjXcSDBODnyZP9wes+bnLn0lx4PgM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY= +github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345 h1:fgSpoKViTSqRb4hjDNj10ig5wUvO0CayCzFdLf6fuRM= github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72 h1:uGeGZl8PxSq8VZGG4QK5njJTFA4/G/x5CYORvQVXtAE= github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -49,6 +50,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -60,9 +62,9 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -100,6 +102,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -107,6 +110,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= @@ -138,6 +142,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -159,17 +164,19 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237 h1:acuCHBjzG7MFTugvx3buC4m5rLDLaKC9J8C9jtlraRc= github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237/go.mod h1:UOnLAUmVG5paym8pD3C4B9BQylUDC2vXFJJpT7JrlEA= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -197,12 +204,11 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olivere/elastic v6.2.21+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= @@ -222,6 +228,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -277,6 +284,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -329,8 +337,9 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrS golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -359,6 +368,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -377,6 +387,7 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -407,12 +418,15 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -420,6 +434,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/go-apps/meep-metrics-engine/main.go b/go-apps/meep-metrics-engine/main.go index 633df0d90..879f25339 100644 --- a/go-apps/meep-metrics-engine/main.go +++ b/go-apps/meep-metrics-engine/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-metrics-engine/main_test.go b/go-apps/meep-metrics-engine/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-metrics-engine/main_test.go +++ b/go-apps/meep-metrics-engine/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-metrics-engine/server/logger.go b/go-apps/meep-metrics-engine/server/logger.go index 08077d068..6cd799bb3 100644 --- a/go-apps/meep-metrics-engine/server/logger.go +++ b/go-apps/meep-metrics-engine/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/routers.go b/go-apps/meep-metrics-engine/server/routers.go index 128162709..7e0d65206 100644 --- a/go-apps/meep-metrics-engine/server/routers.go +++ b/go-apps/meep-metrics-engine/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -122,6 +122,20 @@ var routes = Routes{ v2.PostHttpQuery, }, + Route{ + "PostSeqQuery", + strings.ToUpper("Post"), + "/metrics/v2/metrics/query/seq", + v2.PostSeqQuery, + }, + + Route{ + "PostDataflowQuery", + strings.ToUpper("Post"), + "/metrics/v2/metrics/query/dataflow", + v2.PostDataflowQuery, + }, + Route{ "PostNetworkQuery", strings.ToUpper("Post"), diff --git a/go-apps/meep-metrics-engine/server/v2/README.md b/go-apps/meep-metrics-engine/server/v2/README.md index a8b1c3e45..05527c4bd 100644 --- a/go-apps/meep-metrics-engine/server/v2/README.md +++ b/go-apps/meep-metrics-engine/server/v2/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 1.0.0 -- Build date: 2021-11-23T08:34:05.614-05:00 +- Build date: 2022-11-04T17:14:00.546-04:00 ### Running the server diff --git a/go-apps/meep-metrics-engine/server/v2/api_metrics.go b/go-apps/meep-metrics-engine/server/v2/api_metrics.go index 7690b945e..7d1c0fadd 100644 --- a/go-apps/meep-metrics-engine/server/v2/api_metrics.go +++ b/go-apps/meep-metrics-engine/server/v2/api_metrics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,6 +28,10 @@ import ( "net/http" ) +func PostDataflowQuery(w http.ResponseWriter, r *http.Request) { + mePostDataflowQuery(w, r) +} + func PostEventQuery(w http.ResponseWriter, r *http.Request) { mePostEventQuery(w, r) } @@ -39,3 +43,7 @@ func PostHttpQuery(w http.ResponseWriter, r *http.Request) { func PostNetworkQuery(w http.ResponseWriter, r *http.Request) { mePostNetworkQuery(w, r) } + +func PostSeqQuery(w http.ResponseWriter, r *http.Request) { + mePostSeqQuery(w, r) +} diff --git a/go-apps/meep-metrics-engine/server/v2/api_subscriptions.go b/go-apps/meep-metrics-engine/server/v2/api_subscriptions.go index 77ff8309b..810a4d11e 100644 --- a/go-apps/meep-metrics-engine/server/v2/api_subscriptions.go +++ b/go-apps/meep-metrics-engine/server/v2/api_subscriptions.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/convert.go b/go-apps/meep-metrics-engine/server/v2/convert.go index 77c17203e..a3c99133e 100755 --- a/go-apps/meep-metrics-engine/server/v2/convert.go +++ b/go-apps/meep-metrics-engine/server/v2/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-metrics-engine/server/v2/logger.go b/go-apps/meep-metrics-engine/server/v2/logger.go index 98294ca95..203e3df8f 100644 --- a/go-apps/meep-metrics-engine/server/v2/logger.go +++ b/go-apps/meep-metrics-engine/server/v2/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/metrics-engine.go b/go-apps/meep-metrics-engine/server/v2/metrics-engine.go index 6d5f0c5d9..238b1ea84 100644 --- a/go-apps/meep-metrics-engine/server/v2/metrics-engine.go +++ b/go-apps/meep-metrics-engine/server/v2/metrics-engine.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -37,6 +37,7 @@ import ( mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model" mq "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq" redis "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis" + sandboxCtrlClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client" sam "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr" "github.com/gorilla/mux" @@ -60,6 +61,9 @@ const ( notifNetworkMetrics = "NetworkMetricsNotification" ) +const listOnly = "listonly" +const strOnly = "stronly" + var defaultDuration string = "1s" var defaultLimit int32 = 1 @@ -69,6 +73,7 @@ var nextEventSubscriptionIdAvailable int var networkSubscriptionMap = map[string]*NetworkRegistration{} var eventSubscriptionMap = map[string]*EventRegistration{} +var pduSessions = map[string]string{} var SandboxName string var mqLocal *mq.MsgQueue @@ -250,7 +255,7 @@ func activateScenarioMetrics() { _ = httpLog.ReInit(ModuleName, SandboxName, activeScenarioName, redisAddr, influxDBAddr) // Set Metrics Store - err := metricStore.SetStore(activeScenarioName) + err := metricStore.SetStore(activeScenarioName, SandboxName, true) if err != nil { log.Error("Failed to set store with error: " + err.Error()) return @@ -293,7 +298,7 @@ func terminateScenarioMetrics() { _ = httpLog.ReInit(ModuleName, SandboxName, activeScenarioName, redisAddr, influxDBAddr) // Set Metrics Store - err := metricStore.SetStore("") + err := metricStore.SetStore("", "", false) if err != nil { log.Error(err.Error()) } @@ -451,11 +456,11 @@ func mePostHttpQuery(w http.ResponseWriter, r *http.Request) { metric.LoggerName = val } } - if values[met.HttpLoggerDirection] != nil { - if val, ok := values[met.HttpLoggerDirection].(string); ok { - metric.Direction = val - } - } + // if values[met.HttpLoggerDirection] != nil { + // if val, ok := values[met.HttpLoggerDirection].(string); ok { + // metric.Direction = val + // } + // } if values[met.HttpLogId] != nil { metric.Id = met.JsonNumToInt32(values[met.HttpLogId].(json.Number)) @@ -507,6 +512,358 @@ func mePostHttpQuery(w http.ResponseWriter, r *http.Request) { fmt.Fprintf(w, string(jsonResponse)) } +func mePostSeqQuery(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=UTF-8") + log.Debug("mePostHttpQuery") + + // Retrieve sequence diagram query parameters from request body + var params SeqQueryParams + if r.Body == nil { + err := errors.New("Request body is missing") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + decoder := json.NewDecoder(r.Body) + err := decoder.Decode(¶ms) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + // Make sure metrics store is up + if metricStore == nil { + err := errors.New("No active scenario to get metrics from") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusNotFound) + return + } + + // Make sure only type of format is specified + if len(params.Fields) > 1 { + err := errors.New("Specify only one type of format: meraid or sdorg") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + // Parse tags + tags := make(map[string]string) + for _, tag := range params.Tags { + tags[tag.Name] = tag.Value + } + + // Get scope + duration := "" + limit := 0 + if params.Scope != nil { + duration = params.Scope.Duration + limit = int(params.Scope.Limit) + } + influxLimit := 2 * limit + + var response SeqMetrics + mobilityEventProcessed := false + if params.ResponseType == listOnly || params.ResponseType == "" { + response.SeqMetricList = &SeqMetricList{ + Name: "sequence metrics", + Columns: append(params.Fields, met.HttpLogTime), + } + } + + // Get http metrics + params.Fields = append(params.Fields, met.HttpLoggerMsgType, met.HttpSrc, met.HttpDst, met.HttpLogEndpoint, + met.HttpBody, met.HttpMethod) + valuesArray, err := metricStore.GetInfluxMetric(met.HttpLogMetricName, tags, params.Fields, duration, influxLimit) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + // Get event metrics + eventMetrics, err := metricStore.GetEventMetric("MOBILITY", duration, limit) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + if len(valuesArray) == 0 && len(eventMetrics) == 0 { + err := errors.New("No matching metrics found") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusNoContent) + return + } + + // Prepare seq metrics list + var metricList []SeqMetric + for i := len(valuesArray) - 1; i >= 0; i-- { + values := valuesArray[i] + httpMetricTime := values[met.HttpLogTime].(string) + if values[params.Fields[0]] != nil { + metricTime, err := time.Parse(time.RFC3339, httpMetricTime) + if err != nil { + log.Error("Failed to parse time with error: ", err.Error()) + continue + } + t := metricTime.Format("15:04:05.000") + + if len(eventMetrics) > 0 { + // Insert event metrics in chronological order + matchCount := 0 + for j := len(eventMetrics) - 1; j >= 0; j-- { + eventMetric := eventMetrics[j] + eventMetricTime, err := time.Parse(time.RFC3339, eventMetric.Time.(string)) + if err != nil { + log.Error("Failed to parse event time with error: ", err.Error()) + continue + } + eventSdorg := "" + eventMermaid := "" + if eventMetricTime.Before(metricTime) { + // Close previous mobility event group if necessary + if mobilityEventProcessed { + eventSdorg += "end\n" + } + mobilityEventProcessed = true + + // Create group for mobility event + eventDescription := eventMetric.Description + eventDescription = strings.Replace(eventDescription, "[", "", -1) + eventDescription = strings.Replace(eventDescription, "]", "", -1) + eventSdorg += "\ngroup Mobility Event: " + eventDescription + "\n" + eventMermaid += "note over event:[" + eventMetricTime.Format("15:04:05.000") + "] Mobility Event: " + eventDescription + "\n" + + if params.Fields[0] == met.HttpMermaid { + metricList = append(metricList, SeqMetric{Time: eventMetric.Time.(string), Mermaid: eventMermaid}) + } + if params.Fields[0] == met.HttpSdorg { + metricList = append(metricList, SeqMetric{Time: eventMetric.Time.(string), Sdorg: eventSdorg}) + } + matchCount++ + } else { + break + } + } + + // Remove processed metrics from list + if matchCount > 0 { + eventMetrics = eventMetrics[:len(eventMetrics)-matchCount] + } + } + + // Handle notifications + notifStr := "" + if values[met.HttpLoggerMsgType].(string) == met.HttpMsgTypeNotification { + // Sandbox Controller requests + if values[met.HttpDst].(string) == "sandbox-ctrl" { + // Add note for PDU Session requests + pduSessionPrefix := "/sandbox-ctrl/connectivity/pdu-session/" + if strings.HasPrefix(values[met.HttpLogEndpoint].(string), pduSessionPrefix) { + pduSession := strings.Split(strings.TrimPrefix(values[met.HttpLogEndpoint].(string), pduSessionPrefix), "/") + if values[met.HttpMethod] == "POST" { + var pduSessionInfo sandboxCtrlClient.PduSessionInfo + err := json.Unmarshal([]byte(values[met.HttpBody].(string)), &pduSessionInfo) + if err != nil { + log.Error(err.Error()) + continue + } + pduSessions[pduSession[1]] = pduSessionInfo.Dnn + // Sequencediagram.org formatted line + notifStr = "note over " + values[met.HttpSrc].(string) + " :[" + t + "] Created PDU Session " + pduSession[1] + " for " + pduSession[0] + " to " + pduSessionInfo.Dnn + "\n" + } else if values[met.HttpMethod] == "DELETE" { + dnn := pduSessions[pduSession[1]] + // Sequencediagram.org formatted line + notifStr = "note over " + values[met.HttpSrc].(string) + " : [" + t + "] Terminated PDU Session " + pduSession[1] + " for " + pduSession[0] + " to " + dnn + "\n" + } + if params.Fields[0] == met.HttpMermaid { + metricList = append(metricList, SeqMetric{Time: httpMetricTime, Mermaid: notifStr}) + } + if params.Fields[0] == met.HttpSdorg { + metricList = append(metricList, SeqMetric{Time: httpMetricTime, Sdorg: notifStr}) + } + } + } + continue + } + + if params.Fields[0] == met.HttpMermaid { + if val, ok := values[met.HttpMermaid].(string); ok { + val = strings.Replace(val, ":", ": ["+t+"]", 1) + metricList = append(metricList, SeqMetric{Time: httpMetricTime, Mermaid: val}) + } + } + if params.Fields[0] == met.HttpSdorg { + if val, ok := values[met.HttpSdorg].(string); ok { + val = strings.Replace(val, ":", ": ["+t+"]", 1) + metricList = append(metricList, SeqMetric{Time: httpMetricTime, Sdorg: val}) + } + } + } + } + // Take max limit logs from aggregated list of logs + if len(metricList) > limit && limit != 0 { + metricList = metricList[len(metricList)-limit:] + } + + for _, metric := range metricList { + updateResponseSeqMetrics(&response, metric, params) + } + + // Send response + jsonResponse, err := json.Marshal(response) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.WriteHeader(http.StatusOK) + fmt.Fprintf(w, string(jsonResponse)) +} + +func updateResponseSeqMetrics(response *SeqMetrics, metric SeqMetric, params SeqQueryParams) { + if params.Fields[0] == met.HttpMermaid && metric.Mermaid != "" { + if params.ResponseType == listOnly || params.ResponseType == "" { + response.SeqMetricList.Values = append(response.SeqMetricList.Values, metric) + } + if params.ResponseType == strOnly || params.ResponseType == "" { + response.SeqMetricString += metric.Mermaid + "\n" + } + } + if params.Fields[0] == met.HttpSdorg && metric.Sdorg != "" { + if params.ResponseType == listOnly || params.ResponseType == "" { + // metric.Sdorg = log + response.SeqMetricList.Values = append(response.SeqMetricList.Values, metric) + } + if params.ResponseType == strOnly || params.ResponseType == "" { + response.SeqMetricString += metric.Sdorg + "\n" + } + } +} + +func mePostDataflowQuery(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=UTF-8") + log.Debug("mePostHttpQuery") + + // Retrieve sequence diagram query parameters from request body + var params DataflowQueryParams + if r.Body == nil { + err := errors.New("Request body is missing") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + decoder := json.NewDecoder(r.Body) + err := decoder.Decode(¶ms) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + // Make sure metrics store is up + if metricStore == nil { + err := errors.New("No active scenario to get metrics from") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusNotFound) + return + } + + // Make sure only type of format is specified + if len(params.Fields) > 1 { + err := errors.New("Supports only one type of format: meraid") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + // Parse tags + tags := make(map[string]string) + for _, tag := range params.Tags { + tags[tag.Name] = tag.Value + } + + // Get scope + duration := "" + limit := 0 + if params.Scope != nil { + duration = params.Scope.Duration + limit = int(params.Scope.Limit) + } + // Get http metrics + var response DataflowMetrics + if params.ResponseType == listOnly || params.ResponseType == "" { + response.DataflowMetricList = &DataflowMetricList{ + Name: "data flow metrics", + Columns: append(params.Fields, met.HttpLogTime), + } + } + + params.Fields = append(params.Fields, met.HttpLoggerMsgType, met.HttpSrc, met.HttpDst, met.HttpLogEndpoint, met.HttpBody, met.HttpMethod) + valuesArray, err := metricStore.GetInfluxMetric(met.HttpLogMetricName, tags, params.Fields, duration, limit) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + if len(valuesArray) == 0 { + err := errors.New("No matching metrics found") + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusNoContent) + return + } + + // Prepare & send response + interactions := make(map[string]int) + var orderedLogs []string + for i := len(valuesArray) - 1; i >= 0; i-- { + values := valuesArray[i] + var metric DataflowMetric + metric.Time = values[met.HttpLogTime].(string) + if values[met.HttpSrc].(string) != "" && values[met.HttpDst].(string) != "" { + src := strings.Replace(values[met.HttpSrc].(string), "-", "_", 1) + dst := strings.Replace(values[met.HttpDst].(string), "-", "_", 1) + val := src + " --> " + dst + if params.ResponseType == listOnly || params.ResponseType == "" { + metric.Mermaid = val + response.DataflowMetricList.Values = append(response.DataflowMetricList.Values, metric) + } + if params.ResponseType == strOnly || params.ResponseType == "" { + interactions[val] = interactions[val] + 1 + if !contains(orderedLogs, val) { + orderedLogs = append(orderedLogs, val) + } + } + } + } + if params.ResponseType == strOnly || params.ResponseType == "" { + for _, orderedLog := range orderedLogs { + response.DataflowMetricString += orderedLog + " : " + fmt.Sprint(interactions[orderedLog]) + "\n" + } + } + jsonResponse, err := json.Marshal(response) + if err != nil { + log.Error(err.Error()) + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.WriteHeader(http.StatusOK) + fmt.Fprintf(w, string(jsonResponse)) +} + +func contains(s []string, str string) bool { + for _, v := range s { + if v == str { + return true + } + } + + return false +} + func mePostNetworkQuery(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") log.Debug("mePostNetworkQuery") diff --git a/go-apps/meep-metrics-engine/server/v2/model_dataflow_metric.go b/go-apps/meep-metrics-engine/server/v2/model_dataflow_metric.go new file mode 100644 index 000000000..51dd7ee97 --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_dataflow_metric.go @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

**Micro-service**
[meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

**Type & Usage**
Platform Service used by control/monitoring software and possibly by edge applications that require metrics

**Details**
API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +// dataflow diagram logs +type DataflowMetric struct { + + // Time of interaction + Time string `json:"time,omitempty"` + + // Mermaid formatted dataflow logs + Mermaid string `json:"mermaid,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_dataflow_metric_list.go b/go-apps/meep-metrics-engine/server/v2/model_dataflow_metric_list.go new file mode 100644 index 000000000..f8ca78dbc --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_dataflow_metric_list.go @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

**Micro-service**
[meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

**Type & Usage**
Platform Service used by control/monitoring software and possibly by edge applications that require metrics

**Details**
API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +type DataflowMetricList struct { + + // Response name + Name string `json:"name,omitempty"` + + // columns included in response based on queried values + Columns []string `json:"columns,omitempty"` + + Values []DataflowMetric `json:"values,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_dataflow_metrics.go b/go-apps/meep-metrics-engine/server/v2/model_dataflow_metrics.go new file mode 100644 index 000000000..5243cd955 --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_dataflow_metrics.go @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

**Micro-service**
[meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

**Type & Usage**
Platform Service used by control/monitoring software and possibly by edge applications that require metrics

**Details**
API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +type DataflowMetrics struct { + DataflowMetricList *DataflowMetricList `json:"dataflowMetricList,omitempty"` + + // String of dataflow metrics with unique interactions + DataflowMetricString string `json:"dataflowMetricString,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_dataflow_query_params.go b/go-apps/meep-metrics-engine/server/v2/model_dataflow_query_params.go new file mode 100644 index 000000000..40af44a55 --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_dataflow_query_params.go @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

**Micro-service**
[meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

**Type & Usage**
Platform Service used by control/monitoring software and possibly by edge applications that require metrics

**Details**
API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +// Seq metrics query parameters +type DataflowQueryParams struct { + + // Tag names to match in query. Supported values:
+ Tags []Tag `json:"tags,omitempty"` + + Scope *Scope `json:"scope,omitempty"` + + // Requested information. Supported values:

  • mermaid: Mermaid format
    + Fields []string `json:"fields,omitempty"` + + // Queried response Type. Supported Values:
    NOTE1: only one of listonly or responly may be included NOTE2: if listonly or responly are not included, the response contains both the list and string
  • listonly: Include only a list of dataflow metrics in response
  • stronly: Include only a concatenated string of dataflow metrics in response
    + ResponseType string `json:"responseType,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_event_metric.go b/go-apps/meep-metrics-engine/server/v2/model_event_metric.go index a42fce1f1..6d7432167 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_event_metric.go +++ b/go-apps/meep-metrics-engine/server/v2/model_event_metric.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_event_metric_list.go b/go-apps/meep-metrics-engine/server/v2/model_event_metric_list.go index 15082f08f..d0b0a69bb 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_event_metric_list.go +++ b/go-apps/meep-metrics-engine/server/v2/model_event_metric_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_event_query_params.go b/go-apps/meep-metrics-engine/server/v2/model_event_query_params.go index 99586843c..a31454075 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_event_query_params.go +++ b/go-apps/meep-metrics-engine/server/v2/model_event_query_params.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_event_subscription.go b/go-apps/meep-metrics-engine/server/v2/model_event_subscription.go index 55c7202fe..884c9200a 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_event_subscription.go +++ b/go-apps/meep-metrics-engine/server/v2/model_event_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_event_subscription_list.go b/go-apps/meep-metrics-engine/server/v2/model_event_subscription_list.go index 2b99ee547..ef727f7c6 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_event_subscription_list.go +++ b/go-apps/meep-metrics-engine/server/v2/model_event_subscription_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_event_subscription_params.go b/go-apps/meep-metrics-engine/server/v2/model_event_subscription_params.go index bd6d35d45..6b567d91b 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_event_subscription_params.go +++ b/go-apps/meep-metrics-engine/server/v2/model_event_subscription_params.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_events_callback_reference.go b/go-apps/meep-metrics-engine/server/v2/model_events_callback_reference.go index ed537e95b..8567d88a7 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_events_callback_reference.go +++ b/go-apps/meep-metrics-engine/server/v2/model_events_callback_reference.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_http_metric.go b/go-apps/meep-metrics-engine/server/v2/model_http_metric.go index 7abef951d..b37258625 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_http_metric.go +++ b/go-apps/meep-metrics-engine/server/v2/model_http_metric.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_http_metric_list.go b/go-apps/meep-metrics-engine/server/v2/model_http_metric_list.go index 6c4bb6cfa..933cb2f41 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_http_metric_list.go +++ b/go-apps/meep-metrics-engine/server/v2/model_http_metric_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_http_query_params.go b/go-apps/meep-metrics-engine/server/v2/model_http_query_params.go index 6b4c5add3..21c951a65 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_http_query_params.go +++ b/go-apps/meep-metrics-engine/server/v2/model_http_query_params.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_callback_reference.go b/go-apps/meep-metrics-engine/server/v2/model_network_callback_reference.go index fefecb39e..2ff65a59a 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_callback_reference.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_callback_reference.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_metric.go b/go-apps/meep-metrics-engine/server/v2/model_network_metric.go index b6f8c4108..b1153a62e 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_metric.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_metric.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_metric_list.go b/go-apps/meep-metrics-engine/server/v2/model_network_metric_list.go index 822d5bf50..be0b56c7f 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_metric_list.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_metric_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_query_params.go b/go-apps/meep-metrics-engine/server/v2/model_network_query_params.go index d7c3bfb49..dfc7de00e 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_query_params.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_query_params.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_subscription.go b/go-apps/meep-metrics-engine/server/v2/model_network_subscription.go index 371615919..570fdba66 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_subscription.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_subscription_list.go b/go-apps/meep-metrics-engine/server/v2/model_network_subscription_list.go index fb1955860..f39b18faf 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_subscription_list.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_subscription_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_network_subscription_params.go b/go-apps/meep-metrics-engine/server/v2/model_network_subscription_params.go index 03463825b..bfa2d1999 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_network_subscription_params.go +++ b/go-apps/meep-metrics-engine/server/v2/model_network_subscription_params.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_scope.go b/go-apps/meep-metrics-engine/server/v2/model_scope.go index 54176152a..450083c03 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_scope.go +++ b/go-apps/meep-metrics-engine/server/v2/model_scope.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-metrics-engine/server/v2/model_seq_metric.go b/go-apps/meep-metrics-engine/server/v2/model_seq_metric.go new file mode 100644 index 000000000..9288e2db3 --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_seq_metric.go @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +// Sequence diagram logs +type SeqMetric struct { + + // Time of Seq logs + Time string `json:"time,omitempty"` + + // Mermaid formatted seq logs + Mermaid string `json:"mermaid,omitempty"` + + // Sequencediagram.org formatted seq logs + Sdorg string `json:"sdorg,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_seq_metric_list.go b/go-apps/meep-metrics-engine/server/v2/model_seq_metric_list.go new file mode 100644 index 000000000..032b2b7d0 --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_seq_metric_list.go @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +// Seq metrics query response +type SeqMetricList struct { + + // Response name + Name string `json:"name,omitempty"` + + // columns included in response based on queried values + Columns []string `json:"columns,omitempty"` + + Values []SeqMetric `json:"values,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_seq_metrics.go b/go-apps/meep-metrics-engine/server/v2/model_seq_metrics.go new file mode 100644 index 000000000..49ebb4243 --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_seq_metrics.go @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +type SeqMetrics struct { + SeqMetricList *SeqMetricList `json:"seqMetricList,omitempty"` + + // String of sequence metrics + SeqMetricString string `json:"seqMetricString,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_seq_query_params.go b/go-apps/meep-metrics-engine/server/v2/model_seq_query_params.go new file mode 100644 index 000000000..934aefb3d --- /dev/null +++ b/go-apps/meep-metrics-engine/server/v2/model_seq_query_params.go @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package server + +// Seq metrics query parameters +type SeqQueryParams struct { + + // Tag names to match in query. Supported values:
    + Tags []Tag `json:"tags,omitempty"` + + // Requested information. Supported values:
    NOTE: only one of mermaid or sdorg must be included

  • mermaid: Mermaid format
  • sdorg: Sequencediagram.org format
    + Fields []string `json:"fields,omitempty"` + + // Queried response Type. Supported Values:
    NOTE1: only one of listonly or responly may be included NOTE2: if listonly or responly are not included, the response contains both the list and string
  • listonly: Include only a list of sequence metrics in response
  • stronly: Include only a concatenated string of sequence metrics in response
    + ResponseType string `json:"responseType,omitempty"` + + Scope *Scope `json:"scope,omitempty"` +} diff --git a/go-apps/meep-metrics-engine/server/v2/model_tag.go b/go-apps/meep-metrics-engine/server/v2/model_tag.go index a964f8edb..d3061538c 100644 --- a/go-apps/meep-metrics-engine/server/v2/model_tag.go +++ b/go-apps/meep-metrics-engine/server/v2/model_tag.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/Dockerfile b/go-apps/meep-mg-manager/Dockerfile index 23b4dc76a..76ddf0733 100644 --- a/go-apps/meep-mg-manager/Dockerfile +++ b/go-apps/meep-mg-manager/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-mg-manager/entrypoint.sh b/go-apps/meep-mg-manager/entrypoint.sh index e44d6be22..619543b16 100644 --- a/go-apps/meep-mg-manager/entrypoint.sh +++ b/go-apps/meep-mg-manager/entrypoint.sh @@ -4,6 +4,7 @@ set -e echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" if [[ ! -z "${MEEP_MEP_NAME}" ]]; then svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}" @@ -38,4 +39,11 @@ for file in /user-api/*; do done # Start service -exec /meep-mg-manager +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-mg-manager-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + exec /meep-mg-manager -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-mg-manager +fi diff --git a/go-apps/meep-mg-manager/go.sum b/go-apps/meep-mg-manager/go.sum index 5e1862030..57d9b731b 100644 --- a/go-apps/meep-mg-manager/go.sum +++ b/go-apps/meep-mg-manager/go.sum @@ -107,6 +107,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= diff --git a/go-apps/meep-mg-manager/main.go b/go-apps/meep-mg-manager/main.go index 62603c4bf..82f7b5d26 100644 --- a/go-apps/meep-mg-manager/main.go +++ b/go-apps/meep-mg-manager/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-mg-manager/main_test.go b/go-apps/meep-mg-manager/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-mg-manager/main_test.go +++ b/go-apps/meep-mg-manager/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-mg-manager/server/README.md b/go-apps/meep-mg-manager/server/README.md index c08f90151..fa3adab91 100644 --- a/go-apps/meep-mg-manager/server/README.md +++ b/go-apps/meep-mg-manager/server/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 1.0.0 -- Build date: 2021-11-23T08:34:01.794-05:00 +- Build date: 2022-11-04T17:13:53.137-04:00 ### Running the server diff --git a/go-apps/meep-mg-manager/server/api_membership.go b/go-apps/meep-mg-manager/server/api_membership.go index 6d01adf0b..b863f1863 100644 --- a/go-apps/meep-mg-manager/server/api_membership.go +++ b/go-apps/meep-mg-manager/server/api_membership.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/api_state_transfer.go b/go-apps/meep-mg-manager/server/api_state_transfer.go index 760b54faf..f2d595206 100644 --- a/go-apps/meep-mg-manager/server/api_state_transfer.go +++ b/go-apps/meep-mg-manager/server/api_state_transfer.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/logger.go b/go-apps/meep-mg-manager/server/logger.go index 67e0a8cca..44ef706fe 100644 --- a/go-apps/meep-mg-manager/server/logger.go +++ b/go-apps/meep-mg-manager/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/mg-manager.go b/go-apps/meep-mg-manager/server/mg-manager.go index 5c6a3d439..ba88095ce 100644 --- a/go-apps/meep-mg-manager/server/mg-manager.go +++ b/go-apps/meep-mg-manager/server/mg-manager.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-mg-manager/server/model_mobility_group.go b/go-apps/meep-mg-manager/server/model_mobility_group.go index eb90b7273..a2626b9b3 100644 --- a/go-apps/meep-mg-manager/server/model_mobility_group.go +++ b/go-apps/meep-mg-manager/server/model_mobility_group.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/model_mobility_group_app.go b/go-apps/meep-mg-manager/server/model_mobility_group_app.go index 3b68d94c7..aca61c171 100644 --- a/go-apps/meep-mg-manager/server/model_mobility_group_app.go +++ b/go-apps/meep-mg-manager/server/model_mobility_group_app.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/model_mobility_group_app_state.go b/go-apps/meep-mg-manager/server/model_mobility_group_app_state.go index 91d1bca6b..e88885c5e 100644 --- a/go-apps/meep-mg-manager/server/model_mobility_group_app_state.go +++ b/go-apps/meep-mg-manager/server/model_mobility_group_app_state.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/model_mobility_group_ue.go b/go-apps/meep-mg-manager/server/model_mobility_group_ue.go index 7c646cd4e..0dc0182c9 100644 --- a/go-apps/meep-mg-manager/server/model_mobility_group_ue.go +++ b/go-apps/meep-mg-manager/server/model_mobility_group_ue.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mg-manager/server/routers.go b/go-apps/meep-mg-manager/server/routers.go index 8354475d7..a1757d594 100644 --- a/go-apps/meep-mg-manager/server/routers.go +++ b/go-apps/meep-mg-manager/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -51,7 +51,7 @@ func NewRouter() *mux.Router { handler = route.HandlerFunc handler = Logger(handler, route.Name) handler = met.MetricsHandler(handler, mgm.sandboxName, serviceName) - handler = httpLog.LogRx(handler, "") + handler = httpLog.LogRx(handler) router. Methods(route.Method). Path(route.Pattern). diff --git a/go-apps/meep-mon-engine/Dockerfile b/go-apps/meep-mon-engine/Dockerfile index f3ee1968e..90aa81d7c 100644 --- a/go-apps/meep-mon-engine/Dockerfile +++ b/go-apps/meep-mon-engine/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-mon-engine/entrypoint.sh b/go-apps/meep-mon-engine/entrypoint.sh index ebf4561ae..bb7e5ebe2 100644 --- a/go-apps/meep-mon-engine/entrypoint.sh +++ b/go-apps/meep-mon-engine/entrypoint.sh @@ -4,6 +4,7 @@ set -e echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" if [[ ! -z "${MEEP_MEP_NAME}" ]]; then svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}" @@ -38,4 +39,11 @@ for file in /user-api/*; do done # Start service -exec /meep-mon-engine +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-mon-engine-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + exec /meep-mon-engine -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-mon-engine +fi diff --git a/go-apps/meep-mon-engine/main.go b/go-apps/meep-mon-engine/main.go index b267d65ed..b8ff8bb93 100644 --- a/go-apps/meep-mon-engine/main.go +++ b/go-apps/meep-mon-engine/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-mon-engine/main_test.go b/go-apps/meep-mon-engine/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-mon-engine/main_test.go +++ b/go-apps/meep-mon-engine/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-mon-engine/server/README.md b/go-apps/meep-mon-engine/server/README.md index 5bf3c234d..bfe2d913c 100644 --- a/go-apps/meep-mon-engine/server/README.md +++ b/go-apps/meep-mon-engine/server/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 1.0.0 -- Build date: 2021-11-23T08:34:00.453-05:00 +- Build date: 2022-11-04T17:13:50.803-04:00 ### Running the server diff --git a/go-apps/meep-mon-engine/server/api_pod_states.go b/go-apps/meep-mon-engine/server/api_pod_states.go index 8b8b2237a..301059946 100644 --- a/go-apps/meep-mon-engine/server/api_pod_states.go +++ b/go-apps/meep-mon-engine/server/api_pod_states.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mon-engine/server/logger.go b/go-apps/meep-mon-engine/server/logger.go index 379269b7d..0354787ad 100644 --- a/go-apps/meep-mon-engine/server/logger.go +++ b/go-apps/meep-mon-engine/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mon-engine/server/model_pod_status.go b/go-apps/meep-mon-engine/server/model_pod_status.go index 9a95afdf6..38cb8a847 100644 --- a/go-apps/meep-mon-engine/server/model_pod_status.go +++ b/go-apps/meep-mon-engine/server/model_pod_status.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mon-engine/server/model_pods_status.go b/go-apps/meep-mon-engine/server/model_pods_status.go index 0f78cb98f..a81e89e74 100644 --- a/go-apps/meep-mon-engine/server/model_pods_status.go +++ b/go-apps/meep-mon-engine/server/model_pods_status.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-mon-engine/server/mon-engine.go b/go-apps/meep-mon-engine/server/mon-engine.go index ee2ebb872..2cfb0de24 100644 --- a/go-apps/meep-mon-engine/server/mon-engine.go +++ b/go-apps/meep-mon-engine/server/mon-engine.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-mon-engine/server/routers.go b/go-apps/meep-mon-engine/server/routers.go index c6cebc206..a3d773e0b 100644 --- a/go-apps/meep-mon-engine/server/routers.go +++ b/go-apps/meep-mon-engine/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-platform-ctrl/Dockerfile b/go-apps/meep-platform-ctrl/Dockerfile index 5357e6557..18eb1834f 100644 --- a/go-apps/meep-platform-ctrl/Dockerfile +++ b/go-apps/meep-platform-ctrl/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-platform-ctrl/api/swagger.yaml b/go-apps/meep-platform-ctrl/api/swagger.yaml index 51037f575..0ce527806 100644 --- a/go-apps/meep-platform-ctrl/api/swagger.yaml +++ b/go-apps/meep-platform-ctrl/api/swagger.yaml @@ -342,6 +342,8 @@ definitions: $ref: "#/definitions/NetworkCharacteristics" connectivity: $ref: "#/definitions/ConnectivityConfig" + d2d: + $ref: "#/definitions/D2dConfig" interDomainLatency: type: "integer" description: "**DEPRECATED** As of release 1.5.0, replaced by netChar latency" @@ -420,6 +422,16 @@ definitions: - "OPEN" - "PDU" example: {} + D2dConfig: + type: "object" + properties: + d2dMaxDistance: + type: "number" + description: "Maximum distance for D2D. Default distance is 100m" + disableD2dViaNetwork: + type: "boolean" + description: "Enable-Disable D2D via network. Default value is false" + description: "D2D config" Domain: type: "object" properties: @@ -671,6 +683,16 @@ definitions: velocity: type: "number" description: "Speed of movement along path in m/s" + d2dInRange: + type: "array" + items: + type: "string" + description: "D2D UEs visible to UE" + poaInRange: + type: "array" + items: + type: "string" + description: "POAs visible to UE" description: "Geographic data" Point: type: "object" diff --git a/go-apps/meep-platform-ctrl/entrypoint.sh b/go-apps/meep-platform-ctrl/entrypoint.sh index 4067a66b2..f09dc15e7 100644 --- a/go-apps/meep-platform-ctrl/entrypoint.sh +++ b/go-apps/meep-platform-ctrl/entrypoint.sh @@ -5,6 +5,7 @@ echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" echo "USER_SWAGGER: ${USER_SWAGGER}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" if [[ ! -z "${MEEP_MEP_NAME}" ]]; then svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}" @@ -46,4 +47,11 @@ if [[ ! -z "${USER_SWAGGER}" ]]; then fi # Start service -exec /meep-platform-ctrl +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-platform-ctrl-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + exec /meep-platform-ctrl -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-platform-ctrl +fi diff --git a/go-apps/meep-platform-ctrl/main.go b/go-apps/meep-platform-ctrl/main.go index 7d682e9f1..79b939aae 100644 --- a/go-apps/meep-platform-ctrl/main.go +++ b/go-apps/meep-platform-ctrl/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-platform-ctrl/main_test.go b/go-apps/meep-platform-ctrl/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-platform-ctrl/main_test.go +++ b/go-apps/meep-platform-ctrl/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-platform-ctrl/server/README.md b/go-apps/meep-platform-ctrl/server/README.md index cc1ae7b57..7ae23148b 100644 --- a/go-apps/meep-platform-ctrl/server/README.md +++ b/go-apps/meep-platform-ctrl/server/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 1.0.0 -- Build date: 2021-11-23T08:33:06.780-05:00 +- Build date: 2022-11-04T17:12:07.345-04:00 ### Running the server diff --git a/go-apps/meep-platform-ctrl/server/api_sandbox_control.go b/go-apps/meep-platform-ctrl/server/api_sandbox_control.go index 6b6babd23..44bb28e5f 100644 --- a/go-apps/meep-platform-ctrl/server/api_sandbox_control.go +++ b/go-apps/meep-platform-ctrl/server/api_sandbox_control.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-platform-ctrl/server/api_scenario_configuration.go b/go-apps/meep-platform-ctrl/server/api_scenario_configuration.go index 6876db52c..82052d9ae 100644 --- a/go-apps/meep-platform-ctrl/server/api_scenario_configuration.go +++ b/go-apps/meep-platform-ctrl/server/api_scenario_configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-platform-ctrl/server/logger.go b/go-apps/meep-platform-ctrl/server/logger.go index 81cd5e492..4d1775efa 100644 --- a/go-apps/meep-platform-ctrl/server/logger.go +++ b/go-apps/meep-platform-ctrl/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-platform-ctrl/server/platform-ctrl.go b/go-apps/meep-platform-ctrl/server/platform-ctrl.go index 4ae3632cc..7536b71c5 100644 --- a/go-apps/meep-platform-ctrl/server/platform-ctrl.go +++ b/go-apps/meep-platform-ctrl/server/platform-ctrl.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-platform-ctrl/server/platform-ctrl_test.go b/go-apps/meep-platform-ctrl/server/platform-ctrl_test.go index 79eff22d0..e2d6ba8ae 100644 --- a/go-apps/meep-platform-ctrl/server/platform-ctrl_test.go +++ b/go-apps/meep-platform-ctrl/server/platform-ctrl_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-platform-ctrl/server/routers.go b/go-apps/meep-platform-ctrl/server/routers.go index 7705df8dd..9008c111c 100644 --- a/go-apps/meep-platform-ctrl/server/routers.go +++ b/go-apps/meep-platform-ctrl/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-rnis/Dockerfile b/go-apps/meep-rnis/Dockerfile index 7ac476768..f4719570e 100644 --- a/go-apps/meep-rnis/Dockerfile +++ b/go-apps/meep-rnis/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-rnis/api/swagger.yaml b/go-apps/meep-rnis/api/swagger.yaml index 3cdd718c2..503114fe9 100644 --- a/go-apps/meep-rnis/api/swagger.yaml +++ b/go-apps/meep-rnis/api/swagger.yaml @@ -1,9 +1,6 @@ openapi: 3.0.0 info: - contact: - name: InterDigital AdvantEDGE Support - email: AdvantEDGE@InterDigital.com - title: AdvantEDGE Radio Network Information Service REST API + title: AdvantEDGE Radio Network Information API version: 2.2.1 description: "Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf) @@ -18,16 +15,18 @@ info:

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription" license: - name: "Apache 2.0" - url: "https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE" + name: Apache 2.0 + url: 'https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE' + contact: + name: InterDigital AdvantEDGE Support + email: AdvantEDGE@InterDigital.com externalDocs: - description: ETSI GS MEC 012 Radio Network Information API, V2.2.1 - url: 'https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf' + description: ETSI MEC012 V2.2.1 Radio Network Information API + url: 'http://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_mec012v020201p.pdf' servers: - url: 'https://localhost/sandboxname/rni/v2' tags: -- name: 'rni' -- name: 'unsupported' + - name: 'rni' paths: /queries/rab_info: get: @@ -514,7 +513,7 @@ paths: '429': $ref: '#/components/responses/429' x-swagger-router-controller: "subscriptions" - /notifications/mec011/appTermination: + '/notifications/mec011/appTermination': post: tags: - 'rni' @@ -1261,6 +1260,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaAssoc type: object x-etsi-ref: 6.3.8 @@ -1439,6 +1439,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaAssocHo type: object x-etsi-ref: 6.3.2 @@ -2202,6 +2203,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaAssocTri type: object x-etsi-ref: 6.3.6 @@ -2327,6 +2329,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaAssoc type: object x-etsi-ref: 6.3.7 @@ -2597,6 +2600,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaNrMrs type: object x-etsi-ref: 6.3.11 @@ -2859,6 +2863,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaQci type: object x-etsi-ref: 6.3.3 @@ -3150,6 +3155,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaQci type: object x-etsi-ref: 6.3.4 @@ -3231,7 +3237,7 @@ components: x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) callbackReference: - description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. + description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. format: uri type: string x-etsi-mec-cardinality: 0..1 @@ -3286,6 +3292,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - filterCriteriaQci type: object x-etsi-ref: 6.3.5 @@ -3718,6 +3725,7 @@ components: x-etsi-mec-origin-type: String required: - subscriptionType + - callbackReference - eventType - S1BearerSubscriptionCriteria type: object @@ -3854,6 +3862,24 @@ components: discriminator: propertyName: notificationType + WebsockNotifConfig: + title: WebsockNotifConfig + description: > + This type represents configuration for the delivery of subscription notifications over Websockets per the pattern defined in defined in clause 6.12a of ETSI GS MEC 009 [6]. + type: object + properties: + websocketUri: + format: uri + type: string + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uri + description: Set by RNIS to indicate to the service consumer the Websocket URI to be used for delivering notifications. + requestWebsocketUri: + type: boolean + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uri + description: Set to true by the service consumer to indicate that Websocket delivery is requested. + x-etsi-ref: 6.3.12 AppTerminationNotification: description: >- This type represents the information that the MEC platform @@ -3894,47 +3920,3 @@ components: enum: - STOPPING - TERMINATING - WebsockNotifConfig: - title: WebsockNotifConfig - description: > - This type represents configuration for the delivery of subscription notifications over Websockets per the pattern defined in defined in clause 6.12a of ETSI GS MEC 009 [6]. - type: object - properties: - websocketUri: - format: uri - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uri - description: Set by RNIS to indicate to the service consumer the Websocket URI to be used for delivering notifications. - requestWebsocketUri: - type: boolean - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uri - description: Set to true by the service consumer to indicate that Websocket delivery is requested. - x-etsi-ref: 6.3.12 - - TestNotification: - description: > - This type represents a test notification from a Radio Network Information service to determine if the Websocket method is to be utilized for the RNIS to issue notifications for a subscription, as defined in clause 6.12a of ETSI GS MEC 009 [6]. - type: object - required: - - _links - - notificationType - properties: - notificationType: - description: Shall be set to "RabEstNotification". - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: 1 - x-etsi-mec-origin-type: Structure (inlined) - x-etsi-ref: 6.4.12 diff --git a/go-apps/meep-rnis/entrypoint.sh b/go-apps/meep-rnis/entrypoint.sh index 9c3c8bd0b..04970c6a0 100644 --- a/go-apps/meep-rnis/entrypoint.sh +++ b/go-apps/meep-rnis/entrypoint.sh @@ -4,6 +4,7 @@ set -e echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" if [[ ! -z "${MEEP_MEP_NAME}" ]]; then svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}" @@ -38,4 +39,11 @@ for file in /user-api/*; do done # Start service -exec /meep-rnis +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-rnis-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + exec /meep-rnis -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-rnis +fi diff --git a/go-apps/meep-rnis/go.sum b/go-apps/meep-rnis/go.sum index db044d8fa..767651888 100644 --- a/go-apps/meep-rnis/go.sum +++ b/go-apps/meep-rnis/go.sum @@ -110,6 +110,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= diff --git a/go-apps/meep-rnis/main.go b/go-apps/meep-rnis/main.go index 5c118893f..a2b5ecd34 100644 --- a/go-apps/meep-rnis/main.go +++ b/go-apps/meep-rnis/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-rnis/main_test.go b/go-apps/meep-rnis/main_test.go index 04e894a5b..6e642d668 100644 --- a/go-apps/meep-rnis/main_test.go +++ b/go-apps/meep-rnis/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-rnis/sbi/rnis-sbi.go b/go-apps/meep-rnis/sbi/rnis-sbi.go index 0c81e9dec..b26654878 100755 --- a/go-apps/meep-rnis/sbi/rnis-sbi.go +++ b/go-apps/meep-rnis/sbi/rnis-sbi.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -562,7 +562,7 @@ func processActiveScenarioUpdate() { func refreshMeasurements() { // Update UE measurements - ueMeasMap, _ := sbi.gisCache.GetAllMeasurements() + uePoaMeasMap, _ := sbi.gisCache.GetAllPoaMeasurements() ueNameList := sbi.activeModel.GetNodeNames("UE") for _, name := range ueNameList { @@ -574,7 +574,7 @@ func refreshMeasurements() { ueParent := sbi.activeModel.GetNodeParent(name) if poa, ok := ueParent.(*dataModel.NetworkLocation); ok { - poaNames, rsrps, rsrqs := getMeas(name, "", ueMeasMap) + poaNames, rsrps, rsrqs := getMeas(name, "", uePoaMeasMap) sbi.updateMeasInfoCB(name, poa.Name, poaNames, rsrps, rsrqs) } else { sbi.updateMeasInfoCB(name, "", nil, nil, nil) @@ -582,12 +582,12 @@ func refreshMeasurements() { } } -func getMeas(ue string, poaName string, ueMeasMap map[string]*gc.UeMeasurement) ([]string, []int32, []int32) { +func getMeas(ue string, poaName string, uePoaMeasMap map[string]*gc.UePoaMeasurement) ([]string, []int32, []int32) { var poaNames []string var rsrps []int32 var rsrqs []int32 - if ueMeas, ueFound := ueMeasMap[ue]; ueFound { + if ueMeas, ueFound := uePoaMeasMap[ue]; ueFound { if poaName == "" { for poaName, meas := range ueMeas.Measurements { poaNames = append(poaNames, poaName) diff --git a/go-apps/meep-rnis/server/README.md b/go-apps/meep-rnis/server/README.md index ce6c68ea5..e68080794 100644 --- a/go-apps/meep-rnis/server/README.md +++ b/go-apps/meep-rnis/server/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 2.2.1 -- Build date: 2022-06-05T16:36:32.163308+05:00[Asia/Karachi] +- Build date: 2022-11-04T17:14:12.656517-04:00[America/New_York] ### Running the server diff --git a/go-apps/meep-rnis/server/api_rni.go b/go-apps/meep-rnis/server/api_rni.go index 499334a1c..35bfb9a3b 100644 --- a/go-apps/meep-rnis/server/api_rni.go +++ b/go-apps/meep-rnis/server/api_rni.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/api_unsupported.go b/go-apps/meep-rnis/server/api_unsupported.go index 11444d51a..e9a0f932b 100644 --- a/go-apps/meep-rnis/server/api_unsupported.go +++ b/go-apps/meep-rnis/server/api_unsupported.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/convert.go b/go-apps/meep-rnis/server/convert.go index 55e9c6a90..d1ad3c585 100755 --- a/go-apps/meep-rnis/server/convert.go +++ b/go-apps/meep-rnis/server/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-rnis/server/logger.go b/go-apps/meep-rnis/server/logger.go index ccd00a0d8..e22ab0bc3 100644 --- a/go-apps/meep-rnis/server/logger.go +++ b/go-apps/meep-rnis/server/logger.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_app_termination_notification.go b/go-apps/meep-rnis/server/model_app_termination_notification.go index f5e3bced5..8b0cf3407 100644 --- a/go-apps/meep-rnis/server/model_app_termination_notification.go +++ b/go-apps/meep-rnis/server/model_app_termination_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_app_termination_notification__links.go b/go-apps/meep-rnis/server/model_app_termination_notification__links.go index 794ac7628..95a54b838 100644 --- a/go-apps/meep-rnis/server/model_app_termination_notification__links.go +++ b/go-apps/meep-rnis/server/model_app_termination_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_associate_id.go b/go-apps/meep-rnis/server/model_associate_id.go index ce3340462..4a9ad2d94 100644 --- a/go-apps/meep-rnis/server/model_associate_id.go +++ b/go-apps/meep-rnis/server/model_associate_id.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_ca_reconf_notification.go b/go-apps/meep-rnis/server/model_ca_reconf_notification.go index 55f98d009..897d8edf6 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_notification.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,13 +24,14 @@ package server type CaReconfNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to associate the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` - // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to N. + // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. CarrierAggregationMeasInfo []CaReconfNotificationCarrierAggregationMeasInfo `json:"carrierAggregationMeasInfo,omitempty"` Ecgi *Ecgi `json:"ecgi"` + // Shall be set to \"CaReConfNotification\". + NotificationType string `json:"notificationType"` SecondaryCellAdd []CaReconfNotificationSecondaryCellAdd `json:"secondaryCellAdd,omitempty"` diff --git a/go-apps/meep-rnis/server/model_ca_reconf_notification__links.go b/go-apps/meep-rnis/server/model_ca_reconf_notification__links.go index 6474853ee..4cfed0b28 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_notification__links.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_ca_reconf_notification_carrier_aggregation_meas_info.go b/go-apps/meep-rnis/server/model_ca_reconf_notification_carrier_aggregation_meas_info.go index 0b1c2d646..80c896f63 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_notification_carrier_aggregation_meas_info.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_notification_carrier_aggregation_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,10 +24,9 @@ package server type CaReconfNotificationCarrierAggregationMeasInfo struct { - // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. - CellIdNei string `json:"cellIdNei"` - // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. - CellIdSrv string `json:"cellIdSrv"` + CellIdNei string `json:"cellIdNei,omitempty"` + + CellIdSrv string `json:"cellIdSrv,omitempty"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. RsrpNei int32 `json:"rsrpNei,omitempty"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. diff --git a/go-apps/meep-rnis/server/model_ca_reconf_notification_secondary_cell_add.go b/go-apps/meep-rnis/server/model_ca_reconf_notification_secondary_cell_add.go index 2710409f1..66e84c1c4 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_notification_secondary_cell_add.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_notification_secondary_cell_add.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,5 +24,5 @@ package server type CaReconfNotificationSecondaryCellAdd struct { - Ecgi *Ecgi `json:"ecgi"` + Ecgi *Ecgi `json:"ecgi,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_ca_reconf_subscription.go b/go-apps/meep-rnis/server/model_ca_reconf_subscription.go index 05c75464c..dda8ea971 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_subscription.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,11 +25,9 @@ package server // This type represents a subscription to UE carrier aggregation reconfiguration notifications from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type CaReconfSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. @@ -38,4 +36,6 @@ type CaReconfSubscription struct { ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteriaAssoc *CaReconfSubscriptionFilterCriteriaAssoc `json:"filterCriteriaAssoc"` + // Shall be set to \"CaReconfSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_ca_reconf_subscription__links.go b/go-apps/meep-rnis/server/model_ca_reconf_subscription__links.go index 58a5cea83..d2891979e 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_subscription__links.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_subscription__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_ca_reconf_subscription_filter_criteria_assoc.go b/go-apps/meep-rnis/server/model_ca_reconf_subscription_filter_criteria_assoc.go index fc110fb47..d140640b4 100644 --- a/go-apps/meep-rnis/server/model_ca_reconf_subscription_filter_criteria_assoc.go +++ b/go-apps/meep-rnis/server/model_ca_reconf_subscription_filter_criteria_assoc.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_cell_change_notification.go b/go-apps/meep-rnis/server/model_cell_change_notification.go index 77b60fd57..2754e2888 100644 --- a/go-apps/meep-rnis/server/model_cell_change_notification.go +++ b/go-apps/meep-rnis/server/model_cell_change_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -23,20 +23,20 @@ */ package server -// This type represents a notification from RNIS with regards to cell change procedure NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. type CellChangeNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to associate the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` - + // Indicate the status of the UE handover procedure. Values are defined as following:

    1 = IN_PREPARATION.

    2 = IN_EXECUTION.

    3 = COMPLETED.

    4 = REJECTED.

    5 = CANCELLED. HoStatus int32 `json:"hoStatus"` + // Shall be set to \"CellChangeNotification\". + NotificationType string `json:"notificationType"` SrcEcgi *Ecgi `json:"srcEcgi"` TempUeId *CellChangeNotificationTempUeId `json:"tempUeId,omitempty"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` - // E-UTRAN Cell Global Identifier of the target cell. See note. + // E-UTRAN Cell Global Identifier of the target cell. See note. NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED. TrgEcgi []Ecgi `json:"trgEcgi"` Links *CaReconfNotificationLinks `json:"_links"` diff --git a/go-apps/meep-rnis/server/model_cell_change_notification_temp_ue_id.go b/go-apps/meep-rnis/server/model_cell_change_notification_temp_ue_id.go index 44be9fa3a..30223d381 100644 --- a/go-apps/meep-rnis/server/model_cell_change_notification_temp_ue_id.go +++ b/go-apps/meep-rnis/server/model_cell_change_notification_temp_ue_id.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_cell_change_subscription.go b/go-apps/meep-rnis/server/model_cell_change_subscription.go index 2ffd184bb..13371f637 100644 --- a/go-apps/meep-rnis/server/model_cell_change_subscription.go +++ b/go-apps/meep-rnis/server/model_cell_change_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,17 +25,17 @@ package server // This type represents a subscription to cell change notifications from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type CellChangeSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` - // Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. - WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` + CallbackReference string `json:"callbackReference"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` - FilterCriteriaAssocHo *CellChangeSubscriptionFilterCriteriaAssocHo `json:"filterCriteriaAssocHo"` + WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` + + FilterCriteriaAssocHo *CellChangeSubscriptionFilterCriteriaAssocHo `json:"filterCriteriaAssocHo"` + // Shall be set to \"CellChangeSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_cell_change_subscription_filter_criteria_assoc_ho.go b/go-apps/meep-rnis/server/model_cell_change_subscription_filter_criteria_assoc_ho.go index 5bba03db3..480ffb140 100644 --- a/go-apps/meep-rnis/server/model_cell_change_subscription_filter_criteria_assoc_ho.go +++ b/go-apps/meep-rnis/server/model_cell_change_subscription_filter_criteria_assoc_ho.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_ecgi.go b/go-apps/meep-rnis/server/model_ecgi.go index 705b32570..8cc76079c 100644 --- a/go-apps/meep-rnis/server/model_ecgi.go +++ b/go-apps/meep-rnis/server/model_ecgi.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,6 @@ package server type Ecgi struct { - // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. CellId string `json:"cellId"` Plmn *Plmn `json:"plmn"` diff --git a/go-apps/meep-rnis/server/model_expiry_notification.go b/go-apps/meep-rnis/server/model_expiry_notification.go index fd9f5d953..66aa65136 100644 --- a/go-apps/meep-rnis/server/model_expiry_notification.go +++ b/go-apps/meep-rnis/server/model_expiry_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,11 +24,11 @@ package server type ExpiryNotification struct { - NotificationType string `json:"notificationType"` - Links *ExpiryNotificationLinks `json:"_links"` ExpiryDeadline *TimeStamp `json:"expiryDeadline"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + // Shall be set to \"ExpiryNotification\" + NotificationType string `json:"notificationType"` } diff --git a/go-apps/meep-rnis/server/model_expiry_notification__links.go b/go-apps/meep-rnis/server/model_expiry_notification__links.go index 1b9704bff..3a226d65d 100644 --- a/go-apps/meep-rnis/server/model_expiry_notification__links.go +++ b/go-apps/meep-rnis/server/model_expiry_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_inline_notification.go b/go-apps/meep-rnis/server/model_inline_notification.go index 910ba766f..8477d8b4f 100644 --- a/go-apps/meep-rnis/server/model_inline_notification.go +++ b/go-apps/meep-rnis/server/model_inline_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,5 +24,4 @@ package server type InlineNotification struct { - NotificationType string `json:"notificationType"` } diff --git a/go-apps/meep-rnis/server/model_inline_subscription.go b/go-apps/meep-rnis/server/model_inline_subscription.go index 1ef7507ea..08d54fd0a 100644 --- a/go-apps/meep-rnis/server/model_inline_subscription.go +++ b/go-apps/meep-rnis/server/model_inline_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,5 +24,4 @@ package server type InlineSubscription struct { - SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_l2_meas.go b/go-apps/meep-rnis/server/model_l2_meas.go index e89ff5c62..907eb173f 100644 --- a/go-apps/meep-rnis/server/model_l2_meas.go +++ b/go-apps/meep-rnis/server/model_l2_meas.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_l2_meas_cell_info.go b/go-apps/meep-rnis/server/model_l2_meas_cell_info.go index 449a9fefa..ac8d145a5 100644 --- a/go-apps/meep-rnis/server/model_l2_meas_cell_info.go +++ b/go-apps/meep-rnis/server/model_l2_meas_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -35,7 +35,7 @@ type L2MeasCellInfo struct { // It indicates (in percentage) the PRB usage for total downlink traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12]. DlTotalPrbUsageCell int32 `json:"dl_total_prb_usage_cell,omitempty"` - Ecgi *Ecgi `json:"ecgi"` + Ecgi *Ecgi `json:"ecgi,omitempty"` // It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11]. NumberOfActiveUeDlGbrCell int32 `json:"number_of_active_ue_dl_gbr_cell,omitempty"` // It indicates the number of active UEs with downlink non-GBR traffic, as defined in ETSI TS 136 314 [i.11]. @@ -44,7 +44,7 @@ type L2MeasCellInfo struct { NumberOfActiveUeUlGbrCell int32 `json:"number_of_active_ue_ul_gbr_cell,omitempty"` // It indicates the number of active UEs with uplink non-GBR traffic, as defined in ETSI TS 136 314 [i.11]. NumberOfActiveUeUlNongbrCell int32 `json:"number_of_active_ue_ul_nongbr_cell,omitempty"` - // It indicates (in percentage) the received dedicated preambles, as defined in ETSI TS 136 314 [i.11]. + // It indicates (in percentage) the received dedicated preamples, as defined in ETSI TS 136 314 [i.11]. ReceivedDedicatedPreamblesCell int32 `json:"received_dedicated_preambles_cell,omitempty"` // It indicates (in percentage) the received randomly selected preambles in the high range, as defined in ETSI TS 136 314 [i.11]. ReceivedRandomlySelectedPreamblesHighRangeCell int32 `json:"received_randomly_selected_preambles_high_range_cell,omitempty"` diff --git a/go-apps/meep-rnis/server/model_l2_meas_cell_ue_info.go b/go-apps/meep-rnis/server/model_l2_meas_cell_ue_info.go index ace285c62..7a7780799 100644 --- a/go-apps/meep-rnis/server/model_l2_meas_cell_ue_info.go +++ b/go-apps/meep-rnis/server/model_l2_meas_cell_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,7 @@ package server type L2MeasCellUeInfo struct { - AssociateId *AssociateId `json:"associateId"` + AssociateId *AssociateId `json:"associateId,omitempty"` // It indicates the data volume of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. DlGbrDataVolumeUe int32 `json:"dl_gbr_data_volume_ue,omitempty"` // It indicates the packet delay of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. @@ -42,7 +42,7 @@ type L2MeasCellUeInfo struct { // It indicates the scheduled throughput of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. DlNongbrThroughputUe int32 `json:"dl_nongbr_throughput_ue,omitempty"` - Ecgi *Ecgi `json:"ecgi"` + Ecgi *Ecgi `json:"ecgi,omitempty"` // It indicates the data volume of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. UlGbrDataVolumeUe int32 `json:"ul_gbr_data_volume_ue,omitempty"` // It indicates the packet delay of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. diff --git a/go-apps/meep-rnis/server/model_link_type.go b/go-apps/meep-rnis/server/model_link_type.go index c3d09f706..0dd2f7366 100644 --- a/go-apps/meep-rnis/server/model_link_type.go +++ b/go-apps/meep-rnis/server/model_link_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_meas_quantity_results_nr.go b/go-apps/meep-rnis/server/model_meas_quantity_results_nr.go index 620791e1e..eed02122f 100644 --- a/go-apps/meep-rnis/server/model_meas_quantity_results_nr.go +++ b/go-apps/meep-rnis/server/model_meas_quantity_results_nr.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification.go index fda8d12e5..5145a6706 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,10 +24,9 @@ package server type MeasRepUeNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to associate the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` - // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to N. + // This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. CarrierAggregationMeasInfo []MeasRepUeNotificationCarrierAggregationMeasInfo `json:"carrierAggregationMeasInfo,omitempty"` Ecgi *Ecgi `json:"ecgi"` @@ -39,6 +38,8 @@ type MeasRepUeNotification struct { NewRadioMeasInfo []MeasRepUeNotificationNewRadioMeasInfo `json:"newRadioMeasInfo,omitempty"` // Measurement quantities concerning the 5G NR neighbours. NewRadioMeasNeiInfo []MeasRepUeNotificationNewRadioMeasNeiInfo `json:"newRadioMeasNeiInfo,omitempty"` + // Shall be set to \"MeasRepUeNotification\". + NotificationType string `json:"notificationType"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. Rsrp int32 `json:"rsrp"` // Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go index ea3185afb..472161afc 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,10 +24,9 @@ package server type MeasRepUeNotificationCarrierAggregationMeasInfo struct { - // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. CellIdNei string `json:"cellIdNei,omitempty"` - // String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. - CellIdSrv string `json:"cellIdSrv"` + + CellIdSrv string `json:"cellIdSrv,omitempty"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. RsrpNei int32 `json:"rsrpNei,omitempty"` // Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go index bc6398369..815541597 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,7 @@ package server type MeasRepUeNotificationEutranNeighbourCellMeasInfo struct { - Ecgi *Ecgi `json:"ecgi"` + Ecgi *Ecgi `json:"ecgi,omitempty"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.5]. Rsrp int32 `json:"rsrp,omitempty"` // Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_info.go index d6476d3c5..da2f904f1 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -26,7 +26,7 @@ package server type MeasRepUeNotificationNewRadioMeasInfo struct { NrBNCs *MeasRepUeNotificationNrBnCs `json:"nrBNCs,omitempty"` // ARFCN applicable for a downlink, uplink or bi-directional (TDD) NR carrier frequency, as defined in ETSI TS 138.101 [i.15]. - NrCarrierFreq int32 `json:"nrCarrierFreq"` + NrCarrierFreq int32 `json:"nrCarrierFreq,omitempty"` - NrSCs *MeasRepUeNotificationNrSCs `json:"nrSCs"` + NrSCs *MeasRepUeNotificationNrSCs `json:"nrSCs,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_nei_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_nei_info.go index 77c2f834f..7034b4ca3 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_nei_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_new_radio_meas_nei_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,7 +25,7 @@ package server type MeasRepUeNotificationNewRadioMeasNeiInfo struct { // 5G NR neighbour cell info. - NrNCellInfo []MeasRepUeNotificationNrNCellInfo `json:"nrNCellInfo"` + NrNCellInfo []MeasRepUeNotificationNrNCellInfo `json:"nrNCellInfo,omitempty"` // Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. NrNCellRsrp int32 `json:"nrNCellRsrp,omitempty"` // Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs.go index b1f93e5f5..2986406e0 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go index 447333ae1..1762f606a 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,8 +24,7 @@ package server type MeasRepUeNotificationNrBnCsNrBnCellInfo struct { - // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. - NrBNCellGId string `json:"nrBNCellGId"` + NrBNCellGId string `json:"nrBNCellGId,omitempty"` // Public land mobile network identities - NrBNCellPlmn []Plmn `json:"nrBNCellPlmn"` + NrBNCellPlmn []Plmn `json:"nrBNCellPlmn,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_n_cell_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_n_cell_info.go index e8001f329..bde81dfaa 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_n_cell_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_n_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,8 +24,7 @@ package server type MeasRepUeNotificationNrNCellInfo struct { - // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. - NrNCellGId string `json:"nrNCellGId"` + NrNCellGId string `json:"nrNCellGId,omitempty"` // Public land mobile network identities. - NrNCellPlmn []Plmn `json:"nrNCellPlmn"` + NrNCellPlmn []Plmn `json:"nrNCellPlmn,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs.go index d5c724f91..b8936e551 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go index 6439ed592..bca3f1cfd 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,8 +24,7 @@ package server type MeasRepUeNotificationNrSCsNrSCellInfo struct { - // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. - NrSCellGId string `json:"nrSCellGId"` + NrSCellGId string `json:"nrSCellGId,omitempty"` // Public land mobile network identities. - NrSCellPlmn []Plmn `json:"nrSCellPlmn"` + NrSCellPlmn []Plmn `json:"nrSCellPlmn,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_subscription.go b/go-apps/meep-rnis/server/model_meas_rep_ue_subscription.go index 0b449d304..51862a3f2 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_subscription.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,11 +25,9 @@ package server // This type represents a subscription to UE measurement report notifications from Radio Network Information Service for UEs served by E-UTRA Cells. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to select the method to be used for notifications and to return only that method in the response. type MeasRepUeSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications. @@ -38,4 +36,6 @@ type MeasRepUeSubscription struct { ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteriaAssocTri *MeasRepUeSubscriptionFilterCriteriaAssocTri `json:"filterCriteriaAssocTri"` + // Shall be set to \"MeasRepUeSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go b/go-apps/meep-rnis/server/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go index ff19936c2..948319a6a 100644 --- a/go-apps/meep-rnis/server/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go +++ b/go-apps/meep-rnis/server/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_meas_ta_notification.go b/go-apps/meep-rnis/server/model_meas_ta_notification.go index e49c193cc..ec8dcc073 100644 --- a/go-apps/meep-rnis/server/model_meas_ta_notification.go +++ b/go-apps/meep-rnis/server/model_meas_ta_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,11 +24,12 @@ package server type MeasTaNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to associate the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` Ecgi *Ecgi `json:"ecgi"` + // Shall be set to \"MeasTaNotification\". + NotificationType string `json:"notificationType"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` // The timing advance as defined in ETSI TS 136 214 [i.5]. diff --git a/go-apps/meep-rnis/server/model_meas_ta_subscription.go b/go-apps/meep-rnis/server/model_meas_ta_subscription.go index bb62834a0..6274ce32f 100644 --- a/go-apps/meep-rnis/server/model_meas_ta_subscription.go +++ b/go-apps/meep-rnis/server/model_meas_ta_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,11 +25,9 @@ package server // This type represents a subscription to UE timing advance notifications from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type MeasTaSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. @@ -38,4 +36,6 @@ type MeasTaSubscription struct { ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteriaAssoc *CaReconfSubscriptionFilterCriteriaAssoc `json:"filterCriteriaAssoc"` + // Shall be set to \"MeasTaSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification.go index ef3542b40..500fdf735 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,11 +24,12 @@ package server type NrMeasRepUeNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to associate the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` // This parameter can be repeated to contain measurement information of all the neighbouring cells up to N. It shall not be included if nrNeighCellMeasInfo is included. EutraNeighCellMeasInfo []NrMeasRepUeNotificationEutraNeighCellMeasInfo `json:"eutraNeighCellMeasInfo,omitempty"` + // Shall be set to \"NrMeasRepUeNotification\". + NotificationType string `json:"notificationType"` // This parameter can be repeated to contain measurement information of all the neighbouring cells up to N. It shall not be included if eutraNeighCellMeasInfo is included. NrNeighCellMeasInfo []NrMeasRepUeNotificationNrNeighCellMeasInfo `json:"nrNeighCellMeasInfo,omitempty"` // This parameter can be repeated to contain information of all the serving cells up to N. diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go index 06aae3961..cde2a42e1 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,7 @@ package server type NrMeasRepUeNotificationEutraNeighCellMeasInfo struct { - Ecgi *Ecgi `json:"ecgi"` + Ecgi *Ecgi `json:"ecgi,omitempty"` // Reference Signal Received Power as defined in ETSI TS 138 331 [i.13]. Rsrp int32 `json:"rsrp,omitempty"` // Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13]. diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_n_cell.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_n_cell.go index 6507ad095..83cb42370 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_n_cell.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_n_cell.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go index cc268d8f9..8f2233365 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ type NrMeasRepUeNotificationNrNeighCellMeasInfo struct { MeasQuantityResultsSsbCell *MeasQuantityResultsNr `json:"measQuantityResultsSsbCell,omitempty"` - Nrcgi *Nrcgi `json:"nrcgi"` + Nrcgi *Nrcgi `json:"nrcgi,omitempty"` RsIndexResults *RsIndexResults `json:"rsIndexResults,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_s_cell.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_s_cell.go index 28297240d..10c3238d8 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_s_cell.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_s_cell.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -23,7 +23,7 @@ */ package server -// Measurement information relating to the best neighbour of this serving cell. +// Measurement information relating to this serving cell. type NrMeasRepUeNotificationSCell struct { MeasQuantityResultsCsiRsCell *MeasQuantityResultsNr `json:"measQuantityResultsCsiRsCell,omitempty"` diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go index f16a02c34..62204da79 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -26,7 +26,7 @@ package server type NrMeasRepUeNotificationServCellMeasInfo struct { NCell *NrMeasRepUeNotificationNCell `json:"nCell,omitempty"` - Nrcgi *Nrcgi `json:"nrcgi"` + Nrcgi *Nrcgi `json:"nrcgi,omitempty"` - SCell *NrMeasRepUeNotificationSCell `json:"sCell"` + SCell *NrMeasRepUeNotificationSCell `json:"sCell,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription.go index 9f4ce1d5d..a1ccf8a09 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,11 +25,9 @@ package server // This type represents a subscription to 5G UE measurement report notifications from Radio Network Information Service for UEs served by NR Cells. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type NrMeasRepUeSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. @@ -38,4 +36,6 @@ type NrMeasRepUeSubscription struct { ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteriaNrMrs *NrMeasRepUeSubscriptionFilterCriteriaNrMrs `json:"filterCriteriaNrMrs"` + // Shall be set to \"NrMeasRepUeSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go index 0ea23dd03..68c071d56 100644 --- a/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go +++ b/go-apps/meep-rnis/server/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_nrcgi.go b/go-apps/meep-rnis/server/model_nrcgi.go index ba55997a8..884e19420 100644 --- a/go-apps/meep-rnis/server/model_nrcgi.go +++ b/go-apps/meep-rnis/server/model_nrcgi.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,8 +24,7 @@ package server type Nrcgi struct { - // String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. - NrCellId string `json:"nrCellId"` + NrcellId string `json:"nrcellId"` Plmn *Plmn `json:"plmn"` } diff --git a/go-apps/meep-rnis/server/model_one_of_inline_notification.go b/go-apps/meep-rnis/server/model_one_of_inline_notification.go index 4147b11f0..9f5bd28e5 100644 --- a/go-apps/meep-rnis/server/model_one_of_inline_notification.go +++ b/go-apps/meep-rnis/server/model_one_of_inline_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,14 +24,4 @@ package server type OneOfInlineNotification struct { - /* CellChangeNotification - RabEstNotification - RabModNotification - RabRelNotification - MeasRepUeNotification - NrMeasRepUeNotification - MeasTaNotification - CaReconfNotification - S1BearerNotification - */ } diff --git a/go-apps/meep-rnis/server/model_one_of_inline_subscription.go b/go-apps/meep-rnis/server/model_one_of_inline_subscription.go index f6709738f..a0ae6f0ab 100644 --- a/go-apps/meep-rnis/server/model_one_of_inline_subscription.go +++ b/go-apps/meep-rnis/server/model_one_of_inline_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,14 +24,4 @@ package server type OneOfInlineSubscription struct { - /* CellChangeSubscription - RabEstSubscription - RabModSubscription - RabRelSubscription - MeasRepUeSubscription - NrMeasRepUeSubscription - MeasTaSubscription - CaReconfSubscription - S1BearerSubscription - */ } diff --git a/go-apps/meep-rnis/server/model_operation_action_type.go b/go-apps/meep-rnis/server/model_operation_action_type.go index 190f0a2a1..2388a8196 100644 --- a/go-apps/meep-rnis/server/model_operation_action_type.go +++ b/go-apps/meep-rnis/server/model_operation_action_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,6 +28,6 @@ type OperationActionType string // List of OperationActionType const ( - STOPPING OperationActionType = "STOPPING" - TERMINATING OperationActionType = "TERMINATING" + STOPPING_OperationActionType OperationActionType = "STOPPING" + TERMINATING_OperationActionType OperationActionType = "TERMINATING" ) diff --git a/go-apps/meep-rnis/server/model_plmn.go b/go-apps/meep-rnis/server/model_plmn.go index 84a31cebc..904dc64cd 100644 --- a/go-apps/meep-rnis/server/model_plmn.go +++ b/go-apps/meep-rnis/server/model_plmn.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_plmn_info.go b/go-apps/meep-rnis/server/model_plmn_info.go index 901dd12fc..a7440c53a 100644 --- a/go-apps/meep-rnis/server/model_plmn_info.go +++ b/go-apps/meep-rnis/server/model_plmn_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_problem_details.go b/go-apps/meep-rnis/server/model_problem_details.go index 32ec9250a..bd6caf483 100644 --- a/go-apps/meep-rnis/server/model_problem_details.go +++ b/go-apps/meep-rnis/server/model_problem_details.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_est_notification.go b/go-apps/meep-rnis/server/model_rab_est_notification.go index c07e1516f..bb7df5cdb 100644 --- a/go-apps/meep-rnis/server/model_rab_est_notification.go +++ b/go-apps/meep-rnis/server/model_rab_est_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,6 @@ package server type RabEstNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to bind the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` @@ -33,10 +32,12 @@ type RabEstNotification struct { ErabId int32 `json:"erabId"` ErabQosParameters *RabEstNotificationErabQosParameters `json:"erabQosParameters,omitempty"` + // Shall be set to \"RabEstNotification\". + NotificationType string `json:"notificationType"` TempUeId *RabEstNotificationTempUeId `json:"tempUeId,omitempty"` - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` - Links *CaReconfNotificationLinks `json:"_links"` + + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters.go b/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters.go index c4c278d90..305a2d973 100644 --- a/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters.go +++ b/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters_qos_information.go b/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters_qos_information.go index dc4160adf..e06bb09b1 100644 --- a/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters_qos_information.go +++ b/go-apps/meep-rnis/server/model_rab_est_notification_erab_qos_parameters_qos_information.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_est_notification_temp_ue_id.go b/go-apps/meep-rnis/server/model_rab_est_notification_temp_ue_id.go index 7019b58f5..235d6be1c 100644 --- a/go-apps/meep-rnis/server/model_rab_est_notification_temp_ue_id.go +++ b/go-apps/meep-rnis/server/model_rab_est_notification_temp_ue_id.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_est_subscription.go b/go-apps/meep-rnis/server/model_rab_est_subscription.go index b0986b99d..024cd0ccc 100644 --- a/go-apps/meep-rnis/server/model_rab_est_subscription.go +++ b/go-apps/meep-rnis/server/model_rab_est_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,17 +25,17 @@ package server // This type represents a subscription to RAB establishment notifications from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type RabEstSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` + + ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` - ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` - FilterCriteriaQci *RabEstSubscriptionFilterCriteriaQci `json:"filterCriteriaQci"` + // Shall be set to \"RabEstSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_rab_est_subscription_filter_criteria_qci.go b/go-apps/meep-rnis/server/model_rab_est_subscription_filter_criteria_qci.go index e57916341..5067f83f2 100644 --- a/go-apps/meep-rnis/server/model_rab_est_subscription_filter_criteria_qci.go +++ b/go-apps/meep-rnis/server/model_rab_est_subscription_filter_criteria_qci.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_info.go b/go-apps/meep-rnis/server/model_rab_info.go index aaea2a255..ee141289e 100644 --- a/go-apps/meep-rnis/server/model_rab_info.go +++ b/go-apps/meep-rnis/server/model_rab_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_info_cell_user_info.go b/go-apps/meep-rnis/server/model_rab_info_cell_user_info.go index ac99be7cf..26a2873d2 100644 --- a/go-apps/meep-rnis/server/model_rab_info_cell_user_info.go +++ b/go-apps/meep-rnis/server/model_rab_info_cell_user_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,7 @@ package server type RabInfoCellUserInfo struct { - Ecgi *Ecgi `json:"ecgi"` + Ecgi *Ecgi `json:"ecgi,omitempty"` // Information on UEs in the specific cell as defined below. - UeInfo []RabInfoUeInfo `json:"ueInfo"` + UeInfo []RabInfoUeInfo `json:"ueInfo,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_rab_info_erab_info.go b/go-apps/meep-rnis/server/model_rab_info_erab_info.go index 0eb83e7d5..a728608d3 100644 --- a/go-apps/meep-rnis/server/model_rab_info_erab_info.go +++ b/go-apps/meep-rnis/server/model_rab_info_erab_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_info_ue_info.go b/go-apps/meep-rnis/server/model_rab_info_ue_info.go index 6a6704785..62518e667 100644 --- a/go-apps/meep-rnis/server/model_rab_info_ue_info.go +++ b/go-apps/meep-rnis/server/model_rab_info_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -27,5 +27,5 @@ type RabInfoUeInfo struct { // 0 to N identifiers to associate the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` // Information on E-RAB as defined below. - ErabInfo []RabInfoErabInfo `json:"erabInfo"` + ErabInfo []RabInfoErabInfo `json:"erabInfo,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_rab_mod_notification.go b/go-apps/meep-rnis/server/model_rab_mod_notification.go index 314a407a9..d578057ab 100644 --- a/go-apps/meep-rnis/server/model_rab_mod_notification.go +++ b/go-apps/meep-rnis/server/model_rab_mod_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,7 +24,6 @@ package server type RabModNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to bind the event for a specific UE or flow. AssociateId []AssociateId `json:"associateId,omitempty"` @@ -33,6 +32,8 @@ type RabModNotification struct { ErabId int32 `json:"erabId"` ErabQosParameters *RabModNotificationErabQosParameters `json:"erabQosParameters,omitempty"` + // Shall be set to \"RabModNotification\". + NotificationType string `json:"notificationType"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` diff --git a/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters.go b/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters.go index 251ef1269..5badcbfca 100644 --- a/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters.go +++ b/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters_qos_information.go b/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters_qos_information.go index 633fbcb13..7523ea220 100644 --- a/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters_qos_information.go +++ b/go-apps/meep-rnis/server/model_rab_mod_notification_erab_qos_parameters_qos_information.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_mod_subscription.go b/go-apps/meep-rnis/server/model_rab_mod_subscription.go index 1f6c2dc64..3a323150b 100644 --- a/go-apps/meep-rnis/server/model_rab_mod_subscription.go +++ b/go-apps/meep-rnis/server/model_rab_mod_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,11 +25,9 @@ package server // This type represents a subscription to RAB modification notifications from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type RabModSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. @@ -38,4 +36,6 @@ type RabModSubscription struct { ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteriaQci *RabModSubscriptionFilterCriteriaQci `json:"filterCriteriaQci"` + // Shall be set to \"RabModSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_rab_mod_subscription_filter_criteria_qci.go b/go-apps/meep-rnis/server/model_rab_mod_subscription_filter_criteria_qci.go index 3f3a64c49..eb5736296 100644 --- a/go-apps/meep-rnis/server/model_rab_mod_subscription_filter_criteria_qci.go +++ b/go-apps/meep-rnis/server/model_rab_mod_subscription_filter_criteria_qci.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_rel_notification.go b/go-apps/meep-rnis/server/model_rab_rel_notification.go index 558ea2188..f8222804d 100644 --- a/go-apps/meep-rnis/server/model_rab_rel_notification.go +++ b/go-apps/meep-rnis/server/model_rab_rel_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,13 +24,14 @@ package server type RabRelNotification struct { - NotificationType string `json:"notificationType"` // 0 to N identifiers to bind the event for a specific UE or flow as defined below. AssociateId []AssociateId `json:"associateId,omitempty"` Ecgi *Ecgi `json:"ecgi"` ErabReleaseInfo *RabRelNotificationErabReleaseInfo `json:"erabReleaseInfo"` + // Shall be set to \"RabRelNotification\". + NotificationType string `json:"notificationType"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` diff --git a/go-apps/meep-rnis/server/model_rab_rel_notification_erab_release_info.go b/go-apps/meep-rnis/server/model_rab_rel_notification_erab_release_info.go index cdbabc5e8..f341e1463 100644 --- a/go-apps/meep-rnis/server/model_rab_rel_notification_erab_release_info.go +++ b/go-apps/meep-rnis/server/model_rab_rel_notification_erab_release_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rab_rel_subscription.go b/go-apps/meep-rnis/server/model_rab_rel_subscription.go index 64761cab9..0cff1f596 100644 --- a/go-apps/meep-rnis/server/model_rab_rel_subscription.go +++ b/go-apps/meep-rnis/server/model_rab_rel_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,17 +25,17 @@ package server // This type represents a subscription to RAB release notifications from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to select the method to be used for notifications and to return only that method in the response. type RabRelSubscription struct { - SubscriptionType string `json:"subscriptionType"` - Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` - // Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications. + // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteriaQci *RabModSubscriptionFilterCriteriaQci `json:"filterCriteriaQci"` + // Shall be set to \"RabRelSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_results_per_csi_rs_index.go b/go-apps/meep-rnis/server/model_results_per_csi_rs_index.go index 563944080..cf30a0edc 100644 --- a/go-apps/meep-rnis/server/model_results_per_csi_rs_index.go +++ b/go-apps/meep-rnis/server/model_results_per_csi_rs_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list.go b/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list.go index 76f2502bd..e2aa44bdb 100644 --- a/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list.go +++ b/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go b/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go index 9061ecc12..412976b28 100644 --- a/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go +++ b/go-apps/meep-rnis/server/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_results_per_ssb_index.go b/go-apps/meep-rnis/server/model_results_per_ssb_index.go index 70e816d4c..c083d1872 100644 --- a/go-apps/meep-rnis/server/model_results_per_ssb_index.go +++ b/go-apps/meep-rnis/server/model_results_per_ssb_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_results_per_ssb_index_list.go b/go-apps/meep-rnis/server/model_results_per_ssb_index_list.go index 3074821cb..19bb3e31a 100644 --- a/go-apps/meep-rnis/server/model_results_per_ssb_index_list.go +++ b/go-apps/meep-rnis/server/model_results_per_ssb_index_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_results_per_ssb_index_list_results_per_ssb_index.go b/go-apps/meep-rnis/server/model_results_per_ssb_index_list_results_per_ssb_index.go index 1dcc8d4ea..063be2dd0 100644 --- a/go-apps/meep-rnis/server/model_results_per_ssb_index_list_results_per_ssb_index.go +++ b/go-apps/meep-rnis/server/model_results_per_ssb_index_list_results_per_ssb_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_rs_index_results.go b/go-apps/meep-rnis/server/model_rs_index_results.go index 622b4b41b..76043c799 100644 --- a/go-apps/meep-rnis/server/model_rs_index_results.go +++ b/go-apps/meep-rnis/server/model_rs_index_results.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_s1_bearer_info.go b/go-apps/meep-rnis/server/model_s1_bearer_info.go index fc14b146b..ce02cce73 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_info.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_s1_bearer_info_enb_info.go b/go-apps/meep-rnis/server/model_s1_bearer_info_enb_info.go index 04513f0c8..47991479c 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_info_enb_info.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_info_enb_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_s1_bearer_info_s1_bearer_info_detailed.go b/go-apps/meep-rnis/server/model_s1_bearer_info_s1_bearer_info_detailed.go index 7683a1ac1..7601e66ad 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_info_s1_bearer_info_detailed.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_info_s1_bearer_info_detailed.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -26,7 +26,7 @@ package server type S1BearerInfoS1BearerInfoDetailed struct { EnbInfo *S1BearerInfoEnbInfo `json:"enbInfo,omitempty"` // The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. - ErabId int32 `json:"erabId"` + ErabId int32 `json:"erabId,omitempty"` - SGwInfo *S1BearerInfoSGwInfo `json:"sGwInfo"` + SGwInfo *S1BearerInfoSGwInfo `json:"sGwInfo,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_s1_bearer_info_s1_ue_info.go b/go-apps/meep-rnis/server/model_s1_bearer_info_s1_ue_info.go index 2f7c6ecb7..6f285f4a9 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_info_s1_ue_info.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_info_s1_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,11 +25,11 @@ package server type S1BearerInfoS1UeInfo struct { // 1 to N identifiers to associate the information for a specific UE or flow. - AssociateId []AssociateId `json:"associateId"` + AssociateId []AssociateId `json:"associateId,omitempty"` // E-UTRAN Cell Global Identifier. - Ecgi []Ecgi `json:"ecgi"` + Ecgi []Ecgi `json:"ecgi,omitempty"` // S1 bearer information as defined below. - S1BearerInfoDetailed []S1BearerInfoS1BearerInfoDetailed `json:"s1BearerInfoDetailed"` + S1BearerInfoDetailed []S1BearerInfoS1BearerInfoDetailed `json:"s1BearerInfoDetailed,omitempty"` TempUeId *CellChangeNotificationTempUeId `json:"tempUeId,omitempty"` } diff --git a/go-apps/meep-rnis/server/model_s1_bearer_info_s_gw_info.go b/go-apps/meep-rnis/server/model_s1_bearer_info_s_gw_info.go index 3ba349d91..b402ed2c0 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_info_s_gw_info.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_info_s_gw_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_s1_bearer_notification.go b/go-apps/meep-rnis/server/model_s1_bearer_notification.go index 84fa80aef..4d74a589a 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_notification.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -24,6 +24,7 @@ package server type S1BearerNotification struct { + // Shall be set to \"S1BearerNotification\". NotificationType string `json:"notificationType"` // The subscribed event that triggered this notification in S1BearerSubscription. S1Event int32 `json:"s1Event"` diff --git a/go-apps/meep-rnis/server/model_s1_bearer_notification_s1_ue_info.go b/go-apps/meep-rnis/server/model_s1_bearer_notification_s1_ue_info.go index 321c8d828..fd5211809 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_notification_s1_ue_info.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_notification_s1_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_s1_bearer_subscription.go b/go-apps/meep-rnis/server/model_s1_bearer_subscription.go index d4bdd6d91..fbe22acd3 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_subscription.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,19 +25,19 @@ package server // This type represents a subscription to S1-U bearer information notification from Radio Network Information Service. NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. type S1BearerSubscription struct { - SubscriptionType string `json:"subscriptionType"` + S1BearerSubscriptionCriteria *S1BearerSubscriptionS1BearerSubscriptionCriteria `json:"S1BearerSubscriptionCriteria"` Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` - - S1BearerSubscriptionCriteria *S1BearerSubscriptionS1BearerSubscriptionCriteria `json:"S1BearerSubscriptionCriteria"` // Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined:

    0 = RESERVED.

    1 = S1_BEARER_ESTABLISH.

    2 = S1_BEARER_MODIFY.

    3 = S1_BEARER_RELEASE. EventType []int32 `json:"eventType"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` + // Shall be set to \"S1BearerSubscription\". + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-rnis/server/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go b/go-apps/meep-rnis/server/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go index 865d9016d..197d9cc12 100644 --- a/go-apps/meep-rnis/server/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go +++ b/go-apps/meep-rnis/server/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_subscription_link_list.go b/go-apps/meep-rnis/server/model_subscription_link_list.go index 09db6d50c..f7b95a21a 100644 --- a/go-apps/meep-rnis/server/model_subscription_link_list.go +++ b/go-apps/meep-rnis/server/model_subscription_link_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_subscription_link_list__links.go b/go-apps/meep-rnis/server/model_subscription_link_list__links.go index 9a50efaa4..0c5730dcf 100644 --- a/go-apps/meep-rnis/server/model_subscription_link_list__links.go +++ b/go-apps/meep-rnis/server/model_subscription_link_list__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_subscription_link_list__links_subscription.go b/go-apps/meep-rnis/server/model_subscription_link_list__links_subscription.go index af4f9d96f..61a12ad9e 100644 --- a/go-apps/meep-rnis/server/model_subscription_link_list__links_subscription.go +++ b/go-apps/meep-rnis/server/model_subscription_link_list__links_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_time_stamp.go b/go-apps/meep-rnis/server/model_time_stamp.go index d11594865..0fc4b7152 100644 --- a/go-apps/meep-rnis/server/model_time_stamp.go +++ b/go-apps/meep-rnis/server/model_time_stamp.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_trigger.go b/go-apps/meep-rnis/server/model_trigger.go index e3dd9bf3f..97230b783 100644 --- a/go-apps/meep-rnis/server/model_trigger.go +++ b/go-apps/meep-rnis/server/model_trigger.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_trigger_nr.go b/go-apps/meep-rnis/server/model_trigger_nr.go index 6ee39e965..370a0f2c9 100644 --- a/go-apps/meep-rnis/server/model_trigger_nr.go +++ b/go-apps/meep-rnis/server/model_trigger_nr.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/model_websock_notif_config.go b/go-apps/meep-rnis/server/model_websock_notif_config.go index 481001c1f..affc087e6 100644 --- a/go-apps/meep-rnis/server/model_websock_notif_config.go +++ b/go-apps/meep-rnis/server/model_websock_notif_config.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-apps/meep-rnis/server/rnis.go b/go-apps/meep-rnis/server/rnis.go index a5b2e96e9..7c693b7cf 100644 --- a/go-apps/meep-rnis/server/rnis.go +++ b/go-apps/meep-rnis/server/rnis.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -715,7 +715,7 @@ func updateUeData(obj sbi.UeDataSbi) { newEcgi.Plmn = &plmn var newNrcgi Nrcgi - newNrcgi.NrCellId = obj.NrCellId + newNrcgi.NrcellId = obj.NrCellId newNrcgi.Plmn = &plmn var ueData UeData @@ -737,7 +737,7 @@ func updateUeData(obj sbi.UeDataSbi) { var oldErabId int32 = -1 oldNrPlmnMnc := "" oldNrPlmnMcc := "" - oldNrCellId := "" + oldNrcellId := "" //get from DB jsonUeData, _ := rc.JSONGetEntry(baseKey+"UE:"+obj.Name, ".") @@ -756,7 +756,7 @@ func updateUeData(obj sbi.UeDataSbi) { if ueDataObj.Nrcgi != nil { oldNrPlmnMnc = ueDataObj.Nrcgi.Plmn.Mnc oldNrPlmnMcc = ueDataObj.Nrcgi.Plmn.Mcc - oldNrCellId = ueDataObj.Nrcgi.NrCellId + oldNrcellId = ueDataObj.Nrcgi.NrcellId } // Keep previous measurements ueData.InRangePoas = ueDataObj.InRangePoas @@ -802,7 +802,7 @@ func updateUeData(obj sbi.UeDataSbi) { //keep erabId info that was there ueData.ErabId = oldErabId - if newNrcgi.Plmn.Mnc != oldNrPlmnMnc || newNrcgi.Plmn.Mcc != oldNrPlmnMcc || newNrcgi.NrCellId != oldNrCellId { + if newNrcgi.Plmn.Mnc != oldNrPlmnMnc || newNrcgi.Plmn.Mcc != oldNrPlmnMcc || newNrcgi.NrcellId != oldNrcellId { //update because nrcgi changed _ = rc.JSONSetEntry(baseKey+"UE:"+obj.Name, ".", convertUeDataToJson(&ueData)) } @@ -852,7 +852,7 @@ func updatePoaInfo(obj sbi.PoaInfoSbi) { poaInfo.Ecgi = ecgi case poaType5G: var nrcgi Nrcgi - nrcgi.NrCellId = obj.CellId + nrcgi.NrcellId = obj.CellId nrcgi.Plmn = &plmn poaInfo.Nrcgi = nrcgi default: @@ -1461,13 +1461,13 @@ func isMatchNrMrFilterCriteriaNrcgi(filterCriteria interface{}, newPlmn *Plmn, o } } if matchingPlmn { - if nrcgi.NrCellId == "" { + if nrcgi.NrcellId == "" { return true } - if newCellId == nrcgi.NrCellId { + if newCellId == nrcgi.NrcellId { return true } - if oldCellId == nrcgi.NrCellId { + if oldCellId == nrcgi.NrcellId { return true } } @@ -1902,7 +1902,7 @@ func checkMrNotificationRegisteredSubscriptions(key string, jsonInfo string, ext var measRepUeNotificationNrNCellInfo MeasRepUeNotificationNrNCellInfo measRepUeNotificationNrNCellInfo.NrNCellPlmn = append(measRepUeNotificationNrNCellInfo.NrNCellPlmn, *poaInfo.Nrcgi.Plmn) - measRepUeNotificationNrNCellInfo.NrNCellGId = poaInfo.Nrcgi.NrCellId + measRepUeNotificationNrNCellInfo.NrNCellGId = poaInfo.Nrcgi.NrcellId neighborCell.NrNCellInfo = append(neighborCell.NrNCellInfo, measRepUeNotificationNrNCellInfo) notif.NewRadioMeasNeiInfo = append(notif.NewRadioMeasNeiInfo, neighborCell) default: @@ -1955,7 +1955,7 @@ func checkNrMrNotificationRegisteredSubscriptions(key string, jsonInfo string, e return err } - if ueData.Nrcgi == nil || ueData.Nrcgi.NrCellId == "" { + if ueData.Nrcgi == nil || ueData.Nrcgi.NrcellId == "" { //that ue is not on a 5G poa return nil } @@ -1978,7 +1978,7 @@ func checkNrMrNotificationRegisteredSubscriptions(key string, jsonInfo string, e if match { if ueData.Nrcgi != nil { - match = isMatchFilterCriteriaNrcgi(nrMeasRepUeSubscriptionType, sub.FilterCriteriaNrMrs, ueData.Nrcgi.Plmn, nil, ueData.Nrcgi.NrCellId, "") + match = isMatchFilterCriteriaNrcgi(nrMeasRepUeSubscriptionType, sub.FilterCriteriaNrMrs, ueData.Nrcgi.Plmn, nil, ueData.Nrcgi.NrcellId, "") } else { match = false } @@ -2104,7 +2104,7 @@ func sendCcNotification(notifyUrl string, notification CellChangeNotification) { resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif)) duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime) + _ = httpLog.LogNotification(notifyUrl, "POST", "", "", string(jsonNotif), resp, startTime) if err != nil { log.Error(err) met.ObserveNotification(sandboxName, serviceName, notifCellChange, notifyUrl, nil, duration) @@ -2123,7 +2123,7 @@ func sendReNotification(notifyUrl string, notification RabEstNotification) { resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif)) duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime) + _ = httpLog.LogNotification(notifyUrl, "POST", "", "", string(jsonNotif), resp, startTime) if err != nil { log.Error(err) met.ObserveNotification(sandboxName, serviceName, notifRabEst, notifyUrl, nil, duration) @@ -2142,7 +2142,7 @@ func sendRrNotification(notifyUrl string, notification RabRelNotification) { resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif)) duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime) + _ = httpLog.LogNotification(notifyUrl, "POST", "", "", string(jsonNotif), resp, startTime) if err != nil { log.Error(err) met.ObserveNotification(sandboxName, serviceName, notifRabRel, notifyUrl, nil, duration) @@ -2161,7 +2161,7 @@ func sendMrNotification(notifyUrl string, notification MeasRepUeNotification) { resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif)) duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime) + _ = httpLog.LogNotification(notifyUrl, "POST", "", "", string(jsonNotif), resp, startTime) if err != nil { log.Error(err) met.ObserveNotification(sandboxName, serviceName, notifMeasRepUe, notifyUrl, nil, duration) @@ -2180,7 +2180,7 @@ func sendNrMrNotification(notifyUrl string, notification NrMeasRepUeNotification resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif)) duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime) + _ = httpLog.LogNotification(notifyUrl, "POST", "", "", string(jsonNotif), resp, startTime) if err != nil { log.Error(err) met.ObserveNotification(sandboxName, serviceName, notifNrMeasRepUe, notifyUrl, nil, duration) @@ -2199,7 +2199,7 @@ func sendExpiryNotification(notifyUrl string, notification ExpiryNotification) { resp, err := http.Post(notifyUrl, "application/json", bytes.NewBuffer(jsonNotif)) duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifyUrl, "POST", string(jsonNotif), resp, startTime) + _ = httpLog.LogNotification(notifyUrl, "POST", "", "", string(jsonNotif), resp, startTime) if err != nil { log.Error(err) met.ObserveNotification(sandboxName, serviceName, notifExpiry, notifyUrl, nil, duration) @@ -2333,8 +2333,6 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { self.Href = hostUrl.String() + basePath + "subscriptions/" + subsIdStr link.Self = self - // TODO.. if required.. - var jsonResponse []byte switch subscriptionType { @@ -2515,7 +2513,7 @@ func subscriptionsPost(w http.ResponseWriter, r *http.Request) { } for _, nrcgi := range subscription.FilterCriteriaNrMrs.Nrcgi { - if nrcgi.Plmn == nil || nrcgi.NrCellId == "" { + if nrcgi.Plmn == nil || nrcgi.NrcellId == "" { log.Error("For non null nrcgi, plmn and cellId are mandatory") errHandlerProblemDetails(w, "For non null nrcgi, plmn and cellId are mandatory", http.StatusBadRequest) return diff --git a/go-apps/meep-rnis/server/rnis_test.go b/go-apps/meep-rnis/server/rnis_test.go index e03b3b37e..df36a6b05 100644 --- a/go-apps/meep-rnis/server/rnis_test.go +++ b/go-apps/meep-rnis/server/rnis_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -897,7 +897,7 @@ func testSubscriptionCellChangePost(t *testing.T) string { expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)} //expectedExpiry := TimeStamp{0, 1998599770} expectedLink := &CaReconfSubscriptionLinks{Self: &expectedLinkType} - expectedResponse := CellChangeSubscription{CELL_CHANGE_SUBSCRIPTION, expectedLink, expectedCallBackRef, nil, nil, &expectedFilter, false} + expectedResponse := CellChangeSubscription{expectedLink, expectedCallBackRef, nil, nil, false, &expectedFilter, CELL_CHANGE_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -915,7 +915,7 @@ func testSubscriptionCellChangePost(t *testing.T) string { //filter is not exactly the same in response and request filterCriteria := expectedFilter filterCriteria.HoStatus = nil - cellChangeSubscriptionPost1 := CellChangeSubscription{CELL_CHANGE_SUBSCRIPTION, nil, expectedCallBackRef, nil, nil, &expectedFilter, false} + cellChangeSubscriptionPost1 := CellChangeSubscription{nil, expectedCallBackRef, nil, nil, false, &expectedFilter, CELL_CHANGE_SUBSCRIPTION} body, err := json.Marshal(cellChangeSubscriptionPost1) if err != nil { @@ -960,7 +960,7 @@ func testSubscriptionCellChangePut(t *testing.T, subscriptionId string, expectSu expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + subscriptionId} //expectedExpiry := TimeStamp{0, 1998599770} expectedLink := &CaReconfSubscriptionLinks{Self: &expectedLinkType} - expectedResponse := CellChangeSubscription{CELL_CHANGE_SUBSCRIPTION, expectedLink, expectedCallBackRef, nil, nil, &expectedFilter, false} + expectedResponse := CellChangeSubscription{expectedLink, expectedCallBackRef, nil, nil, false, &expectedFilter, CELL_CHANGE_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -976,7 +976,7 @@ func testSubscriptionCellChangePut(t *testing.T, subscriptionId string, expectSu /****************************** * request body section ******************************/ - cellChangeSubscription1 := CellChangeSubscription{CELL_CHANGE_SUBSCRIPTION, expectedLink, expectedCallBackRef, nil, nil, &expectedFilter, false} + cellChangeSubscription1 := CellChangeSubscription{expectedLink, expectedCallBackRef, nil, nil, false, &expectedFilter, CELL_CHANGE_SUBSCRIPTION} body, err := json.Marshal(cellChangeSubscription1) if err != nil { @@ -1105,7 +1105,7 @@ func testSubscriptionRabEstPost(t *testing.T) string { expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)} //expectedExpiry := TimeStamp{0, 1998599770} - expectedResponse := RabEstSubscription{RAB_EST_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := RabEstSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, nil, false, &expectedFilter, RAB_EST_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1121,7 +1121,7 @@ func testSubscriptionRabEstPost(t *testing.T) string { ******************************/ //filter is not exactly the same in response and request - subscriptionPost1 := RabEstSubscription{RAB_EST_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscriptionPost1 := RabEstSubscription{nil, expectedCallBackRef, nil, nil, false, &expectedFilter, RAB_EST_SUBSCRIPTION} body, err := json.Marshal(subscriptionPost1) if err != nil { @@ -1163,7 +1163,7 @@ func testSubscriptionRabEstPut(t *testing.T, subscriptionId string, expectSucces expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + subscriptionId} //expectedExpiry := TimeStamp{0, 1998599770} - expectedResponse := RabEstSubscription{RAB_EST_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := RabEstSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, nil, false, &expectedFilter, RAB_EST_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1180,7 +1180,7 @@ func testSubscriptionRabEstPut(t *testing.T, subscriptionId string, expectSucces * request body section ******************************/ - subscription1 := RabEstSubscription{RAB_EST_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscription1 := RabEstSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, nil, false, &expectedFilter, RAB_EST_SUBSCRIPTION} body, err := json.Marshal(subscription1) if err != nil { @@ -1230,7 +1230,7 @@ func testSubscriptionRabRelPost(t *testing.T) string { expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)} //expectedExpiry := TimeStamp{0, 1988599770} - expectedResponse := RabRelSubscription{RAB_REL_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := RabRelSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, RAB_REL_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1246,7 +1246,7 @@ func testSubscriptionRabRelPost(t *testing.T) string { ******************************/ //filter is not exactly the same in response and request - subscriptionPost1 := RabRelSubscription{RAB_REL_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscriptionPost1 := RabRelSubscription{nil, expectedCallBackRef, nil, false, nil, &expectedFilter, RAB_REL_SUBSCRIPTION} body, err := json.Marshal(subscriptionPost1) if err != nil { @@ -1287,7 +1287,7 @@ func testSubscriptionRabRelPut(t *testing.T, subscriptionId string, expectSucces expectedFilter := RabModSubscriptionFilterCriteriaQci{"myApp", expectedEcgi, 1, 88} expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + subscriptionId} - expectedResponse := RabRelSubscription{RAB_REL_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := RabRelSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, RAB_REL_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1304,7 +1304,7 @@ func testSubscriptionRabRelPut(t *testing.T, subscriptionId string, expectSucces * request body section ******************************/ - subscription1 := RabRelSubscription{RAB_REL_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscription1 := RabRelSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, RAB_REL_SUBSCRIPTION} body, err := json.Marshal(subscription1) if err != nil { @@ -1356,7 +1356,7 @@ func testSubscriptionMeasRepUePost(t *testing.T) string { expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)} //expectedExpiry := TimeStamp{0, 1988599770} - expectedResponse := MeasRepUeSubscription{MEAS_REP_UE_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := MeasRepUeSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, MEAS_REP_UE_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1372,7 +1372,7 @@ func testSubscriptionMeasRepUePost(t *testing.T) string { ******************************/ //filter is not exactly the same in response and request - subscriptionPost1 := MeasRepUeSubscription{MEAS_REP_UE_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscriptionPost1 := MeasRepUeSubscription{nil, expectedCallBackRef, nil, false, nil, &expectedFilter, MEAS_REP_UE_SUBSCRIPTION} body, err := json.Marshal(subscriptionPost1) if err != nil { @@ -1415,7 +1415,7 @@ func testSubscriptionMeasRepUePut(t *testing.T, subscriptionId string, expectSuc expectedFilter := MeasRepUeSubscriptionFilterCriteriaAssocTri{"myApp", expectedAssocId, expectedEcgi, []Trigger{1}} expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + subscriptionId} - expectedResponse := MeasRepUeSubscription{MEAS_REP_UE_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := MeasRepUeSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, MEAS_REP_UE_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1432,7 +1432,7 @@ func testSubscriptionMeasRepUePut(t *testing.T, subscriptionId string, expectSuc * request body section ******************************/ - subscription1 := MeasRepUeSubscription{MEAS_REP_UE_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscription1 := MeasRepUeSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, MEAS_REP_UE_SUBSCRIPTION} body, err := json.Marshal(subscription1) if err != nil { @@ -1484,7 +1484,7 @@ func testSubscriptionNrMeasRepUePost(t *testing.T) string { expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + strconv.Itoa(nextSubscriptionIdAvailable)} //expectedExpiry := TimeStamp{0, 1988599770} - expectedResponse := NrMeasRepUeSubscription{NR_MEAS_REP_UE_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := NrMeasRepUeSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, NR_MEAS_REP_UE_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1500,7 +1500,7 @@ func testSubscriptionNrMeasRepUePost(t *testing.T) string { ******************************/ //filter is not exactly the same in response and request - subscriptionPost1 := NrMeasRepUeSubscription{NR_MEAS_REP_UE_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscriptionPost1 := NrMeasRepUeSubscription{nil, expectedCallBackRef, nil, false, nil, &expectedFilter, NR_MEAS_REP_UE_SUBSCRIPTION} body, err := json.Marshal(subscriptionPost1) if err != nil { @@ -1543,7 +1543,7 @@ func testSubscriptionNrMeasRepUePut(t *testing.T, subscriptionId string, expectS expectedFilter := NrMeasRepUeSubscriptionFilterCriteriaNrMrs{"myApp", expectedAssocId, expectedNrcgi, []TriggerNr{1}} expectedCallBackRef := "myCallbakRef" expectedLinkType := LinkType{"/" + testScenarioName + "/rni/v2/subscriptions/" + subscriptionId} - expectedResponse := NrMeasRepUeSubscription{NR_MEAS_REP_UE_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + expectedResponse := NrMeasRepUeSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, NR_MEAS_REP_UE_SUBSCRIPTION} expectedResponseStr, err := json.Marshal(expectedResponse) if err != nil { @@ -1560,7 +1560,7 @@ func testSubscriptionNrMeasRepUePut(t *testing.T, subscriptionId string, expectS * request body section ******************************/ - subscription1 := NrMeasRepUeSubscription{NR_MEAS_REP_UE_SUBSCRIPTION, &CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter} + subscription1 := NrMeasRepUeSubscription{&CaReconfSubscriptionLinks{&expectedLinkType}, expectedCallBackRef, nil, false, nil, &expectedFilter, NR_MEAS_REP_UE_SUBSCRIPTION} body, err := json.Marshal(subscription1) if err != nil { @@ -1657,7 +1657,7 @@ func TestSubscriptionCellChangeNotification(t *testing.T) { //filter is not exactly the same in response and request filterCriteria := expectedFilter filterCriteria.HoStatus = nil - cellChangeSubscriptionPost1 := CellChangeSubscription{CELL_CHANGE_SUBSCRIPTION, nil, expectedCallBackRef, nil, nil, &expectedFilter, false} + cellChangeSubscriptionPost1 := CellChangeSubscription{nil, expectedCallBackRef, nil, nil, false, &expectedFilter, CELL_CHANGE_SUBSCRIPTION} body, err := json.Marshal(cellChangeSubscriptionPost1) if err != nil { @@ -1693,7 +1693,7 @@ func TestSubscriptionCellChangeNotification(t *testing.T) { updateScenario("mobility3") time.Sleep(100 * time.Millisecond) - httpLog, err := metricStore.GetHttpMetric(moduleName, "TX", "", 1) + httpLog, err := metricStore.GetHttpMetric(moduleName, "notification", "", 1) if err != nil || len(httpLog) != 1 { t.Fatalf("Failed to get metric") } @@ -1815,7 +1815,7 @@ func TestSubscriptionRabEstNotification(t *testing.T) { // * request body section // ****************************** / - rabEstSubscriptionPost1 := RabEstSubscription{RAB_EST_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + rabEstSubscriptionPost1 := RabEstSubscription{nil, expectedCallBackRef, nil, nil, false, &expectedFilter, RAB_EST_SUBSCRIPTION} body, err := json.Marshal(rabEstSubscriptionPost1) if err != nil { @@ -1844,7 +1844,7 @@ func TestSubscriptionRabEstNotification(t *testing.T) { t.Fatalf("Failed to create a store") } - httpLog, err := metricStore.GetHttpMetric(moduleName, "TX", "", 1) + httpLog, err := metricStore.GetHttpMetric(moduleName, "notification", "", 1) if err != nil || len(httpLog) != 1 { t.Fatalf("Failed to get metric") } @@ -1968,7 +1968,7 @@ func TestSubscriptionRabRelNotification(t *testing.T) { // * request body section // ****************************** / - rabRelSubscriptionPost1 := RabRelSubscription{RAB_REL_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + rabRelSubscriptionPost1 := RabRelSubscription{nil, expectedCallBackRef, nil, false, nil, &expectedFilter, RAB_REL_SUBSCRIPTION} body, err := json.Marshal(rabRelSubscriptionPost1) if err != nil { @@ -1995,7 +1995,7 @@ func TestSubscriptionRabRelNotification(t *testing.T) { t.Fatalf("Failed to create a store") } - httpLog, err := metricStore.GetHttpMetric(moduleName, "TX", "", 1) + httpLog, err := metricStore.GetHttpMetric(moduleName, "notification", "", 1) if err != nil || len(httpLog) != 1 { t.Fatalf("Failed to get metric") } @@ -2118,7 +2118,7 @@ func TestSubscriptionMeasRepUeNotification(t *testing.T) { // * request body section // ****************************** / - measRepUeSubscriptionPost1 := MeasRepUeSubscription{MEAS_REP_UE_SUBSCRIPTION, nil, expectedCallBackRef, nil, false, nil, &expectedFilter} + measRepUeSubscriptionPost1 := MeasRepUeSubscription{nil, expectedCallBackRef, nil, false, nil, &expectedFilter, MEAS_REP_UE_SUBSCRIPTION} body, err := json.Marshal(measRepUeSubscriptionPost1) if err != nil { @@ -2147,7 +2147,7 @@ func TestSubscriptionMeasRepUeNotification(t *testing.T) { t.Fatalf("Failed to create a store") } - httpLog, err := metricStore.GetHttpMetric(moduleName, "TX", "", 1) + httpLog, err := metricStore.GetHttpMetric(moduleName, "notification", "", 1) if err != nil || len(httpLog) != 1 { t.Fatalf("Failed to get metric") } diff --git a/go-apps/meep-rnis/server/routers.go b/go-apps/meep-rnis/server/routers.go index fa4ca7a24..b4b9eebde 100644 --- a/go-apps/meep-rnis/server/routers.go +++ b/go-apps/meep-rnis/server/routers.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -50,7 +50,7 @@ func NewRouter() *mux.Router { handler = route.HandlerFunc handler = Logger(handler, route.Name) handler = met.MetricsHandler(handler, sandboxName, serviceName) - handler = httpLog.LogRx(handler, "") + handler = httpLog.LogRx(handler) router. Methods(route.Method). Path(route.Pattern). diff --git a/go-apps/meep-rnis/server/subscriptionCommon.go b/go-apps/meep-rnis/server/subscriptionCommon.go index 0da006494..2af6c058c 100644 --- a/go-apps/meep-rnis/server/subscriptionCommon.go +++ b/go-apps/meep-rnis/server/subscriptionCommon.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/Dockerfile b/go-apps/meep-sandbox-ctrl/Dockerfile index 953cda39b..b14f84db1 100644 --- a/go-apps/meep-sandbox-ctrl/Dockerfile +++ b/go-apps/meep-sandbox-ctrl/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-sandbox-ctrl/api/swagger.yaml b/go-apps/meep-sandbox-ctrl/api/swagger.yaml index ca997156a..bda013240 100644 --- a/go-apps/meep-sandbox-ctrl/api/swagger.yaml +++ b/go-apps/meep-sandbox-ctrl/api/swagger.yaml @@ -1320,6 +1320,8 @@ definitions: $ref: "#/definitions/NetworkCharacteristics" connectivity: $ref: "#/definitions/ConnectivityConfig" + d2d: + $ref: "#/definitions/D2dConfig" interDomainLatency: type: "integer" description: "**DEPRECATED** As of release 1.5.0, replaced by netChar latency" @@ -1398,6 +1400,16 @@ definitions: - "OPEN" - "PDU" example: {} + D2dConfig: + type: "object" + properties: + d2dMaxDistance: + type: "number" + description: "Maximum distance for D2D. Default distance is 100m" + disableD2dViaNetwork: + type: "boolean" + description: "Enable-Disable D2D via network. Default value is false" + description: "D2D config" Domain: type: "object" properties: @@ -1649,6 +1661,16 @@ definitions: velocity: type: "number" description: "Speed of movement along path in m/s" + d2dInRange: + type: "array" + items: + type: "string" + description: "D2D UEs visible to UE" + poaInRange: + type: "array" + items: + type: "string" + description: "POAs visible to UE" description: "Geographic data" Point: type: "object" diff --git a/go-apps/meep-sandbox-ctrl/entrypoint.sh b/go-apps/meep-sandbox-ctrl/entrypoint.sh index 0ce817592..260829cd3 100644 --- a/go-apps/meep-sandbox-ctrl/entrypoint.sh +++ b/go-apps/meep-sandbox-ctrl/entrypoint.sh @@ -5,6 +5,7 @@ echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" echo "MEEP_SANDBOX_NAME: ${MEEP_SANDBOX_NAME}" echo "MEEP_MEP_NAME: ${MEEP_MEP_NAME}" echo "USER_SWAGGER: ${USER_SWAGGER}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" if [[ ! -z "${MEEP_MEP_NAME}" ]]; then svcPath="${MEEP_SANDBOX_NAME}/${MEEP_MEP_NAME}" @@ -46,4 +47,11 @@ if [[ ! -z "${USER_SWAGGER}" ]]; then fi # Start service -exec /meep-sandbox-ctrl +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-sandbox-ctrl-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + exec /meep-sandbox-ctrl -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-sandbox-ctrl +fi diff --git a/go-apps/meep-sandbox-ctrl/go.sum b/go-apps/meep-sandbox-ctrl/go.sum index 0b3e66d3b..05995a35b 100644 --- a/go-apps/meep-sandbox-ctrl/go.sum +++ b/go-apps/meep-sandbox-ctrl/go.sum @@ -113,6 +113,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= diff --git a/go-apps/meep-sandbox-ctrl/main.go b/go-apps/meep-sandbox-ctrl/main.go index 90e76c093..e62d2b8a1 100644 --- a/go-apps/meep-sandbox-ctrl/main.go +++ b/go-apps/meep-sandbox-ctrl/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-sandbox-ctrl/main_test.go b/go-apps/meep-sandbox-ctrl/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-sandbox-ctrl/main_test.go +++ b/go-apps/meep-sandbox-ctrl/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-sandbox-ctrl/server/README.md b/go-apps/meep-sandbox-ctrl/server/README.md index 45c1cb4e7..b40965112 100644 --- a/go-apps/meep-sandbox-ctrl/server/README.md +++ b/go-apps/meep-sandbox-ctrl/server/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 1.0.0 -- Build date: 2021-11-23T08:33:59.028-05:00 +- Build date: 2022-11-04T17:13:48.348-04:00 ### Running the server diff --git a/go-apps/meep-sandbox-ctrl/server/api_active_scenario.go b/go-apps/meep-sandbox-ctrl/server/api_active_scenario.go index 26e902a32..71f51f527 100644 --- a/go-apps/meep-sandbox-ctrl/server/api_active_scenario.go +++ b/go-apps/meep-sandbox-ctrl/server/api_active_scenario.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/api_applications.go b/go-apps/meep-sandbox-ctrl/server/api_applications.go index 14f07179d..0c0644fd3 100644 --- a/go-apps/meep-sandbox-ctrl/server/api_applications.go +++ b/go-apps/meep-sandbox-ctrl/server/api_applications.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/api_connectivity.go b/go-apps/meep-sandbox-ctrl/server/api_connectivity.go index 24e3bd284..f8f43d63e 100644 --- a/go-apps/meep-sandbox-ctrl/server/api_connectivity.go +++ b/go-apps/meep-sandbox-ctrl/server/api_connectivity.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/api_event_replay.go b/go-apps/meep-sandbox-ctrl/server/api_event_replay.go index 8713cbd3a..d81bca4a1 100644 --- a/go-apps/meep-sandbox-ctrl/server/api_event_replay.go +++ b/go-apps/meep-sandbox-ctrl/server/api_event_replay.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/api_events.go b/go-apps/meep-sandbox-ctrl/server/api_events.go index a013c5daf..745aabb7d 100644 --- a/go-apps/meep-sandbox-ctrl/server/api_events.go +++ b/go-apps/meep-sandbox-ctrl/server/api_events.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/api_services.go b/go-apps/meep-sandbox-ctrl/server/api_services.go index ce228cb28..d423d07cb 100644 --- a/go-apps/meep-sandbox-ctrl/server/api_services.go +++ b/go-apps/meep-sandbox-ctrl/server/api_services.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/app-ctrl.go b/go-apps/meep-sandbox-ctrl/server/app-ctrl.go index afbc52de7..0e40a51b1 100644 --- a/go-apps/meep-sandbox-ctrl/server/app-ctrl.go +++ b/go-apps/meep-sandbox-ctrl/server/app-ctrl.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-sandbox-ctrl/server/logger.go b/go-apps/meep-sandbox-ctrl/server/logger.go index 6a324ef38..4317eafc1 100644 --- a/go-apps/meep-sandbox-ctrl/server/logger.go +++ b/go-apps/meep-sandbox-ctrl/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/routers.go b/go-apps/meep-sandbox-ctrl/server/routers.go index d16cf150f..0c1542f34 100644 --- a/go-apps/meep-sandbox-ctrl/server/routers.go +++ b/go-apps/meep-sandbox-ctrl/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-sandbox-ctrl/server/sandbox-ctrl.go b/go-apps/meep-sandbox-ctrl/server/sandbox-ctrl.go index e3cf683a8..ebaf621e2 100644 --- a/go-apps/meep-sandbox-ctrl/server/sandbox-ctrl.go +++ b/go-apps/meep-sandbox-ctrl/server/sandbox-ctrl.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -300,7 +300,7 @@ func activateScenario(scenarioName string) (err error) { } // Set Metrics Store - err = sbxCtrl.metricStore.SetStore(scenarioName) + err = sbxCtrl.metricStore.SetStore(scenarioName, sbxCtrl.sandboxName, true) if err != nil { log.Error("Failed to set scenario metrics store with err: ", err.Error()) return err @@ -381,7 +381,7 @@ func ceActivateScenario(w http.ResponseWriter, r *http.Request) { } // Set Metrics Store - err = sbxCtrl.metricStore.SetStore(scenarioName) + err = sbxCtrl.metricStore.SetStore(scenarioName, sbxCtrl.sandboxName, true) if err != nil { log.Error(err.Error()) http.Error(w, err.Error(), http.StatusInternalServerError) @@ -806,7 +806,7 @@ func ceTerminateScenario(w http.ResponseWriter, r *http.Request) { } // Set Metrics Store - err = sbxCtrl.metricStore.SetStore("") + err = sbxCtrl.metricStore.SetStore("", "", false) if err != nil { log.Error(err.Error()) } diff --git a/go-apps/meep-tc-engine/Dockerfile b/go-apps/meep-tc-engine/Dockerfile index f36f07bd3..1671184f1 100644 --- a/go-apps/meep-tc-engine/Dockerfile +++ b/go-apps/meep-tc-engine/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-engine/go.mod b/go-apps/meep-tc-engine/go.mod index cd1710ddc..eba398489 100644 --- a/go-apps/meep-tc-engine/go.mod +++ b/go-apps/meep-tc-engine/go.mod @@ -21,11 +21,9 @@ require ( github.com/modern-go/reflect2 v1.0.1 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/spf13/pflag v1.0.3 // indirect - golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a // indirect golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.2.2 // indirect k8s.io/api v0.0.0-20181204000039-89a74a8d264d // indirect k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 k8s.io/client-go v10.0.0+incompatible @@ -36,6 +34,7 @@ require ( replace ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr => ../../go-packages/meep-data-key-mgr github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model + github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache => ../../go-packages/meep-gis-cache github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mg-manager-model => ../../go-packages/meep-mg-manager-model github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model diff --git a/go-apps/meep-tc-engine/go.sum b/go-apps/meep-tc-engine/go.sum index 4aa09327c..2f40f212c 100644 --- a/go-apps/meep-tc-engine/go.sum +++ b/go-apps/meep-tc-engine/go.sum @@ -1,25 +1,47 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T59kgRjXcSDBODnyZP9wes+bnLn0lx4PgM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY= +github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345 h1:fgSpoKViTSqRb4hjDNj10ig5wUvO0CayCzFdLf6fuRM= github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30= +github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72 h1:uGeGZl8PxSq8VZGG4QK5njJTFA4/G/x5CYORvQVXtAE= github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4= github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= @@ -27,57 +49,151 @@ github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTV github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q= github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237 h1:acuCHBjzG7MFTugvx3buC4m5rLDLaKC9J8C9jtlraRc= github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237/go.mod h1:UOnLAUmVG5paym8pD3C4B9BQylUDC2vXFJJpT7JrlEA= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY= +github.com/onsi/gomega v1.20.2/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcNpq8q3BCACtVgNfoJxOV7g= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= k8s.io/api v0.0.0-20181204000039-89a74a8d264d h1:HQoGWsWUe/FmRcX9BU440AAMnzBFEf+DBo4nbkQlNzs= k8s.io/api v0.0.0-20181204000039-89a74a8d264d/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 h1:tT6oQBi0qwLbbZSfDkdIsb23EwaLY85hoAV4SpXfdao= diff --git a/go-apps/meep-tc-engine/ip-mgr.go b/go-apps/meep-tc-engine/ip-mgr.go index 67eb552de..4d4ba9f92 100644 --- a/go-apps/meep-tc-engine/ip-mgr.go +++ b/go-apps/meep-tc-engine/ip-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-engine/main.go b/go-apps/meep-tc-engine/main.go index 2d5b751e5..1bb9757c0 100644 --- a/go-apps/meep-tc-engine/main.go +++ b/go-apps/meep-tc-engine/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-engine/main_test.go b/go-apps/meep-tc-engine/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-tc-engine/main_test.go +++ b/go-apps/meep-tc-engine/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-engine/routing-engine.go b/go-apps/meep-tc-engine/routing-engine.go index e6c49086a..1ea5dd021 100644 --- a/go-apps/meep-tc-engine/routing-engine.go +++ b/go-apps/meep-tc-engine/routing-engine.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-engine/tc-engine.go b/go-apps/meep-tc-engine/tc-engine.go index f784b360b..96398e57e 100644 --- a/go-apps/meep-tc-engine/tc-engine.go +++ b/go-apps/meep-tc-engine/tc-engine.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/Dockerfile b/go-apps/meep-tc-sidecar/Dockerfile index f583c950c..70f1823c1 100644 --- a/go-apps/meep-tc-sidecar/Dockerfile +++ b/go-apps/meep-tc-sidecar/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/destination.go b/go-apps/meep-tc-sidecar/destination.go index cf0f00f91..f0e45d931 100644 --- a/go-apps/meep-tc-sidecar/destination.go +++ b/go-apps/meep-tc-sidecar/destination.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/error.go b/go-apps/meep-tc-sidecar/error.go index 1f4b0aa88..c84bfd070 100644 --- a/go-apps/meep-tc-sidecar/error.go +++ b/go-apps/meep-tc-sidecar/error.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/main.go b/go-apps/meep-tc-sidecar/main.go index ad3460072..7d731759b 100644 --- a/go-apps/meep-tc-sidecar/main.go +++ b/go-apps/meep-tc-sidecar/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/payload.go b/go-apps/meep-tc-sidecar/payload.go index f0a0cdd95..27b75ce65 100644 --- a/go-apps/meep-tc-sidecar/payload.go +++ b/go-apps/meep-tc-sidecar/payload.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/pinger.go b/go-apps/meep-tc-sidecar/pinger.go index aa14a3b28..3cbbbbc47 100644 --- a/go-apps/meep-tc-sidecar/pinger.go +++ b/go-apps/meep-tc-sidecar/pinger.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/receiving.go b/go-apps/meep-tc-sidecar/receiving.go index e49a15e07..b63fbae5f 100644 --- a/go-apps/meep-tc-sidecar/receiving.go +++ b/go-apps/meep-tc-sidecar/receiving.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/request.go b/go-apps/meep-tc-sidecar/request.go index 01a7985f3..d4fcb3c83 100644 --- a/go-apps/meep-tc-sidecar/request.go +++ b/go-apps/meep-tc-sidecar/request.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/resolve.go b/go-apps/meep-tc-sidecar/resolve.go index 7150ab7f3..cea4818b6 100644 --- a/go-apps/meep-tc-sidecar/resolve.go +++ b/go-apps/meep-tc-sidecar/resolve.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tc-sidecar/sending.go b/go-apps/meep-tc-sidecar/sending.go index da3ba09dc..e7e706621 100644 --- a/go-apps/meep-tc-sidecar/sending.go +++ b/go-apps/meep-tc-sidecar/sending.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-tm/Dockerfile b/go-apps/meep-tm/Dockerfile index 0d38d3d6d..2e6bdcd53 100644 --- a/go-apps/meep-tm/Dockerfile +++ b/go-apps/meep-tm/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2020 InterDigital Communications, Inc +# Copyright (c) 2022 InterDigital Communications, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/go-apps/meep-tm/main.go b/go-apps/meep-tm/main.go index 4283b490d..7bab8f29c 100644 --- a/go-apps/meep-tm/main.go +++ b/go-apps/meep-tm/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 InterDigital Communications, Inc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/go-apps/meep-tm/server/bwm/bwm.go b/go-apps/meep-tm/server/bwm/bwm.go index bc61cc27d..04bd8e1b2 100644 --- a/go-apps/meep-tm/server/bwm/bwm.go +++ b/go-apps/meep-tm/server/bwm/bwm.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 InterDigital Communications, Inc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/go-apps/meep-virt-engine/Dockerfile b/go-apps/meep-virt-engine/Dockerfile index f0fddb90d..f7ed4aa91 100644 --- a/go-apps/meep-virt-engine/Dockerfile +++ b/go-apps/meep-virt-engine/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/entrypoint.sh b/go-apps/meep-virt-engine/entrypoint.sh index 969022ce8..c378861a2 100644 --- a/go-apps/meep-virt-engine/entrypoint.sh +++ b/go-apps/meep-virt-engine/entrypoint.sh @@ -1,5 +1,8 @@ #!/bin/bash set -e +# echo "MEEP_HOST_URL: ${MEEP_HOST_URL}" +echo "MEEP_CODECOV: ${MEEP_CODECOV}" +echo "MEEP_CODECOV_LOCATION: ${MEEP_CODECOV_LOCATION}" # Move helm charts from docker data to template folder mkdir -p /templates/sandbox @@ -10,12 +13,10 @@ mv /meep-mg-manager /templates/sandbox/meep-mg-manager mv /meep-rnis /templates/sandbox/meep-rnis mv /meep-app-enablement /templates/sandbox/meep-app-enablement mv /meep-wais /templates/sandbox/meep-wais -mv /meep-dai /templates/sandbox/meep-dai mv /meep-ams /templates/sandbox/meep-ams mv /meep-sandbox-ctrl /templates/sandbox/meep-sandbox-ctrl mv /meep-tc-engine /templates/sandbox/meep-tc-engine mv /meep-vis /templates/sandbox/meep-vis -mv /meep-tm /templates/sandbox/meep-tm mkdir -p /templates/scenario mv /meep-virt-chart-templates /templates/scenario/meep-virt-chart-templates @@ -25,4 +26,11 @@ helm repo add incubator https://charts.helm.sh/incubator helm repo update # Start virt engine -exec /meep-virt-engine +currenttime=`date "+%Y%m%d-%H%M%S"` +filepath="/codecov/codecov-meep-virt-engine-" +filename=$filepath$currenttime".out" +if [ "$MEEP_CODECOV" = 'true' ]; then + MEEP_CODECOV=${MEEP_CODECOV} MEEP_CODECOV_LOCATION=${MEEP_CODECOV_LOCATION} exec /meep-virt-engine -test.coverprofile=$filename __DEVEL--code-cov +else + exec /meep-virt-engine +fi diff --git a/go-apps/meep-virt-engine/helm/delete.go b/go-apps/meep-virt-engine/helm/delete.go index 8d4e81697..546ea8e5d 100644 --- a/go-apps/meep-virt-engine/helm/delete.go +++ b/go-apps/meep-virt-engine/helm/delete.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/helm/helm.go b/go-apps/meep-virt-engine/helm/helm.go index e6b31650e..f0c9a713d 100644 --- a/go-apps/meep-virt-engine/helm/helm.go +++ b/go-apps/meep-virt-engine/helm/helm.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/helm/install.go b/go-apps/meep-virt-engine/helm/install.go index 16e3f0781..cfb5d2295 100644 --- a/go-apps/meep-virt-engine/helm/install.go +++ b/go-apps/meep-virt-engine/helm/install.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -63,16 +63,15 @@ func install(chart Chart) error { var cmd *exec.Cmd if strings.Trim(chart.ValuesFile, " ") == "" { codecovLocation := strings.TrimSpace(os.Getenv("MEEP_CODECOV_LOCATION")) + chart.ReleaseName - onboardedappLocation := strings.TrimSpace(os.Getenv("MEEP_ONBOARDEDAPP_LOCATION")) + chart.ReleaseName + codecovEnabled := strings.TrimSpace(os.Getenv("MEEP_CODECOV")) cmd = exec.Command("helm", "install", chart.ReleaseName, "--namespace", chart.Namespace, "--create-namespace", "--set", "nameOverride="+chart.Name, "--set", "fullnameOverride="+chart.Name, chart.Location, "--replace", "--disable-openapi-validation", - "--set", "codecov.enabled="+strings.TrimSpace(os.Getenv("MEEP_CODECOV")), + "--set", "codecov.enabled="+codecovEnabled, "--set", "codecov.location="+codecovLocation, - "--set", "onboardedapp.enabled="+strings.TrimSpace(os.Getenv("MEEP_ONBOARDEDAPP")), - "--set", "onboardedapp.location="+onboardedappLocation) + "--set", "image.env.MEEP_CODECOV="+codecovEnabled) } else { cmd = exec.Command("helm", "install", chart.ReleaseName, "--namespace", chart.Namespace, "--create-namespace", diff --git a/go-apps/meep-virt-engine/helm/list.go b/go-apps/meep-virt-engine/helm/list.go index d4b622ce8..8e947fb70 100644 --- a/go-apps/meep-virt-engine/helm/list.go +++ b/go-apps/meep-virt-engine/helm/list.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/helm/status.go b/go-apps/meep-virt-engine/helm/status.go index d72987cb5..55fde1364 100644 --- a/go-apps/meep-virt-engine/helm/status.go +++ b/go-apps/meep-virt-engine/helm/status.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/helm/util.go b/go-apps/meep-virt-engine/helm/util.go index d1e0b7b14..e34f3ca40 100644 --- a/go-apps/meep-virt-engine/helm/util.go +++ b/go-apps/meep-virt-engine/helm/util.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/helm/worker.go b/go-apps/meep-virt-engine/helm/worker.go index 4746dd128..19dc3f5c6 100644 --- a/go-apps/meep-virt-engine/helm/worker.go +++ b/go-apps/meep-virt-engine/helm/worker.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/main.go b/go-apps/meep-virt-engine/main.go index d72c76edc..1c6600834 100644 --- a/go-apps/meep-virt-engine/main.go +++ b/go-apps/meep-virt-engine/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/main_test.go b/go-apps/meep-virt-engine/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-virt-engine/main_test.go +++ b/go-apps/meep-virt-engine/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/server/chart-template.go b/go-apps/meep-virt-engine/server/chart-template.go index 843c55c42..7681a9970 100644 --- a/go-apps/meep-virt-engine/server/chart-template.go +++ b/go-apps/meep-virt-engine/server/chart-template.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/server/copy.go b/go-apps/meep-virt-engine/server/copy.go index 071f04144..594585ad4 100644 --- a/go-apps/meep-virt-engine/server/copy.go +++ b/go-apps/meep-virt-engine/server/copy.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-virt-engine/server/virt-engine.go b/go-apps/meep-virt-engine/server/virt-engine.go index 82697b33a..62c5fef87 100644 --- a/go-apps/meep-virt-engine/server/virt-engine.go +++ b/go-apps/meep-virt-engine/server/virt-engine.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-vis/Dockerfile b/go-apps/meep-vis/Dockerfile index cd86c6a51..571b4a033 100644 --- a/go-apps/meep-vis/Dockerfile +++ b/go-apps/meep-vis/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-vis/README.md b/go-apps/meep-vis/README.md deleted file mode 100644 index d0fe3daf6..000000000 --- a/go-apps/meep-vis/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# AdvantEDGE V2X Information System REST API - -## Running the Server in Standalone mode - -To run the server in standalone mode (for testing) i.e. without integrating it with AdvantEDGE, make the following changes: - -- In _main.go_, replace the complete file with the following code: - ```go - package main - - import ( - "log" - "net/http" - - sw "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-vis/server" - ) - - func main() { - log.Printf("Server started") - - router := sw.NewRouter() - - log.Fatal(http.ListenAndServe(":8080", router)) - } - ``` -- In _go.mod_, add the following line in `replace`: - ```go - github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-vis/server => ./server - ``` -- In _./server/vis.go_, remove all the code related to SBI and Redis. This includes - - _sbi_ and _dkm_ imports - - _Init()_, _Run()_ and _Stop()_ functions -- Run the server by using the command - ```sh - go run main.go - ``` -- Now the requests can be sent to - ``` - http://localhost:8080/vis/v2/ - ``` diff --git a/go-apps/meep-vis/api/swagger.yaml b/go-apps/meep-vis/api/swagger.yaml index 4aa0a30a8..9ec5e2f8d 100644 --- a/go-apps/meep-vis/api/swagger.yaml +++ b/go-apps/meep-vis/api/swagger.yaml @@ -1,7 +1,8 @@ openapi: 3.0.0 info: title: AdvantEDGE V2X Information Service REST API - description: V2X Information Service is AdvantEDGE's implementation of [ETSI MEC + description: + V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis) @@ -20,1662 +21,1152 @@ externalDocs: description: ETSI GS MEC 030 V2X Information Service API, v2.2.1 url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_mec030v020201p.pdf servers: -- url: https://localhost/sandboxname/vis/v2 + - url: https://localhost/sandboxname/vis/v2 tags: -- name: v2xi -- name: unsupported + - name: v2xi + - name: unsupported + paths: /queries/uu_unicast_provisioning_info: get: tags: - - unsupported - summary: Used to query provisioning information for V2X communication over Uu - unicast. - description: Used to query provisioning information for V2X communication over - Uu unicast. + - 'unsupported' + summary: 'Used to query provisioning information for V2X communication over Uu unicast.' + description: 'Used to query provisioning information for V2X communication over Uu unicast.' operationId: prov_info_uu_unicastGET parameters: - - name: location_info - in: query - description: Comma separated list of locations to identify a cell of a base - station or a particular geographical area - required: true - style: form - explode: true - schema: - type: string + - in: query + name: location_info + schema: + type: string + required: true + description: 'Comma separated list of locations to identify a cell of a base station or a particular geographical area' + responses: - "200": + '200': description: 'A response body containing the Uu unicast provisioning information. ' content: application/json: schema: $ref: '#/components/schemas/UuUnicastProvisioningInfo' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + /queries/uu_mbms_provisioning_info: get: tags: - - unsupported - summary: retrieve information required for V2X communication over Uu MBMS. - description: retrieve information required for V2X communication over Uu MBMS. + - 'unsupported' + summary: 'retrieve information required for V2X communication over Uu MBMS.' + description: 'retrieve information required for V2X communication over Uu MBMS.' operationId: prov_info_uu_mbmsGET parameters: - - name: location_info - in: query - description: omma separated list of locations to identify a cell of a base - station or a particular geographical area - required: true - style: form - explode: true - schema: - type: string + - in: query + name: location_info + schema: + type: string + required: true + description: 'omma separated list of locations to identify a cell of a base station or a particular geographical area' + responses: - "200": + '200': description: 'A response body containing the Uu unicast provisioning information. ' content: application/json: schema: $ref: '#/components/schemas/UuMbmsProvisioningInfo' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + /queries/pc5_provisioning_info: get: tags: - - unsupported - summary: Query provisioning information for V2X communication over PC5. - description: Query provisioning information for V2X communication over PC5. + - 'unsupported' + summary: 'Query provisioning information for V2X communication over PC5.' + description: 'Query provisioning information for V2X communication over PC5.' operationId: prov_infoGET parameters: - - name: location_info - in: query - description: Comma separated list of locations to identify a cell of a base - station or a particular geographical area - required: true - style: form - explode: true - schema: - type: string + - in: query + name: location_info + schema: + type: string + required: true + description: 'Comma separated list of locations to identify a cell of a base station or a particular geographical area' responses: - "200": - description: A response body containing the PC5 provisioning information - is returned. + '200': + description: 'A response body containing the PC5 provisioning information is returned.' content: application/json: schema: $ref: '#/components/schemas/Pc5ProvisioningInfo' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + /provide_predicted_qos: post: tags: - - v2xi - summary: Request the predicted QoS correspondent to potential routes of a vehicular - UE. - description: Request the predicted QoS correspondent to potential routes of - a vehicular UE. + - 'v2xi' + summary: 'Request the predicted QoS correspondent to potential routes of a vehicular UE.' + description: 'Request the predicted QoS correspondent to potential routes of a vehicular UE.' operationId: predicted_qosPOST requestBody: + required: true content: application/json: schema: $ref: '#/components/schemas/PredictedQos' - required: true responses: - "200": - description: The response body shall contain the predicted QoS corresponding - to potential routes of a vehicular UE + '200': + description: 'The response body shall contain the predicted QoS corresponding to potential routes of a vehicular UE' content: application/json: schema: $ref: '#/components/schemas/PredictedQos' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + /publish_v2x_message: post: tags: - - unsupported - summary: Used to publish a V2X message. - description: Used to publish a V2X message. + - 'unsupported' + summary: 'Used to publish a V2X message.' + description: 'Used to publish a V2X message.' operationId: v2x_messagePOST requestBody: + required: true content: application/json: schema: $ref: '#/components/schemas/V2xMsgPublication' - required: true responses: - "204": - description: No Content - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '204': + $ref: '#/components/responses/204' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + /subscriptions: get: tags: - - unsupported - summary: Request information about the subscriptions for this requestor. - description: Request information about the subscriptions for this requestor. + - 'unsupported' + summary: 'Request information about the subscriptions for this requestor.' + description: 'Request information about the subscriptions for this requestor.' operationId: subGET parameters: - - name: subscription_type - in: query - description: 'Query parameter to filter on a specific subscription type. Permitted - values: prov_chg_uu_uni: provisioning information change for V2X communication - over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X - communication over Uu MBMS prov_chg_uu_pc5: provisioning information change - for V2X communication over PC5. v2x_msg: V2X interoperability message' - required: false - style: form - explode: true - schema: - type: string + - in: query + name: subscription_type + description: 'Query parameter to filter on a specific subscription type. Permitted values: prov_chg_uu_uni: provisioning information change for V2X communication over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X communication over Uu MBMS prov_chg_uu_pc5: provisioning information change for V2X communication over PC5. v2x_msg: V2X interoperability message' + schema: + type: string + required: false responses: - "200": - description: A response body containing the list of links to requestor subscriptions - is returned. + '200': + description: 'A response body containing the list of links to requestor subscriptions is returned.' content: application/json: schema: $ref: '#/components/schemas/SubscriptionLinkList' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' post: tags: - - unsupported + - 'unsupported' summary: ' create a new subscription to VIS notifications.' description: ' create a new subscription to VIS notifications.' operationId: subPOST requestBody: + required: true content: application/json: schema: - $ref: '#/components/schemas/body' - required: true + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' responses: - "201": - description: In the returned NotificationSubscription structure, the created - subscription is described using the appropriate data type. - content: - application/json: - schema: - $ref: '#/components/schemas/body' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "415": - description: 'Unsupported Media Type : used to indicate that the server - or the client does not support the content type of the entity body.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '201': + description: 'In the returned NotificationSubscription structure, the created subscription is described using the appropriate data type.' + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '415': + $ref: '#/components/responses/415' + '422': + $ref: '#/components/responses/422' + '429': + $ref: '#/components/responses/429' + callbacks: notification: '{$request.body#/callbackReference}': post: - summary: Callback POST used to send a notification - description: A notification from VIS. + summary: 'Callback POST used to send a notification' + description: 'A notification from VIS.' operationId: notificationPOST requestBody: description: Subscription notification + required: true content: application/json: schema: oneOf: - - $ref: '#/components/schemas/ProvChgUuUniNotification' - - $ref: '#/components/schemas/ProvChgUuMbmsNotification' - - $ref: '#/components/schemas/ProvChgPc5Notification' - - $ref: '#/components/schemas/V2xMsgNotification' - required: true + - $ref: '#/components/schemas/ProvChgUuUniNotification' + - $ref: '#/components/schemas/ProvChgUuMbmsNotification' + - $ref: '#/components/schemas/ProvChgPc5Notification' + - $ref: '#/components/schemas/V2xMsgNotification' responses: - "204": - description: No Content + '204': + $ref: '#/components/responses/204' + /subscriptions/{subscriptionId}: + parameters: + - in: path + name: subscriptionId + description: 'Refers to created subscription, where the VIS API allocates a unique resource name for this subscription' + schema: + type: string + required: true + get: tags: - - unsupported - summary: Retrieve information about this subscription. - description: Retrieve information about this subscription. + - 'unsupported' + summary: 'Retrieve information about this subscription.' + description: 'Retrieve information about this subscription.' operationId: individualSubscriptionGET - parameters: - - name: subscriptionId - in: path - description: Refers to created subscription, where the VIS API allocates a - unique resource name for this subscription - required: true - style: simple - explode: false - schema: - type: string + responses: - "200": - description: A response body containing the data type describing the specific - RNI event subscription is returned - content: - application/json: - schema: - $ref: '#/components/schemas/body' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '200': + description: 'A response body containing the data type describing the specific RNI event subscription is returned' + content: + application/json: + schema: + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '406': + $ref: '#/components/responses/406' + '429': + $ref: '#/components/responses/429' + put: tags: - - unsupported - summary: Used to update the existing subscription. - description: Used to update the existing subscription. + - 'unsupported' + summary: 'Used to update the existing subscription.' + description: 'Used to update the existing subscription.' operationId: individualSubscriptionPUT - parameters: - - name: subscriptionId - in: path - description: Refers to created subscription, where the VIS API allocates a - unique resource name for this subscription - required: true - style: simple - explode: false - schema: - type: string requestBody: + required: true content: application/json: schema: - $ref: '#/components/schemas/body_1' - required: true + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' responses: - "200": - description: A response body containing data type describing the updated - subscription is returned - content: - application/json: - schema: - $ref: '#/components/schemas/body_1' - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + '200': + description: 'A response body containing data type describing the updated subscription is returned' content: application/json: schema: - $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "412": - description: 'Precondition failed : used when a condition has failed during - conditional requests, e.g. when using ETags to avoid write conflicts when - using PUT' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + oneOf: + - $ref: '#/components/schemas/ProvChgUuUniSubscription' + - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' + - $ref: '#/components/schemas/ProvChgPc5Subscription' + - $ref: '#/components/schemas/V2xMsgSubscription' + '400': + $ref: '#/components/responses/400' + '401': + $ref: '#/components/responses/401' + + '403': + $ref: '#/components/responses/403' + + '404': + $ref: '#/components/responses/404' + + '406': + $ref: '#/components/responses/406' + + '412': + $ref: '#/components/responses/412' + + '422': + $ref: '#/components/responses/422' + + '429': + $ref: '#/components/responses/429' delete: tags: - - unsupported - summary: Used to cancel the existing subscription. - description: Used to cancel the existing subscription. + - 'unsupported' + summary: 'Used to cancel the existing subscription.' + description: 'Used to cancel the existing subscription.' operationId: individualSubscriptionDELETE - parameters: - - name: subscriptionId - in: path - description: Refers to created subscription, where the VIS API allocates a - unique resource name for this subscription - required: true - style: simple - explode: false - schema: - type: string responses: - "204": - description: No Content - "401": - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' - "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/json: - schema: - $ref: '#/components/schemas/ProblemDetails' + '204': + $ref: '#/components/responses/204' + '401': + $ref: '#/components/responses/401' + '403': + $ref: '#/components/responses/403' + '404': + $ref: '#/components/responses/404' + '429': + $ref: '#/components/responses/429' + + # /notifitication_end_point_provided_by_client + #post: + /notifications/mec011/appTermination: post: tags: - - v2xi - summary: MEC011 Application Termination notification for self termination - description: Terminates itself. + - 'v2xi' + summary: 'MEC011 Application Termination notification for self termination' + description: 'Terminates itself.' operationId: mec011AppTerminationPOST requestBody: - description: Termination notification details + description: 'Termination notification details' + required: true content: application/json: schema: $ref: '#/components/schemas/AppTerminationNotification' example: - notificationType: AppTerminationNotification - operationAction: TERMINATING + notificationType: 'AppTerminationNotification' + operationAction: 'TERMINATING' maxGracefulTimeout: 10 _links: subscription: - href: http://mec011Server.example.com/mec_app_support/v1/applications/appId1234/subscriptions/sub123 + href: 'http://mec011Server.example.com/mec_app_support/v1/applications/appId1234/subscriptions/sub123' confirmTermination: - href: http://mec011Server.example.com/mec_app_support/v1/confirm_termination - required: true + href: 'http://mec011Server.example.com/mec_app_support/v1/confirm_termination' responses: - "204": + '204': description: No Content - x-swagger-router-controller: notifications + x-swagger-router-controller: 'notifications' + components: schemas: CellId: - required: - - cellId - type: object properties: cellId: - type: string description: E-UTRAN Cell Identity as a bit string (size (28)). - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - example: - cellId: cellId - x-etsi-ref: 6.6.2 - Earfcn: required: - - earfcn + - cellId type: object + x-etsi-ref: 6.6.2 + Earfcn: properties: earfcn: + description: E-UTRA Absolute Radio Frequency Channel Number, range (0... 65535) type: integer - description: E-UTRA Absolute Radio Frequency Channel Number, range (0... - 65535) - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer - example: - earfcn: 1 - x-etsi-ref: 6.6.3 - Ecgi: required: - - cellId - - plmn + - earfcn type: object + x-etsi-ref: 6.6.3 + Ecgi: properties: cellId: + # description': The E-UTRAN Cell Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': CellId $ref: '#/components/schemas/CellId' plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn $ref: '#/components/schemas/Plmn' - example: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - x-etsi-ref: 6.5.5 - FddInfo: required: - - dlEarfcn - - dlTransmissionBandwidth - - ulEarfcn - - ulTransmissionBandwidth + - plmn + - cellId type: object + x-etsi-ref: 6.5.5 + FddInfo: properties: dlEarfcn: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Earfcn $ref: '#/components/schemas/Earfcn' dlTransmissionBandwidth: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TransmissionBandwidth $ref: '#/components/schemas/TransmissionBandwidth' ulEarfcn: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Earfcn $ref: '#/components/schemas/Earfcn' ulTransmissionBandwidth: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TransmissionBandwidth $ref: '#/components/schemas/TransmissionBandwidth' - example: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - x-etsi-ref: 6.5.6 - links: required: - - self + - ulEarfcn + - dlEarfcn + - ulTransmissionBandwidth + - dlTransmissionBandwidth type: object + x-etsi-ref: 6.5.6 + links: + description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. properties: self: + # description': Self-referring URI. The URI shall be unique within the VIS API as it acts as an ID for the subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType $ref: '#/components/schemas/LinkType' - description: Hyperlink related to the resource. This shall be only included - in the HTTP responses and in HTTP PUT requests. + required: + - self + type: object x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) LinkType: - required: - - href - type: object properties: href: - type: string description: URI referring to a resource format: uri - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uri - example: - href: http://example.com/aeiou + required: + - href + type: object x-etsi-ref: 6.5.13 LocationInfo: - type: object properties: ecgi: + # description': E-UTRAN CelI Global Identifier of the serving cell. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' geoArea: $ref: '#/components/schemas/LocationInfo.geoArea' - example: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId + type: object x-etsi-notes: "NOTE:\tEither ecgi or geoArea shall be present, but not both." x-etsi-ref: 6.5.3 LocationInfo.geoArea: - required: - - latitude - - longitude - type: object + description: Information of a geographical area. properties: latitude: - type: number - description: Latitude (DATUM = WGS84) -90 to 90 in decimal degree format - DDD.ddd + description: 'Latitude (DATUM = WGS84) -90 to 90 in decimal degree format DDD.ddd' format: float - x-etsi-mec-cardinality: "1" + type: number + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Float longitude: - type: number - description: Longitude (DATUM = WGS84) -180 to 180 in decimal degree format - DDD.ddd + description: 'Longitude (DATUM = WGS84) -180 to 180 in decimal degree format DDD.ddd' format: float - x-etsi-mec-cardinality: "1" + type: number + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Float - description: Information of a geographical area. - example: - latitude: 0.8008282 - longitude: 6.0274563 + required: + - latitude + - longitude + type: object x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Structure (inlined) Pc5NeighbourCellInfo: - required: - - ecgi - - plmn - - siV2xConfig - type: object properties: ecgi: + # description': E-UTRAN CelI Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn $ref: '#/components/schemas/Plmn' siV2xConfig: + # description': V2X sidelink communication configuration, as defined in ETSI TS 136 331 [i.11]. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': SystemInformationBlockType21 (as defined in ETSI TS 136 331 [i.11]) $ref: '#/components/schemas/SystemInformationBlockType21' - example: - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - x-etsi-ref: 6.5.12 - Pc5ProvisioningInfo: required: - - proInfoPc5 + - plmn + - ecgi + - siV2xConfig type: object + x-etsi-ref: 6.5.12 + Pc5ProvisioningInfo: properties: proInfoPc5: - minItems: 1 type: array + minItems: 1 items: $ref: '#/components/schemas/Pc5ProvisioningInfo.proInfoPc5' timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - example: - timeStamp: - seconds: 7 - nanoSeconds: 2 - proInfoPc5: - - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - dstLayer2Id: dstLayer2Id - - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - dstLayer2Id: dstLayer2Id + required: + - proInfoPc5 + type: object x-etsi-ref: 6.2.4 Pc5ProvisioningInfo.proInfoPc5: - required: - - dstLayer2Id - - locationInfo + description: The provisioning information per location as defined below. type: object properties: dstLayer2Id: + description: "For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS\_136\_321 [i.12].\nPLMN operators coordinate to make sure Destination Layer2 ID(s) for different V2X services are configured in a consistent manner." type: string - description: |- - For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - PLMN operators coordinate to make sure Destination Layer2 ID(s) for different V2X services are configured in a consistent manner. - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over PC5. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. items: $ref: '#/components/schemas/Pc5NeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Pc5NeighbourCellInfo - description: The provisioning information per location as defined below. - example: - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - plmn: - mnc: mnc - mcc: mcc - siV2xConfig: {} - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - dstLayer2Id: dstLayer2Id + required: + - locationInfo + - dstLayer2Id x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) Plmn: - required: - - mcc - - mnc - type: object properties: mcc: - type: string description: The Mobile Country Code part of PLMN Identity. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String mnc: - type: string description: The Mobile Network Code part of PLMN Identity. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - example: - mnc: mnc - mcc: mcc - x-etsi-ref: 6.5.4 - PredictedQos: required: - - locationGranularity - - routes + - mcc + - mnc type: object + x-etsi-ref: 6.5.4 + PredictedQos: properties: locationGranularity: - type: string description: Granularity of visited location. Measured in meters. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String routes: + description: Information relating to the potential routes of a vehicular UE. + items: + $ref: '#/components/schemas/PredictedQos.routes' minItems: 1 required: - - routeInfo + - routeInfo type: array - description: Information relating to the potential routes of a vehicular - UE. - items: - $ref: '#/components/schemas/PredictedQos.routes' x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) timeGranularity: + # description': Time granularity of visiting a location. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - example: - routes: - - routeInfo: - - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 - - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 - - routeInfo: - - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 - - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 - timeGranularity: null - locationGranularity: locationGranularity - x-etsi-notes: "NOTE:\tThe data type of locationGranularity is a string which\ - \ indicates the granularity of a visited location by means of latitudinal\ - \ and longitudinal margins." + required: + - locationGranularity + - routes + type: object + x-etsi-notes: "NOTE:\tThe data type of locationGranularity is a string which indicates the granularity of a visited location by means of latitudinal and longitudinal margins." x-etsi-ref: 6.2.5 PredictedQos.routes: - minItems: 1 - type: object properties: routeInfo: - minItems: 2 - required: - - location - type: array - description: |- - Information relating to a specific route. - The first structure shall relate to the route origin and the last to the route destination. Intermediate waypoint locations may also be provided. + description: 'Information relating to a specific route. + + The first structure shall relate to the route origin and the last to the route destination. Intermediate waypoint locations may also be provided.' items: $ref: '#/components/schemas/PredictedQos.routes.routeInfo' + required: + - location + minItems: 2 + type: array x-etsi-mec-cardinality: 2..N x-etsi-mec-origin-type: Structure (inlined) - example: - routeInfo: - - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 - - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 + type: object + minItems: 1 PredictedQos.routes.routeInfo: type: object properties: location: + # description': Vehicular UE location. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' rsrp: - type: integer - description: |- - Reference Signal Received Power as defined in ETSI TS 136 214 [i.13]. - Shall only be included in the response. + description: + 'Reference Signal Received Power as defined in ETSI TS 136 214 [i.13]. + + Shall only be included in the response.' format: uint8 + type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - type: integer - description: |- - Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. - Shall only be included in the response. + description: + 'Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. + + Shall only be included in the response.' format: uint8 + type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 time: + # description': Estimated time at the location. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - example: - rsrq: 6 - location: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - rsrp: 0 - time: - seconds: 7 - nanoSeconds: 2 ProblemDetails: - type: object properties: detail: + description: A human-readable explanation specific to this occurrence of the problem type: string - description: A human-readable explanation specific to this occurrence of - the problem x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String instance: - type: string - description: A URI reference that identifies the specific occurrence of - the problem + description: A URI reference that identifies the specific occurrence of the problem format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI status: - type: integer description: The HTTP status code for this occurrence of the problem format: uint32 + type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 title: - type: string description: A short, human-readable summary of the problem type + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String type: - type: string - description: A URI reference according to IETF RFC 3986 that identifies - the problem type + description: A URI reference according to IETF RFC 3986 that identifies the problem type format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI - ProvChgPc5Notification: - required: - - locationInfo - - notificationType type: object + ProvChgPc5Notification: properties: dstLayer2Id: + description: For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. type: string - description: For sidelink communication, the Destination Layer-2 ID is set - to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over PC5. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. items: $ref: '#/components/schemas/Pc5NeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Pc5NeighbourCellInfo notificationType: - type: string description: Shall be set to "ProvChgPc5Notification". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - x-etsi-ref: 6.4.4 - ProvChgPc5Subscription: required: - - filterCriteria - - subscriptionType + - notificationType + - locationInfo type: object + x-etsi-ref: 6.4.4 + ProvChgPc5Subscription: properties: _links: $ref: '#/components/schemas/links' callbackReference: - type: string - description: URI exposed by the client on which to receive notifications - via HTTP. See note. + description: URI exposed by the client on which to receive notifications via HTTP. See note. format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uri expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteria: $ref: '#/components/schemas/ProvChgPc5Subscription.filterCriteria' requestTestNotification: + description: "Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS\_MEC\_009 [i.1], clause 6.12a.\nDefault: FALSE." type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: - type: string description: Shall be set to "ProvChgPc5Subscription". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String websockNotifConfig: + # description': Provides details to negotiate and signal the use of a Websocket connection between VIS and the service consumer for notifications. See note. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': WebsockNotifConfig $ref: '#/components/schemas/WebsockNotifConfig' - x-etsi-notes: 'NOTE: At least one of callbackReference and websockNotifConfig - shall be provided by the service consumer. If both are provided, it is up - to VIS to choose an alternative and return only that alternative in the response, - as described in ETSI GS MEC 009 [i.1], clause 6.12a.' - x-etsi-ref: 6.3.4 - ProvChgPc5Subscription.filterCriteria: required: - - dstLayer2Id - - locationInfo + - subscriptionType + - filterCriteria type: object + x-etsi-notes: 'NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to VIS to choose an alternative and return only that alternative in the response, as described in ETSI GS MEC 009 [i.1], clause 6.12a.' + x-etsi-ref: 6.3.4 + ProvChgPc5Subscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. properties: dstLayer2Id: + description: For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. type: string - description: For sidelink communication, the Destination Layer-2 ID is set - to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over PC5. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. items: $ref: '#/components/schemas/Pc5NeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Pc5NeighbourCellInfo - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. - x-etsi-mec-cardinality: "1" - x-etsi-mec-origin-type: Structure (inlined) - ProvChgUuMbmsNotification: required: - - locationInfo - - notificationType + - locationInfo + - dstLayer2Id type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) + ProvChgUuMbmsNotification: properties: locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over Uu MBMS. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. items: $ref: '#/components/schemas/UuMbmsNeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo notificationType: - type: string description: Shall be set to "ProvChgUuMbmsNotification". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' v2xServerUsd: + # description': User Service Description for V2X Application Server is used to configure the UE for receiving local V2X Application Server information when it is provided over MBMS. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': V2xServerUsd $ref: '#/components/schemas/V2xServerUsd' - x-etsi-ref: 6.4.3 - ProvChgUuMbmsSubscription: required: - - filterCriteria - - subscriptionType + - notificationType + - locationInfo type: object + x-etsi-ref: 6.4.3 + ProvChgUuMbmsSubscription: properties: _links: $ref: '#/components/schemas/links' callbackReference: - type: string - description: URI exposed by the client on which to receive notifications - via HTTP. See note. + description: URI exposed by the client on which to receive notifications via HTTP. See note. format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uri expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteria: $ref: '#/components/schemas/ProvChgUuMbmsSubscription.filterCriteria' requestTestNotification: + description: "Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS\_MEC\_009 [i.1], clause 6.12a.\nDefault: FALSE." type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: - type: string description: Shall be set to "ProvChgUuMbmsSubscription". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String websockNotifConfig: + # description': Provides details to negotiate and signal the use of a Websocket connection between VIS and the service consumer for notifications. See note. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': WebsockNotifConfig $ref: '#/components/schemas/WebsockNotifConfig' - x-etsi-notes: "NOTE:\tAt least one of callbackReference and websockNotifConfig\ - \ shall be provided by the service consumer. If both are provided, it is up\ - \ to VIS to choose an alternative and return only that alternative in the\ - \ response, as described in ETSI GS MEC 009 [i.1], clause 6.12a." - x-etsi-ref: 6.3.3 - ProvChgUuMbmsSubscription.filterCriteria: required: - - locationInfo - - v2xServerUsd + - subscriptionType + - filterCriteria type: object + x-etsi-notes: "NOTE:\tAt least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to VIS to choose an alternative and return only that alternative in the response, as described in ETSI GS MEC 009 [i.1], clause 6.12a." + x-etsi-ref: 6.3.3 + ProvChgUuMbmsSubscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. properties: locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over Uu MBMS. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. items: $ref: '#/components/schemas/UuMbmsNeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo v2xServerUsd: + # description': User Service Description for V2X Application Server is used to configure the UE for receiving local V2X Application Server information when it is provided over MBMS. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xServerUsd $ref: '#/components/schemas/V2xServerUsd' - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. - x-etsi-mec-cardinality: "1" - x-etsi-mec-origin-type: Structure (inlined) - ProvChgUuUniNotification: required: - - locationInfo - - notificationType + - locationInfo + - v2xServerUsd type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) + ProvChgUuUniNotification: properties: locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over Uu unicast. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. items: $ref: '#/components/schemas/UuUniNeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: UuUniNeighbourCellInfo notificationType: - type: string description: Shall be set to "ProvChgUuUniNotification". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' v2xApplicationServer: + # description': V2X Application Server address (consisting of IP address and UDP port) for unicast. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': V2xApplicationServer $ref: '#/components/schemas/V2xApplicationServer' - x-etsi-ref: 6.4.2 - ProvChgUuUniSubscription: required: - - filterCriteria - - subscriptionType + - notificationType + - locationInfo type: object + x-etsi-ref: 6.4.2 + ProvChgUuUniSubscription: properties: _links: $ref: '#/components/schemas/links' callbackReference: - type: string - description: URI exposed by the client on which to receive notifications - via HTTP. See note. + description: URI exposed by the client on which to receive notifications via HTTP. See note. format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uri expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteria: $ref: '#/components/schemas/ProvChgUuUniSubscription.filterCriteria' requestTestNotification: + description: "Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS\_MEC\_009 [i.1], clause 6.12a.\nDefault: FALSE." type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: - type: string description: Shall be set to "ProvChgUuUniSubscription". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String websockNotifConfig: + # description': Provides details to negotiate and signal the use of a Websocket connection between VIS and the service consumer for notifications. See note. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': WebsockNotifConfig $ref: '#/components/schemas/WebsockNotifConfig' - x-etsi-notes: "NOTE:\tAt least one of callbackReference and websockNotifConfig\ - \ shall be provided by the service consumer. If both are provided, it is up\ - \ to VIS to choose an alternative and return only that alternative in the\ - \ response, as described in ETSI GS MEC 009 [i.1], clause 6.12a." - x-etsi-ref: 6.3.2 - ProvChgUuUniSubscription.filterCriteria: required: - - locationInfo - - v2xApplicationServer + - subscriptionType + - filterCriteria type: object + x-etsi-notes: "NOTE:\tAt least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to VIS to choose an alternative and return only that alternative in the response, as described in ETSI GS MEC 009 [i.1], clause 6.12a." + x-etsi-ref: 6.3.2 + ProvChgUuUniSubscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. properties: locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over Uu unicast. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. items: $ref: '#/components/schemas/UuUniNeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: UuUniNeighbourCellInfo v2xApplicationServer: + # description': V2X Application Server address (consisting of IP address and UDP port) for unicast. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xApplicationServer $ref: '#/components/schemas/V2xApplicationServer' - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. - x-etsi-mec-cardinality: "1" - x-etsi-mec-origin-type: Structure (inlined) - SubscriptionLinkList: required: - - _links + - locationInfo + - v2xApplicationServer type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) + SubscriptionLinkList: properties: _links: $ref: '#/components/schemas/SubscriptionLinkList.links' - example: - _links: - subscriptions: - - subscriptionType: subscriptionType - href: http://example.com/aeiou - - subscriptionType: subscriptionType - href: http://example.com/aeiou - self: - href: http://example.com/aeiou + required: + - _links + type: object x-etsi-ref: 6.3.6 SystemInformationBlockType21: type: object TddInfo: - required: - - earfcn - - subframeAssignment - - transmissionBandwidth - type: object properties: earfcn: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Earfcn $ref: '#/components/schemas/Earfcn' subframeAssignment: - type: string description: Uplink-downlink subframe configuration information. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String transmissionBandwidth: + # description': '' + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TransmissionBandwidth $ref: '#/components/schemas/TransmissionBandwidth' - example: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - x-etsi-ref: 6.5.7 - SubscriptionLinkList.links: required: - - self + - earfcn + - transmissionBandwidth + - subframeAssignment type: object + x-etsi-ref: 6.5.7 + SubscriptionLinkList.links: + description: List of hyperlinks related to the resource. properties: self: + # description': URI of this resource. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType $ref: '#/components/schemas/LinkType' subscriptions: type: array items: $ref: '#/components/schemas/SubscriptionLinkList.links.subscriptions' - description: List of hyperlinks related to the resource. - example: - subscriptions: - - subscriptionType: subscriptionType - href: http://example.com/aeiou - - subscriptionType: subscriptionType - href: http://example.com/aeiou - self: - href: http://example.com/aeiou - x-etsi-mec-cardinality: "1" + required: + - self + type: object + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Structure (inlined) SubscriptionLinkList.links.subscriptions: - minItems: 0 - required: - - href - - subscriptionType + description: The service consumer's subscriptions. type: object + minItems: 0 properties: href: - type: string description: The URI referring to the subscription. format: uri - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: URI subscriptionType: + description: Type of the subscription. The values are as defined in the "subscriptionType" attribute for each different V2X information event subscription data type. type: string - description: Type of the subscription. The values are as defined in the - "subscriptionType" attribute for each different V2X information event - subscription data type. - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - description: The service consumer's subscriptions. - example: - subscriptionType: subscriptionType - href: http://example.com/aeiou + required: + - href + - subscriptionType x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) TestNotification: - required: - - _links - - notificationType - type: object properties: _links: - $ref: '#/components/schemas/TestNotification__links' + description: 'Hyperlink related to the resource. ' + properties: + subscription: + # description': URI identifying the subscription for the test notification. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType + $ref: '#/components/schemas/LinkType' + required: + - subscription + type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) notificationType: - type: string description: Shall be set to "TestNotification". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - x-etsi-ref: 6.4.6 - TimeStamp: required: - - nanoSeconds - - seconds + - notificationType + - _links type: object + x-etsi-ref: 6.4.6 + TimeStamp: properties: nanoSeconds: - type: integer - description: The nanoseconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC. + description: The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC. format: uint32 - x-etsi-mec-cardinality: "1" + type: integer + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint32 seconds: - type: integer - description: The seconds part of the time. Time is defined as Unixtime since - January 1, 1970, 00:00:00 UTC. + description: The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC. format: uint32 - x-etsi-mec-cardinality: "1" + type: integer + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Uint32 - example: - seconds: 7 - nanoSeconds: 2 - x-etsi-ref: 6.5.2 - TransmissionBandwidth: required: - - transmissionBandwidth + - seconds + - nanoSeconds type: object + x-etsi-ref: 6.5.2 + TransmissionBandwidth: properties: transmissionBandwidth: $ref: '#/components/schemas/TransmissionBandwidth.transmissionBandwidth' - example: - transmissionBandwidth: 5 + required: + - transmissionBandwidth + type: object x-etsi-ref: 6.6.4 TransmissionBandwidth.transmissionBandwidth: - type: integer description: | 'Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows: @@ -1691,638 +1182,284 @@ components: 6 = bw100 (100 resource blocks)' enum: - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - x-etsi-mec-cardinality: "1" + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + type: integer + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum UuMbmsNeighbourCellInfo: - required: - - ecgi - - fddInfo - - mbmsServiceAreaIdentity - - pci - - plmn - - tddInfo - type: object properties: ecgi: + # description': E-UTRAN CelI Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' fddInfo: + # description': Information for FDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': FddInfo $ref: '#/components/schemas/FddInfo' mbmsServiceAreaIdentity: - minItems: 1 - type: array description: Supported MBMS Service Area Identities in the cell. items: type: string + minItems: 1 + type: array x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: String pci: - type: integer description: Physical Cell Identifier. - x-etsi-mec-cardinality: "1" + type: integer + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn $ref: '#/components/schemas/Plmn' tddInfo: + # description': Information for TDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TddInfo $ref: '#/components/schemas/TddInfo' - example: - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity + required: + - plmn + - ecgi + - pci + - fddInfo + - tddInfo - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId + type: object x-etsi-ref: 6.5.11 UuMbmsProvisioningInfo: - required: - - proInfoUuMbms - type: object properties: proInfoUuMbms: - minItems: 1 type: array + minItems: 1 items: $ref: '#/components/schemas/UuMbmsProvisioningInfo.proInfoUuMbms' timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - example: - timeStamp: - seconds: 7 - nanoSeconds: 2 - proInfoUuMbms: - - v2xServerUsd: - sdpInfo: - ipMulticastAddress: ipMulticastAddress - portNumber: portNumber - tmgi: - mnc: mnc - mcc: mcc - mbmsServiceId: mbmsServiceId - serviceAreaIdentifier: - - serviceAreaIdentifier - - serviceAreaIdentifier - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity - - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity - - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - v2xServerUsd: - sdpInfo: - ipMulticastAddress: ipMulticastAddress - portNumber: portNumber - tmgi: - mnc: mnc - mcc: mcc - mbmsServiceId: mbmsServiceId - serviceAreaIdentifier: - - serviceAreaIdentifier - - serviceAreaIdentifier - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity - - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity - - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId + required: + - proInfoUuMbms + type: object x-etsi-ref: 6.2.3 UuMbmsProvisioningInfo.proInfoUuMbms: - required: - - locationInfo - - v2xServerUsd + description: The provisioning information per location as defined below. type: object properties: locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over Uu MBMS. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. items: $ref: '#/components/schemas/UuMbmsNeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo v2xServerUsd: + # description': User Service Description for V2X Application Server is used to configure the UE for receiving local V2X Application Server information when it is provided over MBMS. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xServerUsd $ref: '#/components/schemas/V2xServerUsd' - description: The provisioning information per location as defined below. - example: - v2xServerUsd: - sdpInfo: - ipMulticastAddress: ipMulticastAddress - portNumber: portNumber - tmgi: - mnc: mnc - mcc: mcc - mbmsServiceId: mbmsServiceId - serviceAreaIdentifier: - - serviceAreaIdentifier - - serviceAreaIdentifier - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity - - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - mbmsServiceAreaIdentity: - - mbmsServiceAreaIdentity - - mbmsServiceAreaIdentity - pci: 0 - plmn: - mnc: mnc - mcc: mcc - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId + required: + - locationInfo + - v2xServerUsd x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) UuUniNeighbourCellInfo: - required: - - ecgi - - fddInfo - - pci - - plmn - - tddInfo - type: object properties: ecgi: + # description': E-UTRAN CelI Global Identifier. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' fddInfo: + # description': Information for FDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': FddInfo $ref: '#/components/schemas/FddInfo' pci: - type: integer description: Physical Cell Identifier. - x-etsi-mec-cardinality: "1" + type: integer + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Integer plmn: + # description': Public Land Mobile Network Identity. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': Plmn $ref: '#/components/schemas/Plmn' tddInfo: + # description': Information for TDD operation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TddInfo $ref: '#/components/schemas/TddInfo' - example: - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - x-etsi-ref: 6.5.9 - UuUnicastProvisioningInfo: required: - - proInfoUuUnicast + - plmn + - ecgi + - pci + - fddInfo + - tddInfo type: object + x-etsi-ref: 6.5.9 + UuUnicastProvisioningInfo: properties: proInfoUuUnicast: - minItems: 1 type: array + minItems: 1 items: $ref: '#/components/schemas/UuUnicastProvisioningInfo.proInfoUuUnicast' timeStamp: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - example: - timeStamp: - seconds: 7 - nanoSeconds: 2 - proInfoUuUnicast: - - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - v2xApplicationServer: - ipAddress: ipAddress - udpPort: udpPort - - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - v2xApplicationServer: - ipAddress: ipAddress - udpPort: udpPort + required: + - proInfoUuUnicast + type: object x-etsi-ref: 6.2.2 UuUnicastProvisioningInfo.proInfoUuUnicast: - required: - - locationInfo - - v2xApplicationServer + description: The provisioning information per location as defined below. type: object properties: locationInfo: + # description': Location information to identify a cell of a base station or a particular geographical area. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LocationInfo $ref: '#/components/schemas/LocationInfo' neighbourCellInfo: - minItems: 0 - type: array - description: The information of the neighbour cells in a visiting PLMN that - support V2X communication over Uu unicast. + description: The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. items: $ref: '#/components/schemas/UuUniNeighbourCellInfo' + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: UuUniNeighbourCellInfo v2xApplicationServer: + # description': V2X Application Server address (consisting of IP address and UDP port) for unicast. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': V2xApplicationServer $ref: '#/components/schemas/V2xApplicationServer' - description: The provisioning information per location as defined below. - example: - locationInfo: - geoArea: - latitude: 0.8008282 - longitude: 6.0274563 - ecgi: - plmn: - mnc: mnc - mcc: mcc - cellId: - cellId: cellId - neighbourCellInfo: - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - - fddInfo: - dlEarfcn: - earfcn: 1 - ulEarfcn: null - dlTransmissionBandwidth: - transmissionBandwidth: 5 - ulTransmissionBandwidth: null - pci: 5 - plmn: null - tddInfo: - subframeAssignment: subframeAssignment - transmissionBandwidth: null - earfcn: null - ecgi: null - v2xApplicationServer: - ipAddress: ipAddress - udpPort: udpPort + required: + - locationInfo + - v2xApplicationServer x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) V2xApplicationServer: - required: - - ipAddress - - udpPort - type: object properties: ipAddress: + description: '' type: string - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String udpPort: + description: '' type: string - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - example: - ipAddress: ipAddress - udpPort: udpPort - x-etsi-ref: 6.5.8 - V2xMsgNotification: required: - - _links - - msgContent - - msgEncodeFormat - - msgType - - notificationType - - stdOrganization - - timeStamp + - ipAddress + - udpPort type: object + x-etsi-ref: 6.5.8 + V2xMsgNotification: properties: _links: $ref: '#/components/schemas/V2xMsgNotification.links' msgContent: + description: Published V2X message content. The format of the string is defined by the standardization organization indicated by the attribute stdOrganization. type: string - description: Published V2X message content. The format of the string is - defined by the standardization organization indicated by the attribute - stdOrganization. - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String msgEncodeFormat: - type: string description: The encode format of the V2X message, for example base64. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String msgType: $ref: '#/components/schemas/msgType' notificationType: - type: string description: Shall be set to "V2xMsgNotification". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String stdOrganization: - type: string - description: "Standardization organization which defines the published V2X\ - \ message type: \nETSI: European Telecommunications Standards Institute.\n\ - See note 1." + description: "Standardization organization which defines the published V2X message type: \nETSI: European Telecommunications Standards Institute.\nSee note 1." enum: - - ETSI - x-etsi-mec-cardinality: "1" + - ETSI + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum timeStamp: + # description': Date and time of the notification generation. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as\ - \ needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified\ - \ in ETSI TS 102 894-2 [6], clause A.114." - x-etsi-ref: 6.4.5 - V2xMsgNotification.links: required: - - subscription + - notificationType + - timeStamp + - stdOrganization + - msgType + - msgEncodeFormat + - msgContent + - _links type: object + x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." + x-etsi-ref: 6.4.5 + V2xMsgNotification.links: + description: links to resources related to this notification. properties: subscription: + # description': A link to the related subscription. + # x-etsi-mec-cardinality': '1' + # x-etsi-mec-origin-type': LinkType $ref: '#/components/schemas/LinkType' - description: links to resources related to this notification. - x-etsi-mec-cardinality: "1" - x-etsi-mec-origin-type: Structure (inlined) - V2xMsgPublication: required: - - msgContent - - msgEncodeFormat - - msgType - - stdOrganization + - subscription type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) + V2xMsgPublication: properties: msgContent: + description: Published V2X message content. Its format is defined by the standardization organization indicated by the attribute stdOrganization. type: string - description: Published V2X message content. Its format is defined by the - standardization organization indicated by the attribute stdOrganization. - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String msgEncodeFormat: - type: string description: The encode format of the V2X message, for example base64. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String msgType: $ref: '#/components/schemas/msgType' stdOrganization: - type: string - description: "Standardization organization which defines the published V2X\ - \ message type:\nETSI: European Telecommunications Standards Institute.\ - \ \nSee note 1." + description: "Standardization organization which defines the published V2X message type:\nETSI: European Telecommunications Standards Institute. \nSee note 1." enum: - - ETSI - x-etsi-mec-cardinality: "1" + - ETSI + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum - x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as\ - \ needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified\ - \ in ETSI TS 102 894-2 [6], clause A.114." + required: + - stdOrganization + - msgType + - msgEncodeFormat + - msgContent + type: object + x-etsi-notes: "NOTE 1:\tOther standardization organizations could be added as needed.\nNOTE 2:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." x-etsi-ref: 6.2.6 msgType: - type: integer description: | Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. − denm(1): Decentralized Environmental Notification Message (DENM) as specified in ETSI EN 302 637-3, @@ -2339,323 +1476,263 @@ components: − saem(12): Services Announcement Extended Message as specified in ETSI TS 102 890-1, − rtcmem(13): Radio Technical Commission for Maritime Services (RTCM) Message as specified in ETSI TS 103 301, enum: - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9 - - 10 - - 11 - - 12 - - 13 - x-etsi-mec-cardinality: "1" + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 + - 10 + - 11 + - 12 + - 13 + type: integer + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum V2xMsgSubscription: - required: - - filterCriteria - - subscriptionType - type: object properties: _links: $ref: '#/components/schemas/links' callbackReference: - type: string - description: URI exposed by the client on which to receive notifications - via HTTP. See note 1. + description: URI exposed by the client on which to receive notifications via HTTP. See note 1. format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uri expiryDeadline: + # description': Time stamp. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteria: $ref: '#/components/schemas/V2xMsgSubscription.filterCriteria' requestTestNotification: + description: "Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS\_MEC 009 [i.1], clause 6.12a.\nDefault: FALSE." type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: - type: string description: Shall be set to "V2xMsgSubscription". - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String websockNotifConfig: + # description': Provides details to negotiate and signal the use of a Websocket connection between VIS and the service consumer for notifications. See note 1. + # x-etsi-mec-cardinality': 0..1 + # x-etsi-mec-origin-type': WebsockNotifConfig $ref: '#/components/schemas/WebsockNotifConfig' - x-etsi-notes: "NOTE 1:\tAt least one of callbackReference and websockNotifConfig\ - \ shall be provided by the service consumer. If both are provided, it is up\ - \ to VIS to choose an alternative and return only that alternative in the\ - \ response, as described in ETSI GS MEC 009 [i.1], clause 6.12a.\nNOTE 2:\t\ - Other standardization organizations could be added as needed.\nNOTE 3:\tThe\ - \ V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2\ - \ [6], clause A.114." - x-etsi-ref: 6.3.5 - V2xMsgSubscription.filterCriteria: required: - - stdOrganization + - subscriptionType + - filterCriteria type: object + x-etsi-notes: "NOTE 1:\tAt least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to VIS to choose an alternative and return only that alternative in the response, as described in ETSI GS MEC 009 [i.1], clause 6.12a.\nNOTE 2:\tOther standardization organizations could be added as needed.\nNOTE 3:\tThe V2X message types of ETSI shall be used as specified in ETSI TS 102 894-2 [6], clause A.114." + x-etsi-ref: 6.3.5 + V2xMsgSubscription.filterCriteria: + description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. properties: msgType: - minItems: 0 - type: array - description: Subscribed V2X message type. Its value is defined by the standardization - organization indicated by the attribute stdOrganization. See note 3. + description: Subscribed V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 3. items: type: string + minItems: 0 + type: array x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Enum stdOrganization: - type: string - description: "Standardization organization which defines the subscribed\ - \ V2X message type: \nETSI: European Telecommunications Standards Institute.\ - \ \nSee note 2." + description: "Standardization organization which defines the subscribed V2X message type: \nETSI: European Telecommunications Standards Institute. \nSee note 2." enum: - - ETSI - x-etsi-mec-cardinality: "1" + - ETSI + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: Enum - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. - x-etsi-mec-cardinality: "1" - x-etsi-mec-origin-type: Structure (inlined) - V2xServerUsd: required: - - sdpInfo - - serviceAreaIdentifier - - tmgi + - stdOrganization type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) + V2xServerUsd: properties: sdpInfo: $ref: '#/components/schemas/V2xServerUsd.sdpInfo' serviceAreaIdentifier: - minItems: 1 - type: array - description: A list of service area identifier for the applicable MBMS broadcast - area. + description: A list of service area identifier for the applicable MBMS broadcast area. items: type: string + minItems: 1 + type: array x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: String tmgi: $ref: '#/components/schemas/V2xServerUsd.tmgi' - example: - sdpInfo: - ipMulticastAddress: ipMulticastAddress - portNumber: portNumber - tmgi: - mnc: mnc - mcc: mcc - mbmsServiceId: mbmsServiceId - serviceAreaIdentifier: - - serviceAreaIdentifier + required: + - tmgi - serviceAreaIdentifier + - sdpInfo + type: object x-etsi-ref: 6.5.10 V2xServerUsd.sdpInfo: - required: - - ipMulticastAddress - - portNumber - type: object + description: SDP with IP multicast address and port number used for V2X communication via MBMS. properties: ipMulticastAddress: + description: '' type: string - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String portNumber: + description: '' type: string - x-etsi-mec-cardinality: "1" + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - description: SDP with IP multicast address and port number used for V2X communication - via MBMS. - example: - ipMulticastAddress: ipMulticastAddress - portNumber: portNumber - x-etsi-mec-cardinality: "1" - x-etsi-mec-origin-type: Structure (inlined) - V2xServerUsd.tmgi: required: - - mbmsServiceId - - mcc - - mnc + - ipMulticastAddress + - portNumber type: object + x-etsi-mec-cardinality: '1' + x-etsi-mec-origin-type: Structure (inlined) + V2xServerUsd.tmgi: + description: Temporary Mobile Group Identity (TMGI), which is used within MBMS to uniquely identify Multicast and Broadcast bearer services. properties: mbmsServiceId: - type: string description: MBMS Service ID consisting of three octets. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String mcc: - type: string description: The Mobile Country Code part of PLMN Identity. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String mnc: - type: string description: The Mobile Network Code part of PLMN Identity. - x-etsi-mec-cardinality: "1" + type: string + x-etsi-mec-cardinality: '1' x-etsi-mec-origin-type: String - description: Temporary Mobile Group Identity (TMGI), which is used within MBMS - to uniquely identify Multicast and Broadcast bearer services. - example: - mnc: mnc - mcc: mcc - mbmsServiceId: mbmsServiceId - x-etsi-mec-cardinality: "" + required: + - mbmsServiceId + - mcc + - mnc + type: object + x-etsi-mec-cardinality: '' x-etsi-mec-origin-type: Structure (inlined) WebsockNotifConfig: - type: object properties: requestWebsocketUri: + description: Set to TRUE by the service consumer to indicate that Websocket delivery is requested. type: boolean - description: Set to TRUE by the service consumer to indicate that Websocket - delivery is requested. x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean websocketUri: - type: string - description: Set by VIS to indicate to the service consumer the Websocket - URI to be used for delivering notifications. + description: Set by VIS to indicate to the service consumer the Websocket URI to be used for delivering notifications. format: uri + type: string x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uri + type: object x-etsi-ref: 6.5.14 AppTerminationNotification: - required: - - _links - - maxGracefulTimeout - - notificationType - - operationAction + description: >- + This type represents the information that the MEC platform + notifies the subscribed application instance about the corresponding + application instance termination/stop. type: object + required: + - notificationType + - operationAction + - maxGracefulTimeout + - _links properties: notificationType: - type: string description: Shall be set to AppTerminationNotification. + type: string operationAction: $ref: '#/components/schemas/OperationActionType' maxGracefulTimeout: + description: >- + Maximum timeout value in seconds for graceful termination or graceful + stop of an application instance. type: integer - description: Maximum timeout value in seconds for graceful termination or - graceful stop of an application instance. format: uint32 _links: - $ref: '#/components/schemas/AppTerminationNotification__links' - description: This type represents the information that the MEC platform notifies - the subscribed application instance about the corresponding application instance - termination/stop. + description: >- + Object containing hyperlinks related to the resource. + type: object + required: + - subscription + properties: + subscription: + $ref: '#/components/schemas/LinkType' + confirmTermination: + $ref: '#/components/schemas/LinkType' OperationActionType: - type: string description: Operation that is being performed on the MEC application instance. + type: string enum: - - STOPPING - - TERMINATING - body: - oneOf: - - $ref: '#/components/schemas/ProvChgUuUniSubscription' - - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' - - $ref: '#/components/schemas/ProvChgPc5Subscription' - - $ref: '#/components/schemas/V2xMsgSubscription' - body_1: - oneOf: - - $ref: '#/components/schemas/ProvChgUuUniSubscription' - - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' - - $ref: '#/components/schemas/ProvChgPc5Subscription' - - $ref: '#/components/schemas/V2xMsgSubscription' - TestNotification__links: - required: - - subscription - type: object - properties: - subscription: - $ref: '#/components/schemas/LinkType' - description: 'Hyperlink related to the resource. ' - AppTerminationNotification__links: - required: - - subscription - type: object - properties: - subscription: - $ref: '#/components/schemas/LinkType' - confirmTermination: - $ref: '#/components/schemas/LinkType' - description: Object containing hyperlinks related to the resource. + - STOPPING + - TERMINATING + responses: - "204": + '204': description: No Content - "206": + '206': description: Partial content - "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + '400': + description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "401": + '401': description: 'Unauthorized : used when the client did not submit credentials.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + '403': + description: 'Forbidden : operation is not allowed given the current status of the resource.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "404": - description: 'Not Found : used when a client provided a URI that cannot be - mapped to a valid resource URI.' + '404': + description: 'Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + '406': + description: 'Not Acceptable : used to indicate that the server cannot provide the any of the content formats supported by the client.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "409": - description: 'Conflict : The operation cannot be executed currently, due to - a conflict with the state of the resource' + '409': + description: 'Conflict : The operation cannot be executed currently, due to a conflict with the state of the resource' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "412": - description: 'Precondition failed : used when a condition has failed during - conditional requests, e.g. when using ETags to avoid write conflicts when - using PUT' + '412': + description: 'Precondition failed : used when a condition has failed during conditional requests, e.g. when using ETags to avoid write conflicts when using PUT' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "415": - description: 'Unsupported Media Type : used to indicate that the server or - the client does not support the content type of the entity body.' + '415': + description: 'Unsupported Media Type : used to indicate that the server or the client does not support the content type of the entity body.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained instructions. - This error condition can occur if an JSON request body is syntactically correct - but semantically incorrect, for example if the target area for the request - is considered too large. This error condition can also occur if the capabilities - required by the request are not supported.' + '422': + description: 'Unprocessable Entity : used to indicate that the server understands the content type of the request entity and that the syntax of the request entity is correct but that the server is unable to process the contained instructions. This error condition can occur if an JSON request body is syntactically correct but semantically incorrect, for example if the target area for the request is considered too large. This error condition can also occur if the capabilities required by the request are not supported.' content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' - "429": + '429': description: 'Too Many Requests : used when a rate limiter has triggered.' content: application/json: diff --git a/go-apps/meep-vis/go.mod b/go-apps/meep-vis/go.mod index 17d3b7621..4d2920b3f 100644 --- a/go-apps/meep-vis/go.mod +++ b/go-apps/meep-vis/go.mod @@ -6,7 +6,6 @@ require ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0 - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0 @@ -14,7 +13,6 @@ require ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0 - // github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client v0.0.0 // indirect github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-subscriptions v0.0.0 @@ -29,7 +27,6 @@ replace ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client => ../../go-packages/meep-app-support-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr => ../../go-packages/meep-data-key-mgr github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache => ../../go-packages/meep-gis-cache 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-logger => ../../go-packages/meep-logger @@ -37,7 +34,6 @@ replace ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis - // github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client => ../../go-packages/meep-vis-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client => ../../go-packages/meep-sandbox-ctrl-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client => ../../go-packages/meep-service-mgmt-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-subscriptions => ../../go-packages/meep-subscriptions diff --git a/go-apps/meep-vis/go.sum b/go-apps/meep-vis/go.sum index 1cdda602f..d2b3eaf4a 100644 --- a/go-apps/meep-vis/go.sum +++ b/go-apps/meep-vis/go.sum @@ -1,18 +1,15 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= -github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T59kgRjXcSDBODnyZP9wes+bnLn0lx4PgM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY= -github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345 h1:fgSpoKViTSqRb4hjDNj10ig5wUvO0CayCzFdLf6fuRM= github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72 h1:uGeGZl8PxSq8VZGG4QK5njJTFA4/G/x5CYORvQVXtAE= github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -55,7 +52,6 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -114,7 +110,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -122,6 +117,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= @@ -151,8 +147,6 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= @@ -178,13 +172,11 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw= -github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= @@ -194,7 +186,6 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237 h1:acuCHBjzG7MFTugvx3buC4m5rLDLaKC9J8C9jtlraRc= github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237/go.mod h1:UOnLAUmVG5paym8pD3C4B9BQylUDC2vXFJJpT7JrlEA= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -221,7 +212,6 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= @@ -230,12 +220,10 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= @@ -258,7 +246,6 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -291,6 +278,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3 h1:lBNvYUFo7d4fHs8BXUmoTzbdUo4usq6PlP5qn894sGA= +github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3/go.mod h1:jo59Sv6xirZtbxbaZbCtrQd1CSufmcxJZIC8hm2tepw= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= @@ -315,8 +304,6 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -325,7 +312,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -451,7 +437,6 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -484,14 +469,12 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/go-apps/meep-vis/main.go b/go-apps/meep-vis/main.go index 4625fc2c8..0aa75ce0f 100644 --- a/go-apps/meep-vis/main.go +++ b/go-apps/meep-vis/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-vis/main_test.go b/go-apps/meep-vis/main_test.go index f12275209..415ff68c0 100644 --- a/go-apps/meep-vis/main_test.go +++ b/go-apps/meep-vis/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 ETSI STF 625 + * Copyright (c) 2022 ETSI STF 625 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/go-apps/meep-vis/sbi/vis-sbi.go b/go-apps/meep-vis/sbi/vis-sbi.go index a387f1a61..b416c2445 100644 --- a/go-apps/meep-vis/sbi/vis-sbi.go +++ b/go-apps/meep-vis/sbi/vis-sbi.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -22,12 +22,8 @@ import ( "strings" "sync" - // "time" - dataModel "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model" - gc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache" 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" mq "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq" sam "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr" @@ -36,15 +32,12 @@ import ( const moduleName string = "meep-vis-sbi" -var metricStore *met.MetricStore var redisAddr string = "meep-redis-master.default.svc.cluster.local:6379" var influxAddr string = "http://meep-influxdb.default.svc.cluster.local:8086" const postgisUser = "postgres" const postgisPwd = "pwd" -var GridFileExists bool = true - type SbiCfg struct { ModuleName string SandboxName string @@ -59,28 +52,27 @@ type SbiCfg struct { } type VisSbi struct { - moduleName string - sandboxName string - mepName string - scenarioName string - localityEnabled bool - locality map[string]bool - mqLocal *mq.MsgQueue - handlerId int - apiMgr *sam.SwaggerApiMgr - activeModel *mod.Model - gisCache *gc.GisCache - trafficMgr *tm.TrafficMgr - updateScenarioNameCB func(string) - cleanUpCB func() - mutex sync.Mutex - GridFileExists bool + moduleName string + sandboxName string + mepName string + scenarioName string + localityEnabled bool + locality map[string]bool + mqLocal *mq.MsgQueue + handlerId int + apiMgr *sam.SwaggerApiMgr + activeModel *mod.Model + trafficMgr *tm.TrafficMgr + updateScenarioNameCB func(string) + cleanUpCB func() + mutex sync.Mutex + predictionModelSupported bool } var sbi *VisSbi // Init - V2XI Service SBI initialization -func Init(cfg SbiCfg) (err error) { +func Init(cfg SbiCfg) (predictionModelSupported bool, err error) { // Create new SBI instance if sbi != nil { @@ -111,7 +103,7 @@ func Init(cfg SbiCfg) (err error) { sbi.mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sbi.sandboxName), moduleName, sbi.sandboxName, cfg.RedisAddr) if err != nil { log.Error("Failed to create Message Queue with error: ", err) - return err + return false, err } log.Info("Message Queue created") @@ -119,7 +111,7 @@ func Init(cfg SbiCfg) (err error) { sbi.apiMgr, err = sam.NewSwaggerApiMgr(sbi.moduleName, sbi.sandboxName, sbi.mepName, sbi.mqLocal) if err != nil { log.Error("Failed to create Swagger API Manager. Error: ", err) - return err + return false, err } log.Info("Swagger API Manager created") @@ -134,87 +126,44 @@ func Init(cfg SbiCfg) (err error) { sbi.activeModel, err = mod.NewModel(modelCfg) if err != nil { log.Error("Failed to create model: ", err.Error()) - return err + return false, err } - // Connect to GIS cache - sbi.gisCache, err = gc.NewGisCache(sbi.sandboxName, cfg.RedisAddr) - if err != nil { - log.Error("Failed to connect to GIS Cache: ", err.Error()) - return err - } - log.Info("Connected to GIS Cache") - // Get prediction model support - var predictionModelSupported bool = false predictionModelSupportedEnv := strings.TrimSpace(os.Getenv("MEEP_PREDICT_MODEL_SUPPORTED")) if predictionModelSupportedEnv != "" { value, err := strconv.ParseBool(predictionModelSupportedEnv) if err == nil { - predictionModelSupported = value + sbi.predictionModelSupported = value } } - log.Info("MEEP_PREDICT_MODEL_SUPPORTED: ", predictionModelSupported) + log.Info("MEEP_PREDICT_MODEL_SUPPORTED: ", sbi.predictionModelSupported) - if predictionModelSupported { + if sbi.predictionModelSupported { // Connect to VIS Traffic Manager sbi.trafficMgr, err = tm.NewTrafficMgr(sbi.moduleName, sbi.sandboxName, postgisUser, postgisPwd, cfg.PostgisHost, cfg.PostgisPort) if sbi.trafficMgr.GridFileExists { if err != nil { log.Error("Failed connection to VIS Traffic Manager: ", err) - return err + return false, err } log.Info("Connected to VIS Traffic Manager") // Delete any old tables _ = sbi.trafficMgr.DeleteTables() - // Create new tables - err = sbi.trafficMgr.CreateTables() - if err != nil { - log.Error("Failed to create tables: ", err) - return err - } - log.Info("Created new VIS DB tables") } else { // In case grid map file does not exist log.Error("Failed connection to VIS Traffic Manager as grid map file does not exist") _ = sbi.trafficMgr.DeleteTrafficMgr() - GridFileExists = false - predictionModelSupported = false + sbi.predictionModelSupported = false } } // Initialize service processActiveScenarioUpdate() - if predictionModelSupported { - // Populate VIS DB Grid Map Table - err = sbi.trafficMgr.PopulateGridMapTable() - if err != nil { - log.Error("Failed to populate grid map table: ", err) - return err - } - log.Info("Populated VIS DB grid map table") - - // Populate VIS DB Categories Table - err = sbi.trafficMgr.PopulateCategoryTable() - if err != nil { - log.Error("Failed to populate categories table: ", err) - return err - } - log.Info("Populated VIS DB categories table") - - // Populate VIS DB Traffic Load Table - err = populatePoaTable() - if err != nil { - log.Error("Failed to populate traffic load table: ", err) - return err - } - log.Info("Populated VIS DB traffic load table") - } - - return nil + return sbi.predictionModelSupported, nil } // Run - MEEP VIS execution @@ -244,9 +193,6 @@ func Run() (err error) { return err } - // Start refresh loop - // startRefreshTicker() - return nil } @@ -255,9 +201,6 @@ func Stop() (err error) { return } - // Stop refresh loop - // stopRefreshTicker() - if sbi.mqLocal != nil { sbi.mqLocal.UnregisterHandler(sbi.handlerId) } @@ -306,33 +249,56 @@ func processActiveScenarioTerminate() { // Sync with active scenario store sbi.activeModel.UpdateScenario() + // Update scenario name + sbi.scenarioName = "" + // Flush all Traffic Manager tables - _ = sbi.trafficMgr.DeleteTables() + if sbi.trafficMgr != nil { + _ = sbi.trafficMgr.DeleteAllPoaLoad() + _ = sbi.trafficMgr.DeleteTables() + } sbi.cleanUpCB() } func processActiveScenarioUpdate() { - sbi.mutex.Lock() defer sbi.mutex.Unlock() log.Debug("processActiveScenarioUpdate") - sbi.activeModel.UpdateScenario() - scenarioName := sbi.activeModel.GetScenarioName() - - // Connect to Metric Store - sbi.updateScenarioNameCB(scenarioName) - + // Process new scenario + var scenarioName = sbi.activeModel.GetScenarioName() if scenarioName != sbi.scenarioName { + // Update scenario name sbi.scenarioName = scenarioName - var err error + sbi.updateScenarioNameCB(sbi.scenarioName) - metricStore, err = met.NewMetricStore(scenarioName, sbi.sandboxName, influxAddr, redisAddr) - if err != nil { - log.Error("Failed connection to metric-store: ", err) + if sbi.predictionModelSupported { + // Create new tables + err := sbi.trafficMgr.CreateTables() + if err != nil { + log.Error("Failed to create tables: ", err) + return + } + log.Info("Created new VIS DB tables") + + // Populate VIS DB Grid Map Table + err = sbi.trafficMgr.PopulateGridMapTable() + if err != nil { + log.Error("Failed to populate grid map table: ", err) + return + } + log.Info("Populated VIS DB grid map table") + + // Populate VIS DB Traffic Load Table + err = populatePoaTable() + if err != nil { + log.Error("Failed to populate traffic load table: ", err) + return + } + log.Info("Populated VIS DB traffic load table") } } } diff --git a/go-apps/meep-vis/server/README.md b/go-apps/meep-vis/server/README.md index 5ccdc01b5..3b8c46ea9 100644 --- a/go-apps/meep-vis/server/README.md +++ b/go-apps/meep-vis/server/README.md @@ -1,4 +1,4 @@ -# Go API Server for swagger +# Go API Server for server V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 2.2.1 -- Build date: 2022-02-14T12:42:53.611161+05:00[Asia/Karachi] +- Build date: 2022-11-04T17:14:22.484925-04:00[America/New_York] ### Running the server diff --git a/go-apps/meep-vis/server/api_unsupported.go b/go-apps/meep-vis/server/api_unsupported.go index 8aac7a811..8fcdd0780 100644 --- a/go-apps/meep-vis/server/api_unsupported.go +++ b/go-apps/meep-vis/server/api_unsupported.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/api_v2xi.go b/go-apps/meep-vis/server/api_v2xi.go index 546ce6845..ddfde7704 100644 --- a/go-apps/meep-vis/server/api_v2xi.go +++ b/go-apps/meep-vis/server/api_v2xi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/convert.go b/go-apps/meep-vis/server/convert.go index e20223608..28a71648b 100644 --- a/go-apps/meep-vis/server/convert.go +++ b/go-apps/meep-vis/server/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-vis/server/logger.go b/go-apps/meep-vis/server/logger.go index 3c246455e..aa32c0de7 100644 --- a/go-apps/meep-vis/server/logger.go +++ b/go-apps/meep-vis/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_app_termination_notification.go b/go-apps/meep-vis/server/model_app_termination_notification.go index 62bea9a8d..377b8682a 100644 --- a/go-apps/meep-vis/server/model_app_termination_notification.go +++ b/go-apps/meep-vis/server/model_app_termination_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_app_termination_notification__links.go b/go-apps/meep-vis/server/model_app_termination_notification__links.go index ac61325d2..68f748d68 100644 --- a/go-apps/meep-vis/server/model_app_termination_notification__links.go +++ b/go-apps/meep-vis/server/model_app_termination_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_cell_id.go b/go-apps/meep-vis/server/model_cell_id.go index 9179a287f..ceafbfa69 100644 --- a/go-apps/meep-vis/server/model_cell_id.go +++ b/go-apps/meep-vis/server/model_cell_id.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_earfcn.go b/go-apps/meep-vis/server/model_earfcn.go index 810b888db..307261900 100644 --- a/go-apps/meep-vis/server/model_earfcn.go +++ b/go-apps/meep-vis/server/model_earfcn.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_ecgi.go b/go-apps/meep-vis/server/model_ecgi.go index f47589a7b..2f724b6ab 100644 --- a/go-apps/meep-vis/server/model_ecgi.go +++ b/go-apps/meep-vis/server/model_ecgi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_fdd_info.go b/go-apps/meep-vis/server/model_fdd_info.go index e7e09b4e5..0ea760d5e 100644 --- a/go-apps/meep-vis/server/model_fdd_info.go +++ b/go-apps/meep-vis/server/model_fdd_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_link_type.go b/go-apps/meep-vis/server/model_link_type.go index 9479a66f2..61f09b331 100644 --- a/go-apps/meep-vis/server/model_link_type.go +++ b/go-apps/meep-vis/server/model_link_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_links.go b/go-apps/meep-vis/server/model_links.go index b00ccb2b7..f29ff6ae5 100644 --- a/go-apps/meep-vis/server/model_links.go +++ b/go-apps/meep-vis/server/model_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_location_info.go b/go-apps/meep-vis/server/model_location_info.go index 3210dd068..26619a3c2 100644 --- a/go-apps/meep-vis/server/model_location_info.go +++ b/go-apps/meep-vis/server/model_location_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_location_info_geo_area.go b/go-apps/meep-vis/server/model_location_info_geo_area.go index 3f395ad77..d758690d2 100644 --- a/go-apps/meep-vis/server/model_location_info_geo_area.go +++ b/go-apps/meep-vis/server/model_location_info_geo_area.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_msg_type.go b/go-apps/meep-vis/server/model_msg_type.go index 40ef2694b..d57735a84 100644 --- a/go-apps/meep-vis/server/model_msg_type.go +++ b/go-apps/meep-vis/server/model_msg_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_body.go b/go-apps/meep-vis/server/model_one_ofsubscriptions_body.go similarity index 82% rename from go-apps/meep-vis/server/model_body.go rename to go-apps/meep-vis/server/model_one_ofsubscriptions_body.go index 1e969bef2..665449ca2 100644 --- a/go-apps/meep-vis/server/model_body.go +++ b/go-apps/meep-vis/server/model_one_ofsubscriptions_body.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,5 +23,5 @@ */ package server -type Body struct { +type OneOfsubscriptionsBody struct { } diff --git a/go-apps/meep-vis/server/model_one_ofsubscriptions_subscription_id_body.go b/go-apps/meep-vis/server/model_one_ofsubscriptions_subscription_id_body.go new file mode 100644 index 000000000..aaa9ab49f --- /dev/null +++ b/go-apps/meep-vis/server/model_one_ofsubscriptions_subscription_id_body.go @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ +package server + +type OneOfsubscriptionsSubscriptionIdBody struct { +} diff --git a/go-apps/meep-vis/server/model_operation_action_type.go b/go-apps/meep-vis/server/model_operation_action_type.go index 4c4cf3c45..4bef6812f 100644 --- a/go-apps/meep-vis/server/model_operation_action_type.go +++ b/go-apps/meep-vis/server/model_operation_action_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,6 +28,6 @@ type OperationActionType string // List of OperationActionType const ( - STOPPING OperationActionType = "STOPPING" - TERMINATING OperationActionType = "TERMINATING" + STOPPING_OperationActionType OperationActionType = "STOPPING" + TERMINATING_OperationActionType OperationActionType = "TERMINATING" ) diff --git a/go-apps/meep-vis/server/model_pc5_neighbour_cell_info.go b/go-apps/meep-vis/server/model_pc5_neighbour_cell_info.go index 0894d9ca0..e0996a1d8 100644 --- a/go-apps/meep-vis/server/model_pc5_neighbour_cell_info.go +++ b/go-apps/meep-vis/server/model_pc5_neighbour_cell_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_pc5_provisioning_info.go b/go-apps/meep-vis/server/model_pc5_provisioning_info.go index 2a930e82e..1414e0522 100644 --- a/go-apps/meep-vis/server/model_pc5_provisioning_info.go +++ b/go-apps/meep-vis/server/model_pc5_provisioning_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,7 +24,7 @@ package server type Pc5ProvisioningInfo struct { - ProInfoPc5 *[]interface{} `json:"proInfoPc5"` + ProInfoPc5 []Pc5ProvisioningInfoProInfoPc5 `json:"proInfoPc5"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-apps/meep-vis/server/model_pc5_provisioning_info_pro_info_pc5.go b/go-apps/meep-vis/server/model_pc5_provisioning_info_pro_info_pc5.go new file mode 100644 index 000000000..6a777be3f --- /dev/null +++ b/go-apps/meep-vis/server/model_pc5_provisioning_info_pro_info_pc5.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ +package server + +// The provisioning information per location as defined below. +type Pc5ProvisioningInfoProInfoPc5 struct { + // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. PLMN operators coordinate to make sure Destination Layer2 ID(s) for different V2X services are configured in a consistent manner. + DstLayer2Id string `json:"dstLayer2Id"` + + LocationInfo *LocationInfo `json:"locationInfo"` + // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + NeighbourCellInfo []Pc5NeighbourCellInfo `json:"neighbourCellInfo,omitempty"` +} diff --git a/go-apps/meep-vis/server/model_plmn.go b/go-apps/meep-vis/server/model_plmn.go index 26c0cbf61..d92c72192 100644 --- a/go-apps/meep-vis/server/model_plmn.go +++ b/go-apps/meep-vis/server/model_plmn.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_predicted_qos.go b/go-apps/meep-vis/server/model_predicted_qos.go index 6478f278d..538b244c4 100644 --- a/go-apps/meep-vis/server/model_predicted_qos.go +++ b/go-apps/meep-vis/server/model_predicted_qos.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_predicted_qos_routes.go b/go-apps/meep-vis/server/model_predicted_qos_routes.go index 2e3b98435..ee8da07fa 100644 --- a/go-apps/meep-vis/server/model_predicted_qos_routes.go +++ b/go-apps/meep-vis/server/model_predicted_qos_routes.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,5 +25,5 @@ package server type PredictedQosRoutes struct { // Information relating to a specific route. The first structure shall relate to the route origin and the last to the route destination. Intermediate waypoint locations may also be provided. - RouteInfo []PredictedQosRoutesRouteInfo `json:"routeInfo"` + RouteInfo []PredictedQosRoutesRouteInfo `json:"routeInfo,omitempty"` } diff --git a/go-apps/meep-vis/server/model_predicted_qos_routes_route_info.go b/go-apps/meep-vis/server/model_predicted_qos_routes_route_info.go index f0b19398b..923c80369 100644 --- a/go-apps/meep-vis/server/model_predicted_qos_routes_route_info.go +++ b/go-apps/meep-vis/server/model_predicted_qos_routes_route_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,7 +24,7 @@ package server type PredictedQosRoutesRouteInfo struct { - Location *LocationInfo `json:"location"` + Location *LocationInfo `json:"location,omitempty"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response. Rsrp int32 `json:"rsrp,omitempty"` // Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response. diff --git a/go-apps/meep-vis/server/model_problem_details.go b/go-apps/meep-vis/server/model_problem_details.go index 91d1baf28..95f1b38f1 100644 --- a/go-apps/meep-vis/server/model_problem_details.go +++ b/go-apps/meep-vis/server/model_problem_details.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_pc5_notification.go b/go-apps/meep-vis/server/model_prov_chg_pc5_notification.go index 924ffa241..e4a350f07 100644 --- a/go-apps/meep-vis/server/model_prov_chg_pc5_notification.go +++ b/go-apps/meep-vis/server/model_prov_chg_pc5_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_pc5_subscription.go b/go-apps/meep-vis/server/model_prov_chg_pc5_subscription.go index 010b96c02..e8d711124 100644 --- a/go-apps/meep-vis/server/model_prov_chg_pc5_subscription.go +++ b/go-apps/meep-vis/server/model_prov_chg_pc5_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_pc5_subscription_filter_criteria.go b/go-apps/meep-vis/server/model_prov_chg_pc5_subscription_filter_criteria.go index b5dd2f752..28fc9d3d2 100644 --- a/go-apps/meep-vis/server/model_prov_chg_pc5_subscription_filter_criteria.go +++ b/go-apps/meep-vis/server/model_prov_chg_pc5_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_uu_mbms_notification.go b/go-apps/meep-vis/server/model_prov_chg_uu_mbms_notification.go index 044d6ab32..c6ef28509 100644 --- a/go-apps/meep-vis/server/model_prov_chg_uu_mbms_notification.go +++ b/go-apps/meep-vis/server/model_prov_chg_uu_mbms_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription.go b/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription.go index f400adb7c..af2d0c262 100644 --- a/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription.go +++ b/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription_filter_criteria.go b/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription_filter_criteria.go index c2528db28..4d6417bfb 100644 --- a/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription_filter_criteria.go +++ b/go-apps/meep-vis/server/model_prov_chg_uu_mbms_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_uu_uni_notification.go b/go-apps/meep-vis/server/model_prov_chg_uu_uni_notification.go index 065faf34c..59322b867 100644 --- a/go-apps/meep-vis/server/model_prov_chg_uu_uni_notification.go +++ b/go-apps/meep-vis/server/model_prov_chg_uu_uni_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription.go b/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription.go index 39229a31d..2464b24d3 100644 --- a/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription.go +++ b/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription_filter_criteria.go b/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription_filter_criteria.go index 2d96071b9..3cca9e47f 100644 --- a/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription_filter_criteria.go +++ b/go-apps/meep-vis/server/model_prov_chg_uu_uni_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_subscription_link_list.go b/go-apps/meep-vis/server/model_subscription_link_list.go index a1123861c..bdc798a41 100644 --- a/go-apps/meep-vis/server/model_subscription_link_list.go +++ b/go-apps/meep-vis/server/model_subscription_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_subscription_link_list_links.go b/go-apps/meep-vis/server/model_subscription_link_list_links.go index 70bfc76ee..ddb5c1b5d 100644 --- a/go-apps/meep-vis/server/model_subscription_link_list_links.go +++ b/go-apps/meep-vis/server/model_subscription_link_list_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,5 +27,5 @@ package server type SubscriptionLinkListLinks struct { Self *LinkType `json:"self"` - Subscriptions *[]interface{} `json:"subscriptions,omitempty"` + Subscriptions []SubscriptionLinkListLinksSubscriptions `json:"subscriptions,omitempty"` } diff --git a/go-apps/meep-vis/server/model_one_ofbody_1.go b/go-apps/meep-vis/server/model_subscription_link_list_links_subscriptions.go similarity index 66% rename from go-apps/meep-vis/server/model_one_ofbody_1.go rename to go-apps/meep-vis/server/model_subscription_link_list_links_subscriptions.go index ca726149c..1cdc1636b 100644 --- a/go-apps/meep-vis/server/model_one_ofbody_1.go +++ b/go-apps/meep-vis/server/model_subscription_link_list_links_subscriptions.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,9 +23,10 @@ */ package server -type OneOfbody1 struct { - // ProvChgUuUniSubscription - // ProvChgUuMbmsSubscription - // ProvChgPc5Subscription - // V2xMsgSubscription +// The service consumer's subscriptions. +type SubscriptionLinkListLinksSubscriptions struct { + // The URI referring to the subscription. + Href string `json:"href"` + // Type of the subscription. The values are as defined in the \"subscriptionType\" attribute for each different V2X information event subscription data type. + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-apps/meep-vis/server/model_body_1.go b/go-apps/meep-vis/server/model_subscriptions_body.go similarity index 82% rename from go-apps/meep-vis/server/model_body_1.go rename to go-apps/meep-vis/server/model_subscriptions_body.go index 18b196ab4..2d656ab66 100644 --- a/go-apps/meep-vis/server/model_body_1.go +++ b/go-apps/meep-vis/server/model_subscriptions_body.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,5 +23,5 @@ */ package server -type Body1 struct { +type SubscriptionsBody struct { } diff --git a/go-apps/meep-vis/server/model_subscriptions_subscription_id_body.go b/go-apps/meep-vis/server/model_subscriptions_subscription_id_body.go new file mode 100644 index 000000000..8cb24c70f --- /dev/null +++ b/go-apps/meep-vis/server/model_subscriptions_subscription_id_body.go @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ +package server + +type SubscriptionsSubscriptionIdBody struct { +} diff --git a/go-apps/meep-vis/server/model_system_information_block_type21.go b/go-apps/meep-vis/server/model_system_information_block_type21.go index ccdd9da6d..62b07c591 100644 --- a/go-apps/meep-vis/server/model_system_information_block_type21.go +++ b/go-apps/meep-vis/server/model_system_information_block_type21.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_tdd_info.go b/go-apps/meep-vis/server/model_tdd_info.go index 34d8d1ef6..5f366738f 100644 --- a/go-apps/meep-vis/server/model_tdd_info.go +++ b/go-apps/meep-vis/server/model_tdd_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_test_notification.go b/go-apps/meep-vis/server/model_test_notification.go index 3d0672405..22b4780e4 100644 --- a/go-apps/meep-vis/server/model_test_notification.go +++ b/go-apps/meep-vis/server/model_test_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_test_notification__links.go b/go-apps/meep-vis/server/model_test_notification__links.go index 117970dff..ccbb96b1d 100644 --- a/go-apps/meep-vis/server/model_test_notification__links.go +++ b/go-apps/meep-vis/server/model_test_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_time_stamp.go b/go-apps/meep-vis/server/model_time_stamp.go index 414312580..dbfbd52ad 100644 --- a/go-apps/meep-vis/server/model_time_stamp.go +++ b/go-apps/meep-vis/server/model_time_stamp.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_transmission_bandwidth.go b/go-apps/meep-vis/server/model_transmission_bandwidth.go index 8520b9117..92a149c41 100644 --- a/go-apps/meep-vis/server/model_transmission_bandwidth.go +++ b/go-apps/meep-vis/server/model_transmission_bandwidth.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_transmission_bandwidth_transmission_bandwidth.go b/go-apps/meep-vis/server/model_transmission_bandwidth_transmission_bandwidth.go index 0aa6551ed..74ece3e62 100644 --- a/go-apps/meep-vis/server/model_transmission_bandwidth_transmission_bandwidth.go +++ b/go-apps/meep-vis/server/model_transmission_bandwidth_transmission_bandwidth.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_uu_mbms_neighbour_cell_info.go b/go-apps/meep-vis/server/model_uu_mbms_neighbour_cell_info.go index b609c78a5..f44bcfb21 100644 --- a/go-apps/meep-vis/server/model_uu_mbms_neighbour_cell_info.go +++ b/go-apps/meep-vis/server/model_uu_mbms_neighbour_cell_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_uu_mbms_provisioning_info.go b/go-apps/meep-vis/server/model_uu_mbms_provisioning_info.go index 74a9495ba..7274d26ca 100644 --- a/go-apps/meep-vis/server/model_uu_mbms_provisioning_info.go +++ b/go-apps/meep-vis/server/model_uu_mbms_provisioning_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,7 +24,7 @@ package server type UuMbmsProvisioningInfo struct { - ProInfoUuMbms *[]interface{} `json:"proInfoUuMbms"` + ProInfoUuMbms []UuMbmsProvisioningInfoProInfoUuMbms `json:"proInfoUuMbms"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-apps/meep-vis/server/model_one_ofbody.go b/go-apps/meep-vis/server/model_uu_mbms_provisioning_info_pro_info_uu_mbms.go similarity index 65% rename from go-apps/meep-vis/server/model_one_ofbody.go rename to go-apps/meep-vis/server/model_uu_mbms_provisioning_info_pro_info_uu_mbms.go index 5767379e4..d141cd9c1 100644 --- a/go-apps/meep-vis/server/model_one_ofbody.go +++ b/go-apps/meep-vis/server/model_uu_mbms_provisioning_info_pro_info_uu_mbms.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,9 +23,11 @@ */ package server -type OneOfbody struct { - // ProvChgUuUniSubscription - // ProvChgUuMbmsSubscription - // ProvChgPc5Subscription - // V2xMsgSubscription +// The provisioning information per location as defined below. +type UuMbmsProvisioningInfoProInfoUuMbms struct { + LocationInfo *LocationInfo `json:"locationInfo"` + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + NeighbourCellInfo []UuMbmsNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` + + V2xServerUsd *V2xServerUsd `json:"v2xServerUsd"` } diff --git a/go-apps/meep-vis/server/model_uu_uni_neighbour_cell_info.go b/go-apps/meep-vis/server/model_uu_uni_neighbour_cell_info.go index 98ee4e07c..df3662453 100644 --- a/go-apps/meep-vis/server/model_uu_uni_neighbour_cell_info.go +++ b/go-apps/meep-vis/server/model_uu_uni_neighbour_cell_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_uu_unicast_provisioning_info.go b/go-apps/meep-vis/server/model_uu_unicast_provisioning_info.go index 462173d8d..3a213ece4 100644 --- a/go-apps/meep-vis/server/model_uu_unicast_provisioning_info.go +++ b/go-apps/meep-vis/server/model_uu_unicast_provisioning_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,7 +24,7 @@ package server type UuUnicastProvisioningInfo struct { - ProInfoUuUnicast *[]interface{} `json:"proInfoUuUnicast"` + ProInfoUuUnicast []UuUnicastProvisioningInfoProInfoUuUnicast `json:"proInfoUuUnicast"` TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-apps/meep-vis/server/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go b/go-apps/meep-vis/server/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go new file mode 100644 index 000000000..611423218 --- /dev/null +++ b/go-apps/meep-vis/server/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ +package server + +// The provisioning information per location as defined below. +type UuUnicastProvisioningInfoProInfoUuUnicast struct { + LocationInfo *LocationInfo `json:"locationInfo"` + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + NeighbourCellInfo []UuUniNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` + + V2xApplicationServer *V2xApplicationServer `json:"v2xApplicationServer"` +} diff --git a/go-apps/meep-vis/server/model_v2x_application_server.go b/go-apps/meep-vis/server/model_v2x_application_server.go index 17af8f08e..485fbca59 100644 --- a/go-apps/meep-vis/server/model_v2x_application_server.go +++ b/go-apps/meep-vis/server/model_v2x_application_server.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_msg_notification.go b/go-apps/meep-vis/server/model_v2x_msg_notification.go index eb2e6d6d8..7bf9427cb 100644 --- a/go-apps/meep-vis/server/model_v2x_msg_notification.go +++ b/go-apps/meep-vis/server/model_v2x_msg_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_msg_notification_links.go b/go-apps/meep-vis/server/model_v2x_msg_notification_links.go index 383000815..abbfc728d 100644 --- a/go-apps/meep-vis/server/model_v2x_msg_notification_links.go +++ b/go-apps/meep-vis/server/model_v2x_msg_notification_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_msg_publication.go b/go-apps/meep-vis/server/model_v2x_msg_publication.go index 116fb57b8..b53e9f2f3 100644 --- a/go-apps/meep-vis/server/model_v2x_msg_publication.go +++ b/go-apps/meep-vis/server/model_v2x_msg_publication.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_msg_subscription.go b/go-apps/meep-vis/server/model_v2x_msg_subscription.go index 72abf5a49..c857f0f2e 100644 --- a/go-apps/meep-vis/server/model_v2x_msg_subscription.go +++ b/go-apps/meep-vis/server/model_v2x_msg_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_msg_subscription_filter_criteria.go b/go-apps/meep-vis/server/model_v2x_msg_subscription_filter_criteria.go index 913467b2a..90170e8d8 100644 --- a/go-apps/meep-vis/server/model_v2x_msg_subscription_filter_criteria.go +++ b/go-apps/meep-vis/server/model_v2x_msg_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_server_usd.go b/go-apps/meep-vis/server/model_v2x_server_usd.go index 459d5117e..a76db4cce 100644 --- a/go-apps/meep-vis/server/model_v2x_server_usd.go +++ b/go-apps/meep-vis/server/model_v2x_server_usd.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_server_usd_sdp_info.go b/go-apps/meep-vis/server/model_v2x_server_usd_sdp_info.go index 4c4bf33b0..388bb6e7a 100644 --- a/go-apps/meep-vis/server/model_v2x_server_usd_sdp_info.go +++ b/go-apps/meep-vis/server/model_v2x_server_usd_sdp_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_v2x_server_usd_tmgi.go b/go-apps/meep-vis/server/model_v2x_server_usd_tmgi.go index 043030d26..827c084ea 100644 --- a/go-apps/meep-vis/server/model_v2x_server_usd_tmgi.go +++ b/go-apps/meep-vis/server/model_v2x_server_usd_tmgi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/model_websock_notif_config.go b/go-apps/meep-vis/server/model_websock_notif_config.go index 59a010309..2fdd4181c 100644 --- a/go-apps/meep-vis/server/model_websock_notif_config.go +++ b/go-apps/meep-vis/server/model_websock_notif_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-vis/server/routers.go b/go-apps/meep-vis/server/routers.go index f90a4c723..cbfada6ff 100644 --- a/go-apps/meep-vis/server/routers.go +++ b/go-apps/meep-vis/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -50,7 +50,7 @@ func NewRouter() *mux.Router { handler = route.HandlerFunc handler = Logger(handler, route.Name) handler = met.MetricsHandler(handler, sandboxName, serviceName) - handler = httpLog.LogRx(handler, "") + handler = httpLog.LogRx(handler) router. Methods(route.Method). Path(route.Pattern). @@ -87,20 +87,6 @@ var routes = Routes{ Index, }, - Route{ - "Mec011AppTerminationPOST", - strings.ToUpper("Post"), - "/vis/v2/notifications/mec011/appTermination", - Mec011AppTerminationPOST, - }, - - Route{ - "PredictedQosPOST", - strings.ToUpper("Post"), - "/vis/v2/provide_predicted_qos", - PredictedQosPOST, - }, - Route{ "IndividualSubscriptionDELETE", strings.ToUpper("Delete"), @@ -163,4 +149,18 @@ var routes = Routes{ "/vis/v2/publish_v2x_message", V2xMessagePOST, }, + + Route{ + "Mec011AppTerminationPOST", + strings.ToUpper("Post"), + "/vis/v2/notifications/mec011/appTermination", + Mec011AppTerminationPOST, + }, + + Route{ + "PredictedQosPOST", + strings.ToUpper("Post"), + "/vis/v2/provide_predicted_qos", + PredictedQosPOST, + }, } diff --git a/go-apps/meep-vis/server/vis.go b/go-apps/meep-vis/server/vis.go index e8c5ff5a2..7e37b9835 100644 --- a/go-apps/meep-vis/server/vis.go +++ b/go-apps/meep-vis/server/vis.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -337,16 +337,6 @@ func Init() (err error) { } log.Info("MEEP_LOCALITY: ", locality) - // Get prediction model support - predictionModelSupportedEnv := strings.TrimSpace(os.Getenv("MEEP_PREDICT_MODEL_SUPPORTED")) - if predictionModelSupportedEnv != "" { - value, err := strconv.ParseBool(predictionModelSupportedEnv) - if err == nil { - predictionModelSupported = value - } - } - log.Info("MEEP_PREDICT_MODEL_SUPPORTED: ", predictionModelSupported) - // Set base path if mepName == defaultMepName { basePath = "/" + sandboxName + "/" + visBasePath @@ -390,14 +380,11 @@ func Init() (err error) { if mepName != defaultMepName { sbiCfg.MepName = mepName } - err = sbi.Init(sbiCfg) + predictionModelSupported, err = sbi.Init(sbiCfg) if err != nil { log.Error("Failed initialize SBI. Error: ", err) return err } - if !sbi.GridFileExists { - predictionModelSupported = false - } log.Info("SBI Initialized") // Create App Enablement REST clients @@ -579,6 +566,13 @@ func predictedQosPost(w http.ResponseWriter, r *http.Request) { return } + // Make sure scenario is running + if currentStoreName == "" { + log.Error("Scenario not deployed") + errHandlerProblemDetails(w, "Scenario not deployed.", http.StatusBadRequest) + return + } + // Validating mandatory parameters in request if requestData.LocationGranularity == "" { log.Error("Mandatory locationGranularity parameter not present") @@ -660,7 +654,7 @@ func predictedQosPost(w http.ResponseWriter, r *http.Request) { powerResp, _, err := gisAppClient.GeospatialDataApi.GetGeoDataPowerValues(context.TODO(), geocoordinatesList) if err != nil { log.Error("Failed to communicate with gis engine: ", err) - errHandlerProblemDetails(w, "Failed to communicate with gis engine.", http.StatusBadRequest) + errHandlerProblemDetails(w, "Failed to communicate with gis engine.", http.StatusInternalServerError) return } routeInfoList := responseData.Routes[i].RouteInfo @@ -670,7 +664,7 @@ func predictedQosPost(w http.ResponseWriter, r *http.Request) { rsrp := currGeoCoordinate.Rsrp rsrq := currGeoCoordinate.Rsrq poaName := currGeoCoordinate.PoaName - estTimeHour := int32(time.Unix(int64(routeInfo.Time.Seconds), int64(routeInfo.Time.Seconds)).Hour()) + estTimeHour := int32(time.Unix(int64(routeInfo.Time.Seconds), int64(routeInfo.Time.NanoSeconds)).Hour()) currGeoCoordinate.Rsrp, currGeoCoordinate.Rsrq, _ = sbi.GetPredictedPowerValues(estTimeHour, rsrp, rsrq, poaName) } latCheck := routeInfo.Location.GeoArea.Latitude == currGeoCoordinate.Latitude diff --git a/go-apps/meep-vis/server/vis_test.go b/go-apps/meep-vis/server/vis_test.go index 1652ac7a8..26d14a60e 100644 --- a/go-apps/meep-vis/server/vis_test.go +++ b/go-apps/meep-vis/server/vis_test.go @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package server import ( @@ -475,14 +491,13 @@ const redisTestAddr = "localhost:30380" const influxTestAddr = "http://localhost:30986" const postgisTestHost = "localhost" const postgisTestPort = "30432" -const gisTestAppClientUrl = "http://localhost:8080" const testScenarioName = "testScenario" var m *mod.Model var mqLocal *mq.MsgQueue func TestNotImplemented(t *testing.T) { - log.Info("--- ", t.Name()) + fmt.Println("--- ", t.Name()) log.MeepTextLogInit(t.Name()) _, err := sendRequest(http.MethodDelete, "/subscriptions/1", nil, nil, nil, http.StatusNotImplemented, IndividualSubscriptionDELETE) @@ -533,7 +548,7 @@ func TestNotImplemented(t *testing.T) { } func TestPredictedQosPost(t *testing.T) { - log.Info("--- ", t.Name()) + fmt.Println("--- ", t.Name()) log.MeepTextLogInit(t.Name()) initializeVars() @@ -547,7 +562,7 @@ func TestPredictedQosPost(t *testing.T) { t.Fatalf("Error running test basic procedure") } - log.Info("Set a scenario") + fmt.Println("Set a scenario") initialiseScenario(testScenario) time.Sleep(1000 * time.Millisecond) @@ -565,8 +580,8 @@ func TestPredictedQosPost(t *testing.T) { expected_locationInfoB := LocationInfo{nil, &expected_pointB} // Fill PredictedQosRoutesRouteInfo with LocationInfo list expected_routeInfo := make([]PredictedQosRoutesRouteInfo, 2) - expected_routeInfo[0] = PredictedQosRoutesRouteInfo{&expected_locationInfoA, 21, 63, nil} - expected_routeInfo[1] = PredictedQosRoutesRouteInfo{&expected_locationInfoB, 58, 60, nil} + expected_routeInfo[0] = PredictedQosRoutesRouteInfo{&expected_locationInfoA, 0, 0, nil} + expected_routeInfo[1] = PredictedQosRoutesRouteInfo{&expected_locationInfoB, 0, 0, nil} // PredictedQosRoutes with PredictedQosRoutesRouteInfo list expected_predictedQosRoutes := PredictedQosRoutes{expected_routeInfo} // Fill PredictedQos with PredictedQosRoutes list @@ -577,7 +592,7 @@ func TestPredictedQosPost(t *testing.T) { if err != nil { t.Fatalf(err.Error()) } - log.Info("expected_predictedQos_str: ", string(expected_predictedQos_str)) + fmt.Println("expected_predictedQos_str: ", string(expected_predictedQos_str)) /****************************** * request body section @@ -605,7 +620,7 @@ func TestPredictedQosPost(t *testing.T) { if err != nil { t.Fatalf(err.Error()) } - log.Info("body: ", string(body)) + fmt.Println("body: ", string(body)) /****************************** * request execution section @@ -622,7 +637,8 @@ func TestPredictedQosPost(t *testing.T) { if err != nil { t.Fatalf(err.Error()) } - if !validatePredictedQoS(respBody, expected_predictedQos) { + fmt.Println("respBody: ", respBody) + if rr != string(expected_predictedQos_str) { t.Fatalf(err.Error()) } log.Info("Received expected response") @@ -641,7 +657,6 @@ func initializeVars() { os.Setenv("MEEP_PREDICT_MODEL_SUPPORTED", "true") postgisHost = postgisTestHost postgisPort = postgisTestPort - gisAppClientUrl = gisTestAppClientUrl os.Setenv("MEEP_SANDBOX_NAME", testScenarioName) } @@ -674,7 +689,7 @@ func initialiseScenario(testScenario string) { } log.Info("Message Queue created") - log.Info("Set Model") + fmt.Println("Set Model") err = m.SetScenario([]byte(testScenario)) if err != nil { log.Error("Failed to set model: ", err) @@ -796,49 +811,3 @@ func sendRequest(method string, url string, body io.Reader, vars map[string]stri } return string(rr.Body.String()), nil } - -func validatePredictedQoS(response PredictedQos, expexted_response PredictedQos) bool { - if response.LocationGranularity != expexted_response.LocationGranularity { - log.Info("response.LocationGranularity != LocationGranularity") - return false - } - if len(response.Routes) != len(expexted_response.Routes) { - log.Info("response.Routes != Routes") - return false - } - if len(response.Routes[0].RouteInfo) != len(expexted_response.Routes[0].RouteInfo) { - log.Info("response.RouteInfo != RouteInfo") - return false - } - notFound := false - for _, item := range response.Routes[0].RouteInfo { - found := false - for _, item1 := range expexted_response.Routes[0].RouteInfo { - if item.Location != nil && item1.Location != nil { - if item.Location.GeoArea != nil && item1.Location.GeoArea != nil { - if item.Location.GeoArea.Latitude == item1.Location.GeoArea.Latitude && item.Location.GeoArea.Longitude == item1.Location.GeoArea.Longitude { - if item.Rsrp == item1.Rsrp && item.Rsrq == item1.Rsrq { - // Found it - found = true - break - } else { - log.Info("response.Rsrx != Rsrx") - } - } else { - log.Info("response.Latitude/Longitude != Latitude/Longitude") - } - } else { - log.Info("response.GeoArea != GeoArea") - } - } else { - log.Info("response.Location != Location") - } - } // End of 'for' statement - if !found { - notFound = true - break - } - } - - return !notFound -} diff --git a/go-apps/meep-wais/Dockerfile b/go-apps/meep-wais/Dockerfile index e59967a27..98c8e8d7a 100644 --- a/go-apps/meep-wais/Dockerfile +++ b/go-apps/meep-wais/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2020 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-wais/go.sum b/go-apps/meep-wais/go.sum index 976257211..6c1ce1618 100644 --- a/go-apps/meep-wais/go.sum +++ b/go-apps/meep-wais/go.sum @@ -112,6 +112,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= diff --git a/go-apps/meep-wais/main.go b/go-apps/meep-wais/main.go index 6003ef9f0..1ddba496c 100644 --- a/go-apps/meep-wais/main.go +++ b/go-apps/meep-wais/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-wais/main_test.go b/go-apps/meep-wais/main_test.go index 7f017cfd4..6e642d668 100644 --- a/go-apps/meep-wais/main_test.go +++ b/go-apps/meep-wais/main_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-wais/sbi/wais-sbi.go b/go-apps/meep-wais/sbi/wais-sbi.go index c63830f2e..905099c2e 100755 --- a/go-apps/meep-wais/sbi/wais-sbi.go +++ b/go-apps/meep-wais/sbi/wais-sbi.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -305,7 +305,7 @@ func processActiveScenarioUpdate() { } // Get all POA positions & UE measurments poaPositionMap, _ := sbi.gisCache.GetAllPositions(gc.TypePoa) - ueMeasMap, _ := sbi.gisCache.GetAllMeasurements() + uePoaMeasMap, _ := sbi.gisCache.GetAllPoaMeasurements() // Update UE info ueNames := []string{} @@ -325,7 +325,7 @@ func processActiveScenarioUpdate() { switch poa.Type_ { case mod.NodeTypePoaWifi: apMacId = poa.PoaWifiConfig.MacId - rssi = getRssi(name, poa.Name, ueMeasMap) + rssi = getRssi(name, poa.Name, uePoaMeasMap) } ue := (sbi.activeModel.GetNode(name)).(*dataModel.PhysicalLocation) @@ -433,7 +433,7 @@ func refreshPositions() { func refreshMeasurements() { // Update UE measurements - ueMeasMap, _ := sbi.gisCache.GetAllMeasurements() + uePoaMeasMap, _ := sbi.gisCache.GetAllPoaMeasurements() ueNameList := sbi.activeModel.GetNodeNames("UE") for _, name := range ueNameList { // Ignore disconnected UEs @@ -449,7 +449,7 @@ func refreshMeasurements() { switch poa.Type_ { case mod.NodeTypePoaWifi: apMacId = poa.PoaWifiConfig.MacId - rssi = getRssi(name, poa.Name, ueMeasMap) + rssi = getRssi(name, poa.Name, uePoaMeasMap) } ue := (sbi.activeModel.GetNode(name)).(*dataModel.PhysicalLocation) apps := (sbi.activeModel.GetNodeChild(name)).(*[]dataModel.Process) @@ -467,8 +467,8 @@ func refreshMeasurements() { } } -func getRssi(ue string, poa string, ueMeasMap map[string]*gc.UeMeasurement) *int32 { - if ueMeas, ueFound := ueMeasMap[ue]; ueFound { +func getRssi(ue string, poa string, uePoaMeasMap map[string]*gc.UePoaMeasurement) *int32 { + if ueMeas, ueFound := uePoaMeasMap[ue]; ueFound { if meas, poaFound := ueMeas.Measurements[poa]; poaFound { rssi := int32(meas.Rssi) return &rssi diff --git a/go-apps/meep-wais/server/README.md b/go-apps/meep-wais/server/README.md index 3b38a2327..a97ed43bb 100644 --- a/go-apps/meep-wais/server/README.md +++ b/go-apps/meep-wais/server/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 2.2.1 -- Build date: 2021-11-23T08:34:15.628283-05:00[America/Toronto] +- Build date: 2022-11-04T17:14:17.826019-04:00[America/New_York] ### Running the server diff --git a/go-apps/meep-wais/server/api_unsupported.go b/go-apps/meep-wais/server/api_unsupported.go index 434d32bba..3a389a3d4 100644 --- a/go-apps/meep-wais/server/api_unsupported.go +++ b/go-apps/meep-wais/server/api_unsupported.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/api_wai.go b/go-apps/meep-wais/server/api_wai.go index 5abbe148c..82549a3f0 100644 --- a/go-apps/meep-wais/server/api_wai.go +++ b/go-apps/meep-wais/server/api_wai.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/convert.go b/go-apps/meep-wais/server/convert.go index 83a5afac3..dccc4119f 100755 --- a/go-apps/meep-wais/server/convert.go +++ b/go-apps/meep-wais/server/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-wais/server/logger.go b/go-apps/meep-wais/server/logger.go index 474a1307f..20c067d0e 100644 --- a/go-apps/meep-wais/server/logger.go +++ b/go-apps/meep-wais/server/logger.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_ap_associated.go b/go-apps/meep-wais/server/model_ap_associated.go index 133afb117..3b9ecfdd5 100644 --- a/go-apps/meep-wais/server/model_ap_associated.go +++ b/go-apps/meep-wais/server/model_ap_associated.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_ap_identity.go b/go-apps/meep-wais/server/model_ap_identity.go index 578293e02..8aa272af0 100644 --- a/go-apps/meep-wais/server/model_ap_identity.go +++ b/go-apps/meep-wais/server/model_ap_identity.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_ap_info.go b/go-apps/meep-wais/server/model_ap_info.go index 5f5cafd8a..c15a59cc1 100644 --- a/go-apps/meep-wais/server/model_ap_info.go +++ b/go-apps/meep-wais/server/model_ap_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_ap_location.go b/go-apps/meep-wais/server/model_ap_location.go index 1bd0969ea..a09be2025 100644 --- a/go-apps/meep-wais/server/model_ap_location.go +++ b/go-apps/meep-wais/server/model_ap_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_app_termination_notification.go b/go-apps/meep-wais/server/model_app_termination_notification.go index d743ee181..3856464b6 100644 --- a/go-apps/meep-wais/server/model_app_termination_notification.go +++ b/go-apps/meep-wais/server/model_app_termination_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_app_termination_notification__links.go b/go-apps/meep-wais/server/model_app_termination_notification__links.go index 5f374f979..a6fcf88a5 100644 --- a/go-apps/meep-wais/server/model_app_termination_notification__links.go +++ b/go-apps/meep-wais/server/model_app_termination_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_assoc_sta_notification.go b/go-apps/meep-wais/server/model_assoc_sta_notification.go index 228f0edd5..2f595b37d 100644 --- a/go-apps/meep-wais/server/model_assoc_sta_notification.go +++ b/go-apps/meep-wais/server/model_assoc_sta_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_assoc_sta_subscription.go b/go-apps/meep-wais/server/model_assoc_sta_subscription.go index 8f24fdc0d..6157e6d43 100644 --- a/go-apps/meep-wais/server/model_assoc_sta_subscription.go +++ b/go-apps/meep-wais/server/model_assoc_sta_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_assoc_sta_subscription__links.go b/go-apps/meep-wais/server/model_assoc_sta_subscription__links.go index e8240cb48..bac742e78 100644 --- a/go-apps/meep-wais/server/model_assoc_sta_subscription__links.go +++ b/go-apps/meep-wais/server/model_assoc_sta_subscription__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_assoc_sta_subscription_notification_event.go b/go-apps/meep-wais/server/model_assoc_sta_subscription_notification_event.go index 58c432ba9..9fbda66ab 100644 --- a/go-apps/meep-wais/server/model_assoc_sta_subscription_notification_event.go +++ b/go-apps/meep-wais/server/model_assoc_sta_subscription_notification_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_beacon_report.go b/go-apps/meep-wais/server/model_beacon_report.go index 141976e88..93b1d6901 100644 --- a/go-apps/meep-wais/server/model_beacon_report.go +++ b/go-apps/meep-wais/server/model_beacon_report.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_beacon_reporting_config.go b/go-apps/meep-wais/server/model_beacon_reporting_config.go index c3ce8f8e9..43123b99d 100644 --- a/go-apps/meep-wais/server/model_beacon_reporting_config.go +++ b/go-apps/meep-wais/server/model_beacon_reporting_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_beacon_request_config.go b/go-apps/meep-wais/server/model_beacon_request_config.go index 5a21869ad..5d79d1c39 100644 --- a/go-apps/meep-wais/server/model_beacon_request_config.go +++ b/go-apps/meep-wais/server/model_beacon_request_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_bss_capabilities.go b/go-apps/meep-wais/server/model_bss_capabilities.go index 1f7ff7b47..50409ff3c 100644 --- a/go-apps/meep-wais/server/model_bss_capabilities.go +++ b/go-apps/meep-wais/server/model_bss_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_bss_load.go b/go-apps/meep-wais/server/model_bss_load.go index fbf9c1e2b..40688553f 100644 --- a/go-apps/meep-wais/server/model_bss_load.go +++ b/go-apps/meep-wais/server/model_bss_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_bssid_info.go b/go-apps/meep-wais/server/model_bssid_info.go index 0dcc449b2..33a75fd08 100644 --- a/go-apps/meep-wais/server/model_bssid_info.go +++ b/go-apps/meep-wais/server/model_bssid_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_channel_load.go b/go-apps/meep-wais/server/model_channel_load.go index d82c5207c..fa4917f72 100644 --- a/go-apps/meep-wais/server/model_channel_load.go +++ b/go-apps/meep-wais/server/model_channel_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_channel_load_config.go b/go-apps/meep-wais/server/model_channel_load_config.go index 6ff956545..c67a32719 100644 --- a/go-apps/meep-wais/server/model_channel_load_config.go +++ b/go-apps/meep-wais/server/model_channel_load_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_civic_location.go b/go-apps/meep-wais/server/model_civic_location.go index 98bfb4bf5..ba0c01d20 100644 --- a/go-apps/meep-wais/server/model_civic_location.go +++ b/go-apps/meep-wais/server/model_civic_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_dmg_capabilities.go b/go-apps/meep-wais/server/model_dmg_capabilities.go index af508d988..e3280be96 100644 --- a/go-apps/meep-wais/server/model_dmg_capabilities.go +++ b/go-apps/meep-wais/server/model_dmg_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_edmg_capabilities.go b/go-apps/meep-wais/server/model_edmg_capabilities.go index d3ab0ae3e..47c99423c 100644 --- a/go-apps/meep-wais/server/model_edmg_capabilities.go +++ b/go-apps/meep-wais/server/model_edmg_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_expiry_notification.go b/go-apps/meep-wais/server/model_expiry_notification.go index ac8e3b645..6202353e6 100644 --- a/go-apps/meep-wais/server/model_expiry_notification.go +++ b/go-apps/meep-wais/server/model_expiry_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_expiry_notification__links.go b/go-apps/meep-wais/server/model_expiry_notification__links.go index 9956675c2..ab6d0a6a6 100644 --- a/go-apps/meep-wais/server/model_expiry_notification__links.go +++ b/go-apps/meep-wais/server/model_expiry_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_ext_bss_load.go b/go-apps/meep-wais/server/model_ext_bss_load.go index 739ea05b8..30d20d454 100644 --- a/go-apps/meep-wais/server/model_ext_bss_load.go +++ b/go-apps/meep-wais/server/model_ext_bss_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_geo_location.go b/go-apps/meep-wais/server/model_geo_location.go index 85137b115..e5a8e8a0c 100644 --- a/go-apps/meep-wais/server/model_geo_location.go +++ b/go-apps/meep-wais/server/model_geo_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_he_capabilities.go b/go-apps/meep-wais/server/model_he_capabilities.go index 0bcc5e448..9f591b984 100644 --- a/go-apps/meep-wais/server/model_he_capabilities.go +++ b/go-apps/meep-wais/server/model_he_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_ht_capabilities.go b/go-apps/meep-wais/server/model_ht_capabilities.go index 88ad77ad3..09f708ec6 100644 --- a/go-apps/meep-wais/server/model_ht_capabilities.go +++ b/go-apps/meep-wais/server/model_ht_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_inline_notification.go b/go-apps/meep-wais/server/model_inline_notification.go index d48ba30d6..c073b9bd0 100644 --- a/go-apps/meep-wais/server/model_inline_notification.go +++ b/go-apps/meep-wais/server/model_inline_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_inline_subscription.go b/go-apps/meep-wais/server/model_inline_subscription.go index 7e994b76f..fc43936f6 100644 --- a/go-apps/meep-wais/server/model_inline_subscription.go +++ b/go-apps/meep-wais/server/model_inline_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_link_type.go b/go-apps/meep-wais/server/model_link_type.go index 43a4ec1dd..a091ae128 100644 --- a/go-apps/meep-wais/server/model_link_type.go +++ b/go-apps/meep-wais/server/model_link_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_config.go b/go-apps/meep-wais/server/model_measurement_config.go index db8b6748b..7668b494e 100644 --- a/go-apps/meep-wais/server/model_measurement_config.go +++ b/go-apps/meep-wais/server/model_measurement_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_config__links.go b/go-apps/meep-wais/server/model_measurement_config__links.go index 8cf05190b..71080f63b 100644 --- a/go-apps/meep-wais/server/model_measurement_config__links.go +++ b/go-apps/meep-wais/server/model_measurement_config__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_config_link_list.go b/go-apps/meep-wais/server/model_measurement_config_link_list.go index ff5cde4ce..d07ab7d53 100644 --- a/go-apps/meep-wais/server/model_measurement_config_link_list.go +++ b/go-apps/meep-wais/server/model_measurement_config_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_config_link_list_measurement_config.go b/go-apps/meep-wais/server/model_measurement_config_link_list_measurement_config.go index a914f76e8..12a6dd04a 100644 --- a/go-apps/meep-wais/server/model_measurement_config_link_list_measurement_config.go +++ b/go-apps/meep-wais/server/model_measurement_config_link_list_measurement_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_info.go b/go-apps/meep-wais/server/model_measurement_info.go index 2d3d6f847..18d6609c4 100644 --- a/go-apps/meep-wais/server/model_measurement_info.go +++ b/go-apps/meep-wais/server/model_measurement_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_report_notification.go b/go-apps/meep-wais/server/model_measurement_report_notification.go index f833bf194..d80f14282 100644 --- a/go-apps/meep-wais/server/model_measurement_report_notification.go +++ b/go-apps/meep-wais/server/model_measurement_report_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_measurement_report_subscription.go b/go-apps/meep-wais/server/model_measurement_report_subscription.go index 639ed993c..4f632b15f 100644 --- a/go-apps/meep-wais/server/model_measurement_report_subscription.go +++ b/go-apps/meep-wais/server/model_measurement_report_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_neighbor_report.go b/go-apps/meep-wais/server/model_neighbor_report.go index 72737b2cc..8562bdf11 100644 --- a/go-apps/meep-wais/server/model_neighbor_report.go +++ b/go-apps/meep-wais/server/model_neighbor_report.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_neighbor_report_config.go b/go-apps/meep-wais/server/model_neighbor_report_config.go index 677fa2be5..03642a141 100644 --- a/go-apps/meep-wais/server/model_neighbor_report_config.go +++ b/go-apps/meep-wais/server/model_neighbor_report_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_o_bss_load.go b/go-apps/meep-wais/server/model_o_bss_load.go index 3caa7bd83..c1da6e65b 100644 --- a/go-apps/meep-wais/server/model_o_bss_load.go +++ b/go-apps/meep-wais/server/model_o_bss_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_one_of_inline_notification.go b/go-apps/meep-wais/server/model_one_of_inline_notification.go index ee4f785a8..166f3df96 100644 --- a/go-apps/meep-wais/server/model_one_of_inline_notification.go +++ b/go-apps/meep-wais/server/model_one_of_inline_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_one_of_inline_subscription.go b/go-apps/meep-wais/server/model_one_of_inline_subscription.go index d684c9d17..63097eb5c 100644 --- a/go-apps/meep-wais/server/model_one_of_inline_subscription.go +++ b/go-apps/meep-wais/server/model_one_of_inline_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_operation_action_type.go b/go-apps/meep-wais/server/model_operation_action_type.go index 32e1afa3e..070b43887 100644 --- a/go-apps/meep-wais/server/model_operation_action_type.go +++ b/go-apps/meep-wais/server/model_operation_action_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,6 +28,6 @@ type OperationActionType string // List of OperationActionType const ( - STOPPING OperationActionType = "STOPPING" - TERMINATING OperationActionType = "TERMINATING" + STOPPING_OperationActionType OperationActionType = "STOPPING" + TERMINATING_OperationActionType OperationActionType = "TERMINATING" ) diff --git a/go-apps/meep-wais/server/model_problem_details.go b/go-apps/meep-wais/server/model_problem_details.go index 3caebf827..26a86a844 100644 --- a/go-apps/meep-wais/server/model_problem_details.go +++ b/go-apps/meep-wais/server/model_problem_details.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_reported_beacon_frame_info.go b/go-apps/meep-wais/server/model_reported_beacon_frame_info.go index c04c95755..e88072d75 100644 --- a/go-apps/meep-wais/server/model_reported_beacon_frame_info.go +++ b/go-apps/meep-wais/server/model_reported_beacon_frame_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_reporting_reason_qo_s_counters.go b/go-apps/meep-wais/server/model_reporting_reason_qo_s_counters.go index 39e409fe9..7e1f4ef4d 100644 --- a/go-apps/meep-wais/server/model_reporting_reason_qo_s_counters.go +++ b/go-apps/meep-wais/server/model_reporting_reason_qo_s_counters.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_reporting_reason_sta_counters.go b/go-apps/meep-wais/server/model_reporting_reason_sta_counters.go index 5dc14dddd..605e18887 100644 --- a/go-apps/meep-wais/server/model_reporting_reason_sta_counters.go +++ b/go-apps/meep-wais/server/model_reporting_reason_sta_counters.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_rssi.go b/go-apps/meep-wais/server/model_rssi.go index 4b2941ca3..6c6fab28e 100644 --- a/go-apps/meep-wais/server/model_rssi.go +++ b/go-apps/meep-wais/server/model_rssi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_counter_trigger_condition.go b/go-apps/meep-wais/server/model_sta_counter_trigger_condition.go index f6661c0a1..0383ff1c0 100644 --- a/go-apps/meep-wais/server/model_sta_counter_trigger_condition.go +++ b/go-apps/meep-wais/server/model_sta_counter_trigger_condition.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_data_rate.go b/go-apps/meep-wais/server/model_sta_data_rate.go index c51819dec..ba06b55a9 100644 --- a/go-apps/meep-wais/server/model_sta_data_rate.go +++ b/go-apps/meep-wais/server/model_sta_data_rate.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_data_rate_notification.go b/go-apps/meep-wais/server/model_sta_data_rate_notification.go index fe925e2de..33bf77af5 100644 --- a/go-apps/meep-wais/server/model_sta_data_rate_notification.go +++ b/go-apps/meep-wais/server/model_sta_data_rate_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_data_rate_subscription.go b/go-apps/meep-wais/server/model_sta_data_rate_subscription.go index db7f32c83..64f09c5ea 100644 --- a/go-apps/meep-wais/server/model_sta_data_rate_subscription.go +++ b/go-apps/meep-wais/server/model_sta_data_rate_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_data_rate_subscription_notification_event.go b/go-apps/meep-wais/server/model_sta_data_rate_subscription_notification_event.go index d63da6145..4316a56fa 100644 --- a/go-apps/meep-wais/server/model_sta_data_rate_subscription_notification_event.go +++ b/go-apps/meep-wais/server/model_sta_data_rate_subscription_notification_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_identity.go b/go-apps/meep-wais/server/model_sta_identity.go index 8bb74e048..b050b1632 100644 --- a/go-apps/meep-wais/server/model_sta_identity.go +++ b/go-apps/meep-wais/server/model_sta_identity.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_info.go b/go-apps/meep-wais/server/model_sta_info.go index 423e725f6..8c4741aaa 100644 --- a/go-apps/meep-wais/server/model_sta_info.go +++ b/go-apps/meep-wais/server/model_sta_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_statistics.go b/go-apps/meep-wais/server/model_sta_statistics.go index 5f0a9c55d..6d1c007c9 100644 --- a/go-apps/meep-wais/server/model_sta_statistics.go +++ b/go-apps/meep-wais/server/model_sta_statistics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_statistics_config.go b/go-apps/meep-wais/server/model_sta_statistics_config.go index f9bd05eb6..71cc37e38 100644 --- a/go-apps/meep-wais/server/model_sta_statistics_config.go +++ b/go-apps/meep-wais/server/model_sta_statistics_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_statistics_group2to9_data.go b/go-apps/meep-wais/server/model_sta_statistics_group2to9_data.go index 36c5382e4..acd8fb577 100644 --- a/go-apps/meep-wais/server/model_sta_statistics_group2to9_data.go +++ b/go-apps/meep-wais/server/model_sta_statistics_group2to9_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_statistics_group_one_data.go b/go-apps/meep-wais/server/model_sta_statistics_group_one_data.go index eb6170591..927e58697 100644 --- a/go-apps/meep-wais/server/model_sta_statistics_group_one_data.go +++ b/go-apps/meep-wais/server/model_sta_statistics_group_one_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_sta_statistics_group_zero_data.go b/go-apps/meep-wais/server/model_sta_statistics_group_zero_data.go index 65bc45972..5ca881ed4 100644 --- a/go-apps/meep-wais/server/model_sta_statistics_group_zero_data.go +++ b/go-apps/meep-wais/server/model_sta_statistics_group_zero_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_subscription_link_list.go b/go-apps/meep-wais/server/model_subscription_link_list.go index 4b77255f0..8bba754ba 100644 --- a/go-apps/meep-wais/server/model_subscription_link_list.go +++ b/go-apps/meep-wais/server/model_subscription_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_subscription_link_list__links.go b/go-apps/meep-wais/server/model_subscription_link_list__links.go index 7633941de..e516c5f6d 100644 --- a/go-apps/meep-wais/server/model_subscription_link_list__links.go +++ b/go-apps/meep-wais/server/model_subscription_link_list__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_subscription_link_list_subscription.go b/go-apps/meep-wais/server/model_subscription_link_list_subscription.go index e521a3019..70db13729 100644 --- a/go-apps/meep-wais/server/model_subscription_link_list_subscription.go +++ b/go-apps/meep-wais/server/model_subscription_link_list_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_test_notification.go b/go-apps/meep-wais/server/model_test_notification.go index 275bda954..211ccb8a8 100644 --- a/go-apps/meep-wais/server/model_test_notification.go +++ b/go-apps/meep-wais/server/model_test_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_test_notification__links.go b/go-apps/meep-wais/server/model_test_notification__links.go index 1787e2ec6..30d6d3525 100644 --- a/go-apps/meep-wais/server/model_test_notification__links.go +++ b/go-apps/meep-wais/server/model_test_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_time_stamp.go b/go-apps/meep-wais/server/model_time_stamp.go index 0a9fe12e8..d6e20a8f6 100644 --- a/go-apps/meep-wais/server/model_time_stamp.go +++ b/go-apps/meep-wais/server/model_time_stamp.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_vht_capabilities.go b/go-apps/meep-wais/server/model_vht_capabilities.go index 5cb867022..eab420824 100644 --- a/go-apps/meep-wais/server/model_vht_capabilities.go +++ b/go-apps/meep-wais/server/model_vht_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_wan_metrics.go b/go-apps/meep-wais/server/model_wan_metrics.go index 89d4a872d..48ef3827b 100644 --- a/go-apps/meep-wais/server/model_wan_metrics.go +++ b/go-apps/meep-wais/server/model_wan_metrics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_websock_notif_config.go b/go-apps/meep-wais/server/model_websock_notif_config.go index ee12fed40..adc9f7e28 100644 --- a/go-apps/meep-wais/server/model_websock_notif_config.go +++ b/go-apps/meep-wais/server/model_websock_notif_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/model_wlan_capabilities.go b/go-apps/meep-wais/server/model_wlan_capabilities.go index 0458865a3..05e845f75 100644 --- a/go-apps/meep-wais/server/model_wlan_capabilities.go +++ b/go-apps/meep-wais/server/model_wlan_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-apps/meep-wais/server/routers.go b/go-apps/meep-wais/server/routers.go index 4c84b79bc..6f3403e6a 100644 --- a/go-apps/meep-wais/server/routers.go +++ b/go-apps/meep-wais/server/routers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -50,7 +50,7 @@ func NewRouter() *mux.Router { handler = route.HandlerFunc handler = Logger(handler, route.Name) handler = met.MetricsHandler(handler, sandboxName, serviceName) - handler = httpLog.LogRx(handler, "") + handler = httpLog.LogRx(handler) router. Methods(route.Method). Path(route.Pattern). @@ -122,13 +122,6 @@ var routes = Routes{ MeasurementsPUT, }, - Route{ - "Mec011AppTerminationPOST", - strings.ToUpper("Post"), - "/wai/v2/notifications/mec011/appTermination", - Mec011AppTerminationPOST, - }, - Route{ "ApInfoGET", strings.ToUpper("Get"), @@ -136,6 +129,13 @@ var routes = Routes{ ApInfoGET, }, + Route{ + "Mec011AppTerminationPOST", + strings.ToUpper("Post"), + "/wai/v2/notifications/mec011/appTermination", + Mec011AppTerminationPOST, + }, + Route{ "StaInfoGET", strings.ToUpper("Get"), diff --git a/go-apps/meep-wais/server/wais.go b/go-apps/meep-wais/server/wais.go index e2a61d0fa..e31b1ce3c 100644 --- a/go-apps/meep-wais/server/wais.go +++ b/go-apps/meep-wais/server/wais.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-wais/server/wais_test.go b/go-apps/meep-wais/server/wais_test.go index 35323c0dc..e073a2a62 100644 --- a/go-apps/meep-wais/server/wais_test.go +++ b/go-apps/meep-wais/server/wais_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -6389,7 +6389,7 @@ func TestSubscriptionAssocStaNotification(t *testing.T) { t.Fatalf("Failed to create a store") } - httpLog, err := metricStore.GetHttpMetric(moduleName, "TX", "", 1) + httpLog, err := metricStore.GetHttpMetric(moduleName, "notification", "", 1) if err != nil || len(httpLog) != 1 { t.Fatalf("Failed to get metric") } diff --git a/go-apps/meep-webhook/Dockerfile b/go-apps/meep-webhook/Dockerfile index 76a140511..6e34cf61a 100644 --- a/go-apps/meep-webhook/Dockerfile +++ b/go-apps/meep-webhook/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019 InterDigital Communications, Inc +# Copyright (c) 2022 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. diff --git a/go-apps/meep-webhook/main.go b/go-apps/meep-webhook/main.go index 32903c2bb..c81c29cb0 100644 --- a/go-apps/meep-webhook/main.go +++ b/go-apps/meep-webhook/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meep-webhook/webhook.go b/go-apps/meep-webhook/webhook.go index 8113c862a..a111573b0 100644 --- a/go-apps/meep-webhook/webhook.go +++ b/go-apps/meep-webhook/webhook.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/build.go b/go-apps/meepctl/cmd/build.go index 7860b1ff1..9c2ae89db 100644 --- a/go-apps/meepctl/cmd/build.go +++ b/go-apps/meepctl/cmd/build.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/config.go b/go-apps/meepctl/cmd/config.go index 706ebbbfd..a71c6339d 100644 --- a/go-apps/meepctl/cmd/config.go +++ b/go-apps/meepctl/cmd/config.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/configGitdir.go b/go-apps/meepctl/cmd/configGitdir.go index 6ecb94487..ba17d7334 100644 --- a/go-apps/meepctl/cmd/configGitdir.go +++ b/go-apps/meepctl/cmd/configGitdir.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/configIp.go b/go-apps/meepctl/cmd/configIp.go index 018baf6b1..c70d703f8 100644 --- a/go-apps/meepctl/cmd/configIp.go +++ b/go-apps/meepctl/cmd/configIp.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/configRegistry.go b/go-apps/meepctl/cmd/configRegistry.go index 203b59e67..6fd7b40cb 100644 --- a/go-apps/meepctl/cmd/configRegistry.go +++ b/go-apps/meepctl/cmd/configRegistry.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/delete.go b/go-apps/meepctl/cmd/delete.go index 7a0285f82..f2f831c4e 100644 --- a/go-apps/meepctl/cmd/delete.go +++ b/go-apps/meepctl/cmd/delete.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/deploy.go b/go-apps/meepctl/cmd/deploy.go index 681437276..b1d8631a0 100644 --- a/go-apps/meepctl/cmd/deploy.go +++ b/go-apps/meepctl/cmd/deploy.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -32,15 +32,14 @@ import ( ) type DeployData struct { - codecov bool - onboardedapp bool - gitdir string - workdir string - registry string - tag string - coreApps []string - depApps []string - crds []string + codecov bool + gitdir string + workdir string + registry string + tag string + coreApps []string + depApps []string + crds []string } const deployDesc = `Deploy containers on the K8s cluster @@ -183,12 +182,9 @@ func deployCore(cobraCmd *cobra.Command) { // Code coverage storage deployCodeCovStorage(cobraCmd) - deployOnboardedAppStorage(cobraCmd) - for _, app := range deployData.coreApps { chart := deployData.gitdir + "/" + utils.RepoCfg.GetString("repo.core.go-apps."+app+".chart") codecov := utils.RepoCfg.GetBool("repo.core.go-apps." + app + ".codecov") - onboardedapp := utils.RepoCfg.GetBool("repo.core.go-apps." + app + ".onboardedapp") userFe := utils.RepoCfg.GetBool("repo.deployment.user.frontend") userSwagger := utils.RepoCfg.GetBool("repo.deployment.user.swagger") hostName := utils.RepoCfg.GetString("repo.deployment.ingress.host") @@ -199,17 +195,11 @@ func deployCore(cobraCmd *cobra.Command) { coreFlags := utils.HelmFlags(flags, "--set", "image.repository="+deployData.registry+"/"+app) coreFlags = utils.HelmFlags(coreFlags, "--set", "image.tag="+deployData.tag) if deployData.codecov && codecov { - coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_CODECOV='true'") + coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_CODECOV=true") coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_CODECOV_LOCATION="+deployData.workdir+"/codecov/") coreFlags = utils.HelmFlags(coreFlags, "--set", "codecov.enabled=true") coreFlags = utils.HelmFlags(coreFlags, "--set", "codecov.location="+deployData.workdir+"/codecov/"+app) } - if deployData.onboardedapp && onboardedapp { - coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_ONBOARDEDAPP='true'") - coreFlags = utils.HelmFlags(coreFlags, "--set", "image.env.MEEP_ONBOARDEDAPP_LOCATION="+deployData.workdir+"/onboardedapp-vol/") - coreFlags = utils.HelmFlags(coreFlags, "--set", "onboardedapp.enabled=true") - coreFlags = utils.HelmFlags(coreFlags, "--set", "onboardedapp.location="+deployData.workdir+"/onboardedapp-vol/"+app) - } if userFe { coreFlags = utils.HelmFlags(coreFlags, "--set", "user.frontend.enabled=true") coreFlags = utils.HelmFlags(coreFlags, "--set", "user.frontend.location="+deployData.workdir+"/user/frontend") @@ -567,22 +557,6 @@ func deployCodeCovStorage(cobraCmd *cobra.Command) { } } -func deployOnboardedAppStorage(cobraCmd *cobra.Command) { - cmd := exec.Command("rm", "-rf", deployData.workdir+"/onboardedapp-bak") - _, _ = utils.ExecuteCmd(cmd, cobraCmd) - cmd = exec.Command("mv", deployData.workdir+"/onboardedapp-vol", deployData.workdir+"/onboardedapp-bak") - _, _ = utils.ExecuteCmd(cmd, cobraCmd) - cmd = exec.Command("mkdir", "-p", deployData.workdir+"/onboardedapp-vol") - _, _ = utils.ExecuteCmd(cmd, cobraCmd) - - for _, app := range deployData.coreApps { - if utils.RepoCfg.GetBool("repo.core.go-apps." + app + ".onboardedapp") { - cmd = exec.Command("mkdir", "-p", deployData.workdir+"/onboardedapp-vol/"+app) - _, _ = utils.ExecuteCmd(cmd, cobraCmd) - } - } -} - func deployCreateWebhookCerts(chart string, cobraCmd *cobra.Command) (string, string, string) { certdir := deployData.workdir + "/certs" cmd := exec.Command("sh", "-c", chart+"/create-k8s-ca-signed-cert.sh --certdir "+certdir) diff --git a/go-apps/meepctl/cmd/dockerize.go b/go-apps/meepctl/cmd/dockerize.go index 69f21a682..21e4d6301 100644 --- a/go-apps/meepctl/cmd/dockerize.go +++ b/go-apps/meepctl/cmd/dockerize.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/genmd.go b/go-apps/meepctl/cmd/genmd.go index bbec25467..f75be04bf 100644 --- a/go-apps/meepctl/cmd/genmd.go +++ b/go-apps/meepctl/cmd/genmd.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/lint.go b/go-apps/meepctl/cmd/lint.go index d0bf835b2..63d25f6fc 100644 --- a/go-apps/meepctl/cmd/lint.go +++ b/go-apps/meepctl/cmd/lint.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replay.go b/go-apps/meepctl/cmd/replay.go index 1daaffe95..88a3296d6 100644 --- a/go-apps/meepctl/cmd/replay.go +++ b/go-apps/meepctl/cmd/replay.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayCat.go b/go-apps/meepctl/cmd/replayCat.go index 67028c092..7e9e17bbd 100644 --- a/go-apps/meepctl/cmd/replayCat.go +++ b/go-apps/meepctl/cmd/replayCat.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayExport.go b/go-apps/meepctl/cmd/replayExport.go index 31ed561f3..0270c0b5e 100644 --- a/go-apps/meepctl/cmd/replayExport.go +++ b/go-apps/meepctl/cmd/replayExport.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayGenerate.go b/go-apps/meepctl/cmd/replayGenerate.go index c23783aa2..2f8003244 100644 --- a/go-apps/meepctl/cmd/replayGenerate.go +++ b/go-apps/meepctl/cmd/replayGenerate.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayImport.go b/go-apps/meepctl/cmd/replayImport.go index 60a4d686a..9db478498 100644 --- a/go-apps/meepctl/cmd/replayImport.go +++ b/go-apps/meepctl/cmd/replayImport.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayLs.go b/go-apps/meepctl/cmd/replayLs.go index 56313e77f..24a77d460 100644 --- a/go-apps/meepctl/cmd/replayLs.go +++ b/go-apps/meepctl/cmd/replayLs.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayRm.go b/go-apps/meepctl/cmd/replayRm.go index c71695e7b..c911bb7da 100644 --- a/go-apps/meepctl/cmd/replayRm.go +++ b/go-apps/meepctl/cmd/replayRm.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayStart.go b/go-apps/meepctl/cmd/replayStart.go index ca6a55f41..1acb78add 100644 --- a/go-apps/meepctl/cmd/replayStart.go +++ b/go-apps/meepctl/cmd/replayStart.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayStatus.go b/go-apps/meepctl/cmd/replayStatus.go index e5ccb0147..804a4fb30 100644 --- a/go-apps/meepctl/cmd/replayStatus.go +++ b/go-apps/meepctl/cmd/replayStatus.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/replayStop.go b/go-apps/meepctl/cmd/replayStop.go index 95e5296f9..ee270f2bf 100644 --- a/go-apps/meepctl/cmd/replayStop.go +++ b/go-apps/meepctl/cmd/replayStop.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/root.go b/go-apps/meepctl/cmd/root.go index 0ad2d6690..a439c5483 100644 --- a/go-apps/meepctl/cmd/root.go +++ b/go-apps/meepctl/cmd/root.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/cmd/test.go b/go-apps/meepctl/cmd/test.go index 0b46e5360..a2fcf76bf 100644 --- a/go-apps/meepctl/cmd/test.go +++ b/go-apps/meepctl/cmd/test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -44,40 +44,72 @@ var testCmd = &cobra.Command{ return } - targets := utils.RepoCfg.GetStringMapString("repo.core") + platformTargets := utils.RepoCfg.GetStringMapString("repo.core.go-apps") + sandboxTargets := utils.RepoCfg.GetStringMapString("repo.sandbox.go-apps") - for k := range targets { - codecovCapable := utils.RepoCfg.GetBool("repo.core." + k + ".codecov") + for k := range platformTargets { + codecovCapable := utils.RepoCfg.GetBool("repo.core.go-apps." + k + ".codecov") if codecovCapable { - gitDir := viper.GetString("meep.gitdir") - workDir := viper.GetString("meep.workdir") - codecovFile := workDir + "/codecov/" + k + "/codecov-" + k + ".out" - if _, err := os.Stat(codecovFile); !os.IsNotExist(err) { - fmt.Println("Found " + codecovFile) - targetDir := gitDir + "/go-apps/" + k - - //go tool cover -html=c.out -o coverage.html - htmlReport := gitDir + "/test/codecov-" + k + ".html" - fmt.Println(" + Generating html report ", htmlReport) - cmd := exec.Command("go", "tool", "cover", "-html="+codecovFile, "-o", htmlReport) - cmd.Dir = targetDir - _, _ = utils.ExecuteCmd(cmd, cobraCmd) - - // go tool cover -func=c.out - txtReport := gitDir + "/test/codecov-" + k + ".txt" - fmt.Println(" + Generating text report ", txtReport) - cmd = exec.Command("go", "tool", "cover", "-func="+codecovFile, "-o", txtReport) - cmd.Dir = targetDir - _, _ = utils.ExecuteCmd(cmd, cobraCmd) - - } + getCoverageReports(k, cobraCmd, args) } - } + for k := range sandboxTargets { + codecovCapable := utils.RepoCfg.GetBool("repo.sandbox.go-apps." + k + ".codecov") + if codecovCapable { + getCoverageReports(k, cobraCmd, args) + } + } }, } +func getCoverageReports(k string, cobraCmd *cobra.Command, args []string) { + gitDir := viper.GetString("meep.gitdir") + workDir := viper.GetString("meep.workdir") + "/codecov/" + k + targetDir := gitDir + "/go-apps/" + k + codecovFile := gitDir + "/test/codecov/" + k + "-aggregated.out" + f, err := os.Open(workDir) + if err != nil { + fmt.Println(err) + return + } + files, err := f.Readdir(0) + if err != nil { + fmt.Println(err) + return + } + cmdArgs := []string{"-cc", codecovFile} + for _, v := range files { + name := workDir + "/" + v.Name() + cmdArgs = append(cmdArgs, name) + } + cmd := exec.Command("cov-report", cmdArgs...) + cmd.Dir = targetDir + _, err = utils.ExecuteCmd(cmd, cobraCmd) + if err != nil { + fmt.Println(err.Error()) + } + if _, err := os.Stat(codecovFile); !os.IsNotExist(err) { + fmt.Println("Found " + codecovFile) + + //go tool cover -html=c.out -o coverage.html + htmlReport := gitDir + "/test/codecov/" + k + "-aggregated.html" + fmt.Println(" + Generating html report ", htmlReport) + cmd := exec.Command("go", "tool", "cover", "-html="+codecovFile, "-o", htmlReport) + cmd.Dir = targetDir + _, _ = utils.ExecuteCmd(cmd, cobraCmd) + + // go tool cover -func=c.out + txtReport := gitDir + "/test/codecov/" + k + "-aggregated.txt" + fmt.Println(" + Generating text report ", txtReport) + cmd = exec.Command("go", "tool", "cover", "-func="+codecovFile, "-o", txtReport) + cmd.Dir = targetDir + _, _ = utils.ExecuteCmd(cmd, cobraCmd) + } else { + fmt.Println(err) + } +} + func init() { rootCmd.AddCommand(testCmd) diff --git a/go-apps/meepctl/cmd/version.go b/go-apps/meepctl/cmd/version.go index b11851b1f..9a988f6c6 100644 --- a/go-apps/meepctl/cmd/version.go +++ b/go-apps/meepctl/cmd/version.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -41,7 +41,7 @@ type versionInfo struct { BuildID string `json:"build,omitempty"` } -const meepctlVersion = "1.8.1" +const meepctlVersion = "1.8.2" const na = "NA" const versionDesc = `Display version information diff --git a/go-apps/meepctl/main.go b/go-apps/meepctl/main.go index c7dbd0686..6293db1e8 100644 --- a/go-apps/meepctl/main.go +++ b/go-apps/meepctl/main.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/utils/config.go b/go-apps/meepctl/utils/config.go index 68cc7ac08..70c54d51c 100644 --- a/go-apps/meepctl/utils/config.go +++ b/go-apps/meepctl/utils/config.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -31,7 +31,7 @@ import ( yaml "gopkg.in/yaml.v2" ) -const configVersion = "1.8.1" +const configVersion = "1.8.2" const defaultNotSet = "not set" diff --git a/go-apps/meepctl/utils/docker.go b/go-apps/meepctl/utils/docker.go index c0e3096dc..a1daba92b 100644 --- a/go-apps/meepctl/utils/docker.go +++ b/go-apps/meepctl/utils/docker.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/utils/exec.go b/go-apps/meepctl/utils/exec.go index af070915e..515afc3b6 100644 --- a/go-apps/meepctl/utils/exec.go +++ b/go-apps/meepctl/utils/exec.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/utils/format.go b/go-apps/meepctl/utils/format.go index 5d822a07c..a5db7cb6c 100644 --- a/go-apps/meepctl/utils/format.go +++ b/go-apps/meepctl/utils/format.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-apps/meepctl/utils/helm.go b/go-apps/meepctl/utils/helm.go index 4d2998dfb..8c0bf7399 100644 --- a/go-apps/meepctl/utils/helm.go +++ b/go-apps/meepctl/utils/helm.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-ams-client/.swagger-codegen/VERSION b/go-packages/meep-ams-client/.swagger-codegen/VERSION index 812aaafe6..92eba66b0 100644 --- a/go-packages/meep-ams-client/.swagger-codegen/VERSION +++ b/go-packages/meep-ams-client/.swagger-codegen/VERSION @@ -1 +1 @@ -3.0.22 \ No newline at end of file +3.0.29 diff --git a/go-packages/meep-ams-client/README.md b/go-packages/meep-ams-client/README.md index ea23b3850..4ca2d6ec8 100644 --- a/go-packages/meep-ams-client/README.md +++ b/go-packages/meep-ams-client/README.md @@ -1,6 +1,6 @@ # Go API client for client -ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. +Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). ## Overview This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client. @@ -8,7 +8,6 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge - API version: 2.2.1 - Package version: 1.0.0 - Build package: io.swagger.codegen.v3.generators.go.GoClientCodegen -For more information, please visit [https://forge.etsi.org/rep/mec/gs021-amsi-api](https://forge.etsi.org/rep/mec/gs021-amsi-api) ## Installation Put the package under your project folder and add the following in import: @@ -22,20 +21,20 @@ All URIs are relative to *https://localhost/sandboxname/amsi/v1* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*AppMobSerApi* | [**AppMobilityServiceByIdDELETE**](docs/AppMobSerApi.md#appmobilityservicebyiddelete) | **Delete** /app_mobility_services/{appMobilityServiceId} | deregister the individual application mobility service -*AppMobSerApi* | [**AppMobilityServiceByIdGET**](docs/AppMobSerApi.md#appmobilityservicebyidget) | **Get** /app_mobility_services/{appMobilityServiceId} | Retrieve information about this individual application mobility service -*AppMobSerApi* | [**AppMobilityServiceByIdPUT**](docs/AppMobSerApi.md#appmobilityservicebyidput) | **Put** /app_mobility_services/{appMobilityServiceId} | update the existing individual application mobility service -*AppMobSerApi* | [**AppMobilityServiceGET**](docs/AppMobSerApi.md#appmobilityserviceget) | **Get** /app_mobility_services | Retrieve information about the registered application mobility service. -*AppMobSerApi* | [**AppMobilityServicePOST**](docs/AppMobSerApi.md#appmobilityservicepost) | **Post** /app_mobility_services | Create a new application mobility service for the service requester. -*LocationApi* | [**Mec011AppTerminationPOST**](docs/LocationApi.md#mec011appterminationpost) | **Post** /notifications/mec011/appTermination | MEC011 Application Termination notification for self termination -*NotificationsApi* | [**NotificationPOST**](docs/NotificationsApi.md#notificationpost) | **Post** /uri_provided_by_subscriber | delivers a notification from the AMS resource to the subscriber -*SubscriptionsApi* | [**SubByIdDELETE**](docs/SubscriptionsApi.md#subbyiddelete) | **Delete** /subscriptions/{subscriptionId} | cancel the existing individual subscription -*SubscriptionsApi* | [**SubByIdGET**](docs/SubscriptionsApi.md#subbyidget) | **Get** /subscriptions/{subscriptionId} | Retrieve information about this subscription. -*SubscriptionsApi* | [**SubByIdPUT**](docs/SubscriptionsApi.md#subbyidput) | **Put** /subscriptions/{subscriptionId} | update the existing individual subscription. -*SubscriptionsApi* | [**SubGET**](docs/SubscriptionsApi.md#subget) | **Get** /subscriptions | Retrieve information about the subscriptions for this requestor. -*SubscriptionsApi* | [**SubPOST**](docs/SubscriptionsApi.md#subpost) | **Post** /subscriptions | Create a new subscription to Application Mobility Service notifications. +*AmsiApi* | [**AppMobilityServiceByIdDELETE**](docs/AmsiApi.md#appmobilityservicebyiddelete) | **Delete** /app_mobility_services/{appMobilityServiceId} | deregister the individual application mobility service +*AmsiApi* | [**AppMobilityServiceByIdGET**](docs/AmsiApi.md#appmobilityservicebyidget) | **Get** /app_mobility_services/{appMobilityServiceId} | Retrieve information about this individual application mobility service +*AmsiApi* | [**AppMobilityServiceByIdPUT**](docs/AmsiApi.md#appmobilityservicebyidput) | **Put** /app_mobility_services/{appMobilityServiceId} | update the existing individual application mobility service +*AmsiApi* | [**AppMobilityServiceGET**](docs/AmsiApi.md#appmobilityserviceget) | **Get** /app_mobility_services | Retrieve information about the registered application mobility service. +*AmsiApi* | [**AppMobilityServicePOST**](docs/AmsiApi.md#appmobilityservicepost) | **Post** /app_mobility_services | Create a new application mobility service for the service requester. +*AmsiApi* | [**Mec011AppTerminationPOST**](docs/AmsiApi.md#mec011appterminationpost) | **Post** /notifications/mec011/appTermination | MEC011 Application Termination notification for self termination +*AmsiApi* | [**SubByIdDELETE**](docs/AmsiApi.md#subbyiddelete) | **Delete** /subscriptions/{subscriptionId} | cancel the existing individual subscription +*AmsiApi* | [**SubByIdGET**](docs/AmsiApi.md#subbyidget) | **Get** /subscriptions/{subscriptionId} | Retrieve information about this subscription. +*AmsiApi* | [**SubByIdPUT**](docs/AmsiApi.md#subbyidput) | **Put** /subscriptions/{subscriptionId} | update the existing individual subscription. +*AmsiApi* | [**SubGET**](docs/AmsiApi.md#subget) | **Get** /subscriptions | Retrieve information about the subscriptions for this requestor. +*AmsiApi* | [**SubPOST**](docs/AmsiApi.md#subpost) | **Post** /subscriptions | Create a new subscription to Application Mobility Service notifications. *UnsupportedApi* | [**AdjAppInstGET**](docs/UnsupportedApi.md#adjappinstget) | **Get** /queries/adjacent_app_instances | Retrieve information about this subscription. *UnsupportedApi* | [**AppMobilityServiceDerPOST**](docs/UnsupportedApi.md#appmobilityservicederpost) | **Post** /app_mobility_services/{appMobilityServiceId}/deregister_task | deregister the individual application mobility service +*UnsupportedApi* | [**NotificationPOST**](docs/UnsupportedApi.md#notificationpost) | **Post** /uri_provided_by_subscriber | delivers a notification from the AMS resource to the subscriber ## Documentation For Models @@ -50,26 +49,24 @@ Class | Method | HTTP request | Description - [AppTerminationNotification](docs/AppTerminationNotification.md) - [AppTerminationNotificationLinks](docs/AppTerminationNotificationLinks.md) - [AssociateId](docs/AssociateId.md) - - [Body](docs/Body.md) - - [Body1](docs/Body1.md) - - [Body2](docs/Body2.md) + - [AssociateIdType](docs/AssociateIdType.md) - [CommunicationInterface](docs/CommunicationInterface.md) - [CommunicationInterfaceIpAddresses](docs/CommunicationInterfaceIpAddresses.md) - [ContextTransferState](docs/ContextTransferState.md) - [ExpiryNotification](docs/ExpiryNotification.md) + - [InlineNotification](docs/InlineNotification.md) + - [InlineSubscription](docs/InlineSubscription.md) + - [Link](docs/Link.md) - [LinkType](docs/LinkType.md) - [MecHostInformation](docs/MecHostInformation.md) - [MobilityProcedureNotification](docs/MobilityProcedureNotification.md) - - [MobilityProcedureNotificationLinks](docs/MobilityProcedureNotificationLinks.md) - [MobilityProcedureNotificationTargetAppInfo](docs/MobilityProcedureNotificationTargetAppInfo.md) - [MobilityProcedureSubscription](docs/MobilityProcedureSubscription.md) - [MobilityProcedureSubscriptionFilterCriteria](docs/MobilityProcedureSubscriptionFilterCriteria.md) - [MobilityProcedureSubscriptionLinks](docs/MobilityProcedureSubscriptionLinks.md) - [MobilityStatus](docs/MobilityStatus.md) - - [ModelType](docs/ModelType.md) - - [OneOfbody](docs/OneOfbody.md) - - [OneOfbody1](docs/OneOfbody1.md) - - [OneOfbody2](docs/OneOfbody2.md) + - [OneOfInlineNotification](docs/OneOfInlineNotification.md) + - [OneOfInlineSubscription](docs/OneOfInlineSubscription.md) - [OperationActionType](docs/OperationActionType.md) - [ProblemDetails](docs/ProblemDetails.md) - [RegistrationInfo](docs/RegistrationInfo.md) @@ -84,10 +81,12 @@ Class | Method | HTTP request | Description - [TimeStamp](docs/TimeStamp.md) - [WebsockNotifConfig](docs/WebsockNotifConfig.md) + ## Documentation For Authorization Endpoints do not require authorization. ## Author -cti_support@etsi.org +AdvantEDGE@InterDigital.com + diff --git a/go-packages/meep-ams-client/api/swagger.yaml b/go-packages/meep-ams-client/api/swagger.yaml index e20d655b2..4fe00efae 100644 --- a/go-packages/meep-ams-client/api/swagger.yaml +++ b/go-packages/meep-ams-client/api/swagger.yaml @@ -1,33 +1,28 @@ openapi: 3.0.0 info: - title: ETSI GS MEC 021 Application Mobility Service API - description: ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + title: AdvantEDGE Application Mobility API + description: "Application Mobility Service is AdvantEDGE's implementation of [ETSI\ + \ MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)\ + \

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)\ + \

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)\ + \

    **Type & Usage**
    Edge Service used by edge applications that want to get\ + \ information about application mobility in the network

    **Note**
    AdvantEDGE\ + \ supports a selected subset of Application Mobility API endpoints (see below)." contact: - name: ETSI Forge - url: https://forge.etsi.org/rep/mec/gs021-amsi-api - email: cti_support@etsi.org + name: InterDigital AdvantEDGE Support + email: AdvantEDGE@InterDigital.com license: - name: BSD-3-Clause - url: https://forge.etsi.org/legal-matters + name: Apache 2.0 + url: https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE version: 2.2.1 externalDocs: - description: ETSI GS MEC 021 Application Mobility Service API, v2.2.1 + description: "ETSI GS MEC 021 Application Mobility Service API, v2.2.1" url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_mec021v020201p.pdf servers: -- url: https://localhost/amsi/v1 +- url: https://localhost/sandboxname/amsi/v1 tags: -- name: adj-app-inst - description: Adjacent App instances -- name: app-mob-ser - description: Application Mobility Services -- name: app-mob-ser-der - description: Application Mobility Services Deregister task -- name: subscriptions - description: Subscription for Application Mobility Service -- name: notifications - description: Notification for Application Mobility Service +- name: amsi - name: unsupported - description: Not supported by the platform paths: /queries/adjacent_app_instances: get: @@ -93,41 +88,41 @@ paths: $ref: '#/components/schemas/AdjacentAppInstanceInfo' x-content-type: application/json "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -136,7 +131,7 @@ paths: /app_mobility_services: get: tags: - - app-mob-ser + - amsi summary: Retrieve information about the registered application mobility service. description: ' Retrieve information about the registered application mobility service.' @@ -198,41 +193,41 @@ paths: $ref: '#/components/schemas/RegistrationInfo' x-content-type: application/json "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -240,7 +235,7 @@ paths: deprecated: false post: tags: - - app-mob-ser + - amsi summary: Create a new application mobility service for the service requester. description: Create a new application mobility service for the service requester. operationId: app_mobility_servicePOST @@ -260,41 +255,41 @@ paths: schema: $ref: '#/components/schemas/RegistrationInfo' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -303,7 +298,7 @@ paths: /app_mobility_services/{appMobilityServiceId}: get: tags: - - app-mob-ser + - amsi summary: Retrieve information about this individual application mobility service description: Retrieve information about this individual application mobility service @@ -326,41 +321,41 @@ paths: schema: $ref: '#/components/schemas/RegistrationInfo' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -368,7 +363,7 @@ paths: deprecated: false put: tags: - - app-mob-ser + - amsi summary: ' update the existing individual application mobility service' description: ' update the existing individual application mobility service' operationId: app_mobility_service_by_idPUT @@ -397,61 +392,62 @@ paths: schema: $ref: '#/components/schemas/RegistrationInfo' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "412": - description: 'Precondition failed : used when a condition has failed during - conditional requests, e.g. when using ETags to avoid write conflicts when - using PUT' + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts\ + \ when using PUT" content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -459,7 +455,7 @@ paths: deprecated: false delete: tags: - - app-mob-ser + - amsi summary: ' deregister the individual application mobility service' description: ' deregister the individual application mobility service' operationId: app_mobility_service_by_idDELETE @@ -478,27 +474,27 @@ paths: description: No Content content: {} "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -526,34 +522,34 @@ paths: description: No Content content: {} "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -562,15 +558,15 @@ paths: /subscriptions: get: tags: - - subscriptions + - amsi summary: Retrieve information about the subscriptions for this requestor. description: Retrieve information about the subscriptions for this requestor. operationId: subGET parameters: - name: subscriptionType in: query - description: 'Query parameter to filter on a specific subscription type. Permitted - values: mobility_proc or adj_app_info' + description: "Query parameter to filter on a specific subscription type. Permitted\ + \ values: mobility_proc or adj_app_info" required: true style: form explode: true @@ -584,41 +580,41 @@ paths: schema: $ref: '#/components/schemas/SubscriptionLinkList' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -626,7 +622,7 @@ paths: deprecated: false post: tags: - - subscriptions + - amsi summary: Create a new subscription to Application Mobility Service notifications. description: Create a new subscription to Application Mobility Service notifications. operationId: subPOST @@ -635,7 +631,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body' + $ref: '#/components/schemas/InlineSubscription' required: true responses: "201": @@ -644,62 +640,63 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body' + $ref: '#/components/schemas/InlineSubscription' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "415": - description: 'Unsupported Media Type : used to indicate that the server - or the client does not support the content type of the entity body.' + description: "Unsupported Media Type : used to indicate that the server\ + \ or the client does not support the content type of the entity body." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -708,15 +705,15 @@ paths: /subscriptions/{subscriptionId}: get: tags: - - subscriptions + - amsi summary: Retrieve information about this subscription. description: Retrieve information about this subscription. operationId: sub_byIdGET parameters: - name: subscriptionId in: path - description: Refers to created subscription, where the AMS API allocates a - unique resource name for this subscription + description: "Refers to created subscription, where the AMS API allocates\ + \ a unique resource name for this subscription" required: true style: simple explode: false @@ -729,43 +726,43 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body' + $ref: '#/components/schemas/InlineSubscription' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -773,15 +770,15 @@ paths: deprecated: false put: tags: - - subscriptions + - amsi summary: update the existing individual subscription. description: update the existing individual subscription. operationId: sub_byIdPUT parameters: - name: subscriptionId in: path - description: Refers to created subscription, where the AMS API allocates a - unique resource name for this subscription + description: "Refers to created subscription, where the AMS API allocates\ + \ a unique resource name for this subscription" required: true style: simple explode: false @@ -791,7 +788,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body_1' + $ref: '#/components/schemas/InlineSubscription' required: true responses: "200": @@ -800,63 +797,64 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body_1' + $ref: '#/components/schemas/InlineSubscription' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "412": - description: 'Precondition failed : used when a condition has failed during - conditional requests, e.g. when using ETags to avoid write conflicts when - using PUT' + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts\ + \ when using PUT" content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -864,15 +862,15 @@ paths: deprecated: false delete: tags: - - subscriptions + - amsi summary: cancel the existing individual subscription description: cancel the existing individual subscription operationId: sub_byIdDELETE parameters: - name: subscriptionId in: path - description: Refers to created subscription, where the AMS API allocates a - unique resource name for this subscription + description: "Refers to created subscription, where the AMS API allocates\ + \ a unique resource name for this subscription" required: true style: simple explode: false @@ -883,27 +881,27 @@ paths: description: No Content content: {} "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -912,7 +910,7 @@ paths: /uri_provided_by_subscriber: post: tags: - - notifications + - unsupported summary: delivers a notification from the AMS resource to the subscriber description: delivers a notification from the AMS resource to the subscriber operationId: notificationPOST @@ -921,7 +919,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body_2' + $ref: '#/components/schemas/InlineNotification' required: true responses: "204": @@ -963,7 +961,7 @@ paths: /notifications/mec011/appTermination: post: tags: - - location + - amsi summary: MEC011 Application Termination notification for self termination description: Terminates itself. operationId: mec011AppTerminationPOST @@ -989,8 +987,8 @@ paths: x-swagger-router-controller: notifications components: schemas: - AdjacentAppInfoSubscription.links: - title: AdjacentAppInfoSubscription.links + AdjacentAppInfoSubscriptionLinks: + title: AdjacentAppInfoSubscriptionLinks required: - self type: object @@ -999,15 +997,15 @@ components: $ref: '#/components/schemas/LinkType' description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - AdjacentAppInfoSubscription.filterCriteria: - title: AdjacentAppInfoSubscription.filterCriteria + AdjacentAppInfoSubscriptionFilterCriteria: + title: AdjacentAppInfoSubscriptionFilterCriteria type: object properties: appInstanceId: type: string - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." AdjacentAppInfoSubscription: title: AdjacentAppInfoSubscription required: @@ -1017,7 +1015,7 @@ components: type: object properties: _links: - $ref: '#/components/schemas/AdjacentAppInfoSubscription.links' + $ref: '#/components/schemas/AdjacentAppInfoSubscriptionLinks' callbackReference: type: string description: URI selected by the service consumer to receive notifications @@ -1026,19 +1024,17 @@ components: format: uri requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test - notification via HTTP on the callbackReference URI, specified in ETSI - GS MEC 009, as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009, as described in clause 6.12a." websockNotifConfig: $ref: '#/components/schemas/WebsockNotifConfig' expiryDeadline: $ref: '#/components/schemas/TimeStamp' filterCriteria: - $ref: '#/components/schemas/AdjacentAppInfoSubscription.filterCriteria' + $ref: '#/components/schemas/AdjacentAppInfoSubscriptionFilterCriteria' subscriptionType: - type: string - description: Shall be set to "AdjacentAppInfoSubscription". - example: '["AdjacentAppInfoSubscription"]' + $ref: '#/components/schemas/SubscriptionType' AdjacentAppInstanceInfo: title: AdjacentAppInstanceInfo required: @@ -1062,9 +1058,9 @@ components: $ref: '#/components/schemas/MECHostInformation' registeredInstanceId: type: string - description: dentifier of the application instance that registers to the - AMS, which is instantiated from the application descriptor identified - by the attribute "appDId". + description: "dentifier of the application instance that registers to the\ + \ AMS, which is instantiated from the application descriptor identified\ + \ by the attribute \"appDId\"." example: appInstanceId: appInstanceId registeredInstanceId: registeredInstanceId @@ -1090,7 +1086,7 @@ components: description: This attribute provides an option for the application instance (server) to communicate with the application client before relocating this application instance to another MEC host. - example: '["APP_MOBILITY_NOT_ALLOWED"]' + example: "[\"APP_MOBILITY_NOT_ALLOWED\"]" enum: - APP_MOBILITY_NOT_ALLOWED - APP_MOBILITY_WITH_CONFIRMATION @@ -1123,16 +1119,16 @@ components: host: host - port: 0 host: host - MobilityProcedureSubscription.links: - title: MobilityProcedureSubscription.links + MobilityProcedureSubscriptionLinks: + title: MobilityProcedureSubscriptionLinks required: - self type: object properties: self: $ref: '#/components/schemas/LinkType' - MobilityProcedureSubscription.filterCriteria: - title: MobilityProcedureSubscription.filterCriteria + MobilityProcedureSubscriptionFilterCriteria: + title: MobilityProcedureSubscriptionFilterCriteria type: object properties: appInstanceId: @@ -1147,14 +1143,14 @@ components: $ref: '#/components/schemas/AssociateId' mobilityStatus: type: array - description: In case mobilityStatus is not included in the subscription - request, the default value 1 = INTER_HOST_MOBILITY_TRIGGERED shall be - used and included in the response. + description: "In case mobilityStatus is not included in the subscription\ + \ request, the default value 1 = INTER_HOST_MOBILITY_TRIGGERED shall be\ + \ used and included in the response." items: $ref: '#/components/schemas/MobilityStatus' - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." WebsockNotifConfig: type: object properties: @@ -1175,7 +1171,7 @@ components: type: object properties: _links: - $ref: '#/components/schemas/MobilityProcedureSubscription.links' + $ref: '#/components/schemas/MobilityProcedureSubscriptionLinks' callbackReference: type: string description: URI selected by the service consumer to receive notifications @@ -1184,24 +1180,22 @@ components: format: uri requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test - notification via HTTP on the callbackReference URI, specified in ETSI - GS MEC 009, as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009, as described in clause 6.12a." websockNotifConfig: $ref: '#/components/schemas/WebsockNotifConfig' expiryDeadline: $ref: '#/components/schemas/TimeStamp' filterCriteria: - $ref: '#/components/schemas/MobilityProcedureSubscription.filterCriteria' + $ref: '#/components/schemas/MobilityProcedureSubscriptionFilterCriteria' subscriptionType: - type: string - description: Shall be set to "MobilityProcedureSubscription". - example: '["MobilityProcedureSubscription"]' + $ref: '#/components/schemas/SubscriptionType' MobilityProcedureNotification: title: MobilityProcedureNotification required: + - _links - associateId - - links - mobilityStatus - notificationType properties: @@ -1220,7 +1214,7 @@ components: targetAppInfo: $ref: '#/components/schemas/MobilityProcedureNotification_targetAppInfo' _links: - $ref: '#/components/schemas/MobilityProcedureNotification__links' + $ref: '#/components/schemas/Link' AdjacentAppInfoNotification: title: AdjacentAppInfoNotification required: @@ -1238,17 +1232,15 @@ components: items: $ref: '#/components/schemas/AssociateId' adjacentAppInfo: - required: - - appInstanceId - - commInterface type: array items: $ref: '#/components/schemas/AdjacentAppInfoNotificationAdjacentAppInfo' _links: - $ref: '#/components/schemas/MobilityProcedureNotification__links' + $ref: '#/components/schemas/Link' AdjacentAppInfoNotificationAdjacentAppInfo: required: - appInstanceId + - commInterface type: object properties: appInstanceId: @@ -1256,8 +1248,8 @@ components: description: Identifier of the adjacent application instance. commInterface: type: array - description: If present, it represents the communication interface(s) information - of the application instance. + description: "If present, it represents the communication interface(s) information\ + \ of the application instance." items: $ref: '#/components/schemas/CommunicationInterface' ExpiryNotification: @@ -1273,7 +1265,7 @@ components: timeStamp: $ref: '#/components/schemas/TimeStamp' _links: - $ref: '#/components/schemas/MobilityProcedureNotification__links' + $ref: '#/components/schemas/Link' expiryDeadline: $ref: '#/components/schemas/TimeStamp' TestNotification: @@ -1291,13 +1283,13 @@ components: title: MobilityStatus type: string description: Indicate the status of the UE mobility - example: '["INTERHOST_MOVEOUT_TRIGGERED"]' + example: "[\"INTERHOST_MOVEOUT_TRIGGERED\"]" enum: - INTERHOST_MOVEOUT_TRIGGERED - INTERHOST_MOVEOUT_COMPLETED - INTERHOST_MOVEOUT_FAILED - RegistrationInfo.deviceInformation: - title: RegistrationInfo.deviceInformation + RegistrationInfoDeviceInformation: + title: RegistrationInfoDeviceInformation required: - associateId type: object @@ -1307,27 +1299,28 @@ components: appMobilityServiceLevel: $ref: '#/components/schemas/AppMobilityServiceLevel' contextTransferState: - $ref: '#/components/schemas/contextTransferState' + $ref: '#/components/schemas/ContextTransferState' example: associateId: - type: '["UE_IPv4_ADDRESS"]' + type: "[\"UE_IPv4_ADDRESS\"]" value: value - appMobilityServiceLevel: '["APP_MOBILITY_NOT_ALLOWED"]' - contextTransferState: '["NOT_TRANSFERRED"]' - RegistrationInfo.serviceConsumerId: - title: RegistrationInfo.serviceConsumerId + appMobilityServiceLevel: "[\"APP_MOBILITY_NOT_ALLOWED\"]" + contextTransferState: "[\"NOT_TRANSFERRED\"]" + RegistrationInfoServiceConsumerId: + title: RegistrationInfoServiceConsumerId type: object properties: appInstanceId: type: string - description: If present, it represents the identifier of the application - instance registering the Application Mobility Service. + description: "If present, it represents the identifier of the application\ + \ instance registering the Application Mobility Service." mepId: type: string - description: If present, it represents the identifier of the MEC platform - registering the Application Mobility Service. - description: The identifier of service consumer requesting the application mobility - service, i.e. either the application instance ID or the MEC platform ID. + description: "If present, it represents the identifier of the MEC platform\ + \ registering the Application Mobility Service." + description: "The identifier of service consumer requesting the application\ + \ mobility service, i.e. either the application instance ID or the MEC platform\ + \ ID." example: appInstanceId: appInstanceId mepId: mepId @@ -1339,41 +1332,42 @@ components: properties: appMobilityServiceId: type: string - description: The identifier of registered application mobility service. - Shall be absent in POST requests, and present otherwise. + description: "The identifier of registered application mobility service.\ + \ Shall be absent in POST requests, and present otherwise." deviceInformation: type: array - description: If present, it specifies the device served by the application - instance which is registering is registering the Application Mobility - Service. + description: "If present, it specifies the device served by the application\ + \ instance which is registering is registering the Application Mobility\ + \ Service." items: - $ref: '#/components/schemas/RegistrationInfo.deviceInformation' + $ref: '#/components/schemas/RegistrationInfoDeviceInformation' expiryTime: type: integer - description: If present, it indicates the time of Application Mobility Service - expiration from the time of registration accepted.The value "0" means - infinite time, i.e. no expiration.The unit of expiry time is one second. + description: "If present, it indicates the time of Application Mobility\ + \ Service expiration from the time of registration accepted.The value\ + \ \"0\" means infinite time, i.e. no expiration.The unit of expiry time\ + \ is one second." serviceConsumerId: - $ref: '#/components/schemas/RegistrationInfo.serviceConsumerId' + $ref: '#/components/schemas/RegistrationInfoServiceConsumerId' example: appMobilityServiceId: appMobilityServiceId deviceInformation: - associateId: - type: '["UE_IPv4_ADDRESS"]' + type: "[\"UE_IPv4_ADDRESS\"]" value: value - appMobilityServiceLevel: '["APP_MOBILITY_NOT_ALLOWED"]' - contextTransferState: '["NOT_TRANSFERRED"]' + appMobilityServiceLevel: "[\"APP_MOBILITY_NOT_ALLOWED\"]" + contextTransferState: "[\"NOT_TRANSFERRED\"]" - associateId: - type: '["UE_IPv4_ADDRESS"]' + type: "[\"UE_IPv4_ADDRESS\"]" value: value - appMobilityServiceLevel: '["APP_MOBILITY_NOT_ALLOWED"]' - contextTransferState: '["NOT_TRANSFERRED"]' + appMobilityServiceLevel: "[\"APP_MOBILITY_NOT_ALLOWED\"]" + contextTransferState: "[\"NOT_TRANSFERRED\"]" expiryTime: 0 serviceConsumerId: appInstanceId: appInstanceId mepId: mepId - SubscriptionLinkList.links: - title: SubscriptionLinkList.links + SubscriptionLinkListLinks: + title: SubscriptionLinkListLinks required: - self type: object @@ -1384,18 +1378,18 @@ components: type: array description: The service consumer’s subscriptions. items: - $ref: '#/components/schemas/SubscriptionLinkList.subscription' + $ref: '#/components/schemas/SubscriptionLinkListSubscription' description: List of hyperlinks related to the resource. example: self: href: href subscription: - - subscriptionType: 0 + - subscriptionType: MobilityProcedureSubscription href: href - - subscriptionType: 0 + - subscriptionType: MobilityProcedureSubscription href: href - SubscriptionLinkList.subscription: - title: SubscriptionLinkList.subscription + SubscriptionLinkListSubscription: + title: SubscriptionLinkListSubscription required: - href - subscriptionType @@ -1405,9 +1399,9 @@ components: type: string description: The URI referring to the subscription. subscriptionType: - $ref: '#/components/schemas/subscriptionType' + $ref: '#/components/schemas/SubscriptionType' example: - subscriptionType: 0 + subscriptionType: MobilityProcedureSubscription href: href SubscriptionLinkList: title: SubscriptionLinkList @@ -1416,49 +1410,51 @@ components: type: object properties: _links: - $ref: '#/components/schemas/SubscriptionLinkList.links' + $ref: '#/components/schemas/SubscriptionLinkListLinks' example: _links: self: href: href subscription: - - subscriptionType: 0 + - subscriptionType: MobilityProcedureSubscription href: href - - subscriptionType: 0 + - subscriptionType: MobilityProcedureSubscription href: href - contextTransferState: - title: contextTransferState + ContextTransferState: + title: ContextTransferState type: string - description: If present, it represents the state of transferring the user context - to another application instance. - example: '["NOT_TRANSFERRED"]' + description: "If present, it represents the state of transferring the user context\ + \ to another application instance." + example: "[\"NOT_TRANSFERRED\"]" enum: - NOT_TRANSFERRED - USER_CONTEXT_TRANSFER_COMPLETED - subscriptionType: - title: subscriptionType - type: integer - description: 'Numeric value (0 - 255) corresponding to specified type of subscription - as following: 0 = RESERVED. 1 = MOBILITY_PROCEDURE. 2 = ADJACENT_APPINFO.' + SubscriptionType: + title: SubscriptionType + type: string enum: - - 0 - - 1 - - 2 + - MobilityProcedureSubscription + - AdjacentAppInfoSubscription AssociateId: title: AssociateId - required: - - type - - value type: object properties: type: - $ref: '#/components/schemas/Type' + $ref: '#/components/schemas/AssociateIdType' value: type: string description: Value for the identifier. example: - type: '["UE_IPv4_ADDRESS"]' + type: "[\"UE_IPv4_ADDRESS\"]" value: value + Link: + required: + - subscription + type: object + properties: + subscription: + $ref: '#/components/schemas/LinkType' + description: Object containing hyperlinks related to the resource. LinkType: title: LinkType required: @@ -1480,14 +1476,14 @@ components: properties: seconds: type: integer - description: '''The seconds part of the Time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC.''' + description: "'The seconds part of the Time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC.'" nanoSeconds: type: integer - description: '''The nanoseconds part of the Time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC.''' - description: '''This data type represents the time stamp as Unix-time since - January 1, 1970, 00:00:00 UTC''' + description: "'The nanoseconds part of the Time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC.'" + description: "'This data type represents the time stamp as Unix-time since January\ + \ 1, 1970, 00:00:00 UTC'" KeyValuePairs: type: object additionalProperties: @@ -1510,9 +1506,6 @@ components: key: {} ProblemDetails: title: ProblemDetails - required: - - status - - detail type: object properties: detail: @@ -1528,16 +1521,16 @@ components: description: The HTTP status code for this occurrence of the problem title: type: string - description: A short, human-readable summary of the problem type + description: "A short, human-readable summary of the problem type" type: type: string description: A URI reference according to IETF RFC 3986 that identifies the problem type - Type: + AssociateIdType: title: Type type: string description: Numeric value (0-255) corresponding to specified type of identifier - example: '["UE_IPv4_ADDRESS"]' + example: "[\"UE_IPv4_ADDRESS\"]" enum: - UE_IPv4_ADDRESS - UE_IPV6_ADDRESS @@ -1581,15 +1574,15 @@ components: $ref: '#/components/schemas/LinkType' confirmTermination: $ref: '#/components/schemas/LinkType' - body: - oneOf: - - $ref: '#/components/schemas/MobilityProcedureSubscription' - - $ref: '#/components/schemas/AdjacentAppInfoSubscription' - body_1: + InlineSubscription: + discriminator: + propertyName: SubscriptionType oneOf: - $ref: '#/components/schemas/MobilityProcedureSubscription' - $ref: '#/components/schemas/AdjacentAppInfoSubscription' - body_2: + InlineNotification: + discriminator: + propertyName: NotificationType oneOf: - $ref: '#/components/schemas/MobilityProcedureNotification' - $ref: '#/components/schemas/AdjacentAppInfoNotification' @@ -1604,14 +1597,6 @@ components: description: Identifiers of the target application instance. commInterface: $ref: '#/components/schemas/CommunicationInterface' - MobilityProcedureNotification__links: - required: - - subscription - type: object - properties: - subscription: - $ref: '#/components/schemas/LinkType' - description: Object containing hyperlinks related to the resource. TestNotification__links: required: - subscription diff --git a/go-packages/meep-ams-client/api_amsi.go b/go-packages/meep-ams-client/api_amsi.go index 43a07bb81..609cbf13b 100644 --- a/go-packages/meep-ams-client/api_amsi.go +++ b/go-packages/meep-ams-client/api_amsi.go @@ -1,23 +1,23 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * - * API version: 2.1.1 + * API version: 2.2.1 * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ @@ -491,7 +491,7 @@ func (a *AmsiApiService) AppMobilityServiceByIdPUT(ctx context.Context, body Reg } /* -AmsiApiService Retrieve information about the registered application mobility service. +AmsiApiService Retrieve information about the registered application mobility service. Retrieve information about the registered application mobility service. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *AppMobilityServiceGETOpts - Optional Parameters: @@ -1351,17 +1351,11 @@ func (a *AmsiApiService) SubByIdPUT(ctx context.Context, body InlineSubscription AmsiApiService Retrieve information about the subscriptions for this requestor. Retrieve information about the subscriptions for this requestor. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param optional nil or *SubGETOpts - Optional Parameters: - * @param "SubscriptionType" (optional.String) - Query parameter to filter on a specific subscription type. Permitted values: mobility_proc or adj_app_info + * @param subscriptionType Query parameter to filter on a specific subscription type. Permitted values: mobility_proc or adj_app_info @return SubscriptionLinkList */ - -type SubGETOpts struct { - SubscriptionType optional.String -} - -func (a *AmsiApiService) SubGET(ctx context.Context, localVarOptionals *SubGETOpts) (SubscriptionLinkList, *http.Response, error) { +func (a *AmsiApiService) SubGET(ctx context.Context, subscriptionType string) (SubscriptionLinkList, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Get") localVarPostBody interface{} @@ -1377,9 +1371,7 @@ func (a *AmsiApiService) SubGET(ctx context.Context, localVarOptionals *SubGETOp localVarQueryParams := url.Values{} localVarFormParams := url.Values{} - if localVarOptionals != nil && localVarOptionals.SubscriptionType.IsSet() { - localVarQueryParams.Add("subscriptionType", parameterToString(localVarOptionals.SubscriptionType.Value(), "")) - } + localVarQueryParams.Add("subscriptionType", parameterToString(subscriptionType, "")) // to determine the Content-Type header localVarHttpContentTypes := []string{} @@ -1560,7 +1552,6 @@ func (a *AmsiApiService) SubPOST(ctx context.Context, body InlineSubscription) ( localVarHttpResponse, err := a.client.callAPI(r) if err != nil || localVarHttpResponse == nil { - fmt.Println("SubPOST: In error: ", err.Error()) return localVarReturnValue, localVarHttpResponse, err } @@ -1584,6 +1575,17 @@ func (a *AmsiApiService) SubPOST(ctx context.Context, body InlineSubscription) ( error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 201 { + var v InlineSubscription + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr + } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) diff --git a/go-packages/meep-ams-client/api_unsupported.go b/go-packages/meep-ams-client/api_unsupported.go index 908cc9b71..23da14fc1 100644 --- a/go-packages/meep-ams-client/api_unsupported.go +++ b/go-packages/meep-ams-client/api_unsupported.go @@ -1,24 +1,24 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ @@ -47,16 +47,16 @@ UnsupportedApiService Retrieve information about this subscription. Retrieve information about this subscription. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *AdjAppInstGETOpts - Optional Parameters: - * @param "Filter" (optional.String) - Attribute-based filtering parameters according to ETSI GS MEC 011 + * @param "Filter" (optional.String) - Attribute-based filtering parameters according to ETSI GS MEC 009 * @param "AllFields" (optional.String) - Include all complex attributes in the response. - * @param "Fields" (optional.String) - Complex attributes to be included into the response. See clause 6.18 in ETSI GS MEC 011 - * @param "ExcludeFields" (optional.String) - Complex attributes to be excluded from the response.See clause 6.18 in ETSI GS MEC 011 + * @param "Fields" (optional.String) - Complex attributes to be included into the response. See clause 6.18 in ETSI GS MEC 009 + * @param "ExcludeFields" (optional.String) - Complex attributes to be excluded from the response.See clause 6.18 in ETSI GS MEC 009 * @param "ExcludeDefault" (optional.String) - Indicates to exclude the following complex attributes from the response See clause 6.18 in ETSI GS MEC 011 for details. @return []AdjacentAppInstanceInfo */ -type UnsupportedApiAdjAppInstGETOpts struct { +type AdjAppInstGETOpts struct { Filter optional.String AllFields optional.String Fields optional.String @@ -64,7 +64,7 @@ type UnsupportedApiAdjAppInstGETOpts struct { ExcludeDefault optional.String } -func (a *UnsupportedApiService) AdjAppInstGET(ctx context.Context, localVarOptionals *UnsupportedApiAdjAppInstGETOpts) ([]AdjacentAppInstanceInfo, *http.Response, error) { +func (a *UnsupportedApiService) AdjAppInstGET(ctx context.Context, localVarOptionals *AdjAppInstGETOpts) ([]AdjacentAppInstanceInfo, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Get") localVarPostBody interface{} @@ -348,3 +348,128 @@ func (a *UnsupportedApiService) AppMobilityServiceDerPOST(ctx context.Context, a return localVarHttpResponse, nil } + +/* +UnsupportedApiService delivers a notification from the AMS resource to the subscriber +delivers a notification from the AMS resource to the subscriber + * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param body + + +*/ +func (a *UnsupportedApiService) NotificationPOST(ctx context.Context, body InlineNotification) (*http.Response, error) { + var ( + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody interface{} + localVarFileName string + localVarFileBytes []byte + ) + + // create path and map variables + localVarPath := a.client.cfg.BasePath + "/uri_provided_by_subscriber" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHttpContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHttpContentType := selectHeaderContentType(localVarHttpContentTypes) + if localVarHttpContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHttpContentType + } + + // to determine the Accept header + localVarHttpHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) + if localVarHttpHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHttpHeaderAccept + } + // body params + localVarPostBody = &body + r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) + if err != nil { + return nil, err + } + + localVarHttpResponse, err := a.client.callAPI(r) + if err != nil || localVarHttpResponse == nil { + return localVarHttpResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body) + localVarHttpResponse.Body.Close() + if err != nil { + return localVarHttpResponse, err + } + + if localVarHttpResponse.StatusCode >= 300 { + newErr := GenericSwaggerError{ + body: localVarBody, + error: localVarHttpResponse.Status, + } + + if localVarHttpResponse.StatusCode == 401 { + var v ProblemDetails + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHttpResponse, newErr + } + newErr.model = v + return localVarHttpResponse, newErr + } + + if localVarHttpResponse.StatusCode == 403 { + var v ProblemDetails + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHttpResponse, newErr + } + newErr.model = v + return localVarHttpResponse, newErr + } + + if localVarHttpResponse.StatusCode == 404 { + var v ProblemDetails + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHttpResponse, newErr + } + newErr.model = v + return localVarHttpResponse, newErr + } + + if localVarHttpResponse.StatusCode == 406 { + var v ProblemDetails + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHttpResponse, newErr + } + newErr.model = v + return localVarHttpResponse, newErr + } + + if localVarHttpResponse.StatusCode == 429 { + var v ProblemDetails + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHttpResponse, newErr + } + newErr.model = v + return localVarHttpResponse, newErr + } + + return localVarHttpResponse, newErr + } + + return localVarHttpResponse, nil +} diff --git a/go-packages/meep-ams-client/client.go b/go-packages/meep-ams-client/client.go index 25614c37c..fecbf2351 100644 --- a/go-packages/meep-ams-client/client.go +++ b/go-packages/meep-ams-client/client.go @@ -1,24 +1,24 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ @@ -52,7 +52,7 @@ var ( xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)") ) -// APIClient manages communication with the ETSI GS MEC 021 Application Mobility Service API API v2.2.1 +// APIClient manages communication with the AdvantEDGE Application Mobility API API v2.2.1 // In most cases there should be only one, shared, APIClient. type APIClient struct { cfg *Configuration @@ -238,15 +238,6 @@ func (c *APIClient) prepareRequest( w.Close() } - if strings.HasPrefix(headerParams["Content-Type"], "application/x-www-form-urlencoded") && len(formParams) > 0 { - if body != nil { - return nil, errors.New("Cannot specify postBody and x-www-form-urlencoded form at the same time.") - } - body = &bytes.Buffer{} - body.WriteString(formParams.Encode()) - // Set Content-Length - headerParams["Content-Length"] = fmt.Sprintf("%d", body.Len()) - } // Setup path and query parameters url, err := url.Parse(path) if err != nil { diff --git a/go-packages/meep-ams-client/configuration.go b/go-packages/meep-ams-client/configuration.go index c7bb1d0b3..4171bc4ad 100644 --- a/go-packages/meep-ams-client/configuration.go +++ b/go-packages/meep-ams-client/configuration.go @@ -1,24 +1,24 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ diff --git a/go-packages/meep-ams-client/convert.go b/go-packages/meep-ams-client/convert.go index 32031c67a..3284ff16a 100755 --- a/go-packages/meep-ams-client/convert.go +++ b/go-packages/meep-ams-client/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-ams-client/docs/AdjacentAppInfoNotification.md b/go-packages/meep-ams-client/docs/AdjacentAppInfoNotification.md index aa87951a6..eabb145ea 100644 --- a/go-packages/meep-ams-client/docs/AdjacentAppInfoNotification.md +++ b/go-packages/meep-ams-client/docs/AdjacentAppInfoNotification.md @@ -7,7 +7,8 @@ Name | Type | Description | Notes **TimeStamp** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] **AssociateId** | [**[]AssociateId**](AssociateId.md) | 1 to N identifiers to associate the information for specific | [optional] [default to null] **AdjacentAppInfo** | [**[]AdjacentAppInfoNotificationAdjacentAppInfo**](AdjacentAppInfoNotificationAdjacentAppInfo.md) | | [optional] [default to null] -**Links** | [***MobilityProcedureNotificationLinks**](MobilityProcedureNotification__links.md) | | [default to null] +**Links** | [***Link**](Link.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/AdjacentAppInfoNotificationAdjacentAppInfo.md b/go-packages/meep-ams-client/docs/AdjacentAppInfoNotificationAdjacentAppInfo.md index ca3c937f2..b30a40aa1 100644 --- a/go-packages/meep-ams-client/docs/AdjacentAppInfoNotificationAdjacentAppInfo.md +++ b/go-packages/meep-ams-client/docs/AdjacentAppInfoNotificationAdjacentAppInfo.md @@ -4,7 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **AppInstanceId** | **string** | Identifier of the adjacent application instance. | [default to null] -**CommInterface** | [**[]CommunicationInterface**](CommunicationInterface.md) | If present, it represents the communication interface(s) information of the application instance. | [optional] [default to null] +**CommInterface** | [**[]CommunicationInterface**](CommunicationInterface.md) | If present, it represents the communication interface(s) information of the application instance. | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/AdjacentAppInfoSubscription.md b/go-packages/meep-ams-client/docs/AdjacentAppInfoSubscription.md index ceedc74ca..205b6f6e5 100644 --- a/go-packages/meep-ams-client/docs/AdjacentAppInfoSubscription.md +++ b/go-packages/meep-ams-client/docs/AdjacentAppInfoSubscription.md @@ -3,13 +3,14 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Links** | [***AdjacentAppInfoSubscriptionLinks**](AdjacentAppInfoSubscription.links.md) | | [optional] [default to null] +**Links** | [***AdjacentAppInfoSubscriptionLinks**](AdjacentAppInfoSubscriptionLinks.md) | | [optional] [default to null] **CallbackReference** | **string** | URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response. | [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009, as described in clause 6.12a. | [optional] [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] -**FilterCriteria** | [***AdjacentAppInfoSubscriptionFilterCriteria**](AdjacentAppInfoSubscription.filterCriteria.md) | | [default to null] -**SubscriptionType** | **string** | Shall be set to \"AdjacentAppInfoSubscription\". | [default to null] +**FilterCriteria** | [***AdjacentAppInfoSubscriptionFilterCriteria**](AdjacentAppInfoSubscriptionFilterCriteria.md) | | [default to null] +**SubscriptionType** | [***SubscriptionType**](SubscriptionType.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/AmsiApi.md b/go-packages/meep-ams-client/docs/AmsiApi.md index 12b6452a6..a95976301 100644 --- a/go-packages/meep-ams-client/docs/AmsiApi.md +++ b/go-packages/meep-ams-client/docs/AmsiApi.md @@ -7,14 +7,14 @@ Method | HTTP request | Description [**AppMobilityServiceByIdDELETE**](AmsiApi.md#AppMobilityServiceByIdDELETE) | **Delete** /app_mobility_services/{appMobilityServiceId} | deregister the individual application mobility service [**AppMobilityServiceByIdGET**](AmsiApi.md#AppMobilityServiceByIdGET) | **Get** /app_mobility_services/{appMobilityServiceId} | Retrieve information about this individual application mobility service [**AppMobilityServiceByIdPUT**](AmsiApi.md#AppMobilityServiceByIdPUT) | **Put** /app_mobility_services/{appMobilityServiceId} | update the existing individual application mobility service -[**AppMobilityServiceGET**](AmsiApi.md#AppMobilityServiceGET) | **Get** /app_mobility_services | Retrieve information about the registered application mobility service. +[**AppMobilityServiceGET**](AmsiApi.md#AppMobilityServiceGET) | **Get** /app_mobility_services | Retrieve information about the registered application mobility service. [**AppMobilityServicePOST**](AmsiApi.md#AppMobilityServicePOST) | **Post** /app_mobility_services | Create a new application mobility service for the service requester. [**Mec011AppTerminationPOST**](AmsiApi.md#Mec011AppTerminationPOST) | **Post** /notifications/mec011/appTermination | MEC011 Application Termination notification for self termination [**SubByIdDELETE**](AmsiApi.md#SubByIdDELETE) | **Delete** /subscriptions/{subscriptionId} | cancel the existing individual subscription [**SubByIdGET**](AmsiApi.md#SubByIdGET) | **Get** /subscriptions/{subscriptionId} | Retrieve information about this subscription. [**SubByIdPUT**](AmsiApi.md#SubByIdPUT) | **Put** /subscriptions/{subscriptionId} | update the existing individual subscription. -[**SubGET**](AmsiApi.md#SubGET) | **Get** /subscriptions/ | Retrieve information about the subscriptions for this requestor. -[**SubPOST**](AmsiApi.md#SubPOST) | **Post** /subscriptions/ | Create a new subscription to Application Mobility Service notifications. +[**SubGET**](AmsiApi.md#SubGET) | **Get** /subscriptions | Retrieve information about the subscriptions for this requestor. +[**SubPOST**](AmsiApi.md#SubPOST) | **Post** /subscriptions | Create a new subscription to Application Mobility Service notifications. # **AppMobilityServiceByIdDELETE** @@ -104,7 +104,7 @@ No authorization required # **AppMobilityServiceGET** > []RegistrationInfo AppMobilityServiceGET(ctx, optional) - Retrieve information about the registered application mobility service. +Retrieve information about the registered application mobility service. Retrieve information about the registered application mobility service. @@ -283,7 +283,7 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **SubGET** -> SubscriptionLinkList SubGET(ctx, optional) +> SubscriptionLinkList SubGET(ctx, subscriptionType) Retrieve information about the subscriptions for this requestor. Retrieve information about the subscriptions for this requestor. @@ -293,14 +293,7 @@ Retrieve information about the subscriptions for this requestor. Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***SubGETOpts** | optional parameters | nil if no parameters - -### Optional Parameters -Optional parameters are passed through a pointer to a SubGETOpts struct - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **subscriptionType** | **optional.String**| Query parameter to filter on a specific subscription type. Permitted values: mobility_proc or adj_app_info | + **subscriptionType** | **string**| Query parameter to filter on a specific subscription type. Permitted values: mobility_proc or adj_app_info | ### Return type diff --git a/go-packages/meep-ams-client/docs/AppMobSerApi.md b/go-packages/meep-ams-client/docs/AppMobSerApi.md deleted file mode 100644 index 12440a843..000000000 --- a/go-packages/meep-ams-client/docs/AppMobSerApi.md +++ /dev/null @@ -1,163 +0,0 @@ -# {{classname}} - -All URIs are relative to *https://localhost/amsi/v1* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**AppMobilityServiceByIdDELETE**](AppMobSerApi.md#AppMobilityServiceByIdDELETE) | **Delete** /app_mobility_services/{appMobilityServiceId} | deregister the individual application mobility service -[**AppMobilityServiceByIdGET**](AppMobSerApi.md#AppMobilityServiceByIdGET) | **Get** /app_mobility_services/{appMobilityServiceId} | Retrieve information about this individual application mobility service -[**AppMobilityServiceByIdPUT**](AppMobSerApi.md#AppMobilityServiceByIdPUT) | **Put** /app_mobility_services/{appMobilityServiceId} | update the existing individual application mobility service -[**AppMobilityServiceGET**](AppMobSerApi.md#AppMobilityServiceGET) | **Get** /app_mobility_services | Retrieve information about the registered application mobility service. -[**AppMobilityServicePOST**](AppMobSerApi.md#AppMobilityServicePOST) | **Post** /app_mobility_services | Create a new application mobility service for the service requester. - -# **AppMobilityServiceByIdDELETE** -> AppMobilityServiceByIdDELETE(ctx, appMobilityServiceId) - deregister the individual application mobility service - - deregister the individual application mobility service - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **appMobilityServiceId** | **string**| It uniquely identifies the created individual application mobility service | - -### Return type - - (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **AppMobilityServiceByIdGET** -> RegistrationInfo AppMobilityServiceByIdGET(ctx, appMobilityServiceId) -Retrieve information about this individual application mobility service - -Retrieve information about this individual application mobility service - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **appMobilityServiceId** | **string**| It uniquely identifies the created individual application mobility service | - -### Return type - -[**RegistrationInfo**](RegistrationInfo.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **AppMobilityServiceByIdPUT** -> RegistrationInfo AppMobilityServiceByIdPUT(ctx, body, appMobilityServiceId) - update the existing individual application mobility service - - update the existing individual application mobility service - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**RegistrationInfo**](RegistrationInfo.md)| | - **appMobilityServiceId** | **string**| It uniquely identifies the created individual application mobility service | - -### Return type - -[**RegistrationInfo**](RegistrationInfo.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **AppMobilityServiceGET** -> []RegistrationInfo AppMobilityServiceGET(ctx, optional) -Retrieve information about the registered application mobility service. - - Retrieve information about the registered application mobility service. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***AppMobSerApiAppMobilityServiceGETOpts** | optional parameters | nil if no parameters - -### Optional Parameters -Optional parameters are passed through a pointer to a AppMobSerApiAppMobilityServiceGETOpts struct -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **filter** | **optional.String**| Attribute-based filtering parameters according to ETSI GS MEC 011 | - **allFields** | **optional.String**| Include all complex attributes in the response. | - **fields** | **optional.String**| Complex attributes to be included into the response. See clause 6.18 in ETSI GS MEC 011 | - **excludeFields** | **optional.String**| Complex attributes to be excluded from the response.See clause 6.18 in ETSI GS MEC 011 | - **excludeDefault** | **optional.String**| Indicates to exclude the following complex attributes from the response See clause 6.18 in ETSI GS MEC 011 for details. | - -### Return type - -[**[]RegistrationInfo**](RegistrationInfo.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **AppMobilityServicePOST** -> RegistrationInfo AppMobilityServicePOST(ctx, body) -Create a new application mobility service for the service requester. - -Create a new application mobility service for the service requester. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**RegistrationInfo**](RegistrationInfo.md)| Application mobility service to be created | - -### Return type - -[**RegistrationInfo**](RegistrationInfo.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/AssociateId.md b/go-packages/meep-ams-client/docs/AssociateId.md index 05e993577..5c71706f3 100644 --- a/go-packages/meep-ams-client/docs/AssociateId.md +++ b/go-packages/meep-ams-client/docs/AssociateId.md @@ -3,8 +3,9 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Type_** | [***ModelType**](Type.md) | | [default to null] -**Value** | **string** | Value for the identifier. | [default to null] +**Type_** | [***AssociateIdType**](AssociateIdType.md) | | [optional] [default to null] +**Value** | **string** | Value for the identifier. | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/Body.md b/go-packages/meep-ams-client/docs/AssociateIdType.md similarity index 93% rename from go-packages/meep-ams-client/docs/Body.md rename to go-packages/meep-ams-client/docs/AssociateIdType.md index 6ab902617..5a1bce061 100644 --- a/go-packages/meep-ams-client/docs/Body.md +++ b/go-packages/meep-ams-client/docs/AssociateIdType.md @@ -1,4 +1,4 @@ -# Body +# AssociateIdType ## Properties Name | Type | Description | Notes @@ -6,3 +6,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/ExpiryNotification.md b/go-packages/meep-ams-client/docs/ExpiryNotification.md index 1f36b8108..807fb182b 100644 --- a/go-packages/meep-ams-client/docs/ExpiryNotification.md +++ b/go-packages/meep-ams-client/docs/ExpiryNotification.md @@ -5,8 +5,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **NotificationType** | **string** | Shall be set to \"ExpiryNotification\". | [default to null] **TimeStamp** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] -**Links** | [***MobilityProcedureNotificationLinks**](MobilityProcedureNotification__links.md) | | [default to null] +**Links** | [***Link**](Link.md) | | [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/InlineNotification.md b/go-packages/meep-ams-client/docs/InlineNotification.md new file mode 100644 index 000000000..168ccca2d --- /dev/null +++ b/go-packages/meep-ams-client/docs/InlineNotification.md @@ -0,0 +1,9 @@ +# InlineNotification + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-ams-client/docs/InlineSubscription.md b/go-packages/meep-ams-client/docs/InlineSubscription.md new file mode 100644 index 000000000..27ba36f48 --- /dev/null +++ b/go-packages/meep-ams-client/docs/InlineSubscription.md @@ -0,0 +1,9 @@ +# InlineSubscription + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-ams-client/docs/MobilityProcedureNotificationLinks.md b/go-packages/meep-ams-client/docs/Link.md similarity index 90% rename from go-packages/meep-ams-client/docs/MobilityProcedureNotificationLinks.md rename to go-packages/meep-ams-client/docs/Link.md index 87434e7b3..739414ef2 100644 --- a/go-packages/meep-ams-client/docs/MobilityProcedureNotificationLinks.md +++ b/go-packages/meep-ams-client/docs/Link.md @@ -1,4 +1,4 @@ -# MobilityProcedureNotificationLinks +# Link ## Properties Name | Type | Description | Notes @@ -7,3 +7,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/LocationApi.md b/go-packages/meep-ams-client/docs/LocationApi.md deleted file mode 100644 index f85982096..000000000 --- a/go-packages/meep-ams-client/docs/LocationApi.md +++ /dev/null @@ -1,36 +0,0 @@ -# {{classname}} - -All URIs are relative to *https://localhost/amsi/v1* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**Mec011AppTerminationPOST**](LocationApi.md#Mec011AppTerminationPOST) | **Post** /notifications/mec011/appTermination | MEC011 Application Termination notification for self termination - -# **Mec011AppTerminationPOST** -> Mec011AppTerminationPOST(ctx, body) -MEC011 Application Termination notification for self termination - -Terminates itself. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**AppTerminationNotification**](AppTerminationNotification.md)| Termination notification details | - -### Return type - - (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: Not defined - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/MobilityProcedureNotification.md b/go-packages/meep-ams-client/docs/MobilityProcedureNotification.md index ab939964f..3aed88da1 100644 --- a/go-packages/meep-ams-client/docs/MobilityProcedureNotification.md +++ b/go-packages/meep-ams-client/docs/MobilityProcedureNotification.md @@ -8,7 +8,8 @@ Name | Type | Description | Notes **AssociateId** | [**[]AssociateId**](AssociateId.md) | 1 to N identifiers to associate the information for specific | [default to null] **MobilityStatus** | [***MobilityStatus**](MobilityStatus.md) | | [default to null] **TargetAppInfo** | [***MobilityProcedureNotificationTargetAppInfo**](MobilityProcedureNotification_targetAppInfo.md) | | [optional] [default to null] -**Links** | [***MobilityProcedureNotificationLinks**](MobilityProcedureNotification__links.md) | | [optional] [default to null] +**Links** | [***Link**](Link.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/MobilityProcedureSubscription.md b/go-packages/meep-ams-client/docs/MobilityProcedureSubscription.md index d8c826c14..476a3bea0 100644 --- a/go-packages/meep-ams-client/docs/MobilityProcedureSubscription.md +++ b/go-packages/meep-ams-client/docs/MobilityProcedureSubscription.md @@ -3,13 +3,14 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Links** | [***MobilityProcedureSubscriptionLinks**](MobilityProcedureSubscription.links.md) | | [optional] [default to null] +**Links** | [***MobilityProcedureSubscriptionLinks**](MobilityProcedureSubscriptionLinks.md) | | [optional] [default to null] **CallbackReference** | **string** | URI selected by the service consumer to receive notifications on the subscribed Application Mobility Service. This shall be included both in the request and in response. | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009, as described in clause 6.12a. | [optional] [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] -**FilterCriteria** | [***MobilityProcedureSubscriptionFilterCriteria**](MobilityProcedureSubscription.filterCriteria.md) | | [default to null] -**SubscriptionType** | **string** | Shall be set to \"MobilityProcedureSubscription\". | [default to null] +**FilterCriteria** | [***MobilityProcedureSubscriptionFilterCriteria**](MobilityProcedureSubscriptionFilterCriteria.md) | | [default to null] +**SubscriptionType** | [***SubscriptionType**](SubscriptionType.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/NotificationsApi.md b/go-packages/meep-ams-client/docs/NotificationsApi.md deleted file mode 100644 index baa918c8b..000000000 --- a/go-packages/meep-ams-client/docs/NotificationsApi.md +++ /dev/null @@ -1,36 +0,0 @@ -# {{classname}} - -All URIs are relative to *https://localhost/amsi/v1* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**NotificationPOST**](NotificationsApi.md#NotificationPOST) | **Post** /uri_provided_by_subscriber | delivers a notification from the AMS resource to the subscriber - -# **NotificationPOST** -> NotificationPOST(ctx, body) -delivers a notification from the AMS resource to the subscriber - -delivers a notification from the AMS resource to the subscriber - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**Body2**](Body2.md)| | - -### Return type - - (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/OneOfInlineNotification.md b/go-packages/meep-ams-client/docs/OneOfInlineNotification.md new file mode 100644 index 000000000..ebef032f7 --- /dev/null +++ b/go-packages/meep-ams-client/docs/OneOfInlineNotification.md @@ -0,0 +1,9 @@ +# OneOfInlineNotification + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-ams-client/docs/OneOfInlineSubscription.md b/go-packages/meep-ams-client/docs/OneOfInlineSubscription.md new file mode 100644 index 000000000..926da1d24 --- /dev/null +++ b/go-packages/meep-ams-client/docs/OneOfInlineSubscription.md @@ -0,0 +1,9 @@ +# OneOfInlineSubscription + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-ams-client/docs/OneOfbody.md b/go-packages/meep-ams-client/docs/OneOfbody.md deleted file mode 100644 index 60b34231e..000000000 --- a/go-packages/meep-ams-client/docs/OneOfbody.md +++ /dev/null @@ -1,8 +0,0 @@ -# OneOfbody - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/OneOfbody1.md b/go-packages/meep-ams-client/docs/OneOfbody1.md deleted file mode 100644 index add66742c..000000000 --- a/go-packages/meep-ams-client/docs/OneOfbody1.md +++ /dev/null @@ -1,8 +0,0 @@ -# OneOfbody1 - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/OneOfbody2.md b/go-packages/meep-ams-client/docs/OneOfbody2.md deleted file mode 100644 index 82dffd279..000000000 --- a/go-packages/meep-ams-client/docs/OneOfbody2.md +++ /dev/null @@ -1,8 +0,0 @@ -# OneOfbody2 - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/RegistrationInfo.md b/go-packages/meep-ams-client/docs/RegistrationInfo.md index 75db67ba4..aff7350eb 100644 --- a/go-packages/meep-ams-client/docs/RegistrationInfo.md +++ b/go-packages/meep-ams-client/docs/RegistrationInfo.md @@ -4,9 +4,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **AppMobilityServiceId** | **string** | The identifier of registered application mobility service. Shall be absent in POST requests, and present otherwise. | [optional] [default to null] -**DeviceInformation** | [**[]RegistrationInfoDeviceInformation**](RegistrationInfo.deviceInformation.md) | If present, it specifies the device served by the application instance which is registering is registering the Application Mobility Service. | [optional] [default to null] +**DeviceInformation** | [**[]RegistrationInfoDeviceInformation**](RegistrationInfoDeviceInformation.md) | If present, it specifies the device served by the application instance which is registering is registering the Application Mobility Service. | [optional] [default to null] **ExpiryTime** | **int32** | If present, it indicates the time of Application Mobility Service expiration from the time of registration accepted.The value \"0\" means infinite time, i.e. no expiration.The unit of expiry time is one second. | [optional] [default to null] -**ServiceConsumerId** | [***RegistrationInfoServiceConsumerId**](RegistrationInfo.serviceConsumerId.md) | | [default to null] +**ServiceConsumerId** | [***RegistrationInfoServiceConsumerId**](RegistrationInfoServiceConsumerId.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/RegistrationInfoDeviceInformation.md b/go-packages/meep-ams-client/docs/RegistrationInfoDeviceInformation.md index 91bd70976..3604da09c 100644 --- a/go-packages/meep-ams-client/docs/RegistrationInfoDeviceInformation.md +++ b/go-packages/meep-ams-client/docs/RegistrationInfoDeviceInformation.md @@ -5,7 +5,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **AssociateId** | [***AssociateId**](AssociateId.md) | | [default to null] **AppMobilityServiceLevel** | [***AppMobilityServiceLevel**](AppMobilityServiceLevel.md) | | [optional] [default to null] -**ContextTransferState** | [***ContextTransferState**](contextTransferState.md) | | [optional] [default to null] +**ContextTransferState** | [***ContextTransferState**](ContextTransferState.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/SubscriptionLinkList.md b/go-packages/meep-ams-client/docs/SubscriptionLinkList.md index ac82d3b67..ba636676c 100644 --- a/go-packages/meep-ams-client/docs/SubscriptionLinkList.md +++ b/go-packages/meep-ams-client/docs/SubscriptionLinkList.md @@ -3,7 +3,8 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Links** | [***SubscriptionLinkListLinks**](SubscriptionLinkList.links.md) | | [default to null] +**Links** | [***SubscriptionLinkListLinks**](SubscriptionLinkListLinks.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/SubscriptionLinkListLinks.md b/go-packages/meep-ams-client/docs/SubscriptionLinkListLinks.md index 0858a33c9..d861ba703 100644 --- a/go-packages/meep-ams-client/docs/SubscriptionLinkListLinks.md +++ b/go-packages/meep-ams-client/docs/SubscriptionLinkListLinks.md @@ -4,7 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Self** | [***LinkType**](LinkType.md) | | [default to null] -**Subscription** | [**[]SubscriptionLinkListSubscription**](SubscriptionLinkList.subscription.md) | The service consumer’s subscriptions. | [optional] [default to null] +**Subscription** | [**[]SubscriptionLinkListSubscription**](SubscriptionLinkListSubscription.md) | The service consumer’s subscriptions. | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/SubscriptionLinkListSubscription.md b/go-packages/meep-ams-client/docs/SubscriptionLinkListSubscription.md index 13c9cd664..1611dd244 100644 --- a/go-packages/meep-ams-client/docs/SubscriptionLinkListSubscription.md +++ b/go-packages/meep-ams-client/docs/SubscriptionLinkListSubscription.md @@ -4,7 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Href** | **string** | The URI referring to the subscription. | [default to null] -**SubscriptionType** | [***SubscriptionType**](subscriptionType.md) | | [default to null] +**SubscriptionType** | [***SubscriptionType**](SubscriptionType.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/SubscriptionsApi.md b/go-packages/meep-ams-client/docs/SubscriptionsApi.md deleted file mode 100644 index 1b224a4a2..000000000 --- a/go-packages/meep-ams-client/docs/SubscriptionsApi.md +++ /dev/null @@ -1,153 +0,0 @@ -# {{classname}} - -All URIs are relative to *https://localhost/amsi/v1* - -Method | HTTP request | Description -------------- | ------------- | ------------- -[**SubByIdDELETE**](SubscriptionsApi.md#SubByIdDELETE) | **Delete** /subscriptions/{subscriptionId} | cancel the existing individual subscription -[**SubByIdGET**](SubscriptionsApi.md#SubByIdGET) | **Get** /subscriptions/{subscriptionId} | Retrieve information about this subscription. -[**SubByIdPUT**](SubscriptionsApi.md#SubByIdPUT) | **Put** /subscriptions/{subscriptionId} | update the existing individual subscription. -[**SubGET**](SubscriptionsApi.md#SubGET) | **Get** /subscriptions | Retrieve information about the subscriptions for this requestor. -[**SubPOST**](SubscriptionsApi.md#SubPOST) | **Post** /subscriptions | Create a new subscription to Application Mobility Service notifications. - -# **SubByIdDELETE** -> SubByIdDELETE(ctx, subscriptionId) -cancel the existing individual subscription - -cancel the existing individual subscription - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **subscriptionId** | **string**| Refers to created subscription, where the AMS API allocates a unique resource name for this subscription | - -### Return type - - (empty response body) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **SubByIdGET** -> Body SubByIdGET(ctx, subscriptionId) -Retrieve information about this subscription. - -Retrieve information about this subscription. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **subscriptionId** | **string**| Refers to created subscription, where the AMS API allocates a unique resource name for this subscription | - -### Return type - -[**Body**](body.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **SubByIdPUT** -> Body1 SubByIdPUT(ctx, body, subscriptionId) -update the existing individual subscription. - -update the existing individual subscription. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**Body1**](Body1.md)| | - **subscriptionId** | **string**| Refers to created subscription, where the AMS API allocates a unique resource name for this subscription | - -### Return type - -[**Body1**](body_1.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **SubGET** -> SubscriptionLinkList SubGET(ctx, subscriptionType) -Retrieve information about the subscriptions for this requestor. - -Retrieve information about the subscriptions for this requestor. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **subscriptionType** | **string**| Query parameter to filter on a specific subscription type. Permitted values: mobility_proc or adj_app_info | - -### Return type - -[**SubscriptionLinkList**](SubscriptionLinkList.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **SubPOST** -> Body SubPOST(ctx, body) -Create a new subscription to Application Mobility Service notifications. - -Create a new subscription to Application Mobility Service notifications. - -### Required Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**Body**](Body.md)| | - -### Return type - -[**Body**](body.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - diff --git a/go-packages/meep-ams-client/docs/TimeStamp.md b/go-packages/meep-ams-client/docs/TimeStamp.md index b13c4a15d..427357626 100644 --- a/go-packages/meep-ams-client/docs/TimeStamp.md +++ b/go-packages/meep-ams-client/docs/TimeStamp.md @@ -3,8 +3,9 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Seconds** | **int32** | 'The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.' | [default to null] -**NanoSeconds** | **int32** | 'The nanoseconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.' | [default to null] +**Seconds** | **int32** | 'The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.' | [default to null] +**NanoSeconds** | **int32** | 'The nanoseconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.' | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/docs/UnsupportedApi.md b/go-packages/meep-ams-client/docs/UnsupportedApi.md index ff6292b39..e59bde151 100644 --- a/go-packages/meep-ams-client/docs/UnsupportedApi.md +++ b/go-packages/meep-ams-client/docs/UnsupportedApi.md @@ -1,11 +1,13 @@ -# {{classname}} +# \UnsupportedApi -All URIs are relative to *https://localhost/amsi/v1* +All URIs are relative to *https://localhost/sandboxname/amsi/v1* Method | HTTP request | Description ------------- | ------------- | ------------- [**AdjAppInstGET**](UnsupportedApi.md#AdjAppInstGET) | **Get** /queries/adjacent_app_instances | Retrieve information about this subscription. [**AppMobilityServiceDerPOST**](UnsupportedApi.md#AppMobilityServiceDerPOST) | **Post** /app_mobility_services/{appMobilityServiceId}/deregister_task | deregister the individual application mobility service +[**NotificationPOST**](UnsupportedApi.md#NotificationPOST) | **Post** /uri_provided_by_subscriber | delivers a notification from the AMS resource to the subscriber + # **AdjAppInstGET** > []AdjacentAppInstanceInfo AdjAppInstGET(ctx, optional) @@ -18,10 +20,11 @@ Retrieve information about this subscription. Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***UnsupportedApiAdjAppInstGETOpts** | optional parameters | nil if no parameters + **optional** | ***AdjAppInstGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a UnsupportedApiAdjAppInstGETOpts struct +Optional parameters are passed through a pointer to a AdjAppInstGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **filter** | **optional.String**| Attribute-based filtering parameters according to ETSI GS MEC 009 | @@ -73,3 +76,31 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **NotificationPOST** +> NotificationPOST(ctx, body) +delivers a notification from the AMS resource to the subscriber + +delivers a notification from the AMS resource to the subscriber + +### Required Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **body** | [**InlineNotification**](InlineNotification.md)| | + +### Return type + + (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + diff --git a/go-packages/meep-ams-client/go.sum b/go-packages/meep-ams-client/go.sum index ff21fb236..a8f1d5d87 100644 --- a/go-packages/meep-ams-client/go.sum +++ b/go-packages/meep-ams-client/go.sum @@ -3,13 +3,18 @@ github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20211012135 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20211012135439-29644864b026/go.mod h1:Xy2Z6nc9m0DRQRj9g0+/4E6OkDlCkFYySa65JoQ2d8g= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -18,9 +23,11 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/go-packages/meep-ams-client/model_adjacent_app_info_notification.go b/go-packages/meep-ams-client/model_adjacent_app_info_notification.go index c416e07bc..950d61b94 100644 --- a/go-packages/meep-ams-client/model_adjacent_app_info_notification.go +++ b/go-packages/meep-ams-client/model_adjacent_app_info_notification.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type AdjacentAppInfoNotification struct { @@ -16,5 +31,5 @@ type AdjacentAppInfoNotification struct { // 1 to N identifiers to associate the information for specific AssociateId []AssociateId `json:"associateId,omitempty"` AdjacentAppInfo []AdjacentAppInfoNotificationAdjacentAppInfo `json:"adjacentAppInfo,omitempty"` - Links *MobilityProcedureNotificationLinks `json:"_links"` + Links *Link `json:"_links"` } diff --git a/go-packages/meep-ams-client/model_adjacent_app_info_notification_adjacent_app_info.go b/go-packages/meep-ams-client/model_adjacent_app_info_notification_adjacent_app_info.go index 3f23521be..5622441e4 100644 --- a/go-packages/meep-ams-client/model_adjacent_app_info_notification_adjacent_app_info.go +++ b/go-packages/meep-ams-client/model_adjacent_app_info_notification_adjacent_app_info.go @@ -1,17 +1,32 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type AdjacentAppInfoNotificationAdjacentAppInfo struct { // Identifier of the adjacent application instance. AppInstanceId string `json:"appInstanceId"` // If present, it represents the communication interface(s) information of the application instance. - CommInterface []CommunicationInterface `json:"commInterface,omitempty"` + CommInterface []CommunicationInterface `json:"commInterface"` } diff --git a/go-packages/meep-ams-client/model_adjacent_app_info_subscription.go b/go-packages/meep-ams-client/model_adjacent_app_info_subscription.go index f24b5dc69..ff8372d94 100644 --- a/go-packages/meep-ams-client/model_adjacent_app_info_subscription.go +++ b/go-packages/meep-ams-client/model_adjacent_app_info_subscription.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type AdjacentAppInfoSubscription struct { @@ -18,6 +33,5 @@ type AdjacentAppInfoSubscription struct { WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteria *AdjacentAppInfoSubscriptionFilterCriteria `json:"filterCriteria"` - // Shall be set to \"AdjacentAppInfoSubscription\". - SubscriptionType string `json:"subscriptionType"` + SubscriptionType *SubscriptionType `json:"subscriptionType"` } diff --git a/go-packages/meep-ams-client/model_adjacent_app_info_subscription_filter_criteria.go b/go-packages/meep-ams-client/model_adjacent_app_info_subscription_filter_criteria.go index 7ef02d005..bfb4ac2d6 100644 --- a/go-packages/meep-ams-client/model_adjacent_app_info_subscription_filter_criteria.go +++ b/go-packages/meep-ams-client/model_adjacent_app_info_subscription_filter_criteria.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. diff --git a/go-packages/meep-ams-client/model_adjacent_app_info_subscription_links.go b/go-packages/meep-ams-client/model_adjacent_app_info_subscription_links.go index e6d36ebbd..974dba927 100644 --- a/go-packages/meep-ams-client/model_adjacent_app_info_subscription_links.go +++ b/go-packages/meep-ams-client/model_adjacent_app_info_subscription_links.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. diff --git a/go-packages/meep-ams-client/model_adjacent_app_instance_info.go b/go-packages/meep-ams-client/model_adjacent_app_instance_info.go index cdfb1bfd5..3f6c34fad 100644 --- a/go-packages/meep-ams-client/model_adjacent_app_instance_info.go +++ b/go-packages/meep-ams-client/model_adjacent_app_instance_info.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type AdjacentAppInstanceInfo struct { diff --git a/go-packages/meep-ams-client/model_app_mobility_service_level.go b/go-packages/meep-ams-client/model_app_mobility_service_level.go index 56ee16a3f..2d9f19361 100644 --- a/go-packages/meep-ams-client/model_app_mobility_service_level.go +++ b/go-packages/meep-ams-client/model_app_mobility_service_level.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // AppMobilityServiceLevel : This attribute provides an option for the application instance (server) to communicate with the application client before relocating this application instance to another MEC host. @@ -14,7 +29,7 @@ type AppMobilityServiceLevel string // List of AppMobilityServiceLevel const ( - NOT_ALLOWED AppMobilityServiceLevel = "APP_MOBILITY_NOT_ALLOWED" - WITH_CONFIRMATION AppMobilityServiceLevel = "APP_MOBILITY_WITH_CONFIRMATION" - WITHOUT_CONFIRMATION AppMobilityServiceLevel = "APP_MOBILITY_WITHOUT_CONFIRMATION" + NOT_ALLOWED_AppMobilityServiceLevel AppMobilityServiceLevel = "APP_MOBILITY_NOT_ALLOWED" + WITH_CONFIRMATION_AppMobilityServiceLevel AppMobilityServiceLevel = "APP_MOBILITY_WITH_CONFIRMATION" + WITHOUT_CONFIRMATION_AppMobilityServiceLevel AppMobilityServiceLevel = "APP_MOBILITY_WITHOUT_CONFIRMATION" ) diff --git a/go-packages/meep-ams-client/model_app_termination_notification.go b/go-packages/meep-ams-client/model_app_termination_notification.go index 2840c92f1..067d5920b 100644 --- a/go-packages/meep-ams-client/model_app_termination_notification.go +++ b/go-packages/meep-ams-client/model_app_termination_notification.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // This type represents the information that the MEC platform notifies the subscribed application instance about the corresponding application instance termination/stop. diff --git a/go-packages/meep-ams-client/model_app_termination_notification__links.go b/go-packages/meep-ams-client/model_app_termination_notification__links.go index b46ce3ea3..8036270fd 100644 --- a/go-packages/meep-ams-client/model_app_termination_notification__links.go +++ b/go-packages/meep-ams-client/model_app_termination_notification__links.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type AppTerminationNotificationLinks struct { diff --git a/go-packages/meep-ams-client/model_associate_id.go b/go-packages/meep-ams-client/model_associate_id.go index 607df129b..cdfe9b935 100644 --- a/go-packages/meep-ams-client/model_associate_id.go +++ b/go-packages/meep-ams-client/model_associate_id.go @@ -1,16 +1,31 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type AssociateId struct { - Type_ *ModelType `json:"type"` + Type_ *AssociateIdType `json:"type,omitempty"` // Value for the identifier. - Value string `json:"value"` + Value string `json:"value,omitempty"` } diff --git a/go-packages/meep-ams-client/model_associate_id_type.go b/go-packages/meep-ams-client/model_associate_id_type.go new file mode 100644 index 000000000..706df5a41 --- /dev/null +++ b/go-packages/meep-ams-client/model_associate_id_type.go @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// AssociateIdType : Numeric value (0-255) corresponding to specified type of identifier +type AssociateIdType string + +// List of AssociateIdType +const ( + UE_I_PV4_ADDRESS_AssociateIdType AssociateIdType = "UE_IPv4_ADDRESS" + UE_IPV6_ADDRESS_AssociateIdType AssociateIdType = "UE_IPV6_ADDRESS" + NATED_IP_ADDRESS_AssociateIdType AssociateIdType = "NATED_IP_ADDRESS" + GTP_TEID_AssociateIdType AssociateIdType = "GTP_TEID" +) diff --git a/go-packages/meep-ams-client/model_communication_interface.go b/go-packages/meep-ams-client/model_communication_interface.go index 7577d520b..d4ff11610 100644 --- a/go-packages/meep-ams-client/model_communication_interface.go +++ b/go-packages/meep-ams-client/model_communication_interface.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type CommunicationInterface struct { diff --git a/go-packages/meep-ams-client/model_communication_interface_ip_addresses.go b/go-packages/meep-ams-client/model_communication_interface_ip_addresses.go index 487e8622a..78a84e8b3 100644 --- a/go-packages/meep-ams-client/model_communication_interface_ip_addresses.go +++ b/go-packages/meep-ams-client/model_communication_interface_ip_addresses.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type CommunicationInterfaceIpAddresses struct { diff --git a/go-packages/meep-ams-client/model_context_transfer_state.go b/go-packages/meep-ams-client/model_context_transfer_state.go index 9efdec319..835e56d03 100644 --- a/go-packages/meep-ams-client/model_context_transfer_state.go +++ b/go-packages/meep-ams-client/model_context_transfer_state.go @@ -1,19 +1,34 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // ContextTransferState : If present, it represents the state of transferring the user context to another application instance. -type ContextTransferState string // STF 625: Change contextTransferState into ContextTransferState +type ContextTransferState string -// List of contextTransferState +// List of ContextTransferState const ( - NOT_TRANSFERRED ContextTransferState = "NOT_TRANSFERRED" - USER_CONTEXT_TRANSFER_COMPLETED ContextTransferState = "USER_CONTEXT_TRANSFER_COMPLETED" + NOT_TRANSFERRED_ContextTransferState ContextTransferState = "NOT_TRANSFERRED" + USER_CONTEXT_TRANSFER_COMPLETED_ContextTransferState ContextTransferState = "USER_CONTEXT_TRANSFER_COMPLETED" ) diff --git a/go-packages/meep-ams-client/model_expiry_notification.go b/go-packages/meep-ams-client/model_expiry_notification.go index 21960795a..a94072d81 100644 --- a/go-packages/meep-ams-client/model_expiry_notification.go +++ b/go-packages/meep-ams-client/model_expiry_notification.go @@ -1,18 +1,33 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ExpiryNotification struct { // Shall be set to \"ExpiryNotification\". - NotificationType string `json:"notificationType"` - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` - Links *MobilityProcedureNotificationLinks `json:"_links"` - ExpiryDeadline *TimeStamp `json:"expiryDeadline"` + NotificationType string `json:"notificationType"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + Links *Link `json:"_links"` + ExpiryDeadline *TimeStamp `json:"expiryDeadline"` } diff --git a/go-apps/meep-ams/server/model_body_2.go b/go-packages/meep-ams-client/model_inline_notification.go similarity index 71% rename from go-apps/meep-ams/server/model_body_2.go rename to go-packages/meep-ams-client/model_inline_notification.go index ccd002bce..0b5ebb9c2 100644 --- a/go-apps/meep-ams/server/model_body_2.go +++ b/go-packages/meep-ams-client/model_inline_notification.go @@ -1,28 +1,29 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports all of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ -package server -type Body2 struct { - // Not used in server +package client + +type InlineNotification struct { + // Not used in client } diff --git a/go-packages/meep-ams-client/model_InlineSubscription.go b/go-packages/meep-ams-client/model_inline_subscription.go similarity index 87% rename from go-packages/meep-ams-client/model_InlineSubscription.go rename to go-packages/meep-ams-client/model_inline_subscription.go index e6aaff103..b149533b0 100644 --- a/go-packages/meep-ams-client/model_InlineSubscription.go +++ b/go-packages/meep-ams-client/model_inline_subscription.go @@ -1,21 +1,21 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 * Contact: AdvantEDGE@InterDigital.com diff --git a/go-packages/meep-ams-client/model_link.go b/go-packages/meep-ams-client/model_link.go new file mode 100644 index 000000000..db0e89a57 --- /dev/null +++ b/go-packages/meep-ams-client/model_link.go @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// Object containing hyperlinks related to the resource. +type Link struct { + Subscription *LinkType `json:"subscription"` +} diff --git a/go-packages/meep-ams-client/model_link_type.go b/go-packages/meep-ams-client/model_link_type.go index 8eb0cf548..0e739af3f 100644 --- a/go-packages/meep-ams-client/model_link_type.go +++ b/go-packages/meep-ams-client/model_link_type.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // 'This data type represents a type of link' diff --git a/go-packages/meep-ams-client/model_mec_host_information.go b/go-packages/meep-ams-client/model_mec_host_information.go index 506f1e424..94166fbcc 100644 --- a/go-packages/meep-ams-client/model_mec_host_information.go +++ b/go-packages/meep-ams-client/model_mec_host_information.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type MecHostInformation struct { diff --git a/go-packages/meep-ams-client/model_mobility_procedure_notification.go b/go-packages/meep-ams-client/model_mobility_procedure_notification.go index 56e49c989..7d3edacd5 100644 --- a/go-packages/meep-ams-client/model_mobility_procedure_notification.go +++ b/go-packages/meep-ams-client/model_mobility_procedure_notification.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type MobilityProcedureNotification struct { @@ -17,5 +32,5 @@ type MobilityProcedureNotification struct { AssociateId []AssociateId `json:"associateId"` MobilityStatus *MobilityStatus `json:"mobilityStatus"` TargetAppInfo *MobilityProcedureNotificationTargetAppInfo `json:"targetAppInfo,omitempty"` - Links *MobilityProcedureNotificationLinks `json:"_links,omitempty"` + Links *Link `json:"_links"` } diff --git a/go-packages/meep-ams-client/model_mobility_procedure_notification__links.go b/go-packages/meep-ams-client/model_mobility_procedure_notification__links.go deleted file mode 100644 index d91a0aef3..000000000 --- a/go-packages/meep-ams-client/model_mobility_procedure_notification__links.go +++ /dev/null @@ -1,15 +0,0 @@ -/* - * ETSI GS MEC 021 Application Mobility Service API - * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. - * - * API version: 2.2.1 - * Contact: cti_support@etsi.org - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ -package client - -// Object containing hyperlinks related to the resource. -type MobilityProcedureNotificationLinks struct { - Subscription *LinkType `json:"subscription"` -} diff --git a/go-packages/meep-ams-client/model_mobility_procedure_notification_target_app_info.go b/go-packages/meep-ams-client/model_mobility_procedure_notification_target_app_info.go index 02b7447f2..a77e40693 100644 --- a/go-packages/meep-ams-client/model_mobility_procedure_notification_target_app_info.go +++ b/go-packages/meep-ams-client/model_mobility_procedure_notification_target_app_info.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type MobilityProcedureNotificationTargetAppInfo struct { diff --git a/go-packages/meep-ams-client/model_mobility_procedure_subscription.go b/go-packages/meep-ams-client/model_mobility_procedure_subscription.go index 85dabba2c..1304d4c5d 100644 --- a/go-packages/meep-ams-client/model_mobility_procedure_subscription.go +++ b/go-packages/meep-ams-client/model_mobility_procedure_subscription.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type MobilityProcedureSubscription struct { @@ -18,6 +33,5 @@ type MobilityProcedureSubscription struct { WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` FilterCriteria *MobilityProcedureSubscriptionFilterCriteria `json:"filterCriteria"` - // Shall be set to \"MobilityProcedureSubscription\". - SubscriptionType string `json:"subscriptionType"` + SubscriptionType *SubscriptionType `json:"subscriptionType"` } diff --git a/go-packages/meep-ams-client/model_mobility_procedure_subscription_filter_criteria.go b/go-packages/meep-ams-client/model_mobility_procedure_subscription_filter_criteria.go index 5b9030420..ad697fbce 100644 --- a/go-packages/meep-ams-client/model_mobility_procedure_subscription_filter_criteria.go +++ b/go-packages/meep-ams-client/model_mobility_procedure_subscription_filter_criteria.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. diff --git a/go-packages/meep-ams-client/model_mobility_procedure_subscription_links.go b/go-packages/meep-ams-client/model_mobility_procedure_subscription_links.go index 6ae2e34e5..2316020fb 100644 --- a/go-packages/meep-ams-client/model_mobility_procedure_subscription_links.go +++ b/go-packages/meep-ams-client/model_mobility_procedure_subscription_links.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type MobilityProcedureSubscriptionLinks struct { diff --git a/go-packages/meep-ams-client/model_mobility_status.go b/go-packages/meep-ams-client/model_mobility_status.go index a2dab5bb2..5913ac7b8 100644 --- a/go-packages/meep-ams-client/model_mobility_status.go +++ b/go-packages/meep-ams-client/model_mobility_status.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // MobilityStatus : Indicate the status of the UE mobility @@ -14,7 +29,7 @@ type MobilityStatus string // List of MobilityStatus const ( - TRIGGERED MobilityStatus = "INTERHOST_MOVEOUT_TRIGGERED" - COMPLETED MobilityStatus = "INTERHOST_MOVEOUT_COMPLETED" - FAILED MobilityStatus = "INTERHOST_MOVEOUT_FAILED" + TRIGGERED_MobilityStatus MobilityStatus = "INTERHOST_MOVEOUT_TRIGGERED" + COMPLETED_MobilityStatus MobilityStatus = "INTERHOST_MOVEOUT_COMPLETED" + FAILED_MobilityStatus MobilityStatus = "INTERHOST_MOVEOUT_FAILED" ) diff --git a/go-packages/meep-ams-client/model_one_of_inline_notification.go b/go-packages/meep-ams-client/model_one_of_inline_notification.go new file mode 100644 index 000000000..de0d20392 --- /dev/null +++ b/go-packages/meep-ams-client/model_one_of_inline_notification.go @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +type OneOfInlineNotification struct { + /* Discriminator */ + NotificationType string `json:"notificationType"` +} diff --git a/go-packages/meep-ams-client/model_one_of_inline_subscription.go b/go-packages/meep-ams-client/model_one_of_inline_subscription.go new file mode 100644 index 000000000..872686353 --- /dev/null +++ b/go-packages/meep-ams-client/model_one_of_inline_subscription.go @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +type OneOfInlineSubscription struct { + /* Discriminator */ + SubscriptionType string `json:"subscriptionType"` +} diff --git a/go-packages/meep-ams-client/model_operation_action_type.go b/go-packages/meep-ams-client/model_operation_action_type.go index 04f14f1bb..a37a3b147 100644 --- a/go-packages/meep-ams-client/model_operation_action_type.go +++ b/go-packages/meep-ams-client/model_operation_action_type.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // OperationActionType : Operation that is being performed on the MEC application instance. diff --git a/go-packages/meep-ams-client/model_problem_details.go b/go-packages/meep-ams-client/model_problem_details.go index bf318eebf..15c84a525 100644 --- a/go-packages/meep-ams-client/model_problem_details.go +++ b/go-packages/meep-ams-client/model_problem_details.go @@ -1,21 +1,36 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProblemDetails struct { // A human-readable explanation specific to this occurrence of the problem - Detail string `json:"detail"` + Detail string `json:"detail,omitempty"` // A URI reference that identifies the specific occurrence of the problem Instance string `json:"instance,omitempty"` // The HTTP status code for this occurrence of the problem - Status int32 `json:"status"` + Status int32 `json:"status,omitempty"` // A short, human-readable summary of the problem type Title string `json:"title,omitempty"` // A URI reference according to IETF RFC 3986 that identifies the problem type diff --git a/go-packages/meep-ams-client/model_registration_info.go b/go-packages/meep-ams-client/model_registration_info.go index aeb1530fb..988281db2 100644 --- a/go-packages/meep-ams-client/model_registration_info.go +++ b/go-packages/meep-ams-client/model_registration_info.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type RegistrationInfo struct { diff --git a/go-packages/meep-ams-client/model_registration_info_device_information.go b/go-packages/meep-ams-client/model_registration_info_device_information.go index 53081aff6..5d572c56f 100644 --- a/go-packages/meep-ams-client/model_registration_info_device_information.go +++ b/go-packages/meep-ams-client/model_registration_info_device_information.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type RegistrationInfoDeviceInformation struct { diff --git a/go-packages/meep-ams-client/model_registration_info_service_consumer_id.go b/go-packages/meep-ams-client/model_registration_info_service_consumer_id.go index d49c8627c..c44b9ffe7 100644 --- a/go-packages/meep-ams-client/model_registration_info_service_consumer_id.go +++ b/go-packages/meep-ams-client/model_registration_info_service_consumer_id.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // The identifier of service consumer requesting the application mobility service, i.e. either the application instance ID or the MEC platform ID. diff --git a/go-packages/meep-ams-client/model_subscription_link_list.go b/go-packages/meep-ams-client/model_subscription_link_list.go index 3af457518..012692924 100644 --- a/go-packages/meep-ams-client/model_subscription_link_list.go +++ b/go-packages/meep-ams-client/model_subscription_link_list.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type SubscriptionLinkList struct { diff --git a/go-packages/meep-ams-client/model_subscription_link_list_links.go b/go-packages/meep-ams-client/model_subscription_link_list_links.go index 4a80c93b0..d19725fc0 100644 --- a/go-packages/meep-ams-client/model_subscription_link_list_links.go +++ b/go-packages/meep-ams-client/model_subscription_link_list_links.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of hyperlinks related to the resource. diff --git a/go-packages/meep-ams-client/model_subscription_link_list_subscription.go b/go-packages/meep-ams-client/model_subscription_link_list_subscription.go index 0934697f9..12286179f 100644 --- a/go-packages/meep-ams-client/model_subscription_link_list_subscription.go +++ b/go-packages/meep-ams-client/model_subscription_link_list_subscription.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type SubscriptionLinkListSubscription struct { diff --git a/go-packages/meep-ams-client/model_subscription_type.go b/go-packages/meep-ams-client/model_subscription_type.go index f6f2c1715..71e361249 100644 --- a/go-packages/meep-ams-client/model_subscription_type.go +++ b/go-packages/meep-ams-client/model_subscription_type.go @@ -1,21 +1,33 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client -// SubscriptionType : Numeric value (0 - 255) corresponding to specified type of subscription as following: 0 = RESERVED. 1 = MOBILITY_PROCEDURE. 2 = ADJACENT_APPINFO. -type SubscriptionType string // STF 625: Change subscriptionType into SubscriptionType -// STF 625: Change int32 into string +type SubscriptionType string -// List of subscriptionType -const ( // STF 625: Rename const names - SubscriptionType_RESERVED SubscriptionType = "0" - SubscriptionType_MOBILITY_PROCEDURE_ SubscriptionType = "1" - SubscriptionType_ADJACENT_APPINFO SubscriptionType = "2" +// List of SubscriptionType +const ( + MOBILITY_PROCEDURE_SUBSCRIPTION_SubscriptionType SubscriptionType = "MobilityProcedureSubscription" + ADJACENT_APP_INFO_SUBSCRIPTION_SubscriptionType SubscriptionType = "AdjacentAppInfoSubscription" ) diff --git a/go-packages/meep-ams-client/model_test_notification.go b/go-packages/meep-ams-client/model_test_notification.go new file mode 100644 index 000000000..d1b0528db --- /dev/null +++ b/go-packages/meep-ams-client/model_test_notification.go @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +type TestNotification struct { + // Shall be set to \"TestNotification\". + NotificationType string `json:"notificationType"` + Links *TestNotificationLinks `json:"_links"` +} diff --git a/go-packages/meep-ams-client/model_test_notification__links.go b/go-packages/meep-ams-client/model_test_notification__links.go new file mode 100644 index 000000000..e33b297ef --- /dev/null +++ b/go-packages/meep-ams-client/model_test_notification__links.go @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// Hyperlink related to the resource. +type TestNotificationLinks struct { + Subscription *LinkType `json:"subscription"` +} diff --git a/go-packages/meep-ams-client/model_time_stamp.go b/go-packages/meep-ams-client/model_time_stamp.go index 8a45c1992..c282069dd 100644 --- a/go-packages/meep-ams-client/model_time_stamp.go +++ b/go-packages/meep-ams-client/model_time_stamp.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // 'This data type represents the time stamp as Unix-time since January 1, 1970, 00:00:00 UTC' diff --git a/go-packages/meep-ams-client/model_type.go b/go-packages/meep-ams-client/model_type.go deleted file mode 100644 index bea934b7c..000000000 --- a/go-packages/meep-ams-client/model_type.go +++ /dev/null @@ -1,21 +0,0 @@ -/* - * ETSI GS MEC 021 Application Mobility Service API - * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. - * - * API version: 2.2.1 - * Contact: cti_support@etsi.org - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ -package client - -// ModelType : Numeric value (0-255) corresponding to specified type of identifier -type ModelType string // Stf 625: Change Type into ModelType - -// List of Type -const ( - UE_I_PV4_ADDRESS ModelType = "UE_IPv4_ADDRESS" - UE_IPV6_ADDRESS ModelType = "UE_IPV6_ADDRESS" - NATED_IP_ADDRESS ModelType = "NATED_IP_ADDRESS" - GTP_TEID ModelType = "GTP_TEID" -) diff --git a/go-packages/meep-ams-client/model_websock_notif_config.go b/go-packages/meep-ams-client/model_websock_notif_config.go index eb5b97af8..ba1e3d053 100644 --- a/go-packages/meep-ams-client/model_websock_notif_config.go +++ b/go-packages/meep-ams-client/model_websock_notif_config.go @@ -1,12 +1,27 @@ /* - * ETSI GS MEC 021 Application Mobility Service API + * Copyright (c) 2022 The AdvantEDGE Authors * - * ETSI GS MEC 021 Application Mobility Service API described using OpenAPI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Application Mobility API + * + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type WebsockNotifConfig struct { diff --git a/go-packages/meep-ams-client/response.go b/go-packages/meep-ams-client/response.go index 31892a3af..6d6991a06 100644 --- a/go-packages/meep-ams-client/response.go +++ b/go-packages/meep-ams-client/response.go @@ -1,21 +1,21 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * * AdvantEDGE Application Mobility API * - * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.01.01_60/gs_MEC021v020101p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). + * Application Mobility Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC021 Application Mobility API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_MEC021v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-ams](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-ams)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about application mobility in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Mobility API endpoints (see below). * * API version: 2.2.1 * Contact: AdvantEDGE@InterDigital.com diff --git a/go-packages/meep-app-support-client/README.md b/go-packages/meep-app-support-client/README.md index 04c7be8b5..c9f154645 100644 --- a/go-packages/meep-app-support-client/README.md +++ b/go-packages/meep-app-support-client/README.md @@ -44,23 +44,34 @@ Class | Method | HTTP request | Description - [AppTerminationNotification](docs/AppTerminationNotification.md) - [AppTerminationNotificationLinks](docs/AppTerminationNotificationLinks.md) - [AppTerminationNotificationSubscription](docs/AppTerminationNotificationSubscription.md) - - [AppTerminationNotificationSubscriptionLinks](docs/AppTerminationNotificationSubscriptionLinks.md) - [CurrentTime](docs/CurrentTime.md) - [DestinationInterface](docs/DestinationInterface.md) + - [DestinationInterfaceInterfaceType](docs/DestinationInterfaceInterfaceType.md) - [DnsRule](docs/DnsRule.md) + - [DnsRuleIpAddressType](docs/DnsRuleIpAddressType.md) + - [DnsRuleState](docs/DnsRuleState.md) - [LinkType](docs/LinkType.md) - - [OperationActionType](docs/OperationActionType.md) - - [ProblemDetails](docs/ProblemDetails.md) + - [LinkTypeConfirmTermination](docs/LinkTypeConfirmTermination.md) - [MecAppSuptApiSubscriptionLinkList](docs/MecAppSuptApiSubscriptionLinkList.md) - [MecAppSuptApiSubscriptionLinkListLinks](docs/MecAppSuptApiSubscriptionLinkListLinks.md) - - [MecAppSuptApiSubscriptionLinkListLinksSubscriptions](docs/MecAppSuptApiSubscriptionLinkListLinksSubscriptions.md) + - [MecAppSuptApiSubscriptionLinkListSubscription](docs/MecAppSuptApiSubscriptionLinkListSubscription.md) + - [OperationActionType](docs/OperationActionType.md) + - [ProblemDetails](docs/ProblemDetails.md) + - [Self](docs/Self.md) + - [TimeSourceStatus](docs/TimeSourceStatus.md) - [TimingCaps](docs/TimingCaps.md) - [TimingCapsNtpServers](docs/TimingCapsNtpServers.md) + - [TimingCapsNtpServersAuthenticationOption](docs/TimingCapsNtpServersAuthenticationOption.md) + - [TimingCapsNtpServersNtpServerAddrType](docs/TimingCapsNtpServersNtpServerAddrType.md) - [TimingCapsPtpMasters](docs/TimingCapsPtpMasters.md) - [TimingCapsTimeStamp](docs/TimingCapsTimeStamp.md) - [TrafficFilter](docs/TrafficFilter.md) - [TrafficRule](docs/TrafficRule.md) + - [TrafficRuleAction](docs/TrafficRuleAction.md) + - [TrafficRuleFilterType](docs/TrafficRuleFilterType.md) + - [TrafficRuleState](docs/TrafficRuleState.md) - [TunnelInfo](docs/TunnelInfo.md) + - [TunnelInfoTunnelType](docs/TunnelInfoTunnelType.md) ## Documentation For Authorization diff --git a/go-packages/meep-app-support-client/api/swagger.yaml b/go-packages/meep-app-support-client/api/swagger.yaml index 4a8fbb749..e7790b4d8 100644 --- a/go-packages/meep-app-support-client/api/swagger.yaml +++ b/go-packages/meep-app-support-client/api/swagger.yaml @@ -1,114 +1,106 @@ -openapi: 3.0.0 -servers: - - url: "https://localhost/sandboxname/mec_app_support/v1" +openapi: 3.0.2 info: title: AdvantEDGE MEC Application Support API - version: 2.2.1 - description: - "MEC Application Support Service is AdvantEDGE's implementation of - [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf) -

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) -

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support) -

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network -

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below)." - license: - name: Apache 2.0 - url: "https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE" + description: "MEC Application Support Service is AdvantEDGE's implementation of\ + \ [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)\ + \

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)\ + \

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)\ + \

    **Type & Usage**
    Edge Service used by edge applications that want to get\ + \ information about applications in the network

    **Note**
    AdvantEDGE supports\ + \ a selected subset of Application Support API endpoints (see below)." contact: name: InterDigital AdvantEDGE Support email: AdvantEDGE@InterDigital.com + license: + name: Apache 2.0 + url: https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE + version: 2.2.1 externalDocs: - description: "ETSI GS MEC011 Application Enablement API, V2.2.1" - url: >- - https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf + url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf +servers: +- url: https://localhost/sandboxname/mec_app_support/v1 security: - - {} +- {} tags: - - name: mec_app_support - - name: unsupported - - name: callbacks +- name: mec_app_support +- name: unsupported +- name: callbacks paths: /applications/{appInstanceId}/traffic_rules: get: tags: - - unsupported - description: - This method retrieves information about all the traffic rules associated + - unsupported + description: This method retrieves information about all the traffic rules associated with a MEC application instance. operationId: ApplicationsTrafficRules_GET parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: type: array example: - - trafficRuleId: TrafficRule123 - serName: ExampleService - filterType: FLOW - priority: 1 - trafficFilter: - - srcAddress: - - 192.168.2.0/24 - - 192.168.3.0/24 - dstAddress: - - 192.127.4.100/32 - dstPort: - - "80" - action: FORWARD_DECAPSULATED - dstInterface: - - dstInterface0: null - interfaceType: IP - dstIpAddress: 20.1.1.1 - - dstInterface1: null - interfaceType: IP - dstIpAddress: 20.1.1.2 - state: ACTIVE + - trafficRuleId: TrafficRule123 + serName: ExampleService + filterType: FLOW + priority: 1 + trafficFilter: + - srcAddress: + - 192.168.2.0/24 + - 192.168.3.0/24 + dstAddress: + - 192.127.4.100/32 + dstPort: + - "80" + action: FORWARD_DECAPSULATED + dstInterface: + - dstInterface0: null + interfaceType: IP + dstIpAddress: 20.1.1.1 + - dstInterface1: null + interfaceType: IP + dstIpAddress: 20.1.1.2 + state: ACTIVE items: - $ref: "#/components/schemas/TrafficRule" + $ref: '#/components/schemas/TrafficRule' x-content-type: application/json "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -116,39 +108,36 @@ paths: /applications/{appInstanceId}/traffic_rules/{trafficRuleId}: get: tags: - - unsupported - description: - This method retrieves information about all the traffic rules associated + - unsupported + description: This method retrieves information about all the traffic rules associated with a MEC application instance. operationId: ApplicationsTrafficRule_GET parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string - - name: trafficRuleId - in: path - description: Represents a traffic rule. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: trafficRuleId + in: path + description: Represents a traffic rule. + required: true + style: simple + explode: false + schema: + type: string responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: - $ref: "#/components/schemas/TrafficRule" + $ref: '#/components/schemas/TrafficRule' example: TrafficRule: value: @@ -157,93 +146,87 @@ paths: filterType: FLOW priority: 1 trafficFilter: - - srcAddress: - - 192.168.2.0/24 - - 192.168.3.0/24 - dstAddress: - - 192.127.4.100/32 - dstPort: - - "80" + - srcAddress: + - 192.168.2.0/24 + - 192.168.3.0/24 + dstAddress: + - 192.127.4.100/32 + dstPort: + - "80" action: FORWARD_DECAPSULATED dstInterface: - - dstInterface0: null - interfaceType: IP - dstIpAddress: 20.1.1.1 + - dstInterface0: null + interfaceType: IP + dstIpAddress: 20.1.1.1 state: ACTIVE "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema put: tags: - - unsupported - description: - This method retrieves information about all the traffic rules associated + - unsupported + description: This method retrieves information about all the traffic rules associated with a MEC application instance. operationId: ApplicationsTrafficRule_PUT parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string - - name: trafficRuleId - in: path - description: Represents a traffic rule. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: trafficRuleId + in: path + description: Represents a traffic rule. + required: true + style: simple + explode: false + schema: + type: string requestBody: description: One or more updated attributes that are allowed to be changed content: application/json: schema: - $ref: "#/components/schemas/TrafficRule" + $ref: '#/components/schemas/TrafficRule' required: true responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: - $ref: "#/components/schemas/TrafficRule" + $ref: '#/components/schemas/TrafficRule' example: TrafficRule: value: @@ -252,59 +235,55 @@ paths: filterType: FLOW priority: 1 trafficFilter: - - srcAddress: - - 192.168.2.0/24 - - 192.168.3.0/24 - dstAddress: - - 192.127.4.100/32 - dstPort: - - "80" + - srcAddress: + - 192.168.2.0/24 + - 192.168.3.0/24 + dstAddress: + - 192.127.4.100/32 + dstPort: + - "80" action: FORWARD_DECAPSULATED dstInterface: - - dstInterface0: null - interfaceType: IP - dstIpAddress: 20.1.1.1 + - dstInterface0: null + interfaceType: IP + dstIpAddress: 20.1.1.1 state: ACTIVE "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "412": - description: - Precondition Failed. It is used when a condition has failed - during conditional requests, e.g. when using ETags to avoid write conflicts. + description: "Precondition Failed. It is used when a condition has failed\ + \ during conditional requests, e.g. when using ETags to avoid write conflicts." content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -312,69 +291,63 @@ paths: /applications/{appInstanceId}/dns_rules: get: tags: - - unsupported - description: - This method retrieves information about all the DNS rules associated + - unsupported + description: This method retrieves information about all the DNS rules associated with a MEC application instance. operationId: ApplicationsDnsRules_GET parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: type: array example: - - dnsRuleId: DnsRule1 - domainName: www.example.com - ipAddressType: IP_V4 - ipAddress: 146.241.7.3 - ttl: 300 - state: ACTIVE + - dnsRuleId: DnsRule1 + domainName: www.example.com + ipAddressType: IP_V4 + ipAddress: 146.241.7.3 + ttl: 300 + state: ACTIVE items: - $ref: "#/components/schemas/DnsRule" + $ref: '#/components/schemas/DnsRule' x-content-type: application/json "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -382,39 +355,36 @@ paths: /applications/{appInstanceId}/dns_rules/{dnsRuleId}: get: tags: - - unsupported - description: - This method retrieves information about a DNS rule associated with + - unsupported + description: This method retrieves information about a DNS rule associated with a MEC application instance. operationId: ApplicationsDnsRule_GET parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string - - name: dnsRuleId - in: path - description: Represents a DNS rule. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: dnsRuleId + in: path + description: Represents a DNS rule. + required: true + style: simple + explode: false + schema: + type: string responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: - $ref: "#/components/schemas/DnsRule" + $ref: '#/components/schemas/DnsRule' example: DnsRule: value: @@ -425,77 +395,72 @@ paths: ttl: 300 state: ACTIVE "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema put: tags: - - unsupported - description: This method activates, de-activates or updates a traffic rule. + - unsupported + description: "This method activates, de-activates or updates a traffic rule." operationId: ApplicationsDnsRule_PUT parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string - - name: dnsRuleId - in: path - description: Represents a DNS rule. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: dnsRuleId + in: path + description: Represents a DNS rule. + required: true + style: simple + explode: false + schema: + type: string requestBody: description: The updated state is included in the entity body of the request. content: application/json: schema: - $ref: "#/components/schemas/DnsRule" + $ref: '#/components/schemas/DnsRule' required: true responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: - $ref: "#/components/schemas/DnsRule" + $ref: '#/components/schemas/DnsRule' example: DnsRule: value: @@ -506,45 +471,41 @@ paths: ttl: 300 state: ACTIVE "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "412": - description: - Precondition Failed. It is used when a condition has failed - during conditional requests, e.g. when using ETags to avoid write conflicts. + description: "Precondition Failed. It is used when a condition has failed\ + \ during conditional requests, e.g. when using ETags to avoid write conflicts." content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -552,274 +513,253 @@ paths: /applications/{appInstanceId}/subscriptions: get: tags: - - mec_app_support - description: - The GET method may be used to request information about all subscriptions - for this requestor. Upon success, the response contains entity body with all - the subscriptions for the requestor. + - mec_app_support + description: "The GET method may be used to request information about all subscriptions\ + \ for this requestor. Upon success, the response contains entity body with\ + \ all the subscriptions for the requestor." operationId: ApplicationsSubscriptions_GET parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string responses: "200": - description: - Upon success, a response body containing the list of links - to the requested subscriptions is returned. + description: "Upon success, a response body containing the list of links\ + \ to the requested subscriptions is returned." content: application/json: schema: - $ref: "#/components/schemas/MecAppSuptApiSubscriptionLinkList" + $ref: '#/components/schemas/MecAppSuptApiSubscriptionLinkList' "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema post: tags: - - mec_app_support - description: - The POST method may be used to create a new subscription. One example - use case is to create a new subscription to the MEC service availability notifications. - Upon success, the response contains entity body describing the created subscription. + - mec_app_support + description: "The POST method may be used to create a new subscription. One\ + \ example use case is to create a new subscription to the MEC service availability\ + \ notifications. Upon success, the response contains entity body describing\ + \ the created subscription." operationId: ApplicationsSubscriptions_POST parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string requestBody: - description: - Entity body in the request contains a subscription to the MEC + description: Entity body in the request contains a subscription to the MEC application termination notifications that is to be created. content: application/json: schema: - $ref: "#/components/schemas/AppTerminationNotificationSubscription" + $ref: '#/components/schemas/AppTerminationNotificationSubscription' required: true responses: "201": - description: - Entity body in the request contains a subscription to the MEC + description: Entity body in the request contains a subscription to the MEC service availability notifications that is to be created. headers: location: description: The resource URI of the created resource style: simple - schema: - type: string - format: uri + explode: false + content: + text/plain: + schema: + type: string + description: The resource URI of the created resource content: application/json: schema: - $ref: "#/components/schemas/AppTerminationNotificationSubscription" + $ref: '#/components/schemas/AppTerminationNotificationSubscription' "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema callbacks: AppTerminationNotification: - "{$request.body#/callbackUri}": + '{$request.body#/callbackUri}': post: tags: - - callbacks - description: - Represents the information that the MEP notifies the subscribed + - callbacks + description: Represents the information that the MEP notifies the subscribed application instance about the corresponding application instance termination/stop' operationId: AppTerminationNotification_POST requestBody: - $ref: "#/components/requestBodies/AppTerminationNotification" + $ref: '#/components/requestBodies/AppTerminationNotification' responses: "200": - description: - Expected responses from callback consumer, if it accepts - the callback + description: "Expected responses from callback consumer, if it accepts\ + \ the callback" /applications/{appInstanceId}/subscriptions/{subscriptionId}: get: tags: - - mec_app_support - description: - The GET method requests information about a subscription for this - requestor. Upon success, the response contains entity body with the subscription - for the requestor. + - mec_app_support + description: "The GET method requests information about a subscription for this\ + \ requestor. Upon success, the response contains entity body with the subscription\ + \ for the requestor." operationId: ApplicationsSubscription_GET parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string - - name: subscriptionId - in: path - description: Represents a subscription to the notifications from the MEC platform. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: subscriptionId + in: path + description: Represents a subscription to the notifications from the MEC platform. + required: true + style: simple + explode: false + schema: + type: string responses: "200": - description: - Upon success, a response body containing the requested subscription - is returned. + description: "Upon success, a response body containing the requested subscription\ + \ is returned." content: application/json: schema: - $ref: "#/components/schemas/AppTerminationNotificationSubscription" + $ref: '#/components/schemas/AppTerminationNotificationSubscription' "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema delete: tags: - - mec_app_support - description: - This method deletes a mecAppSuptApiSubscription. This method is + - mec_app_support + description: This method deletes a mecAppSuptApiSubscription. This method is typically used in "Unsubscribing from service availability event notifications" procedure. operationId: ApplicationsSubscription_DELETE parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string - - name: subscriptionId - in: path - description: Represents a subscription to the notifications from the MEC platform. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: subscriptionId + in: path + description: Represents a subscription to the notifications from the MEC platform. + required: true + style: simple + explode: false + schema: + type: string responses: "204": description: No Content content: {} "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -827,73 +767,67 @@ paths: /applications/{appInstanceId}/confirm_termination: post: tags: - - mec_app_support - description: - This method is used to confirm the application level termination of + - mec_app_support + description: This method is used to confirm the application level termination of an application instance. operationId: ApplicationsConfirmTermination_POST parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string requestBody: content: application/json: schema: - $ref: "#/components/schemas/AppTerminationConfirmation" - required: false + $ref: '#/components/schemas/AppTerminationConfirmation' + required: true responses: "204": description: No Content content: {} "401": - description: - Unauthorized. It is used when the client did not submit the + description: Unauthorized. It is used when the client did not submit the appropriate credentials. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "409": - description: - Conflict. The operation cannot be executed currently, due to - a conflict with the state of the resource. Typically, this is because - the application instance resource is in NOT_INSTANTIATED state. + description: "Conflict. The operation cannot be executed currently, due\ + \ to a conflict with the state of the resource. Typically, this is because\ + \ the application instance resource is in NOT_INSTANTIATED state." content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -903,7 +837,7 @@ paths: content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -911,72 +845,67 @@ paths: /applications/{appInstanceId}/confirm_ready: post: tags: - - mec_app_support - description: - "This method may be used by the MEC application instance to notify - the MEC platform that it is up and running. " + - mec_app_support + description: 'This method may be used by the MEC application instance to notify + the MEC platform that it is up and running. ' operationId: ApplicationsConfirmReady_POST parameters: - - name: appInstanceId - in: path - description: - Represents a MEC application instance. Note that the appInstanceId - is allocated by the MEC platform manager. - required: true - style: simple - explode: false - schema: - type: string + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string requestBody: content: application/json: schema: - $ref: "#/components/schemas/AppReadyConfirmation" + $ref: '#/components/schemas/AppReadyConfirmation' + required: true responses: "204": description: No Content content: {} "401": - description: - Unauthorized. It is used when the client did not submit the + description: Unauthorized. It is used when the client did not submit the appropriate credentials. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "409": - description: - Conflict. The operation cannot be executed currently, due to - a conflict with the state of the resource. Typically, this is because - the application instance resource is in NOT_INSTANTIATED state. + description: "Conflict. The operation cannot be executed currently, due\ + \ to a conflict with the state of the resource. Typically, this is because\ + \ the application instance resource is in NOT_INSTANTIATED state." content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -986,7 +915,7 @@ paths: content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -994,49 +923,44 @@ paths: /timing/timing_caps: get: tags: - - mec_app_support - description: - This method retrieves the information of the platform's timing + - mec_app_support + description: This method retrieves the information of the platform's timing capabilities which corresponds to the timing capabilities query operationId: TimingCaps_GET parameters: [] responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: - $ref: "#/components/schemas/TimingCaps" + $ref: '#/components/schemas/TimingCaps' "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -1044,49 +968,44 @@ paths: /timing/current_time: get: tags: - - mec_app_support - description: - This method retrieves the information of the platform's current + - mec_app_support + description: This method retrieves the information of the platform's current time which corresponds to the get platform time procedure operationId: TimingCurrentTime_GET parameters: [] responses: "200": - description: - It is used to indicate nonspecific success. The response body + description: It is used to indicate nonspecific success. The response body contains a representation of the resource. content: application/json: schema: - $ref: "#/components/schemas/CurrentTime" + $ref: '#/components/schemas/CurrentTime' "400": - description: - Bad Request. It is used to indicate that incorrect parameters + description: Bad Request. It is used to indicate that incorrect parameters were passed to the request. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object description: Empty schema "403": - description: - Forbidden. The operation is not allowed given the current status + description: Forbidden. The operation is not allowed given the current status of the resource. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' "404": - description: - Not Found. It is used when a client provided a URI that cannot + description: Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI. content: application/problem+json: schema: - $ref: "#/components/schemas/ProblemDetails" + $ref: '#/components/schemas/ProblemDetails' text/plain: schema: type: object @@ -1096,228 +1015,216 @@ components: AppReadyConfirmation: title: AppReadyConfirmation required: - - indication + - indication type: object properties: indication: type: string - enum: - - READY description: Indication about the MEC application instance. - description: - This type represents the information that the MEC application instance + description: This type represents the information that the MEC application instance indicates to the MEC platform that it is up and running. AppTerminationConfirmation: title: AppTerminationConfirmation required: - - operationAction + - operationAction type: object properties: operationAction: - $ref: "#/components/schemas/OperationActionType" - description: - This type represents the information that the MEC application instance - provides to the MEC platform when informing it that the application has completed - its application level related terminate/stop actions, e.g. retention of application - state in the case of stop. - AppTerminationNotification.Links: - title: AppTerminationNotification.Links + $ref: '#/components/schemas/OperationActionType' + description: "This type represents the information that the MEC application\ + \ instance provides to the MEC platform when informing it that the application\ + \ has completed its application level related terminate/stop actions, e.g.\ + \ retention of application state in the case of stop." + AppTerminationNotificationLinks: + title: AppTerminationNotificationLinks required: - - subscription + - subscription type: object properties: subscription: - $ref: "#/components/schemas/LinkType" + $ref: '#/components/schemas/LinkType' confirmTermination: - $ref: "#/components/schemas/LinkType" + $ref: '#/components/schemas/LinkTypeConfirmTermination' description: Object containing hyperlinks related to the resource. AppTerminationNotification: title: AppTerminationNotification required: - - _links - - maxGracefulTimeout - - notificationType - - operationAction + - _links + - maxGracefulTimeout + - notificationType + - operationAction type: object properties: notificationType: type: string description: Shall be set to AppTerminationNotification. - example: '["AppTerminationNotification"]' + example: "[\"AppTerminationNotification\"]" operationAction: - $ref: "#/components/schemas/OperationActionType" + $ref: '#/components/schemas/OperationActionType' maxGracefulTimeout: type: integer - description: - Maximum timeout value in seconds for graceful termination or + description: Maximum timeout value in seconds for graceful termination or graceful stop of an application instance. _links: - $ref: "#/components/schemas/AppTerminationNotification.Links" - description: - This type represents the information that the MEC platform notifies + $ref: '#/components/schemas/AppTerminationNotificationLinks' + description: This type represents the information that the MEC platform notifies the subscribed application instance about the corresponding application instance termination/stop. AppTerminationNotificationSubscription: title: AppTerminationNotificationSubscription required: - - _links - - appInstanceId - - callbackReference - - subscriptionType + - _links + - appInstanceId + - callbackReference + - subscriptionType type: object properties: subscriptionType: type: string description: Shall be set to AppTerminationNotificationSubscription. - example: '["AppTerminationNotificationSubscription"]' + example: "[\"AppTerminationNotificationSubscription\"]" callbackReference: type: string - description: - URI selected by the MEC application instance to receive notifications + description: URI selected by the MEC application instance to receive notifications on the subscribed MEC application instance management information. This shall be included in both the request and the response. _links: - $ref: "#/components/schemas/Self" + $ref: '#/components/schemas/Self' appInstanceId: type: string description: It is used as the filtering criterion for the subscribed events. - example: '["ID1"]' - description: - This type represents the information that the MEC platform notifies + example: "[\"ID1\"]" + description: This type represents the information that the MEC platform notifies the subscribed application instance about the corresponding application instance termination/stop. example: - appInstanceId: '["ID1"]' - subscriptionType: '["AppTerminationNotificationSubscription"]' + appInstanceId: "[\"ID1\"]" + subscriptionType: "[\"AppTerminationNotificationSubscription\"]" _links: self: - href: '["/mecAppSuptApi/example"]' + href: "[\"/mecAppSuptApi/example\"]" callbackReference: callbackReference CurrentTime: title: CurrentTime required: - - nanoSeconds - - seconds - - timeSourceStatus + - nanoSeconds + - seconds + - timeSourceStatus type: object properties: seconds: type: integer - description: - The seconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC + description: "The seconds part of the time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC" nanoSeconds: type: integer - description: - The nanoseconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC + description: "The nanoseconds part of the time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC" timeSourceStatus: - $ref: "#/components/schemas/TimeSourceStatus" - description: - This type represents the information provided by the MEC platform + $ref: '#/components/schemas/TimeSourceStatus' + description: This type represents the information provided by the MEC platform in response to the Get Platform Time Request message. example: seconds: 0 nanoSeconds: 6 - timeSourceStatus: '["TRACEABLE"]' - DestinationInterface.InterfaceType: - title: DestinationInterface.InterfaceType + timeSourceStatus: "[\"TRACEABLE\"]" + DestinationInterfaceInterfaceType: + title: DestinationInterfaceInterfaceType type: string description: Type of the interface - example: '["TUNNEL"]' + example: "[\"TUNNEL\"]" enum: - - TUNNEL - - MAC - - IP + - TUNNEL + - MAC + - IP DestinationInterface: title: DestinationInterface required: - - interfaceType + - interfaceType type: object properties: interfaceType: - $ref: "#/components/schemas/DestinationInterface.InterfaceType" + $ref: '#/components/schemas/DestinationInterfaceInterfaceType' tunnelInfo: - $ref: "#/components/schemas/TunnelInfo" + $ref: '#/components/schemas/TunnelInfo' srcMacAddress: type: string description: Source address identifies the MAC address of the interface - example: '["02-00-00-00-00-00"]' + example: "[\"02-00-00-00-00-00\"]" dstMacAddress: type: string description: Source address identifies the MAC address of the interface - example: '["02-00-00-00-00-00"]' + example: "[\"02-00-00-00-00-00\"]" dstIpAddress: type: string description: IP address of the remote destination - example: '["192.0.2.0"]' - description: - This type represents the destination interface. If the action is - FORWARD_DECAPSULATED, FORWARD_ENCAPSULATED or PASSTHROUGH one value shall - be provided. If the action is DUPLICATE_DECAPSULATED or DUPLICATE_ENCAPSULATED, - two values shall be provided. If the action is DROP, no value shall be provided. + example: "[\"192.0.2.0\"]" + description: "This type represents the destination interface. If the action\ + \ is FORWARD_DECAPSULATED, FORWARD_ENCAPSULATED or PASSTHROUGH one value shall\ + \ be provided. If the action is DUPLICATE_DECAPSULATED or DUPLICATE_ENCAPSULATED,\ + \ two values shall be provided. If the action is DROP, no value shall be provided." example: - interfaceType: '["TUNNEL"]' - dstIpAddress: '["192.0.2.0"]' - srcMacAddress: '["02-00-00-00-00-00"]' + interfaceType: "[\"TUNNEL\"]" + dstIpAddress: "[\"192.0.2.0\"]" + srcMacAddress: "[\"02-00-00-00-00-00\"]" tunnelInfo: - tunnelSrcAddress: '["?"]' - tunnelType: '["GTP_U"]' - tunnelDstAddress: '["?"]' - dstMacAddress: '["02-00-00-00-00-00"]' - DnsRule.IpAddressType: - title: DnsRule.IpAddressType + tunnelSrcAddress: "[\"?\"]" + tunnelType: "[\"GTP_U\"]" + tunnelDstAddress: "[\"?\"]" + dstMacAddress: "[\"02-00-00-00-00-00\"]" + DnsRuleIpAddressType: + title: DnsRuleIpAddressType type: string description: IP address type - example: '["IP_V6"]' + example: "[\"IP_V6\"]" enum: - - IP_V6 - - IP_V4 - DnsRule.State: - title: DnsRule.State + - IP_V6 + - IP_V4 + DnsRuleState: + title: DnsRuleState type: string description: DNS rule state. This attribute may be updated using HTTP PUT method - example: '["ACTIVE"]' + example: "[\"ACTIVE\"]" enum: - - ACTIVE - - INACTIVE + - ACTIVE + - INACTIVE DnsRule: title: DnsRule required: - - dnsRuleId - - domainName - - ipAddress - - ipAddressType - - state + - dnsRuleId + - domainName + - ipAddress + - ipAddressType + - state type: object properties: dnsRuleId: type: string description: Identifies the DNS Rule - example: '["dnsRule1"]' + example: "[\"dnsRule1\"]" domainName: type: string description: FQDN resolved by the DNS rule - example: '["www.example.com"]' + example: "[\"www.example.com\"]" ipAddressType: - $ref: "#/components/schemas/DnsRule.IpAddressType" + $ref: '#/components/schemas/DnsRuleIpAddressType' ipAddress: type: string description: IP address associated with the FQDN resolved by the DNS rule - example: '["192.0.2.0"]' + example: "[\"192.0.2.0\"]" ttl: type: integer description: Time to live value state: - $ref: "#/components/schemas/DnsRule.State" + $ref: '#/components/schemas/DnsRuleState' description: This type represents the general information of a DNS rule. example: - domainName: '["www.example.com"]' - ipAddress: '["192.0.2.0"]' - dnsRuleId: '["dnsRule1"]' - state: '["ACTIVE"]' + domainName: "[\"www.example.com\"]" + ipAddress: "[\"192.0.2.0\"]" + dnsRuleId: "[\"dnsRule1\"]" + state: "[\"ACTIVE\"]" ttl: 0 - ipAddressType: '["IP_V6"]' + ipAddressType: "[\"IP_V6\"]" LinkType: title: LinkType type: object @@ -1325,227 +1232,223 @@ components: href: type: string description: URI referring to a resource - example: '["/mecAppSuptApi/example"]' - description: - This type represents a type of link and may be referenced from + example: "[\"/mecAppSuptApi/example\"]" + description: This type represents a type of link and may be referenced from data structures example: - href: '["/mecAppSuptApi/example"]' - MecAppSuptApiSubscriptionLinkList.Links: - title: MecAppSuptApiSubscriptionLinkList.Links + href: "[\"/mecAppSuptApi/example\"]" + LinkTypeConfirmTermination: + title: LinkTypeConfirmTermination + type: object + properties: + href: + type: string + description: URI referring to a resource + example: "[\"/mecAppSuptApi/example\"]" + description: Link to the task resource where to confirm termination in case + the application is ready to be terminated before expiry of the timeout. + MecAppSuptApiSubscriptionLinkListLinks: + title: MecAppSuptApiSubscriptionLinkListLinks required: - - self + - self type: object properties: self: - $ref: "#/components/schemas/LinkType" + $ref: '#/components/schemas/LinkType' subscriptions: type: array description: The MEC application instance's subscriptions items: - $ref: "#/components/schemas/MecAppSuptApiSubscriptionLinkList.Subscription" + $ref: '#/components/schemas/MecAppSuptApiSubscriptionLinkListSubscription' description: Self-referring URI. example: subscriptions: - - rel: rel - href: '["/mecAppSuptApi/example"]' - - rel: rel - href: '["/mecAppSuptApi/example"]' + - rel: rel + href: "[\"/mecAppSuptApi/example\"]" + - rel: rel + href: "[\"/mecAppSuptApi/example\"]" self: - href: '["/mecAppSuptApi/example"]' - MecAppSuptApiSubscriptionLinkList.Subscription: - title: MecAppSuptApiSubscriptionLinkList.Subscription + href: "[\"/mecAppSuptApi/example\"]" + MecAppSuptApiSubscriptionLinkListSubscription: + title: MecAppSuptApiSubscriptionLinkListSubscription required: - - href - - subscriptionType + - href + - rel type: object properties: href: type: string description: URI referring to a resource - example: '["/mecAppSuptApi/example"]' - subscriptionType: + example: "[\"/mecAppSuptApi/example\"]" + rel: type: string description: The values shall be set to AppTerminationNotificationSubscription. description: A link to a subscription. example: - subscriptionType: subscriptionType - href: '["/mecAppSuptApi/example"]' + rel: rel + href: "[\"/mecAppSuptApi/example\"]" MecAppSuptApiSubscriptionLinkList: title: MecAppSuptApiSubscriptionLinkList required: - - _links + - _links type: object properties: _links: - $ref: "#/components/schemas/MecAppSuptApiSubscriptionLinkList.Links" - description: - This type represents a list of links related to currently existing + $ref: '#/components/schemas/MecAppSuptApiSubscriptionLinkListLinks' + description: This type represents a list of links related to currently existing subscriptions for a MEC application instance. This information is returned when sending a request to receive current subscriptions. example: _links: subscriptions: - - rel: rel - href: '["/mecAppSuptApi/example"]' - - rel: rel - href: '["/mecAppSuptApi/example"]' + - rel: rel + href: "[\"/mecAppSuptApi/example\"]" + - rel: rel + href: "[\"/mecAppSuptApi/example\"]" self: - href: '["/mecAppSuptApi/example"]' + href: "[\"/mecAppSuptApi/example\"]" OperationActionType: title: OperationActionType type: string description: Operation that is being performed on the MEC application instance. - example: '["TERMINATING"]' + example: "[\"TERMINATING\"]" enum: - - STOPPING - - TERMINATING + - STOPPING + - TERMINATING ProblemDetails: title: ProblemDetails - required: - - status - - detail type: object properties: type: type: string - description: - A URI reference according to IETF RFC 3986 that identifies + description: A URI reference according to IETF RFC 3986 that identifies the problem type title: type: string - description: A short, human-readable summary of the problem type + description: "A short, human-readable summary of the problem type" status: type: integer description: The HTTP status code for this occurrence of the problem detail: type: string - description: - A human-readable explanation specific to this occurrence of + description: A human-readable explanation specific to this occurrence of the problem instance: type: string - description: - A URI reference that identifies the specific occurrence of + description: A URI reference that identifies the specific occurrence of the problem Self: title: Self required: - - self + - self type: object properties: self: - $ref: "#/components/schemas/LinkType" + $ref: '#/components/schemas/LinkType' description: Self-referring URI. example: self: - href: '["/mecAppSuptApi/example"]' - TimingCaps.NtpServers.AuthenticationOption: - title: TimingCaps.NtpServers.AuthenticationOption + href: "[\"/mecAppSuptApi/example\"]" + TimingCapsNtpServersAuthenticationOption: + title: TimingCapsNtpServersAuthenticationOption type: string description: NTP authentication option - example: '["NONE"]' + example: "[\"NONE\"]" enum: - - NONE - - SYMMETRIC_KEY - - AUTO_KEY - TimingCaps.NtpServers.NtpServerAddrType: - title: TimingCaps.NtpServers.NtpServerAddrType + - NONE + - SYMMETRIC_KEY + - AUTO_KEY + TimingCapsNtpServersNtpServerAddrType: + title: TimingCapsNtpServersNtpServerAddrType type: string description: Address type of NTP server - example: '["IP_ADDRESS"]' + example: "[\"IP_ADDRESS\"]" enum: - - IP_ADDRESS - - DNS_NAME - TimingCaps.NtpServers: - title: TimingCaps.NtpServers + - IP_ADDRESS + - DNS_NAME + TimingCapsNtpServers: + title: TimingCapsNtpServers required: - - authenticationKeyNum - - authenticationOption - - localPriority - - maxPollingInterval - - minPollingInterval - - ntpServerAddr - - ntpServerAddrType + - authenticationKeyNum + - authenticationOption + - localPriority + - maxPollingInterval + - minPollingInterval + - ntpServerAddr + - ntpServerAddrType type: object properties: ntpServerAddrType: - $ref: "#/components/schemas/TimingCaps.NtpServers.NtpServerAddrType" + $ref: '#/components/schemas/TimingCapsNtpServersNtpServerAddrType' ntpServerAddr: type: string description: NTP server address - example: '["192.0.2.0"]' + example: "[\"192.0.2.0\"]" minPollingInterval: type: integer - description: - Minimum poll interval for NTP messages, in seconds as a power - of two. Range 3 to 17 + description: "Minimum poll interval for NTP messages, in seconds as a power\ + \ of two. Range 3 to 17" maxPollingInterval: type: integer - description: - Maximum poll interval for NTP messages, in seconds as a power - of two. Range 3 to 17 + description: "Maximum poll interval for NTP messages, in seconds as a power\ + \ of two. Range 3 to 17" localPriority: type: integer description: NTP server local priority authenticationOption: - $ref: "#/components/schemas/TimingCaps.NtpServers.AuthenticationOption" + $ref: '#/components/schemas/TimingCapsNtpServersAuthenticationOption' authenticationKeyNum: type: integer description: Authentication key number description: NTP server detail. example: - ntpServerAddr: '["192.0.2.0"]' + ntpServerAddr: "[\"192.0.2.0\"]" maxPollingInterval: 5 authenticationKeyNum: 2 localPriority: 5 - authenticationOption: '["NONE"]' - ntpServerAddrType: '["IP_ADDRESS"]' + authenticationOption: "[\"NONE\"]" + ntpServerAddrType: "[\"IP_ADDRESS\"]" minPollingInterval: 1 TimingCaps_PtpMasters: title: TimingCaps_PtpMasters required: - - delayReqMaxRate - - ptpMasterIpAddress - - ptpMasterLocalPriority + - delayReqMaxRate + - ptpMasterIpAddress + - ptpMasterLocalPriority type: object properties: ptpMasterIpAddress: type: string description: PTP Server (referred to as "master" in IEEE 1588-2019) IP Address - example: '["192.0.2.0"]' + example: "[\"192.0.2.0\"]" ptpMasterLocalPriority: type: integer - description: - PTP Server (referred to as "master" in IEEE 1588-2019 ) local + description: PTP Server (referred to as "master" in IEEE 1588-2019 ) local priority delayReqMaxRate: type: integer - description: - Acceptable maximum rate of the Delay_Req messages in packets + description: Acceptable maximum rate of the Delay_Req messages in packets per second description: NTP server detail. example: ptpMasterLocalPriority: 7 - ptpMasterIpAddress: '["192.0.2.0"]' + ptpMasterIpAddress: "[\"192.0.2.0\"]" delayReqMaxRate: 9 - TimingCaps.TimeStamp: - title: TimingCaps.TimeStamp + TimingCapsTimeStamp: + title: TimingCapsTimeStamp required: - - nanoSeconds - - seconds + - nanoSeconds + - seconds type: object properties: seconds: type: integer - description: - The seconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC + description: "The seconds part of the time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC" nanoSeconds: type: integer - description: - The nanoseconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC + description: "The nanoseconds part of the time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC" description: time example: seconds: 0 @@ -1555,68 +1458,64 @@ components: type: object properties: timeStamp: - $ref: "#/components/schemas/TimingCaps.TimeStamp" + $ref: '#/components/schemas/TimingCapsTimeStamp' ntpServers: type: array description: Available NTP servers items: - $ref: "#/components/schemas/TimingCaps.NtpServers" + $ref: '#/components/schemas/TimingCapsNtpServers' ptpMasters: type: array - description: - Number of available PTP Servers (referred to as "masters" in + description: Number of available PTP Servers (referred to as "masters" in IEEE 1588-2019) items: - $ref: "#/components/schemas/TimingCaps_PtpMasters" - description: - This type represents the information provided by the MEC platform + $ref: '#/components/schemas/TimingCaps_PtpMasters' + description: This type represents the information provided by the MEC platform in response to the Timing capabilities Query message. example: timeStamp: seconds: 0 nanoSeconds: 6 ntpServers: - - ntpServerAddr: '["192.0.2.0"]' - maxPollingInterval: 5 - authenticationKeyNum: 2 - localPriority: 5 - authenticationOption: '["NONE"]' - ntpServerAddrType: '["IP_ADDRESS"]' - minPollingInterval: 1 - - ntpServerAddr: '["192.0.2.0"]' - maxPollingInterval: 5 - authenticationKeyNum: 2 - localPriority: 5 - authenticationOption: '["NONE"]' - ntpServerAddrType: '["IP_ADDRESS"]' - minPollingInterval: 1 + - ntpServerAddr: "[\"192.0.2.0\"]" + maxPollingInterval: 5 + authenticationKeyNum: 2 + localPriority: 5 + authenticationOption: "[\"NONE\"]" + ntpServerAddrType: "[\"IP_ADDRESS\"]" + minPollingInterval: 1 + - ntpServerAddr: "[\"192.0.2.0\"]" + maxPollingInterval: 5 + authenticationKeyNum: 2 + localPriority: 5 + authenticationOption: "[\"NONE\"]" + ntpServerAddrType: "[\"IP_ADDRESS\"]" + minPollingInterval: 1 ptpMasters: - - ptpMasterLocalPriority: 7 - ptpMasterIpAddress: '["192.0.2.0"]' - delayReqMaxRate: 9 - - ptpMasterLocalPriority: 7 - ptpMasterIpAddress: '["192.0.2.0"]' - delayReqMaxRate: 9 + - ptpMasterLocalPriority: 7 + ptpMasterIpAddress: "[\"192.0.2.0\"]" + delayReqMaxRate: 9 + - ptpMasterLocalPriority: 7 + ptpMasterIpAddress: "[\"192.0.2.0\"]" + delayReqMaxRate: 9 TrafficFilter: title: TrafficFilter type: object properties: srcAddress: type: array - description: - An IP address or a range of IP address. For IPv4, the IP address - could be an IP address plus mask, or an individual IP address, or a range - of IP addresses. For IPv6, the IP address could be an IP prefix, or a - range of IP prefixes. + description: "An IP address or a range of IP address. For IPv4, the IP address\ + \ could be an IP address plus mask, or an individual IP address, or a\ + \ range of IP addresses. For IPv6, the IP address could be an IP prefix,\ + \ or a range of IP prefixes." items: type: string dstAddress: type: array - description: - An IP address or a range of IP address. For IPv4, the IP address - could be an IP address plus mask, or an individual IP address, or a range - of IP addresses. For IPv6, the IP address could be an IP prefix, or a - range of IP prefixes. + description: "An IP address or a range of IP address. For IPv4, the IP address\ + \ could be an IP address plus mask, or an individual IP address, or a\ + \ range of IP addresses. For IPv6, the IP address could be an IP prefix,\ + \ or a range of IP prefixes." items: type: string srcPort: @@ -1661,13 +1560,11 @@ components: type: string qCI: type: integer - description: - Used to match all packets that have the same Quality Class + description: Used to match all packets that have the same Quality Class Indicator (QCI). dSCP: type: integer - description: - Used to match all IPv4 packets that have the same Differentiated + description: Used to match all IPv4 packets that have the same Differentiated Services Code Point (DSCP) tC: type: integer @@ -1675,244 +1572,239 @@ components: description: This type represents the traffic filter. example: srcTunnelPort: - - srcTunnelPort - - srcTunnelPort + - srcTunnelPort + - srcTunnelPort dstAddress: - - dstAddress - - dstAddress + - dstAddress + - dstAddress srcAddress: - - srcAddress - - srcAddress + - srcAddress + - srcAddress srcPort: - - srcPort - - srcPort + - srcPort + - srcPort token: - - token - - token + - token + - token tC: 5 protocol: - - protocol - - protocol + - protocol + - protocol dstTunnelPort: - - dstTunnelPort - - dstTunnelPort + - dstTunnelPort + - dstTunnelPort dSCP: 1 dstPort: - - dstPort - - dstPort + - dstPort + - dstPort qCI: 6 srcTunnelAddress: - - srcTunnelAddress - - srcTunnelAddress + - srcTunnelAddress + - srcTunnelAddress tgtTunnelAddress: - - tgtTunnelAddress - - tgtTunnelAddress - TrafficRule.Action: - title: TrafficRule.Action + - tgtTunnelAddress + - tgtTunnelAddress + TrafficRuleAction: + title: TrafficRuleAction type: string - description: - The action of the MEC host data plane when a packet matches the + description: The action of the MEC host data plane when a packet matches the trafficFilter - example: '["DROP"]' + example: "[\"DROP\"]" enum: - - DROP - - FORWARD_DECAPSULATED - - FORWARD_ENCAPSULATED - - PASSTHROUGH - - DUPLICATE_DECAPSULATED - - DUPLICATE_ENCAPSULATED - TrafficRule.FilterType: - title: TrafficRule.FilterType + - DROP + - FORWARD_DECAPSULATED + - FORWARD_ENCAPSULATED + - PASSTHROUGH + - DUPLICATE_DECAPSULATED + - DUPLICATE_ENCAPSULATED + TrafficRuleFilterType: + title: TrafficRuleFilterType type: string - description: - Definition of filter per FLOW or PACKET. If flow the filter match + description: Definition of filter per FLOW or PACKET. If flow the filter match UE->EPC packet and the reverse packet is handled in the same context - example: '["FLOW"]' + example: "[\"FLOW\"]" enum: - - FLOW - - PACKET - TrafficRule.State: - title: TrafficRule.State + - FLOW + - PACKET + TrafficRuleState: + title: TrafficRuleState type: string - description: - Contains the traffic rule state. This attribute may be updated + description: Contains the traffic rule state. This attribute may be updated using HTTP PUT method - example: '["ACTIVE"]' + example: "[\"ACTIVE\"]" enum: - - ACTIVE - - INACTIVE + - ACTIVE + - INACTIVE TrafficRule: title: TrafficRule required: - - action - - filterType - - priority - - state - - trafficFilter - - trafficRuleId + - action + - filterType + - priority + - state + - trafficFilter + - trafficRuleId type: object properties: trafficRuleId: type: string description: Identify the traffic rule. - example: '["TrafficRule1"]' + example: "[\"TrafficRule1\"]" filterType: - $ref: "#/components/schemas/TrafficRule.FilterType" + $ref: '#/components/schemas/TrafficRuleFilterType' priority: type: integer - description: - Priority of this traffic rule within the range 0 to 255. If - traffic rules conflict, the one with higher priority take precedence. - Value indicates the priority in descending order, i.e. with 0 as the highest - priority and 255 as the lowest priority. + description: "Priority of this traffic rule within the range 0 to 255. If\ + \ traffic rules conflict, the one with higher priority take precedence.\ + \ Value indicates the priority in descending order, i.e. with 0 as the\ + \ highest priority and 255 as the lowest priority." trafficFilter: type: array items: - $ref: "#/components/schemas/TrafficFilter" + $ref: '#/components/schemas/TrafficFilter' action: - $ref: "#/components/schemas/TrafficRule.Action" + $ref: '#/components/schemas/TrafficRuleAction' dstInterface: maxItems: 2 type: array items: - $ref: "#/components/schemas/DestinationInterface" + $ref: '#/components/schemas/DestinationInterface' state: - $ref: "#/components/schemas/TrafficRule.State" + $ref: '#/components/schemas/TrafficRuleState' description: This type represents the general information of a traffic rule. example: - action: '["DROP"]' - trafficRuleId: '["TrafficRule1"]' + action: "[\"DROP\"]" + trafficRuleId: "[\"TrafficRule1\"]" dstInterface: - - interfaceType: '["TUNNEL"]' - dstIpAddress: '["192.0.2.0"]' - srcMacAddress: '["02-00-00-00-00-00"]' - tunnelInfo: - tunnelSrcAddress: '["?"]' - tunnelType: '["GTP_U"]' - tunnelDstAddress: '["?"]' - dstMacAddress: '["02-00-00-00-00-00"]' - - interfaceType: '["TUNNEL"]' - dstIpAddress: '["192.0.2.0"]' - srcMacAddress: '["02-00-00-00-00-00"]' - tunnelInfo: - tunnelSrcAddress: '["?"]' - tunnelType: '["GTP_U"]' - tunnelDstAddress: '["?"]' - dstMacAddress: '["02-00-00-00-00-00"]' - state: '["ACTIVE"]' - filterType: '["FLOW"]' + - interfaceType: "[\"TUNNEL\"]" + dstIpAddress: "[\"192.0.2.0\"]" + srcMacAddress: "[\"02-00-00-00-00-00\"]" + tunnelInfo: + tunnelSrcAddress: "[\"?\"]" + tunnelType: "[\"GTP_U\"]" + tunnelDstAddress: "[\"?\"]" + dstMacAddress: "[\"02-00-00-00-00-00\"]" + - interfaceType: "[\"TUNNEL\"]" + dstIpAddress: "[\"192.0.2.0\"]" + srcMacAddress: "[\"02-00-00-00-00-00\"]" + tunnelInfo: + tunnelSrcAddress: "[\"?\"]" + tunnelType: "[\"GTP_U\"]" + tunnelDstAddress: "[\"?\"]" + dstMacAddress: "[\"02-00-00-00-00-00\"]" + state: "[\"ACTIVE\"]" + filterType: "[\"FLOW\"]" priority: 0 trafficFilter: - - srcTunnelPort: - - srcTunnelPort - - srcTunnelPort - dstAddress: - - dstAddress - - dstAddress - srcAddress: - - srcAddress - - srcAddress - srcPort: - - srcPort - - srcPort - token: - - token - - token - tC: 5 - protocol: - - protocol - - protocol - dstTunnelPort: - - dstTunnelPort - - dstTunnelPort - dSCP: 1 - dstPort: - - dstPort - - dstPort - qCI: 6 - srcTunnelAddress: - - srcTunnelAddress - - srcTunnelAddress - tgtTunnelAddress: - - tgtTunnelAddress - - tgtTunnelAddress - - srcTunnelPort: - - srcTunnelPort - - srcTunnelPort - dstAddress: - - dstAddress - - dstAddress - srcAddress: - - srcAddress - - srcAddress - srcPort: - - srcPort - - srcPort - token: - - token - - token - tC: 5 - protocol: - - protocol - - protocol - dstTunnelPort: - - dstTunnelPort - - dstTunnelPort - dSCP: 1 - dstPort: - - dstPort - - dstPort - qCI: 6 - srcTunnelAddress: - - srcTunnelAddress - - srcTunnelAddress - tgtTunnelAddress: - - tgtTunnelAddress - - tgtTunnelAddress - TunnelInfo.TunnelType: - title: TunnelInfo.TunnelType + - srcTunnelPort: + - srcTunnelPort + - srcTunnelPort + dstAddress: + - dstAddress + - dstAddress + srcAddress: + - srcAddress + - srcAddress + srcPort: + - srcPort + - srcPort + token: + - token + - token + tC: 5 + protocol: + - protocol + - protocol + dstTunnelPort: + - dstTunnelPort + - dstTunnelPort + dSCP: 1 + dstPort: + - dstPort + - dstPort + qCI: 6 + srcTunnelAddress: + - srcTunnelAddress + - srcTunnelAddress + tgtTunnelAddress: + - tgtTunnelAddress + - tgtTunnelAddress + - srcTunnelPort: + - srcTunnelPort + - srcTunnelPort + dstAddress: + - dstAddress + - dstAddress + srcAddress: + - srcAddress + - srcAddress + srcPort: + - srcPort + - srcPort + token: + - token + - token + tC: 5 + protocol: + - protocol + - protocol + dstTunnelPort: + - dstTunnelPort + - dstTunnelPort + dSCP: 1 + dstPort: + - dstPort + - dstPort + qCI: 6 + srcTunnelAddress: + - srcTunnelAddress + - srcTunnelAddress + tgtTunnelAddress: + - tgtTunnelAddress + - tgtTunnelAddress + TunnelInfoTunnelType: + title: TunnelInfoTunnelType type: string description: This type represents the tunnel information. - example: '["GTP_U"]' + example: "[\"GTP_U\"]" enum: - - GTP_U - - GRE + - GTP_U + - GRE TunnelInfo: title: TunnelInfo required: - - tunnelType + - tunnelType type: object properties: tunnelType: - $ref: "#/components/schemas/TunnelInfo.TunnelType" + $ref: '#/components/schemas/TunnelInfoTunnelType' tunnelDstAddress: type: string description: Destination address of the tunnel - example: '["?"]' + example: "[\"?\"]" tunnelSrcAddress: type: string description: Source address of the tunnel - example: '["?"]' + example: "[\"?\"]" description: This type represents the tunnel information. example: - tunnelSrcAddress: '["?"]' - tunnelType: '["GTP_U"]' - tunnelDstAddress: '["?"]' + tunnelSrcAddress: "[\"?\"]" + tunnelType: "[\"GTP_U\"]" + tunnelDstAddress: "[\"?\"]" TimeSourceStatus: title: TimeSourceStatus type: string - description: - Platform Time Source status. 1 = TRACEABLE - time source is locked + description: Platform Time Source status. 1 = TRACEABLE - time source is locked to the UTC time source. 2 = NONTRACEABLE - time source is not locked to the UTC time source - example: '["TRACEABLE"]' + example: "[\"TRACEABLE\"]" enum: - - TRACEABLE - - NONTRACEABLE + - TRACEABLE + - NONTRACEABLE requestBodies: AppTerminationNotification: content: application/json: schema: - $ref: "#/components/schemas/AppTerminationNotification" + $ref: '#/components/schemas/AppTerminationNotification' required: true diff --git a/go-packages/meep-app-support-client/api_mec_app_support.go b/go-packages/meep-app-support-client/api_mec_app_support.go index f5b1a46f8..c4f904b4f 100644 --- a/go-packages/meep-app-support-client/api_mec_app_support.go +++ b/go-packages/meep-app-support-client/api_mec_app_support.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -75,7 +75,7 @@ func (a *MecAppSupportApiService) ApplicationsConfirmReadyPOST(ctx context.Conte } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -202,7 +202,7 @@ func (a *MecAppSupportApiService) ApplicationsConfirmTerminationPOST(ctx context } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -330,7 +330,7 @@ func (a *MecAppSupportApiService) ApplicationsSubscriptionDELETE(ctx context.Con } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -424,7 +424,7 @@ func (a *MecAppSupportApiService) ApplicationsSubscriptionGET(ctx context.Contex } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -546,7 +546,7 @@ func (a *MecAppSupportApiService) ApplicationsSubscriptionsGET(ctx context.Conte } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -669,7 +669,7 @@ func (a *MecAppSupportApiService) ApplicationsSubscriptionsPOST(ctx context.Cont } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -791,7 +791,7 @@ func (a *MecAppSupportApiService) TimingCapsGET(ctx context.Context) (TimingCaps } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -911,7 +911,7 @@ func (a *MecAppSupportApiService) TimingCurrentTimeGET(ctx context.Context) (Cur } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) diff --git a/go-packages/meep-app-support-client/api_unsupported.go b/go-packages/meep-app-support-client/api_unsupported.go index 695414b57..22ae18210 100644 --- a/go-packages/meep-app-support-client/api_unsupported.go +++ b/go-packages/meep-app-support-client/api_unsupported.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -77,7 +77,7 @@ func (a *UnsupportedApiService) ApplicationsDnsRuleGET(ctx context.Context, appI } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -202,7 +202,7 @@ func (a *UnsupportedApiService) ApplicationsDnsRulePUT(ctx context.Context, body } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -337,7 +337,7 @@ func (a *UnsupportedApiService) ApplicationsDnsRulesGET(ctx context.Context, app } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -461,7 +461,7 @@ func (a *UnsupportedApiService) ApplicationsTrafficRuleGET(ctx context.Context, } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -586,7 +586,7 @@ func (a *UnsupportedApiService) ApplicationsTrafficRulePUT(ctx context.Context, } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -721,7 +721,7 @@ func (a *UnsupportedApiService) ApplicationsTrafficRulesGET(ctx context.Context, } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json", "text/plain"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) diff --git a/go-packages/meep-app-support-client/client.go b/go-packages/meep-app-support-client/client.go index cd98b5bc4..a68d47e77 100644 --- a/go-packages/meep-app-support-client/client.go +++ b/go-packages/meep-app-support-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/configuration.go b/go-packages/meep-app-support-client/configuration.go index c8ee2dede..86d2e8c58 100644 --- a/go-packages/meep-app-support-client/configuration.go +++ b/go-packages/meep-app-support-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/docs/AppTerminationNotification.md b/go-packages/meep-app-support-client/docs/AppTerminationNotification.md index 77026d2ce..9ee251e71 100644 --- a/go-packages/meep-app-support-client/docs/AppTerminationNotification.md +++ b/go-packages/meep-app-support-client/docs/AppTerminationNotification.md @@ -6,7 +6,7 @@ Name | Type | Description | Notes **NotificationType** | **string** | Shall be set to AppTerminationNotification. | [default to null] **OperationAction** | [***OperationActionType**](OperationActionType.md) | | [default to null] **MaxGracefulTimeout** | **int32** | Maximum timeout value in seconds for graceful termination or graceful stop of an application instance. | [default to null] -**Links** | [***AppTerminationNotificationLinks**](AppTerminationNotification__links.md) | | [default to null] +**Links** | [***AppTerminationNotificationLinks**](AppTerminationNotificationLinks.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/AppTerminationNotificationLinks.md b/go-packages/meep-app-support-client/docs/AppTerminationNotificationLinks.md index dd651ee85..8f1654690 100644 --- a/go-packages/meep-app-support-client/docs/AppTerminationNotificationLinks.md +++ b/go-packages/meep-app-support-client/docs/AppTerminationNotificationLinks.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Subscription** | [***LinkType**](LinkType.md) | | [default to null] -**ConfirmTermination** | [***LinkType**](LinkType.md) | | [optional] [default to null] +**ConfirmTermination** | [***LinkTypeConfirmTermination**](LinkTypeConfirmTermination.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscription.md b/go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscription.md index 1be88738b..5970acdcc 100644 --- a/go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscription.md +++ b/go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscription.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **SubscriptionType** | **string** | Shall be set to AppTerminationNotificationSubscription. | [default to null] **CallbackReference** | **string** | URI selected by the MEC application instance to receive notifications on the subscribed MEC application instance management information. This shall be included in both the request and the response. | [default to null] -**Links** | [***AppTerminationNotificationSubscriptionLinks**](AppTerminationNotificationSubscription__links.md) | | [default to null] +**Links** | [***Self**](Self.md) | | [default to null] **AppInstanceId** | **string** | It is used as the filtering criterion for the subscribed events. | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/CurrentTime.md b/go-packages/meep-app-support-client/docs/CurrentTime.md index e5b1834d4..2a2900f4c 100644 --- a/go-packages/meep-app-support-client/docs/CurrentTime.md +++ b/go-packages/meep-app-support-client/docs/CurrentTime.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Seconds** | **int32** | The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC | [default to null] **NanoSeconds** | **int32** | The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC | [default to null] -**TimeSourceStatus** | **string** | Platform Time Source status. 1 = TRACEABLE - time source is locked to the UTC time source. 2 = NONTRACEABLE - time source is not locked to the UTC time source | [default to null] +**TimeSourceStatus** | [***TimeSourceStatus**](TimeSourceStatus.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/DestinationInterface.md b/go-packages/meep-app-support-client/docs/DestinationInterface.md index 74dfcf63b..164761898 100644 --- a/go-packages/meep-app-support-client/docs/DestinationInterface.md +++ b/go-packages/meep-app-support-client/docs/DestinationInterface.md @@ -3,10 +3,10 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**InterfaceType** | **string** | Type of the interface | [default to null] +**InterfaceType** | [***DestinationInterfaceInterfaceType**](DestinationInterfaceInterfaceType.md) | | [default to null] **TunnelInfo** | [***TunnelInfo**](TunnelInfo.md) | | [optional] [default to null] **SrcMacAddress** | **string** | Source address identifies the MAC address of the interface | [optional] [default to null] -**DstMacAddress** | **string** | Destination address identifies the MAC address of the interface | [optional] [default to null] +**DstMacAddress** | **string** | Source address identifies the MAC address of the interface | [optional] [default to null] **DstIpAddress** | **string** | IP address of the remote destination | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/DestinationInterfaceInterfaceType.md b/go-packages/meep-app-support-client/docs/DestinationInterfaceInterfaceType.md new file mode 100644 index 000000000..4f7df04c5 --- /dev/null +++ b/go-packages/meep-app-support-client/docs/DestinationInterfaceInterfaceType.md @@ -0,0 +1,9 @@ +# DestinationInterfaceInterfaceType + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-app-support-client/docs/DnsRule.md b/go-packages/meep-app-support-client/docs/DnsRule.md index bd982130f..d487eeb41 100644 --- a/go-packages/meep-app-support-client/docs/DnsRule.md +++ b/go-packages/meep-app-support-client/docs/DnsRule.md @@ -5,10 +5,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **DnsRuleId** | **string** | Identifies the DNS Rule | [default to null] **DomainName** | **string** | FQDN resolved by the DNS rule | [default to null] -**IpAddressType** | **string** | IP address type | [default to null] +**IpAddressType** | [***DnsRuleIpAddressType**](DnsRuleIpAddressType.md) | | [default to null] **IpAddress** | **string** | IP address associated with the FQDN resolved by the DNS rule | [default to null] **Ttl** | **int32** | Time to live value | [optional] [default to null] -**State** | **string** | DNS rule state. This attribute may be updated using HTTP PUT method | [default to null] +**State** | [***DnsRuleState**](DnsRuleState.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/DnsRuleIpAddressType.md b/go-packages/meep-app-support-client/docs/DnsRuleIpAddressType.md new file mode 100644 index 000000000..5feda5125 --- /dev/null +++ b/go-packages/meep-app-support-client/docs/DnsRuleIpAddressType.md @@ -0,0 +1,9 @@ +# DnsRuleIpAddressType + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-ams-client/docs/ModelType.md b/go-packages/meep-app-support-client/docs/DnsRuleState.md similarity index 94% rename from go-packages/meep-ams-client/docs/ModelType.md rename to go-packages/meep-app-support-client/docs/DnsRuleState.md index dd4d07d89..e3bad22fe 100644 --- a/go-packages/meep-ams-client/docs/ModelType.md +++ b/go-packages/meep-app-support-client/docs/DnsRuleState.md @@ -1,4 +1,4 @@ -# ModelType +# DnsRuleState ## Properties Name | Type | Description | Notes @@ -6,3 +6,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-app-support-client/docs/LinkTypeConfirmTermination.md b/go-packages/meep-app-support-client/docs/LinkTypeConfirmTermination.md new file mode 100644 index 000000000..bee322d22 --- /dev/null +++ b/go-packages/meep-app-support-client/docs/LinkTypeConfirmTermination.md @@ -0,0 +1,10 @@ +# LinkTypeConfirmTermination + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Href** | **string** | URI referring to a resource | [optional] [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-app-support-client/docs/MecAppSupportApi.md b/go-packages/meep-app-support-client/docs/MecAppSupportApi.md index f43c19df7..dd4599eca 100644 --- a/go-packages/meep-app-support-client/docs/MecAppSupportApi.md +++ b/go-packages/meep-app-support-client/docs/MecAppSupportApi.md @@ -39,7 +39,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/problem+json + - **Accept**: application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -68,7 +68,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/problem+json + - **Accept**: application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -97,7 +97,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/problem+json + - **Accept**: application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -126,7 +126,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -154,7 +154,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -183,7 +183,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -207,7 +207,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -231,7 +231,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkList.md b/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkList.md index 7a6e7e9a1..884bffe53 100644 --- a/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkList.md +++ b/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkList.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Links** | [***MecAppSuptApiSubscriptionLinkListLinks**](MecAppSuptApiSubscriptionLinkList__links.md) | | [default to null] +**Links** | [***MecAppSuptApiSubscriptionLinkListLinks**](MecAppSuptApiSubscriptionLinkListLinks.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinks.md b/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinks.md index 0123228bd..0b1a6fcf9 100644 --- a/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinks.md +++ b/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinks.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Self** | [***LinkType**](LinkType.md) | | [default to null] -**Subscriptions** | [**[]MecAppSuptApiSubscriptionLinkListLinksSubscriptions**](MecAppSuptApiSubscriptionLinkList__links_subscriptions.md) | The MEC application instance's subscriptions | [optional] [default to null] +**Subscriptions** | [**[]MecAppSuptApiSubscriptionLinkListSubscription**](MecAppSuptApiSubscriptionLinkListSubscription.md) | The MEC application instance's subscriptions | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinksSubscriptions.md b/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListSubscription.md similarity index 56% rename from go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinksSubscriptions.md rename to go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListSubscription.md index af2f347f9..b857c4e6f 100644 --- a/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListLinksSubscriptions.md +++ b/go-packages/meep-app-support-client/docs/MecAppSuptApiSubscriptionLinkListSubscription.md @@ -1,10 +1,10 @@ -# MecAppSuptApiSubscriptionLinkListLinksSubscriptions +# MecAppSuptApiSubscriptionLinkListSubscription ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Href** | **string** | URI referring to a resource | [default to null] -**SubscriptionType** | **string** | Type of the subscription. The values are as defined in the \"subscriptionType\" attribute for each different Mp1 event subscription data type. | [default to null] +**Rel** | **string** | The values shall be set to AppTerminationNotificationSubscription. | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscriptionLinks.md b/go-packages/meep-app-support-client/docs/Self.md similarity index 88% rename from go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscriptionLinks.md rename to go-packages/meep-app-support-client/docs/Self.md index 0fbb2de38..bfbbd49a4 100644 --- a/go-packages/meep-app-support-client/docs/AppTerminationNotificationSubscriptionLinks.md +++ b/go-packages/meep-app-support-client/docs/Self.md @@ -1,4 +1,4 @@ -# AppTerminationNotificationSubscriptionLinks +# Self ## Properties Name | Type | Description | Notes diff --git a/go-packages/meep-ams-client/docs/Body1.md b/go-packages/meep-app-support-client/docs/TimeSourceStatus.md similarity index 93% rename from go-packages/meep-ams-client/docs/Body1.md rename to go-packages/meep-app-support-client/docs/TimeSourceStatus.md index 8a9eb3d41..b51188a93 100644 --- a/go-packages/meep-ams-client/docs/Body1.md +++ b/go-packages/meep-app-support-client/docs/TimeSourceStatus.md @@ -1,4 +1,4 @@ -# Body1 +# TimeSourceStatus ## Properties Name | Type | Description | Notes @@ -6,3 +6,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-app-support-client/docs/TimingCaps.md b/go-packages/meep-app-support-client/docs/TimingCaps.md index e8697d58c..7347ebf44 100644 --- a/go-packages/meep-app-support-client/docs/TimingCaps.md +++ b/go-packages/meep-app-support-client/docs/TimingCaps.md @@ -3,9 +3,9 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**TimeStamp** | [***TimingCapsTimeStamp**](TimingCaps_timeStamp.md) | | [optional] [default to null] -**NtpServers** | [**[]TimingCapsNtpServers**](TimingCaps_ntpServers.md) | Available NTP servers | [optional] [default to null] -**PtpMasters** | [**[]TimingCapsPtpMasters**](TimingCaps_ptpMasters.md) | Available PTP Masters | [optional] [default to null] +**TimeStamp** | [***TimingCapsTimeStamp**](TimingCapsTimeStamp.md) | | [optional] [default to null] +**NtpServers** | [**[]TimingCapsNtpServers**](TimingCapsNtpServers.md) | Available NTP servers | [optional] [default to null] +**PtpMasters** | [**[]TimingCapsPtpMasters**](TimingCaps_PtpMasters.md) | Number of available PTP Servers (referred to as \"masters\" in IEEE 1588-2019) | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/TimingCapsNtpServers.md b/go-packages/meep-app-support-client/docs/TimingCapsNtpServers.md index fb4d340d4..16368f62d 100644 --- a/go-packages/meep-app-support-client/docs/TimingCapsNtpServers.md +++ b/go-packages/meep-app-support-client/docs/TimingCapsNtpServers.md @@ -3,12 +3,12 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**NtpServerAddrType** | **string** | Address type of NTP server | [default to null] +**NtpServerAddrType** | [***TimingCapsNtpServersNtpServerAddrType**](TimingCapsNtpServersNtpServerAddrType.md) | | [default to null] **NtpServerAddr** | **string** | NTP server address | [default to null] -**MinPollingInterval** | **int32** | Minimum poll interval for NTP messages, in seconds as a power of two. Range 3...17 | [default to null] -**MaxPollingInterval** | **int32** | Maximum poll interval for NTP messages, in seconds as a power of two. Range 3...17 | [default to null] +**MinPollingInterval** | **int32** | Minimum poll interval for NTP messages, in seconds as a power of two. Range 3 to 17 | [default to null] +**MaxPollingInterval** | **int32** | Maximum poll interval for NTP messages, in seconds as a power of two. Range 3 to 17 | [default to null] **LocalPriority** | **int32** | NTP server local priority | [default to null] -**AuthenticationOption** | **string** | NTP authentication option | [default to null] +**AuthenticationOption** | [***TimingCapsNtpServersAuthenticationOption**](TimingCapsNtpServersAuthenticationOption.md) | | [default to null] **AuthenticationKeyNum** | **int32** | Authentication key number | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/TimingCapsNtpServersAuthenticationOption.md b/go-packages/meep-app-support-client/docs/TimingCapsNtpServersAuthenticationOption.md new file mode 100644 index 000000000..e1616dd03 --- /dev/null +++ b/go-packages/meep-app-support-client/docs/TimingCapsNtpServersAuthenticationOption.md @@ -0,0 +1,9 @@ +# TimingCapsNtpServersAuthenticationOption + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-app-support-client/docs/TimingCapsNtpServersNtpServerAddrType.md b/go-packages/meep-app-support-client/docs/TimingCapsNtpServersNtpServerAddrType.md new file mode 100644 index 000000000..09d84767b --- /dev/null +++ b/go-packages/meep-app-support-client/docs/TimingCapsNtpServersNtpServerAddrType.md @@ -0,0 +1,9 @@ +# TimingCapsNtpServersNtpServerAddrType + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-app-support-client/docs/TimingCapsPtpMasters.md b/go-packages/meep-app-support-client/docs/TimingCapsPtpMasters.md index 8c9595903..077c78ad4 100644 --- a/go-packages/meep-app-support-client/docs/TimingCapsPtpMasters.md +++ b/go-packages/meep-app-support-client/docs/TimingCapsPtpMasters.md @@ -3,8 +3,8 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**PtpMasterIpAddress** | **string** | PTP Master IP Address | [default to null] -**PtpMasterLocalPriority** | **int32** | PTP Master local priority | [default to null] +**PtpMasterIpAddress** | **string** | PTP Server (referred to as \"master\" in IEEE 1588-2019) IP Address | [default to null] +**PtpMasterLocalPriority** | **int32** | PTP Server (referred to as \"master\" in IEEE 1588-2019 ) local priority | [default to null] **DelayReqMaxRate** | **int32** | Acceptable maximum rate of the Delay_Req messages in packets per second | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/TrafficRule.md b/go-packages/meep-app-support-client/docs/TrafficRule.md index 8085723c7..1d8a910fa 100644 --- a/go-packages/meep-app-support-client/docs/TrafficRule.md +++ b/go-packages/meep-app-support-client/docs/TrafficRule.md @@ -4,12 +4,12 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **TrafficRuleId** | **string** | Identify the traffic rule. | [default to null] -**FilterType** | **string** | Definition of filter per FLOW or PACKET. If flow the filter match UE->EPC packet and the reverse packet is handled in the same context | [default to null] -**Priority** | **int32** | Priority of this traffic rule. If traffic rule conflicts, the one with higher priority take precedence | [default to null] +**FilterType** | [***TrafficRuleFilterType**](TrafficRuleFilterType.md) | | [default to null] +**Priority** | **int32** | Priority of this traffic rule within the range 0 to 255. If traffic rules conflict, the one with higher priority take precedence. Value indicates the priority in descending order, i.e. with 0 as the highest priority and 255 as the lowest priority. | [default to null] **TrafficFilter** | [**[]TrafficFilter**](TrafficFilter.md) | | [default to null] -**Action** | **string** | The action of the MEC host data plane when a packet matches the trafficFilter | [default to null] -**DstInterface** | [***DestinationInterface**](DestinationInterface.md) | | [optional] [default to null] -**State** | **string** | Contains the traffic rule state. This attribute may be updated using HTTP PUT method | [default to null] +**Action** | [***TrafficRuleAction**](TrafficRuleAction.md) | | [default to null] +**DstInterface** | [**[]DestinationInterface**](DestinationInterface.md) | | [optional] [default to null] +**State** | [***TrafficRuleState**](TrafficRuleState.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/docs/TrafficRuleAction.md b/go-packages/meep-app-support-client/docs/TrafficRuleAction.md new file mode 100644 index 000000000..8f51ae09b --- /dev/null +++ b/go-packages/meep-app-support-client/docs/TrafficRuleAction.md @@ -0,0 +1,9 @@ +# TrafficRuleAction + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-app-support-client/docs/TrafficRuleFilterType.md b/go-packages/meep-app-support-client/docs/TrafficRuleFilterType.md new file mode 100644 index 000000000..7010801a4 --- /dev/null +++ b/go-packages/meep-app-support-client/docs/TrafficRuleFilterType.md @@ -0,0 +1,9 @@ +# TrafficRuleFilterType + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-ams-client/docs/Body2.md b/go-packages/meep-app-support-client/docs/TrafficRuleState.md similarity index 93% rename from go-packages/meep-ams-client/docs/Body2.md rename to go-packages/meep-app-support-client/docs/TrafficRuleState.md index cf73e49d3..1a5c849ba 100644 --- a/go-packages/meep-ams-client/docs/Body2.md +++ b/go-packages/meep-app-support-client/docs/TrafficRuleState.md @@ -1,4 +1,4 @@ -# Body2 +# TrafficRuleState ## Properties Name | Type | Description | Notes @@ -6,3 +6,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-app-support-client/docs/TunnelInfo.md b/go-packages/meep-app-support-client/docs/TunnelInfo.md index 140d35a60..e035b8a15 100644 --- a/go-packages/meep-app-support-client/docs/TunnelInfo.md +++ b/go-packages/meep-app-support-client/docs/TunnelInfo.md @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**TunnelType** | **string** | This type represents the tunnel information. | [default to null] +**TunnelType** | [***TunnelInfoTunnelType**](TunnelInfoTunnelType.md) | | [default to null] **TunnelDstAddress** | **string** | Destination address of the tunnel | [optional] [default to null] **TunnelSrcAddress** | **string** | Source address of the tunnel | [optional] [default to null] diff --git a/go-packages/meep-app-support-client/docs/TunnelInfoTunnelType.md b/go-packages/meep-app-support-client/docs/TunnelInfoTunnelType.md new file mode 100644 index 000000000..487fda5c2 --- /dev/null +++ b/go-packages/meep-app-support-client/docs/TunnelInfoTunnelType.md @@ -0,0 +1,9 @@ +# TunnelInfoTunnelType + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-app-support-client/docs/UnsupportedApi.md b/go-packages/meep-app-support-client/docs/UnsupportedApi.md index b14135411..ade5194d8 100644 --- a/go-packages/meep-app-support-client/docs/UnsupportedApi.md +++ b/go-packages/meep-app-support-client/docs/UnsupportedApi.md @@ -37,7 +37,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -67,7 +67,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -95,7 +95,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -124,7 +124,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -154,7 +154,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -182,7 +182,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json, application/problem+json + - **Accept**: application/json, application/problem+json, text/plain [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/go-packages/meep-app-support-client/model_app_ready_confirmation.go b/go-packages/meep-app-support-client/model_app_ready_confirmation.go index 4f1027e49..a47292c96 100644 --- a/go-packages/meep-app-support-client/model_app_ready_confirmation.go +++ b/go-packages/meep-app-support-client/model_app_ready_confirmation.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_app_termination_confirmation.go b/go-packages/meep-app-support-client/model_app_termination_confirmation.go index 9997fd7cf..d86714cdc 100644 --- a/go-packages/meep-app-support-client/model_app_termination_confirmation.go +++ b/go-packages/meep-app-support-client/model_app_termination_confirmation.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_app_termination_notification.go b/go-packages/meep-app-support-client/model_app_termination_notification.go index e39adc5cc..f89097061 100644 --- a/go-packages/meep-app-support-client/model_app_termination_notification.go +++ b/go-packages/meep-app-support-client/model_app_termination_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_app_termination_notification__links.go b/go-packages/meep-app-support-client/model_app_termination_notification_links.go similarity index 77% rename from go-packages/meep-app-support-client/model_app_termination_notification__links.go rename to go-packages/meep-app-support-client/model_app_termination_notification_links.go index 65c5b0ba4..fc0506b50 100644 --- a/go-packages/meep-app-support-client/model_app_termination_notification__links.go +++ b/go-packages/meep-app-support-client/model_app_termination_notification_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,6 +26,6 @@ package client // Object containing hyperlinks related to the resource. type AppTerminationNotificationLinks struct { - Subscription *LinkType `json:"subscription"` - ConfirmTermination *LinkType `json:"confirmTermination,omitempty"` + Subscription *LinkType `json:"subscription"` + ConfirmTermination *LinkTypeConfirmTermination `json:"confirmTermination,omitempty"` } diff --git a/go-packages/meep-app-support-client/model_app_termination_notification_subscription.go b/go-packages/meep-app-support-client/model_app_termination_notification_subscription.go index 22610dffa..455d721ab 100644 --- a/go-packages/meep-app-support-client/model_app_termination_notification_subscription.go +++ b/go-packages/meep-app-support-client/model_app_termination_notification_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,8 +29,8 @@ type AppTerminationNotificationSubscription struct { // Shall be set to AppTerminationNotificationSubscription. SubscriptionType string `json:"subscriptionType"` // URI selected by the MEC application instance to receive notifications on the subscribed MEC application instance management information. This shall be included in both the request and the response. - CallbackReference string `json:"callbackReference"` - Links *AppTerminationNotificationSubscriptionLinks `json:"_links"` + CallbackReference string `json:"callbackReference"` + Links *Self `json:"_links"` // It is used as the filtering criterion for the subscribed events. AppInstanceId string `json:"appInstanceId"` } diff --git a/go-packages/meep-app-support-client/model_current_time.go b/go-packages/meep-app-support-client/model_current_time.go index 163ed5eec..524b8b261 100644 --- a/go-packages/meep-app-support-client/model_current_time.go +++ b/go-packages/meep-app-support-client/model_current_time.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,6 @@ type CurrentTime struct { // The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC Seconds int32 `json:"seconds"` // The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC - NanoSeconds int32 `json:"nanoSeconds"` - // Platform Time Source status. 1 = TRACEABLE - time source is locked to the UTC time source. 2 = NONTRACEABLE - time source is not locked to the UTC time source - TimeSourceStatus string `json:"timeSourceStatus"` + NanoSeconds int32 `json:"nanoSeconds"` + TimeSourceStatus *TimeSourceStatus `json:"timeSourceStatus"` } diff --git a/go-packages/meep-app-support-client/model_destination_interface.go b/go-packages/meep-app-support-client/model_destination_interface.go index 6c98f5efa..24a684910 100644 --- a/go-packages/meep-app-support-client/model_destination_interface.go +++ b/go-packages/meep-app-support-client/model_destination_interface.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,12 +26,11 @@ package client // This type represents the destination interface. If the action is FORWARD_DECAPSULATED, FORWARD_ENCAPSULATED or PASSTHROUGH one value shall be provided. If the action is DUPLICATE_DECAPSULATED or DUPLICATE_ENCAPSULATED, two values shall be provided. If the action is DROP, no value shall be provided. type DestinationInterface struct { - // Type of the interface - InterfaceType string `json:"interfaceType"` - TunnelInfo *TunnelInfo `json:"tunnelInfo,omitempty"` + InterfaceType *DestinationInterfaceInterfaceType `json:"interfaceType"` + TunnelInfo *TunnelInfo `json:"tunnelInfo,omitempty"` // Source address identifies the MAC address of the interface SrcMacAddress string `json:"srcMacAddress,omitempty"` - // Destination address identifies the MAC address of the interface + // Source address identifies the MAC address of the interface DstMacAddress string `json:"dstMacAddress,omitempty"` // IP address of the remote destination DstIpAddress string `json:"dstIpAddress,omitempty"` diff --git a/go-packages/meep-app-support-client/model_destination_interface_interface_type.go b/go-packages/meep-app-support-client/model_destination_interface_interface_type.go new file mode 100644 index 000000000..a7a68c3ec --- /dev/null +++ b/go-packages/meep-app-support-client/model_destination_interface_interface_type.go @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// DestinationInterfaceInterfaceType : Type of the interface +type DestinationInterfaceInterfaceType string + +// List of DestinationInterfaceInterfaceType +const ( + TUNNEL_DestinationInterfaceInterfaceType DestinationInterfaceInterfaceType = "TUNNEL" + MAC_DestinationInterfaceInterfaceType DestinationInterfaceInterfaceType = "MAC" + IP_DestinationInterfaceInterfaceType DestinationInterfaceInterfaceType = "IP" +) diff --git a/go-packages/meep-app-support-client/model_dns_rule.go b/go-packages/meep-app-support-client/model_dns_rule.go index cfcb809fb..90cdd9693 100644 --- a/go-packages/meep-app-support-client/model_dns_rule.go +++ b/go-packages/meep-app-support-client/model_dns_rule.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,13 +29,11 @@ type DnsRule struct { // Identifies the DNS Rule DnsRuleId string `json:"dnsRuleId"` // FQDN resolved by the DNS rule - DomainName string `json:"domainName"` - // IP address type - IpAddressType string `json:"ipAddressType"` + DomainName string `json:"domainName"` + IpAddressType *DnsRuleIpAddressType `json:"ipAddressType"` // IP address associated with the FQDN resolved by the DNS rule IpAddress string `json:"ipAddress"` // Time to live value - Ttl int32 `json:"ttl,omitempty"` - // DNS rule state. This attribute may be updated using HTTP PUT method - State string `json:"state"` + Ttl int32 `json:"ttl,omitempty"` + State *DnsRuleState `json:"state"` } diff --git a/go-packages/meep-app-support-client/model_dns_rule_ip_address_type.go b/go-packages/meep-app-support-client/model_dns_rule_ip_address_type.go new file mode 100644 index 000000000..42ecca7a8 --- /dev/null +++ b/go-packages/meep-app-support-client/model_dns_rule_ip_address_type.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// DnsRuleIpAddressType : IP address type +type DnsRuleIpAddressType string + +// List of DnsRuleIpAddressType +const ( + V6_DnsRuleIpAddressType DnsRuleIpAddressType = "IP_V6" + V4_DnsRuleIpAddressType DnsRuleIpAddressType = "IP_V4" +) diff --git a/go-packages/meep-app-support-client/model_dns_rule_state.go b/go-packages/meep-app-support-client/model_dns_rule_state.go new file mode 100644 index 000000000..93cf5de77 --- /dev/null +++ b/go-packages/meep-app-support-client/model_dns_rule_state.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// DnsRuleState : DNS rule state. This attribute may be updated using HTTP PUT method +type DnsRuleState string + +// List of DnsRuleState +const ( + ACTIVE_DnsRuleState DnsRuleState = "ACTIVE" + INACTIVE_DnsRuleState DnsRuleState = "INACTIVE" +) diff --git a/go-packages/meep-app-support-client/model_link_type.go b/go-packages/meep-app-support-client/model_link_type.go index 8686c606f..93f5fff3d 100644 --- a/go-packages/meep-app-support-client/model_link_type.go +++ b/go-packages/meep-app-support-client/model_link_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_link_type_confirm_termination.go b/go-packages/meep-app-support-client/model_link_type_confirm_termination.go new file mode 100644 index 000000000..a04268396 --- /dev/null +++ b/go-packages/meep-app-support-client/model_link_type_confirm_termination.go @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// Link to the task resource where to confirm termination in case the application is ready to be terminated before expiry of the timeout. +type LinkTypeConfirmTermination struct { + // URI referring to a resource + Href string `json:"href,omitempty"` +} diff --git a/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list.go b/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list.go index cc4f643ec..f21f23c9b 100644 --- a/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list.go +++ b/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_links.go b/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_links.go index 90589cc96..c44b9e44a 100644 --- a/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_links.go +++ b/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,5 +28,5 @@ package client type MecAppSuptApiSubscriptionLinkListLinks struct { Self *LinkType `json:"self"` // The MEC application instance's subscriptions - Subscriptions []MecAppSuptApiSubscriptionLinkListLinksSubscriptions `json:"subscriptions,omitempty"` + Subscriptions []MecAppSuptApiSubscriptionLinkListSubscription `json:"subscriptions,omitempty"` } diff --git a/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_subscription.go b/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_subscription.go index e77fe4113..d1b9c9376 100644 --- a/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_subscription.go +++ b/go-packages/meep-app-support-client/model_mec_app_supt_api_subscription_link_list_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,9 +25,9 @@ package client // A link to a subscription. -type MecAppSuptApiSubscriptionLinkListLinksSubscriptions struct { +type MecAppSuptApiSubscriptionLinkListSubscription struct { // URI referring to a resource Href string `json:"href"` - // Type of the subscription. The values are as defined in the \"subscriptionType\" attribute for each different Mp1 event subscription data type. - SubscriptionType string `json:"subscriptionType"` + // The values shall be set to AppTerminationNotificationSubscription. + Rel string `json:"rel"` } diff --git a/go-packages/meep-app-support-client/model_operation_action_type.go b/go-packages/meep-app-support-client/model_operation_action_type.go index 1c8a81714..934254143 100644 --- a/go-packages/meep-app-support-client/model_operation_action_type.go +++ b/go-packages/meep-app-support-client/model_operation_action_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_problem_details.go b/go-packages/meep-app-support-client/model_problem_details.go index b793089d9..01ed3d5af 100644 --- a/go-packages/meep-app-support-client/model_problem_details.go +++ b/go-packages/meep-app-support-client/model_problem_details.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_app_termination_notification_subscription__links.go b/go-packages/meep-app-support-client/model_self.go similarity index 81% rename from go-packages/meep-app-support-client/model_app_termination_notification_subscription__links.go rename to go-packages/meep-app-support-client/model_self.go index 9c76ae268..e1eff521e 100644 --- a/go-packages/meep-app-support-client/model_app_termination_notification_subscription__links.go +++ b/go-packages/meep-app-support-client/model_self.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,6 +25,6 @@ package client // Self-referring URI. -type AppTerminationNotificationSubscriptionLinks struct { +type Self struct { Self *LinkType `json:"self"` } diff --git a/go-packages/meep-app-support-client/model_time_source_status.go b/go-packages/meep-app-support-client/model_time_source_status.go new file mode 100644 index 000000000..516dea207 --- /dev/null +++ b/go-packages/meep-app-support-client/model_time_source_status.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TimeSourceStatus : Platform Time Source status. 1 = TRACEABLE - time source is locked to the UTC time source. 2 = NONTRACEABLE - time source is not locked to the UTC time source +type TimeSourceStatus string + +// List of TimeSourceStatus +const ( + TRACEABLE_TimeSourceStatus TimeSourceStatus = "TRACEABLE" + NONTRACEABLE_TimeSourceStatus TimeSourceStatus = "NONTRACEABLE" +) diff --git a/go-packages/meep-app-support-client/model_timing_caps.go b/go-packages/meep-app-support-client/model_timing_caps.go index d31db748d..e26cd2ee3 100644 --- a/go-packages/meep-app-support-client/model_timing_caps.go +++ b/go-packages/meep-app-support-client/model_timing_caps.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,6 +29,6 @@ type TimingCaps struct { TimeStamp *TimingCapsTimeStamp `json:"timeStamp,omitempty"` // Available NTP servers NtpServers []TimingCapsNtpServers `json:"ntpServers,omitempty"` - // Available PTP Masters + // Number of available PTP Servers (referred to as \"masters\" in IEEE 1588-2019) PtpMasters []TimingCapsPtpMasters `json:"ptpMasters,omitempty"` } diff --git a/go-packages/meep-app-support-client/model_timing_caps_ntp_servers.go b/go-packages/meep-app-support-client/model_timing_caps_ntp_servers.go index ba793aad2..c1ff5ca9b 100644 --- a/go-packages/meep-app-support-client/model_timing_caps_ntp_servers.go +++ b/go-packages/meep-app-support-client/model_timing_caps_ntp_servers.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,18 +26,16 @@ package client // NTP server detail. type TimingCapsNtpServers struct { - // Address type of NTP server - NtpServerAddrType string `json:"ntpServerAddrType"` + NtpServerAddrType *TimingCapsNtpServersNtpServerAddrType `json:"ntpServerAddrType"` // NTP server address NtpServerAddr string `json:"ntpServerAddr"` - // Minimum poll interval for NTP messages, in seconds as a power of two. Range 3...17 + // Minimum poll interval for NTP messages, in seconds as a power of two. Range 3 to 17 MinPollingInterval int32 `json:"minPollingInterval"` - // Maximum poll interval for NTP messages, in seconds as a power of two. Range 3...17 + // Maximum poll interval for NTP messages, in seconds as a power of two. Range 3 to 17 MaxPollingInterval int32 `json:"maxPollingInterval"` // NTP server local priority - LocalPriority int32 `json:"localPriority"` - // NTP authentication option - AuthenticationOption string `json:"authenticationOption"` + LocalPriority int32 `json:"localPriority"` + AuthenticationOption *TimingCapsNtpServersAuthenticationOption `json:"authenticationOption"` // Authentication key number AuthenticationKeyNum int32 `json:"authenticationKeyNum"` } diff --git a/go-packages/meep-app-support-client/model_timing_caps_ntp_servers_authentication_option.go b/go-packages/meep-app-support-client/model_timing_caps_ntp_servers_authentication_option.go new file mode 100644 index 000000000..5a641b249 --- /dev/null +++ b/go-packages/meep-app-support-client/model_timing_caps_ntp_servers_authentication_option.go @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TimingCapsNtpServersAuthenticationOption : NTP authentication option +type TimingCapsNtpServersAuthenticationOption string + +// List of TimingCapsNtpServersAuthenticationOption +const ( + NONE_TimingCapsNtpServersAuthenticationOption TimingCapsNtpServersAuthenticationOption = "NONE" + SYMMETRIC_KEY_TimingCapsNtpServersAuthenticationOption TimingCapsNtpServersAuthenticationOption = "SYMMETRIC_KEY" + AUTO_KEY_TimingCapsNtpServersAuthenticationOption TimingCapsNtpServersAuthenticationOption = "AUTO_KEY" +) diff --git a/go-packages/meep-app-support-client/model_timing_caps_ntp_servers_ntp_server_addr_type.go b/go-packages/meep-app-support-client/model_timing_caps_ntp_servers_ntp_server_addr_type.go new file mode 100644 index 000000000..e5bb3e6ba --- /dev/null +++ b/go-packages/meep-app-support-client/model_timing_caps_ntp_servers_ntp_server_addr_type.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TimingCapsNtpServersNtpServerAddrType : Address type of NTP server +type TimingCapsNtpServersNtpServerAddrType string + +// List of TimingCapsNtpServersNtpServerAddrType +const ( + IP_ADDRESS_TimingCapsNtpServersNtpServerAddrType TimingCapsNtpServersNtpServerAddrType = "IP_ADDRESS" + DNS_NAME_TimingCapsNtpServersNtpServerAddrType TimingCapsNtpServersNtpServerAddrType = "DNS_NAME" +) diff --git a/go-packages/meep-app-support-client/model_timing_caps_ptp_masters.go b/go-packages/meep-app-support-client/model_timing_caps_ptp_masters.go index 4da44e789..7207fda9b 100644 --- a/go-packages/meep-app-support-client/model_timing_caps_ptp_masters.go +++ b/go-packages/meep-app-support-client/model_timing_caps_ptp_masters.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,9 +26,9 @@ package client // NTP server detail. type TimingCapsPtpMasters struct { - // PTP Master IP Address + // PTP Server (referred to as \"master\" in IEEE 1588-2019) IP Address PtpMasterIpAddress string `json:"ptpMasterIpAddress"` - // PTP Master local priority + // PTP Server (referred to as \"master\" in IEEE 1588-2019 ) local priority PtpMasterLocalPriority int32 `json:"ptpMasterLocalPriority"` // Acceptable maximum rate of the Delay_Req messages in packets per second DelayReqMaxRate int32 `json:"delayReqMaxRate"` diff --git a/go-packages/meep-app-support-client/model_timing_caps_time_stamp.go b/go-packages/meep-app-support-client/model_timing_caps_time_stamp.go index e5784882e..191744639 100644 --- a/go-packages/meep-app-support-client/model_timing_caps_time_stamp.go +++ b/go-packages/meep-app-support-client/model_timing_caps_time_stamp.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_traffic_filter.go b/go-packages/meep-app-support-client/model_traffic_filter.go index c28a04c2c..ac60343b9 100644 --- a/go-packages/meep-app-support-client/model_traffic_filter.go +++ b/go-packages/meep-app-support-client/model_traffic_filter.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-app-support-client/model_traffic_rule.go b/go-packages/meep-app-support-client/model_traffic_rule.go index 64843e2b8..bd676e637 100644 --- a/go-packages/meep-app-support-client/model_traffic_rule.go +++ b/go-packages/meep-app-support-client/model_traffic_rule.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,15 +27,12 @@ package client // This type represents the general information of a traffic rule. type TrafficRule struct { // Identify the traffic rule. - TrafficRuleId string `json:"trafficRuleId"` - // Definition of filter per FLOW or PACKET. If flow the filter match UE->EPC packet and the reverse packet is handled in the same context - FilterType string `json:"filterType"` - // Priority of this traffic rule. If traffic rule conflicts, the one with higher priority take precedence - Priority int32 `json:"priority"` - TrafficFilter []TrafficFilter `json:"trafficFilter"` - // The action of the MEC host data plane when a packet matches the trafficFilter - Action string `json:"action"` - DstInterface *DestinationInterface `json:"dstInterface,omitempty"` - // Contains the traffic rule state. This attribute may be updated using HTTP PUT method - State string `json:"state"` + TrafficRuleId string `json:"trafficRuleId"` + FilterType *TrafficRuleFilterType `json:"filterType"` + // Priority of this traffic rule within the range 0 to 255. If traffic rules conflict, the one with higher priority take precedence. Value indicates the priority in descending order, i.e. with 0 as the highest priority and 255 as the lowest priority. + Priority int32 `json:"priority"` + TrafficFilter []TrafficFilter `json:"trafficFilter"` + Action *TrafficRuleAction `json:"action"` + DstInterface []DestinationInterface `json:"dstInterface,omitempty"` + State *TrafficRuleState `json:"state"` } diff --git a/go-packages/meep-app-support-client/model_traffic_rule_action.go b/go-packages/meep-app-support-client/model_traffic_rule_action.go new file mode 100644 index 000000000..fb5614034 --- /dev/null +++ b/go-packages/meep-app-support-client/model_traffic_rule_action.go @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TrafficRuleAction : The action of the MEC host data plane when a packet matches the trafficFilter +type TrafficRuleAction string + +// List of TrafficRuleAction +const ( + DROP_TrafficRuleAction TrafficRuleAction = "DROP" + FORWARD_DECAPSULATED_TrafficRuleAction TrafficRuleAction = "FORWARD_DECAPSULATED" + FORWARD_ENCAPSULATED_TrafficRuleAction TrafficRuleAction = "FORWARD_ENCAPSULATED" + PASSTHROUGH_TrafficRuleAction TrafficRuleAction = "PASSTHROUGH" + DUPLICATE_DECAPSULATED_TrafficRuleAction TrafficRuleAction = "DUPLICATE_DECAPSULATED" + DUPLICATE_ENCAPSULATED_TrafficRuleAction TrafficRuleAction = "DUPLICATE_ENCAPSULATED" +) diff --git a/go-packages/meep-app-support-client/model_traffic_rule_filter_type.go b/go-packages/meep-app-support-client/model_traffic_rule_filter_type.go new file mode 100644 index 000000000..50b83e6cf --- /dev/null +++ b/go-packages/meep-app-support-client/model_traffic_rule_filter_type.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TrafficRuleFilterType : Definition of filter per FLOW or PACKET. If flow the filter match UE->EPC packet and the reverse packet is handled in the same context +type TrafficRuleFilterType string + +// List of TrafficRuleFilterType +const ( + FLOW_TrafficRuleFilterType TrafficRuleFilterType = "FLOW" + PACKET_TrafficRuleFilterType TrafficRuleFilterType = "PACKET" +) diff --git a/go-packages/meep-app-support-client/model_traffic_rule_state.go b/go-packages/meep-app-support-client/model_traffic_rule_state.go new file mode 100644 index 000000000..18a38ae41 --- /dev/null +++ b/go-packages/meep-app-support-client/model_traffic_rule_state.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TrafficRuleState : Contains the traffic rule state. This attribute may be updated using HTTP PUT method +type TrafficRuleState string + +// List of TrafficRuleState +const ( + ACTIVE_TrafficRuleState TrafficRuleState = "ACTIVE" + INACTIVE_TrafficRuleState TrafficRuleState = "INACTIVE" +) diff --git a/go-packages/meep-app-support-client/model_tunnel_info.go b/go-packages/meep-app-support-client/model_tunnel_info.go index 826b1fb69..5fea9222a 100644 --- a/go-packages/meep-app-support-client/model_tunnel_info.go +++ b/go-packages/meep-app-support-client/model_tunnel_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,8 +26,7 @@ package client // This type represents the tunnel information. type TunnelInfo struct { - // This type represents the tunnel information. - TunnelType string `json:"tunnelType"` + TunnelType *TunnelInfoTunnelType `json:"tunnelType"` // Destination address of the tunnel TunnelDstAddress string `json:"tunnelDstAddress,omitempty"` // Source address of the tunnel diff --git a/go-packages/meep-app-support-client/model_tunnel_info_tunnel_type.go b/go-packages/meep-app-support-client/model_tunnel_info_tunnel_type.go new file mode 100644 index 000000000..1edb1b26d --- /dev/null +++ b/go-packages/meep-app-support-client/model_tunnel_info_tunnel_type.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE MEC Application Support API + * + * MEC Application Support Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/app-support)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about applications in the network

    **Note**
    AdvantEDGE supports a selected subset of Application Support API endpoints (see below). + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// TunnelInfoTunnelType : This type represents the tunnel information. +type TunnelInfoTunnelType string + +// List of TunnelInfoTunnelType +const ( + GTP_U_TunnelInfoTunnelType TunnelInfoTunnelType = "GTP_U" + GRE_TunnelInfoTunnelType TunnelInfoTunnelType = "GRE" +) diff --git a/go-packages/meep-app-support-client/response.go b/go-packages/meep-app-support-client/response.go index 1c81ce16d..81a8d5574 100644 --- a/go-packages/meep-app-support-client/response.go +++ b/go-packages/meep-app-support-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-applications/application-store.go b/go-packages/meep-applications/application-store.go index 91c3cb133..e2ff041c6 100644 --- a/go-packages/meep-applications/application-store.go +++ b/go-packages/meep-applications/application-store.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -69,7 +69,7 @@ type ApplicationStore struct { mutex sync.Mutex } -var SysAppNames []string = []string{"meep-app-enablement", "meep-ams", "meep-loc-serv", "meep-rnis", "meep-dai", "meep-wais", "meep-vis", "meep-tm"} +var SysAppNames []string = []string{"meep-app-enablement", "meep-ams", "meep-loc-serv", "meep-rnis", "meep-wais", "meep-vis"} // NewApplicationStore - Creates and initialize an Application Store instance func NewApplicationStore(cfg *ApplicationStoreCfg) (as *ApplicationStore, err error) { diff --git a/go-packages/meep-couch/db.go b/go-packages/meep-couch/db.go index 68d343dbd..e69560d8f 100644 --- a/go-packages/meep-couch/db.go +++ b/go-packages/meep-couch/db.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-couch/db_test.go b/go-packages/meep-couch/db_test.go index 0296f02ee..7c2affad4 100644 --- a/go-packages/meep-couch/db_test.go +++ b/go-packages/meep-couch/db_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-dai-mgr/exec.go b/go-packages/meep-dai-mgr/exec.go index d69646496..07b0b5e15 100644 --- a/go-packages/meep-dai-mgr/exec.go +++ b/go-packages/meep-dai-mgr/exec.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 InterDigital Communications, Inc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/go-packages/meep-dai-mgr/format.go b/go-packages/meep-dai-mgr/format.go index 0614f956c..2918fd32a 100644 --- a/go-packages/meep-dai-mgr/format.go +++ b/go-packages/meep-dai-mgr/format.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 InterDigital Communications, Inc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/go-packages/meep-data-key-mgr/data-key-mgr.go b/go-packages/meep-data-key-mgr/data-key-mgr.go index f343c9dd6..d56e24dc7 100644 --- a/go-packages/meep-data-key-mgr/data-key-mgr.go +++ b/go-packages/meep-data-key-mgr/data-key-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-data-model/api/swagger.yaml b/go-packages/meep-data-model/api/swagger.yaml index be336b6ad..151cf88e6 100644 --- a/go-packages/meep-data-model/api/swagger.yaml +++ b/go-packages/meep-data-model/api/swagger.yaml @@ -97,6 +97,8 @@ definitions: $ref: '#/definitions/NetworkCharacteristics' connectivity: $ref: '#/definitions/ConnectivityConfig' + d2d: + $ref: '#/definitions/D2dConfig' interDomainLatency: type: integer description: '**DEPRECATED** As of release 1.5.0, replaced by netChar latency' @@ -126,6 +128,16 @@ definitions: $ref: '#/definitions/Domain' description: Network deployment object example: {} + D2dConfig: + type: object + properties: + d2dMaxDistance: + type: number + description: Maximum distance for D2D. Default distance is 100m + disableD2dViaNetwork: + type: boolean + description: Enable-Disable D2D via network. Default value is false + description: 'D2D config' Domain: type: object properties: @@ -402,6 +414,16 @@ definitions: velocity: description: Speed of movement along path in m/s type: number + d2dInRange: + type: array + items: + type: string + description: D2D UEs visible to UE + poaInRange: + type: array + items: + type: string + description: POAs visible to UE GpuConfig: type: object properties: @@ -480,7 +502,7 @@ definitions: description: Latency variation in ms latencyDistribution: type: string - description: Latency distribution. Can only be set in the Scenario Deployment network characteristics, ignored otherwise. Latency distribution is set for the whole network and applied to every end-to-end traffic flows. Default value is 'Normal' distribution. + description: Latency distribution. Can only be set in the Scenario Deployment network characteristics, ignored otherwise. Latency distribution is set for the whole network and applied to every end-to-end traffic flows. Default value is 'Normal' distribution. enum: - Normal - Pareto diff --git a/go-packages/meep-data-model/docs/D2dConfig.md b/go-packages/meep-data-model/docs/D2dConfig.md new file mode 100644 index 000000000..c538be21f --- /dev/null +++ b/go-packages/meep-data-model/docs/D2dConfig.md @@ -0,0 +1,11 @@ +# D2dConfig + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**D2dMaxDistance** | **float32** | Maximum distance for D2D. Default distance is 100m | [optional] [default to null] +**DisableD2dViaNetwork** | **bool** | Enable-Disable D2D via network. Default value is false | [optional] [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-data-model/docs/Deployment.md b/go-packages/meep-data-model/docs/Deployment.md index 4dc93d961..9f079b0ff 100644 --- a/go-packages/meep-data-model/docs/Deployment.md +++ b/go-packages/meep-data-model/docs/Deployment.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **NetChar** | [***NetworkCharacteristics**](NetworkCharacteristics.md) | | [optional] [default to null] **Connectivity** | [***ConnectivityConfig**](ConnectivityConfig.md) | | [optional] [default to null] +**D2d** | [***D2dConfig**](D2dConfig.md) | | [optional] [default to null] **InterDomainLatency** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar latency | [optional] [default to null] **InterDomainLatencyVariation** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation | [optional] [default to null] **InterDomainThroughput** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar throughputUl and throughputDl | [optional] [default to null] diff --git a/go-packages/meep-data-model/docs/GeoData.md b/go-packages/meep-data-model/docs/GeoData.md index 347ea89ab..f911776fb 100644 --- a/go-packages/meep-data-model/docs/GeoData.md +++ b/go-packages/meep-data-model/docs/GeoData.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **Path** | [***LineString**](LineString.md) | | [optional] [default to null] **EopMode** | **string** | End-of-Path mode: <li>LOOP: When path endpoint is reached, start over from the beginning <li>REVERSE: When path endpoint is reached, return on the reverse path | [optional] [default to null] **Velocity** | **float32** | Speed of movement along path in m/s | [optional] [default to null] +**D2dInRange** | **[]string** | | [optional] [default to null] +**PoaInRange** | **[]string** | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-data-model/model_activation_info.go b/go-packages/meep-data-model/model_activation_info.go index df561accf..6a53e6a7c 100644 --- a/go-packages/meep-data-model/model_activation_info.go +++ b/go-packages/meep-data-model/model_activation_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_application_info.go b/go-packages/meep-data-model/model_application_info.go index e8e056fa7..03240d15d 100644 --- a/go-packages/meep-data-model/model_application_info.go +++ b/go-packages/meep-data-model/model_application_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_cellular_domain_config.go b/go-packages/meep-data-model/model_cellular_domain_config.go index e2c530c3b..9ee4fbe19 100644 --- a/go-packages/meep-data-model/model_cellular_domain_config.go +++ b/go-packages/meep-data-model/model_cellular_domain_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_cellular_poa_config.go b/go-packages/meep-data-model/model_cellular_poa_config.go index 9d5e72935..60999a822 100644 --- a/go-packages/meep-data-model/model_cellular_poa_config.go +++ b/go-packages/meep-data-model/model_cellular_poa_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_connectivity_config.go b/go-packages/meep-data-model/model_connectivity_config.go index 0f9704ad8..b8a0ba6e1 100644 --- a/go-packages/meep-data-model/model_connectivity_config.go +++ b/go-packages/meep-data-model/model_connectivity_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_cpu_config.go b/go-packages/meep-data-model/model_cpu_config.go index aca103a86..3955b7638 100644 --- a/go-packages/meep-data-model/model_cpu_config.go +++ b/go-packages/meep-data-model/model_cpu_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_d2d_config.go b/go-packages/meep-data-model/model_d2d_config.go new file mode 100644 index 000000000..125293270 --- /dev/null +++ b/go-packages/meep-data-model/model_d2d_config.go @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * MEEP Model + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: 1.0.0 + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package model + +// D2D config +type D2dConfig struct { + // Maximum distance for D2D. Default distance is 100m + D2dMaxDistance float32 `json:"d2dMaxDistance,omitempty"` + // Enable-Disable D2D via network. Default value is false + DisableD2dViaNetwork bool `json:"disableD2dViaNetwork,omitempty"` +} diff --git a/go-packages/meep-data-model/model_deployment.go b/go-packages/meep-data-model/model_deployment.go index 6ab76ec20..d16e64d44 100644 --- a/go-packages/meep-data-model/model_deployment.go +++ b/go-packages/meep-data-model/model_deployment.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,6 +27,7 @@ package model type Deployment struct { NetChar *NetworkCharacteristics `json:"netChar,omitempty"` Connectivity *ConnectivityConfig `json:"connectivity,omitempty"` + D2d *D2dConfig `json:"d2d,omitempty"` // **DEPRECATED** As of release 1.5.0, replaced by netChar latency InterDomainLatency int32 `json:"interDomainLatency,omitempty"` // **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation diff --git a/go-packages/meep-data-model/model_dn_config.go b/go-packages/meep-data-model/model_dn_config.go index 475f14541..979865c78 100644 --- a/go-packages/meep-data-model/model_dn_config.go +++ b/go-packages/meep-data-model/model_dn_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_domain.go b/go-packages/meep-data-model/model_domain.go index 6f2a7d41e..432bbaac5 100644 --- a/go-packages/meep-data-model/model_domain.go +++ b/go-packages/meep-data-model/model_domain.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_domains.go b/go-packages/meep-data-model/model_domains.go index 203b44591..22f47f728 100644 --- a/go-packages/meep-data-model/model_domains.go +++ b/go-packages/meep-data-model/model_domains.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_egress_service.go b/go-packages/meep-data-model/model_egress_service.go index d478b6855..7a1d7dd07 100644 --- a/go-packages/meep-data-model/model_egress_service.go +++ b/go-packages/meep-data-model/model_egress_service.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event.go b/go-packages/meep-data-model/model_event.go index 0942c25e9..73f54299c 100644 --- a/go-packages/meep-data-model/model_event.go +++ b/go-packages/meep-data-model/model_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event_list.go b/go-packages/meep-data-model/model_event_list.go index 001e89ac8..418e7b949 100644 --- a/go-packages/meep-data-model/model_event_list.go +++ b/go-packages/meep-data-model/model_event_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event_mobility.go b/go-packages/meep-data-model/model_event_mobility.go index f19ace30c..7cf9cbb1a 100644 --- a/go-packages/meep-data-model/model_event_mobility.go +++ b/go-packages/meep-data-model/model_event_mobility.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event_network_characteristics_update.go b/go-packages/meep-data-model/model_event_network_characteristics_update.go index bc80d3daf..b8c0b3d1f 100644 --- a/go-packages/meep-data-model/model_event_network_characteristics_update.go +++ b/go-packages/meep-data-model/model_event_network_characteristics_update.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event_pdu_session.go b/go-packages/meep-data-model/model_event_pdu_session.go index 105ecf416..477bc28ad 100644 --- a/go-packages/meep-data-model/model_event_pdu_session.go +++ b/go-packages/meep-data-model/model_event_pdu_session.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event_poas_in_range.go b/go-packages/meep-data-model/model_event_poas_in_range.go index f01499756..e885cd36f 100644 --- a/go-packages/meep-data-model/model_event_poas_in_range.go +++ b/go-packages/meep-data-model/model_event_poas_in_range.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_event_scenario_update.go b/go-packages/meep-data-model/model_event_scenario_update.go index e6ca422e8..1e774c600 100644 --- a/go-packages/meep-data-model/model_event_scenario_update.go +++ b/go-packages/meep-data-model/model_event_scenario_update.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_external_config.go b/go-packages/meep-data-model/model_external_config.go index 1d52020a4..45fb7b009 100644 --- a/go-packages/meep-data-model/model_external_config.go +++ b/go-packages/meep-data-model/model_external_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_geo_data.go b/go-packages/meep-data-model/model_geo_data.go index a7257dd76..921fbf17a 100644 --- a/go-packages/meep-data-model/model_geo_data.go +++ b/go-packages/meep-data-model/model_geo_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,5 +32,7 @@ type GeoData struct { // End-of-Path mode:

  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path EopMode string `json:"eopMode,omitempty"` // Speed of movement along path in m/s - Velocity float32 `json:"velocity,omitempty"` + Velocity float32 `json:"velocity,omitempty"` + D2dInRange []string `json:"d2dInRange,omitempty"` + PoaInRange []string `json:"poaInRange,omitempty"` } diff --git a/go-packages/meep-data-model/model_gpu_config.go b/go-packages/meep-data-model/model_gpu_config.go index bc27a6111..4a2bbbfa7 100644 --- a/go-packages/meep-data-model/model_gpu_config.go +++ b/go-packages/meep-data-model/model_gpu_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_ingress_service.go b/go-packages/meep-data-model/model_ingress_service.go index 1ce370e12..60958fc5c 100644 --- a/go-packages/meep-data-model/model_ingress_service.go +++ b/go-packages/meep-data-model/model_ingress_service.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_line_string.go b/go-packages/meep-data-model/model_line_string.go index 1faf371a3..813ff46cd 100644 --- a/go-packages/meep-data-model/model_line_string.go +++ b/go-packages/meep-data-model/model_line_string.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_locality_type.go b/go-packages/meep-data-model/model_locality_type.go index 2d7486a6a..9aa9763cb 100644 --- a/go-packages/meep-data-model/model_locality_type.go +++ b/go-packages/meep-data-model/model_locality_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_memory_config.go b/go-packages/meep-data-model/model_memory_config.go index 1c09e5917..928b64696 100644 --- a/go-packages/meep-data-model/model_memory_config.go +++ b/go-packages/meep-data-model/model_memory_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_network_characteristics.go b/go-packages/meep-data-model/model_network_characteristics.go index 0923f8fd7..c770724c3 100644 --- a/go-packages/meep-data-model/model_network_characteristics.go +++ b/go-packages/meep-data-model/model_network_characteristics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_network_location.go b/go-packages/meep-data-model/model_network_location.go index e579a7884..26ccb7c20 100644 --- a/go-packages/meep-data-model/model_network_location.go +++ b/go-packages/meep-data-model/model_network_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_network_locations.go b/go-packages/meep-data-model/model_network_locations.go index 93ed58465..6ba76bbec 100644 --- a/go-packages/meep-data-model/model_network_locations.go +++ b/go-packages/meep-data-model/model_network_locations.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_node_data_union.go b/go-packages/meep-data-model/model_node_data_union.go index 65d7afa4d..fd0305f6e 100644 --- a/go-packages/meep-data-model/model_node_data_union.go +++ b/go-packages/meep-data-model/model_node_data_union.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_node_service_maps.go b/go-packages/meep-data-model/model_node_service_maps.go index 6bba246d5..015ff89e6 100644 --- a/go-packages/meep-data-model/model_node_service_maps.go +++ b/go-packages/meep-data-model/model_node_service_maps.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_pdu_session.go b/go-packages/meep-data-model/model_pdu_session.go index 3ede720d3..5e0657fdd 100644 --- a/go-packages/meep-data-model/model_pdu_session.go +++ b/go-packages/meep-data-model/model_pdu_session.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_pdu_session_info.go b/go-packages/meep-data-model/model_pdu_session_info.go index 8acf9b766..1d2341cd7 100644 --- a/go-packages/meep-data-model/model_pdu_session_info.go +++ b/go-packages/meep-data-model/model_pdu_session_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_pdu_session_list.go b/go-packages/meep-data-model/model_pdu_session_list.go index f7e498456..7ee42cadb 100644 --- a/go-packages/meep-data-model/model_pdu_session_list.go +++ b/go-packages/meep-data-model/model_pdu_session_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_physical_location.go b/go-packages/meep-data-model/model_physical_location.go index 17ee78096..6fd78f178 100644 --- a/go-packages/meep-data-model/model_physical_location.go +++ b/go-packages/meep-data-model/model_physical_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_physical_locations.go b/go-packages/meep-data-model/model_physical_locations.go index 099ed4867..e4c97c4c4 100644 --- a/go-packages/meep-data-model/model_physical_locations.go +++ b/go-packages/meep-data-model/model_physical_locations.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_poa4_g_config.go b/go-packages/meep-data-model/model_poa4_g_config.go index e11752652..42a3528d7 100644 --- a/go-packages/meep-data-model/model_poa4_g_config.go +++ b/go-packages/meep-data-model/model_poa4_g_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_poa5_g_config.go b/go-packages/meep-data-model/model_poa5_g_config.go index 36c15d5d9..da029f55f 100644 --- a/go-packages/meep-data-model/model_poa5_g_config.go +++ b/go-packages/meep-data-model/model_poa5_g_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_poa_wifi_config.go b/go-packages/meep-data-model/model_poa_wifi_config.go index 8275da2ad..536352556 100644 --- a/go-packages/meep-data-model/model_poa_wifi_config.go +++ b/go-packages/meep-data-model/model_poa_wifi_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_point.go b/go-packages/meep-data-model/model_point.go index 555473283..20f1f576d 100644 --- a/go-packages/meep-data-model/model_point.go +++ b/go-packages/meep-data-model/model_point.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_process.go b/go-packages/meep-data-model/model_process.go index 96cccc78c..e0eb12298 100644 --- a/go-packages/meep-data-model/model_process.go +++ b/go-packages/meep-data-model/model_process.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_processes.go b/go-packages/meep-data-model/model_processes.go index 41dcb3a02..14a16e3d6 100644 --- a/go-packages/meep-data-model/model_processes.go +++ b/go-packages/meep-data-model/model_processes.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_release.go b/go-packages/meep-data-model/model_release.go index 5a8a61d53..c3ef37820 100644 --- a/go-packages/meep-data-model/model_release.go +++ b/go-packages/meep-data-model/model_release.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_replay.go b/go-packages/meep-data-model/model_replay.go index d4ac18abe..920b39a9b 100644 --- a/go-packages/meep-data-model/model_replay.go +++ b/go-packages/meep-data-model/model_replay.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_replay_event.go b/go-packages/meep-data-model/model_replay_event.go index c6b41e80b..62fc1ba40 100644 --- a/go-packages/meep-data-model/model_replay_event.go +++ b/go-packages/meep-data-model/model_replay_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_replay_file_list.go b/go-packages/meep-data-model/model_replay_file_list.go index 182df4599..e1121367e 100644 --- a/go-packages/meep-data-model/model_replay_file_list.go +++ b/go-packages/meep-data-model/model_replay_file_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_replay_info.go b/go-packages/meep-data-model/model_replay_info.go index 1f9cc9bdc..ca3c38972 100644 --- a/go-packages/meep-data-model/model_replay_info.go +++ b/go-packages/meep-data-model/model_replay_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_replay_status.go b/go-packages/meep-data-model/model_replay_status.go index d438f6c42..6dac70f25 100644 --- a/go-packages/meep-data-model/model_replay_status.go +++ b/go-packages/meep-data-model/model_replay_status.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_sandbox.go b/go-packages/meep-data-model/model_sandbox.go index 9d098fd21..b3be898ea 100644 --- a/go-packages/meep-data-model/model_sandbox.go +++ b/go-packages/meep-data-model/model_sandbox.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_sandbox_config.go b/go-packages/meep-data-model/model_sandbox_config.go index afcb5c96c..dbf8e50b0 100644 --- a/go-packages/meep-data-model/model_sandbox_config.go +++ b/go-packages/meep-data-model/model_sandbox_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_sandbox_list.go b/go-packages/meep-data-model/model_sandbox_list.go index d24b03dba..dc2c82d09 100644 --- a/go-packages/meep-data-model/model_sandbox_list.go +++ b/go-packages/meep-data-model/model_sandbox_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_scenario.go b/go-packages/meep-data-model/model_scenario.go index 42e0ff31c..dde0a5f17 100644 --- a/go-packages/meep-data-model/model_scenario.go +++ b/go-packages/meep-data-model/model_scenario.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_scenario_config.go b/go-packages/meep-data-model/model_scenario_config.go index f61d5bf8f..b7eb2511b 100644 --- a/go-packages/meep-data-model/model_scenario_config.go +++ b/go-packages/meep-data-model/model_scenario_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_scenario_list.go b/go-packages/meep-data-model/model_scenario_list.go index 62ffa3db5..15646f1d4 100644 --- a/go-packages/meep-data-model/model_scenario_list.go +++ b/go-packages/meep-data-model/model_scenario_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_scenario_node.go b/go-packages/meep-data-model/model_scenario_node.go index f0d6b5e49..49922ddd3 100644 --- a/go-packages/meep-data-model/model_scenario_node.go +++ b/go-packages/meep-data-model/model_scenario_node.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_service_config.go b/go-packages/meep-data-model/model_service_config.go index 2d7165a6b..0a0124a16 100644 --- a/go-packages/meep-data-model/model_service_config.go +++ b/go-packages/meep-data-model/model_service_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_service_info.go b/go-packages/meep-data-model/model_service_info.go index 01b22febe..a38f3df1a 100644 --- a/go-packages/meep-data-model/model_service_info.go +++ b/go-packages/meep-data-model/model_service_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_service_port.go b/go-packages/meep-data-model/model_service_port.go index 53511547f..3d4d6d0d1 100644 --- a/go-packages/meep-data-model/model_service_port.go +++ b/go-packages/meep-data-model/model_service_port.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_settings.go b/go-packages/meep-data-model/model_settings.go index a9e7e1cb4..e380ac362 100644 --- a/go-packages/meep-data-model/model_settings.go +++ b/go-packages/meep-data-model/model_settings.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_zone.go b/go-packages/meep-data-model/model_zone.go index 4ba60a9c7..08f7df4ab 100644 --- a/go-packages/meep-data-model/model_zone.go +++ b/go-packages/meep-data-model/model_zone.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-data-model/model_zones.go b/go-packages/meep-data-model/model_zones.go index 17d3092b2..98f2a98ec 100644 --- a/go-packages/meep-data-model/model_zones.go +++ b/go-packages/meep-data-model/model_zones.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gc/gc.go b/go-packages/meep-gc/gc.go index e39c4b91f..d75579f3f 100644 --- a/go-packages/meep-gc/gc.go +++ b/go-packages/meep-gc/gc.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-gis-asset-mgr/asset-mgr.go b/go-packages/meep-gis-asset-mgr/asset-mgr.go index e53e6fb4d..d07875ad6 100644 --- a/go-packages/meep-gis-asset-mgr/asset-mgr.go +++ b/go-packages/meep-gis-asset-mgr/asset-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -69,10 +69,12 @@ const ( // DB Table Names const ( - UeTable = "ue" - UeMeasurementTable = "measurements" - PoaTable = "poa" - ComputeTable = "compute" + UeTable = "ue" + LegacyMeasurementTable = "measurements" + D2DMeasurementTable = "d2d_meas" + PoaMeasurementTable = "poa_meas" + PoaTable = "poa" + ComputeTable = "compute" ) // Asset Types @@ -88,10 +90,18 @@ const ( PoaTypeCell4g = "POA-4G" PoaTypeCell5g = "POA-5G" PoaTypeWifi = "POA-WIFI" + PoaTypeD2d = "POA-D2D" PoaTypeDisconnected = "DISCONNECTED" ) -type UeMeasurement struct { +type D2DMeasurement struct { + Ue string + Radius float32 + Distance float32 + InRange bool +} + +type PoaMeasurement struct { Poa string SubType string Radius float32 @@ -103,21 +113,24 @@ type UeMeasurement struct { } type Ue struct { - Id string - Name string - Position string - Path string - PathMode string - PathVelocity float32 - PathLength float32 - PathIncrement float32 - PathFraction float32 - Poa string - PoaDistance float32 - PoaInRange []string - PoaTypePrio []string - Connected bool - Measurements map[string]*UeMeasurement + Id string + Name string + Position string + Path string + PathMode string + PathVelocity float32 + PathLength float32 + PathIncrement float32 + PathFraction float32 + Poa string + PoaDistance float32 + PoaInRange []string + PoaTypePrio []string + Connected bool + D2DRadius float32 + D2DInRange []string + D2DMeasurements map[string]*D2DMeasurement + PoaMeasurements map[string]*PoaMeasurement } type Poa struct { @@ -338,6 +351,7 @@ func (am *AssetMgr) CreateTables() (err error) { name varchar(100) NOT NULL UNIQUE, position geometry(POINT,4326) NOT NULL, path geometry(LINESTRING,4326), + path_json json, path_mode varchar(20) NOT NULL DEFAULT 'LOOP', path_velocity decimal(10,3) NOT NULL DEFAULT '0.000', path_length decimal(10,3) NOT NULL DEFAULT '0.000', @@ -347,6 +361,8 @@ func (am *AssetMgr) CreateTables() (err error) { poa_distance decimal(10,3) NOT NULL DEFAULT '0.000', poa_in_range varchar(100)[] NOT NULL DEFAULT array[]::varchar[], poa_type_prio varchar(20)[] NOT NULL DEFAULT array[]::varchar[], + d2d_radius decimal(10,1) NOT NULL DEFAULT '0.0', + d2d_in_range varchar(100)[] NOT NULL DEFAULT array[]::varchar[], connected boolean NOT NULL DEFAULT 'false', start_time timestamptz NOT NULL DEFAULT now(), PRIMARY KEY (id) @@ -357,8 +373,8 @@ func (am *AssetMgr) CreateTables() (err error) { } log.Info("Created UE table: ", UeTable) - // UE Measurements Table - _, err = am.db.Exec(`CREATE TABLE ` + UeMeasurementTable + ` ( + // POA Measurements Table + _, err = am.db.Exec(`CREATE TABLE ` + PoaMeasurementTable + ` ( id varchar(36) NOT NULL, ue varchar(36) NOT NULL, poa varchar(100) NOT NULL DEFAULT '', @@ -376,7 +392,24 @@ func (am *AssetMgr) CreateTables() (err error) { log.Error(err.Error()) return err } - log.Info("Created UE Measurements table: ", UeMeasurementTable) + log.Info("Created POA Measurements table: ", PoaMeasurementTable) + + // D2D Measurements Table + _, err = am.db.Exec(`CREATE TABLE ` + D2DMeasurementTable + ` ( + id varchar(36) NOT NULL, + ue varchar(36) NOT NULL, + d2d_ue varchar(100) NOT NULL DEFAULT '', + radius decimal(10,1) NOT NULL DEFAULT '0.0', + distance decimal(10,3) NOT NULL DEFAULT '0.000', + in_range boolean NOT NULL DEFAULT 'false', + PRIMARY KEY (id), + FOREIGN KEY (ue) REFERENCES ` + UeTable + `(name) ON DELETE CASCADE + )`) + if err != nil { + log.Error(err.Error()) + return err + } + log.Info("Created POA Measurements table: ", D2DMeasurementTable) // POA Table _, err = am.db.Exec(`CREATE TABLE ` + PoaTable + ` ( @@ -413,7 +446,9 @@ func (am *AssetMgr) CreateTables() (err error) { // DeleteTables - Delete all postgis tables func (am *AssetMgr) DeleteTables() (err error) { - _ = am.DeleteTable(UeMeasurementTable) + _ = am.DeleteTable(LegacyMeasurementTable) + _ = am.DeleteTable(D2DMeasurementTable) + _ = am.DeleteTable(PoaMeasurementTable) _ = am.DeleteTable(UeTable) _ = am.DeleteTable(PoaTable) _ = am.DeleteTable(ComputeTable) @@ -442,6 +477,7 @@ func (am *AssetMgr) CreateUe(id string, name string, data map[string]interface{} var mode string var velocity float32 var connected bool + var d2dRadius float32 var priority string var ok bool @@ -494,6 +530,18 @@ func (am *AssetMgr) CreateUe(id string, name string, data map[string]interface{} } priorityList := strings.Split(strings.TrimSpace(priority), ",") + // Get D2D radius if D2D is supported by UE + for _, priority := range priorityList { + if priority == "d2d" { + if radius, found := data[FieldRadius]; found { + if d2dRadius, ok = radius.(float32); !ok { + return errors.New("Invalid D2D radius data type") + } + } + break + } + } + if path != "" { // Validate Path parameters if mode == "" { @@ -501,9 +549,9 @@ func (am *AssetMgr) CreateUe(id string, name string, data map[string]interface{} } // Create UE entry with path - query := `INSERT INTO ` + UeTable + ` (id, name, position, path, path_mode, path_velocity, poa_type_prio, connected) - VALUES ($1, $2, ST_GeomFromGeoJSON('` + position + `'), ST_GeomFromGeoJSON('` + path + `'), $3, $4, $5, $6)` - _, err = am.db.Exec(query, id, name, mode, velocity, pq.Array(priorityList), connected) + query := `INSERT INTO ` + UeTable + ` (id, name, position, path, path_json, path_mode, path_velocity, poa_type_prio, d2d_radius, connected) + VALUES ($1, $2, ST_GeomFromGeoJSON('` + position + `'), ST_GeomFromGeoJSON('` + path + `'), $3, $4, $5, $6, $7, $8)` + _, err = am.db.Exec(query, id, name, path, mode, velocity, pq.Array(priorityList), d2dRadius, connected) if err != nil { log.Error(err.Error()) return err @@ -517,9 +565,9 @@ func (am *AssetMgr) CreateUe(id string, name string, data map[string]interface{} } } else { // Create UE entry without path - query := `INSERT INTO ` + UeTable + ` (id, name, position, poa_type_prio, connected) - VALUES ($1, $2, ST_GeomFromGeoJSON('` + position + `'), $3, $4)` - _, err = am.db.Exec(query, id, name, pq.Array(priorityList), connected) + query := `INSERT INTO ` + UeTable + ` (id, name, position, poa_type_prio, d2d_radius, connected) + VALUES ($1, $2, ST_GeomFromGeoJSON('` + position + `'), $3, $4, $5)` + _, err = am.db.Exec(query, id, name, pq.Array(priorityList), d2dRadius, connected) if err != nil { log.Error(err.Error()) return err @@ -527,7 +575,7 @@ func (am *AssetMgr) CreateUe(id string, name string, data map[string]interface{} } // Refresh UE information - err = am.refreshUe(name) + err = am.refreshAllUe() if err != nil { log.Error(err.Error()) return err @@ -703,7 +751,7 @@ func (am *AssetMgr) UpdateUe(name string, data map[string]interface{}) (err erro } // Refresh UE information - err = am.refreshUe(name) + err = am.refreshAllUe() if err != nil { log.Error(err.Error()) return err @@ -737,10 +785,11 @@ func (am *AssetMgr) UpdateUe(name string, data map[string]interface{}) (err erro // Update UE position query := `UPDATE ` + UeTable + ` SET path = ST_GeomFromGeoJSON('` + path + `'), - path_mode = $2, - path_velocity = $3 + path_json = $2, + path_mode = $3, + path_velocity = $4 WHERE name = ($1)` - _, err = am.db.Exec(query, name, mode, velocity) + _, err = am.db.Exec(query, name, path, mode, velocity) if err != nil { log.Error(err.Error()) return err @@ -948,13 +997,16 @@ func (am *AssetMgr) GetUe(name string) (ue *Ue, err error) { // Get UE entry var rows *sql.Rows rows, err = am.db.Query(` - SELECT ue.id, ue.name, ST_AsGeoJSON(ue.position), ST_AsGeoJSON(ue.path), + SELECT ue.id, ue.name, ST_AsGeoJSON(ue.position), ue.path_json, ue.path_mode, ue.path_velocity, ue.path_length, ue.path_increment, ue.path_fraction, ue.poa, ue.poa_distance, ue.poa_in_range, ue.poa_type_prio, ue.connected, - COALESCE (meas.poa,''), COALESCE (meas.type,''), COALESCE (meas.radius,'0.0'), COALESCE (meas.distance,'0.000'), - COALESCE (meas.in_range,'false'), COALESCE (meas.rssi,'0.000'), COALESCE (meas.rsrp,'0.0'), COALESCE (meas.rsrq,'0.0') + ue.d2d_radius, ue.d2d_in_range, + COALESCE (d2d_meas.d2d_ue,''), COALESCE (d2d_meas.radius,'0.0'), COALESCE (d2d_meas.distance,'0.000'), COALESCE (d2d_meas.in_range,'false'), + COALESCE (poa_meas.poa,''), COALESCE (poa_meas.type,''), COALESCE (poa_meas.radius,'0.0'), COALESCE (poa_meas.distance,'0.000'), + COALESCE (poa_meas.in_range,'false'), COALESCE (poa_meas.rssi,'0.000'), COALESCE (poa_meas.rsrp,'0.0'), COALESCE (poa_meas.rsrq,'0.0') FROM `+UeTable+` AS ue - LEFT JOIN `+UeMeasurementTable+` AS meas ON (ue.name = meas.ue) + LEFT JOIN `+D2DMeasurementTable+` AS d2d_meas ON (ue.name = d2d_meas.ue AND d2d_meas.in_range) + LEFT JOIN `+PoaMeasurementTable+` AS poa_meas ON (ue.name = poa_meas.ue AND poa_meas.in_range) WHERE ue.name = ($1)`, name) if err != nil { log.Error(err.Error()) @@ -965,15 +1017,18 @@ func (am *AssetMgr) GetUe(name string) (ue *Ue, err error) { // Scan result for rows.Next() { ueEntry := new(Ue) - ueMeas := new(UeMeasurement) + d2dMeas := new(D2DMeasurement) + poaMeas := new(PoaMeasurement) path := new(string) // Fill UE err = rows.Scan(&ueEntry.Id, &ueEntry.Name, &ueEntry.Position, &path, &ueEntry.PathMode, &ueEntry.PathVelocity, &ueEntry.PathLength, &ueEntry.PathIncrement, &ueEntry.PathFraction, &ueEntry.Poa, &ueEntry.PoaDistance, pq.Array(&ueEntry.PoaInRange), pq.Array(&ueEntry.PoaTypePrio), &ueEntry.Connected, - &ueMeas.Poa, &ueMeas.SubType, &ueMeas.Radius, &ueMeas.Distance, &ueMeas.InRange, - &ueMeas.Rssi, &ueMeas.Rsrp, &ueMeas.Rsrq) + &ueEntry.D2DRadius, pq.Array(&ueEntry.D2DInRange), + &d2dMeas.Ue, &d2dMeas.Radius, &d2dMeas.Distance, &d2dMeas.InRange, + &poaMeas.Poa, &poaMeas.SubType, &poaMeas.Radius, &poaMeas.Distance, &poaMeas.InRange, + &poaMeas.Rssi, &poaMeas.Rsrp, &poaMeas.Rsrq) if err != nil { log.Error(err.Error()) return nil, err @@ -982,15 +1037,20 @@ func (am *AssetMgr) GetUe(name string) (ue *Ue, err error) { // Create new UE if not set if ue == nil { ue = ueEntry - ue.Measurements = make(map[string]*UeMeasurement) + ue.D2DMeasurements = make(map[string]*D2DMeasurement) + ue.PoaMeasurements = make(map[string]*PoaMeasurement) if path != nil { ue.Path = *path } } - // Set UE measurement if in range - if ueMeas.InRange { - ue.Measurements[ueMeas.Poa] = ueMeas + // Set D2D measurement if in range + if d2dMeas.InRange { + ue.D2DMeasurements[d2dMeas.Ue] = d2dMeas + } + // Set POA measurement if in range + if poaMeas.InRange { + ue.PoaMeasurements[poaMeas.Poa] = poaMeas } } err = rows.Err() @@ -1125,13 +1185,16 @@ func (am *AssetMgr) GetAllUe() (ueMap map[string]*Ue, err error) { // Get UE entries var rows *sql.Rows rows, err = am.db.Query(` - SELECT ue.id, ue.name, ST_AsGeoJSON(ue.position), ST_AsGeoJSON(ue.path), + SELECT ue.id, ue.name, ST_AsGeoJSON(ue.position), ue.path_json, ue.path_mode, ue.path_velocity, ue.path_length, ue.path_increment, ue.path_fraction, ue.poa, ue.poa_distance, ue.poa_in_range, ue.poa_type_prio, ue.connected, - COALESCE (meas.poa,''), COALESCE (meas.type,''), COALESCE (meas.radius,'0.0'), COALESCE (meas.distance,'0.000'), - COALESCE (meas.in_range,'false'), COALESCE (meas.rssi,'0.000'), COALESCE (meas.rsrp,'0.0'), COALESCE (meas.rsrq,'0.0') + ue.d2d_radius, ue.d2d_in_range, + COALESCE (d2d_meas.d2d_ue,''), COALESCE (d2d_meas.radius,'0.0'), COALESCE (d2d_meas.distance,'0.000'), COALESCE (d2d_meas.in_range,'false'), + COALESCE (poa_meas.poa,''), COALESCE (poa_meas.type,''), COALESCE (poa_meas.radius,'0.0'), COALESCE (poa_meas.distance,'0.000'), + COALESCE (poa_meas.in_range,'false'), COALESCE (poa_meas.rssi,'0.000'), COALESCE (poa_meas.rsrp,'0.0'), COALESCE (poa_meas.rsrq,'0.0') FROM ` + UeTable + ` AS ue - LEFT JOIN ` + UeMeasurementTable + ` AS meas ON (ue.name = meas.ue)`) + LEFT JOIN ` + D2DMeasurementTable + ` AS d2d_meas ON (ue.name = d2d_meas.ue AND d2d_meas.in_range) + LEFT JOIN ` + PoaMeasurementTable + ` AS poa_meas ON (ue.name = poa_meas.ue AND poa_meas.in_range)`) if err != nil { log.Error(err.Error()) return ueMap, err @@ -1141,15 +1204,18 @@ func (am *AssetMgr) GetAllUe() (ueMap map[string]*Ue, err error) { // Scan results for rows.Next() { ueEntry := new(Ue) - ueMeas := new(UeMeasurement) + d2dMeas := new(D2DMeasurement) + poaMeas := new(PoaMeasurement) path := new(string) // Fill UE err = rows.Scan(&ueEntry.Id, &ueEntry.Name, &ueEntry.Position, &path, &ueEntry.PathMode, &ueEntry.PathVelocity, &ueEntry.PathLength, &ueEntry.PathIncrement, &ueEntry.PathFraction, &ueEntry.Poa, &ueEntry.PoaDistance, pq.Array(&ueEntry.PoaInRange), pq.Array(&ueEntry.PoaTypePrio), &ueEntry.Connected, - &ueMeas.Poa, &ueMeas.SubType, &ueMeas.Radius, &ueMeas.Distance, &ueMeas.InRange, - &ueMeas.Rssi, &ueMeas.Rsrp, &ueMeas.Rsrq) + &ueEntry.D2DRadius, pq.Array(&ueEntry.D2DInRange), + &d2dMeas.Ue, &d2dMeas.Radius, &d2dMeas.Distance, &d2dMeas.InRange, + &poaMeas.Poa, &poaMeas.SubType, &poaMeas.Radius, &poaMeas.Distance, &poaMeas.InRange, + &poaMeas.Rssi, &poaMeas.Rsrp, &poaMeas.Rsrq) if err != nil { log.Error(err.Error()) return ueMap, err @@ -1159,16 +1225,21 @@ func (am *AssetMgr) GetAllUe() (ueMap map[string]*Ue, err error) { ue := ueMap[ueEntry.Name] if ue == nil { ue = ueEntry - ue.Measurements = make(map[string]*UeMeasurement) + ue.D2DMeasurements = make(map[string]*D2DMeasurement) + ue.PoaMeasurements = make(map[string]*PoaMeasurement) if path != nil { ue.Path = *path } ueMap[ue.Name] = ue } - // Set UE measurement if in range - if ueMeas.InRange { - ue.Measurements[ueMeas.Poa] = ueMeas + // Set D2D measurement if in range + if d2dMeas.InRange { + ue.D2DMeasurements[d2dMeas.Ue] = d2dMeas + } + // Set POA measurement if in range + if poaMeas.InRange { + ue.PoaMeasurements[poaMeas.Poa] = poaMeas } } err = rows.Err() @@ -1478,7 +1549,7 @@ func (am *AssetMgr) AdvanceUePosition(name string, increment float32) (err error } // Refresh UE information - err = am.refreshUe(name) + err = am.refreshAllUe() if err != nil { log.Error(err.Error()) return err @@ -1583,14 +1654,35 @@ func (am *AssetMgr) refreshUe(name string) (err error) { // Initialize UE information map ueMap := make(map[string]*Ue) + d2dMap := make(map[string]bool) poaMap := make(map[string]bool) + // Get UE list + err = am.parseUeInfo(name, ueMap) + if err != nil { + return err + } + + // Parse UE to POA information results + err = am.parseUeD2DInfo(name, ueMap, d2dMap) + if err != nil { + return err + } + // Parse UE to POA information results err = am.parseUePoaInfo(name, ueMap, poaMap) if err != nil { return err } + // If no D2D UEs found, reset UE D2D Info + if len(d2dMap) == 0 { + err = am.resetUeD2DInfo(name, ueMap) + if err != nil { + return err + } + } + // If no POAs found, reset UE Poa Info if len(poaMap) == 0 { err = am.resetUePoaInfo(name, ueMap) @@ -1621,13 +1713,34 @@ func (am *AssetMgr) refreshAllUe() (err error) { // Initialize UE information map ueMap := make(map[string]*Ue) poaMap := make(map[string]bool) + d2dMap := make(map[string]bool) - // Parse UE to POA information results + // Get UE list + err = am.parseUeInfo("", ueMap) + if err != nil { + return err + } + + // Parse UE D2D information results + err = am.parseUeD2DInfo("", ueMap, d2dMap) + if err != nil { + return err + } + + // Parse UE POA information results err = am.parseUePoaInfo("", ueMap, poaMap) if err != nil { return err } + // If no D2D UEs found, reset all UE D2D Info + if len(d2dMap) == 0 { + err = am.resetUeD2DInfo("", ueMap) + if err != nil { + return err + } + } + // If no POAs found, reset all UE Poa Info if len(poaMap) == 0 { err = am.resetUePoaInfo("", ueMap) @@ -1649,31 +1762,234 @@ func (am *AssetMgr) refreshAllUe() (err error) { return nil } -// Parse UE to POA information results -func (am *AssetMgr) parseUePoaInfo(name string, ueMap map[string]*Ue, poaMap map[string]bool) (err error) { +// Parse UE information +func (am *AssetMgr) parseUeInfo(name string, ueMap map[string]*Ue) (err error) { if profiling { - profilingTimers["parseUePoaInfo"] = time.Now() + profilingTimers["parseUeInfo"] = time.Now() + profilingTimers["parseUeInfo-query"] = time.Now() + } + + // Get full UE information list + var rows *sql.Rows + if name == "" { + rows, err = am.db.Query(` + SELECT ue.name, ue.poa_type_prio, ue.poa + FROM ` + UeTable + ` AS ue`) + } else { + rows, err = am.db.Query(` + SELECT ue.name, ue.poa_type_prio, ue.poa + FROM `+UeTable+` AS ue + WHERE ue.name = ($1)`, name) + } + if err != nil { + log.Error(err.Error()) + return err + } + defer rows.Close() + + if profiling { + now := time.Now() + log.Debug("-- parseUeInfo-query: ", now.Sub(profilingTimers["parseUeInfo-query"])) + profilingTimers["parseUeInfo-scan"] = time.Now() + } + + for rows.Next() { + ueName := "" + poaTypePrio := []string{} + curPoa := "" + + err := rows.Scan(&ueName, pq.Array(&poaTypePrio), &curPoa) + if err != nil { + log.Error(err.Error()) + return err + } + + // Get existing UE Info or create new one + _, found := ueMap[ueName] + if !found { + ue := new(Ue) + ue.Name = ueName + ue.PoaTypePrio = poaTypePrio + ue.Poa = curPoa + ue.PoaInRange = []string{} + ue.PoaMeasurements = map[string]*PoaMeasurement{} + ue.D2DRadius = float32(0) + ue.D2DInRange = []string{} + ue.D2DMeasurements = map[string]*D2DMeasurement{} + ueMap[ueName] = ue + } + } + err = rows.Err() + if err != nil { + log.Error(err) } if profiling { + now := time.Now() + log.Debug("-- parseUeInfo-scan: ", now.Sub(profilingTimers["parseUeD2DInfo-scan"])) + log.Debug("-- parseUeInfo: ", now.Sub(profilingTimers["parseUeD2DInfo"])) + } + return nil +} + +// Parse UE to UE (D2D) information results +func (am *AssetMgr) parseUeD2DInfo(name string, ueMap map[string]*Ue, d2dMap map[string]bool) (err error) { + if profiling { + profilingTimers["parseUeD2DInfo"] = time.Now() + profilingTimers["parseUeD2DInfo-query"] = time.Now() + } + + // Get full matrix of UE to POA information in order to perform + // POA selection & UE measurement calculations + var rows *sql.Rows + if name == "" { + rows, err = am.db.Query(` + SELECT ue.name, d2d_ue.name, ue.d2d_radius, d2d_ue.d2d_radius, + ST_Distance(ue.position::geography, d2d_ue.position::geography), + ST_DWithin(ue.position::geography, d2d_ue.position::geography, LEAST(ue.d2d_radius, d2d_ue.d2d_radius)) + FROM ` + UeTable + ` AS ue, ` + UeTable + ` AS d2d_ue + WHERE ue.d2d_radius > 0 AND ue.name != d2d_ue.name`) + } else { + rows, err = am.db.Query(` + SELECT ue.name, d2d_ue.name, ue.d2d_radius, d2d_ue.d2d_radius, + ST_Distance(ue.position::geography, d2d_ue.position::geography), + ST_DWithin(ue.position::geography, d2d_ue.position::geography, LEAST(ue.d2d_radius, d2d_ue.d2d_radius)) + FROM `+UeTable+` AS ue, `+UeTable+` AS d2d_ue + WHERE ue.d2d_radius > 0 AND ue.name != d2d_ue.name AND ue.name = ($1)`, name) + } + if err != nil { + log.Error(err.Error()) + return err + } + defer rows.Close() + + if profiling { + now := time.Now() + log.Debug("-- parseUeD2DInfo-query: ", now.Sub(profilingTimers["parseUeD2DInfo-query"])) + profilingTimers["parseUeD2DInfo-scan"] = time.Now() + } + + for rows.Next() { + ueName := "" + d2dUeName := "" + d2dRadius := float32(0) + d2dUeRadius := float32(0) + dist := float32(0) + inRange := false + + err := rows.Scan(&ueName, &d2dUeName, &d2dRadius, &d2dUeRadius, &dist, &inRange) + if err != nil { + log.Error(err.Error()) + return err + } + + // Get existing UE Info + ue, found := ueMap[ueName] + if !found { + log.Error("UE not found: " + ueName) + return err + } + + // Add D2D UE to list of D2D UEs + d2dMap[d2dUeName] = true + + // Create new Measurement for each POA + meas := new(D2DMeasurement) + meas.Ue = d2dUeName + meas.Radius = d2dUeRadius + meas.Distance = dist + if inRange && d2dRadius != 0 && d2dUeRadius != 0 { + meas.InRange = true + ue.D2DInRange = append(ue.D2DInRange, d2dUeName) + } + ue.D2DMeasurements[d2dUeName] = meas + } + err = rows.Err() + if err != nil { + log.Error(err) + } + + if profiling { + now := time.Now() + log.Debug("-- parseUeD2DInfo-scan: ", now.Sub(profilingTimers["parseUeD2DInfo-scan"])) + log.Debug("-- parseUeD2DInfo: ", now.Sub(profilingTimers["parseUeD2DInfo"])) + } + return nil +} + +// reset UE D2D Info +func (am *AssetMgr) resetUeD2DInfo(name string, ueMap map[string]*Ue) (err error) { + if profiling { + profilingTimers["resetUeD2DInfo"] = time.Now() + } + + if name == "" { + rows, err := am.db.Query(`SELECT name FROM ` + UeTable) + if err != nil { + log.Error(err.Error()) + return err + } + defer rows.Close() + + for rows.Next() { + ueName := "" + err := rows.Scan(&ueName) + if err != nil { + log.Error(err.Error()) + return err + } + + // Reset D2D fields + ue, found := ueMap[ueName] + if found { + ue.D2DInRange = []string{} + ue.D2DMeasurements = make(map[string]*D2DMeasurement) + } + } + err = rows.Err() + if err != nil { + log.Error(err) + } + } else { + // Reset D2D fields + ue, found := ueMap[name] + if found { + ue.D2DInRange = []string{} + ue.D2DMeasurements = make(map[string]*D2DMeasurement) + } + } + + if profiling { + now := time.Now() + log.Debug("-- resetUeD2DInfo: ", now.Sub(profilingTimers["resetUeD2DInfo"])) + } + return nil +} + +// Parse UE to POA information results +func (am *AssetMgr) parseUePoaInfo(name string, ueMap map[string]*Ue, poaMap map[string]bool) (err error) { + if profiling { + profilingTimers["parseUePoaInfo"] = time.Now() profilingTimers["parseUePoaInfo-query"] = time.Now() } + // Get full matrix of UE to POA information in order to perform // POA selection & UE measurement calculations var rows *sql.Rows if name == "" { rows, err = am.db.Query(` - SELECT ue.name, ue.poa_type_prio, ue.poa, poa.name, poa.type, poa.radius, + SELECT ue.name, poa.name, poa.type, poa.radius, ST_Distance(ue.position::geography, poa.position::geography), ST_DWithin(ue.position::geography, poa.position::geography, poa.radius) - FROM ` + UeTable + `, ` + PoaTable) + FROM ` + UeTable + `, ` + PoaTable + ` + WHERE poa.radius > 0`) } else { rows, err = am.db.Query(` - SELECT ue.name, ue.poa_type_prio, ue.poa, poa.name, poa.type, poa.radius, + SELECT ue.name, poa.name, poa.type, poa.radius, ST_Distance(ue.position::geography, poa.position::geography), ST_DWithin(ue.position::geography, poa.position::geography, poa.radius) FROM `+UeTable+`, `+PoaTable+` - WHERE ue.name = ($1)`, name) + WHERE poa.radius > 0 AND ue.name = ($1)`, name) } if err != nil { log.Error(err.Error()) @@ -1684,23 +2000,18 @@ func (am *AssetMgr) parseUePoaInfo(name string, ueMap map[string]*Ue, poaMap map if profiling { now := time.Now() log.Debug("-- parseUePoaInfo-query: ", now.Sub(profilingTimers["parseUePoaInfo-query"])) - } - - if profiling { profilingTimers["parseUePoaInfo-scan"] = time.Now() } for rows.Next() { ueName := "" - poaTypePrio := []string{} - curPoa := "" poaName := "" poaType := "" poaRadius := float32(0) dist := float32(0) inRange := false - err := rows.Scan(&ueName, pq.Array(&poaTypePrio), &curPoa, &poaName, &poaType, &poaRadius, &dist, &inRange) + err := rows.Scan(&ueName, &poaName, &poaType, &poaRadius, &dist, &inRange) if err != nil { log.Error(err.Error()) return err @@ -1709,20 +2020,15 @@ func (am *AssetMgr) parseUePoaInfo(name string, ueMap map[string]*Ue, poaMap map // Get existing UE Info or create new one ue, found := ueMap[ueName] if !found { - ue = new(Ue) - ue.Name = ueName - ue.PoaTypePrio = poaTypePrio - ue.Poa = curPoa - ue.PoaInRange = []string{} - ue.Measurements = make(map[string]*UeMeasurement) - ueMap[ueName] = ue + log.Error("UE not found: " + ueName) + return err } // Add POA to list of POAs poaMap[poaName] = true - // Create new UE Measurement for each POA - meas := new(UeMeasurement) + // Create new Measurement for each POA + meas := new(PoaMeasurement) meas.Poa = poaName meas.SubType = poaType meas.Radius = poaRadius @@ -1731,7 +2037,7 @@ func (am *AssetMgr) parseUePoaInfo(name string, ueMap map[string]*Ue, poaMap map meas.InRange = true ue.PoaInRange = append(ue.PoaInRange, poaName) } - ue.Measurements[poaName] = meas + ue.PoaMeasurements[poaName] = meas } err = rows.Err() if err != nil { @@ -1741,10 +2047,6 @@ func (am *AssetMgr) parseUePoaInfo(name string, ueMap map[string]*Ue, poaMap map if profiling { now := time.Now() log.Debug("-- parseUePoaInfo-scan: ", now.Sub(profilingTimers["parseUePoaInfo-scan"])) - } - - if profiling { - now := time.Now() log.Debug("-- parseUePoaInfo: ", now.Sub(profilingTimers["parseUePoaInfo"])) } return nil @@ -1772,28 +2074,26 @@ func (am *AssetMgr) resetUePoaInfo(name string, ueMap map[string]*Ue) (err error return err } - // Create empty UE Info - ue := new(Ue) - ue.Name = ueName - ue.PoaTypePrio = []string{} - ue.Poa = "" - ue.PoaInRange = []string{} - ue.Measurements = make(map[string]*UeMeasurement) - ueMap[ueName] = ue + // Reset POA fields + ue, found := ueMap[ueName] + if found { + ue.Poa = "" + ue.PoaInRange = []string{} + ue.PoaMeasurements = make(map[string]*PoaMeasurement) + } } err = rows.Err() if err != nil { log.Error(err) } } else { - // Create single empty UE Info - ue := new(Ue) - ue.Name = name - ue.PoaTypePrio = []string{} - ue.Poa = "" - ue.PoaInRange = []string{} - ue.Measurements = make(map[string]*UeMeasurement) - ueMap[name] = ue + // Reset POA fields + ue, found := ueMap[name] + if found { + ue.Poa = "" + ue.PoaInRange = []string{} + ue.PoaMeasurements = make(map[string]*PoaMeasurement) + } } if profiling { @@ -1839,24 +2139,25 @@ func (am *AssetMgr) updateUeInfo(ueMap map[string]*Ue) (err error) { // Update POA Selection selectedPoa := selectPoa(ue) - distance := float32(0) + poaDistance := float32(0) if selectedPoa != "" { - distance = ue.Measurements[selectedPoa].Distance + poaDistance = ue.PoaMeasurements[selectedPoa].Distance } query := `UPDATE ` + UeTable + ` SET poa = $2, poa_distance = $3, - poa_in_range = $4 + poa_in_range = $4, + d2d_in_range = $5 WHERE name = ($1)` - _, err = tx.Exec(query, ueName, selectedPoa, distance, pq.Array(ue.PoaInRange)) + _, err = tx.Exec(query, ueName, selectedPoa, poaDistance, pq.Array(ue.PoaInRange), pq.Array(ue.D2DInRange)) if err != nil { log.Error(err.Error()) return err } - // Update UE measurements - for poaName, meas := range ue.Measurements { + // Update POA measurements + for poaName, meas := range ue.PoaMeasurements { // Calculate power measurements rssi, rsrp, rsrq := calculatePower(meas.SubType, meas.Radius, meas.Distance) if rsrp == 0 && rsrq == 0 && rssi == 0 { @@ -1865,17 +2166,33 @@ func (am *AssetMgr) updateUeInfo(ueMap map[string]*Ue) (err error) { // Add new entry or update existing one id := ueName + "-" + poaName - query := `INSERT INTO ` + UeMeasurementTable + ` (id, ue, poa, type, radius, distance, in_range, rssi, rsrp, rsrq) + query := `INSERT INTO ` + PoaMeasurementTable + ` (id, ue, poa, type, radius, distance, in_range, rssi, rsrp, rsrq) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) ON CONFLICT (id) DO UPDATE SET radius = $5, distance = $6, in_range = $7, rssi = $8, rsrp = $9, rsrq = $10 - WHERE ` + UeMeasurementTable + `.ue = ($2) AND ` + UeMeasurementTable + `.poa = ($3)` + WHERE ` + PoaMeasurementTable + `.ue = ($2) AND ` + PoaMeasurementTable + `.poa = ($3)` _, err = tx.Exec(query, id, ueName, poaName, meas.SubType, meas.Radius, meas.Distance, meas.InRange, rssi, rsrp, rsrq) if err != nil { log.Error(err.Error()) return err } } + + // Update D2D measurements + for d2dUeName, meas := range ue.D2DMeasurements { + // Add new entry or update existing one + id := ueName + "-" + d2dUeName + query := `INSERT INTO ` + D2DMeasurementTable + ` (id, ue, d2d_ue, radius, distance, in_range) + VALUES ($1, $2, $3, $4, $5, $6) + ON CONFLICT (id) + DO UPDATE SET radius = $4, distance = $5, in_range = $6 + WHERE ` + D2DMeasurementTable + `.ue = ($2) AND ` + D2DMeasurementTable + `.d2d_ue = ($3)` + _, err = tx.Exec(query, id, ueName, d2dUeName, meas.Radius, meas.Distance, meas.InRange) + if err != nil { + log.Error(err.Error()) + return err + } + } } if profiling { @@ -1894,7 +2211,7 @@ func selectPoa(ue *Ue) (selectedPoa string) { // Start with current POA as selected POA, if still in range currentPoaType := "" selectedPoaType := "" - currentPoaInfo, found := ue.Measurements[ue.Poa] + currentPoaInfo, found := ue.PoaMeasurements[ue.Poa] if found && currentPoaInfo.InRange && isSupportedPoaType(currentPoaInfo.SubType, ue.PoaTypePrio) { currentPoaType = currentPoaInfo.SubType selectedPoaType = currentPoaType @@ -1903,13 +2220,13 @@ func selectPoa(ue *Ue) (selectedPoa string) { // Look for closest POA in range with a more localized RAT for _, poa := range ue.PoaInRange { - poaInfo := ue.Measurements[poa] + poaInfo := ue.PoaMeasurements[poa] if isSupportedPoaType(poaInfo.SubType, ue.PoaTypePrio) { if selectedPoa == "" || comparePoaTypes(poaInfo.SubType, selectedPoaType, ue.PoaTypePrio) > 0 || (comparePoaTypes(poaInfo.SubType, selectedPoaType, ue.PoaTypePrio) == 0 && comparePoaTypes(poaInfo.SubType, currentPoaType, ue.PoaTypePrio) > 0 && - poaInfo.Distance < ue.Measurements[selectedPoa].Distance) { + poaInfo.Distance < ue.PoaMeasurements[selectedPoa].Distance) { selectedPoaType = poaInfo.SubType selectedPoa = poa } @@ -1937,7 +2254,7 @@ func isSupportedPoaType(poaType string, poaTypePrio []string) bool { func getPoaTypePriority(poaType string, poaTypePrio []string) int { if len(poaTypePrio) == 0 { - poaTypePrio = []string{"wifi", "5g", "4g", "other"} + poaTypePrio = []string{"d2d", "wifi", "5g", "4g", "other"} } // Determine string to search for @@ -1950,6 +2267,8 @@ func getPoaTypePriority(poaType string, poaTypePrio []string) int { poaTypeStr = "5g" } else if poaType == PoaTypeWifi { poaTypeStr = "wifi" + } else if poaType == PoaTypeD2d { + poaTypeStr = "d2d" } // Get priority @@ -2172,7 +2491,7 @@ func (am *AssetMgr) GetPowerValuesForCoordinates(coordinates []Coordinate) ([]Co if maxRsrp != minCell4gRsrp && maxRsrq != minCell4gRsrq { newCoordinatePowerValue.PoaName = bestPoa } else { - newCoordinatePowerValue.PoaName = "" // TODO Check if empty string is the most significant value to be used + newCoordinatePowerValue.PoaName = "" // TODO: Check if empty string is the most significant value to be used } CoordinatePowerValues = append(CoordinatePowerValues, newCoordinatePowerValue) diff --git a/go-packages/meep-gis-asset-mgr/assets-mgr_test.go b/go-packages/meep-gis-asset-mgr/assets-mgr_test.go index bc2d28fee..caeedf82b 100644 --- a/go-packages/meep-gis-asset-mgr/assets-mgr_test.go +++ b/go-packages/meep-gis-asset-mgr/assets-mgr_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -147,7 +147,8 @@ func TestNewAssetMgr(t *testing.T) { } // Cleanup - _ = am.DeleteTable(UeMeasurementTable) + _ = am.DeleteTable(D2DMeasurementTable) + _ = am.DeleteTable(PoaMeasurementTable) _ = am.DeleteTable(UeTable) _ = am.DeleteTable(PoaTable) _ = am.DeleteTable(ComputeTable) @@ -1649,6 +1650,9 @@ func TestAssetMgrGetPowerValuesForCoordinates(t *testing.T) { FieldConnected: true, } err = am.CreateUe(ue1Id, ue1Name, ueData) + if err != nil { + t.Fatalf("Failed to create UE: " + err.Error()) + } // ue4 ueData = map[string]interface{}{ FieldPosition: ue4Loc, @@ -1658,7 +1662,10 @@ func TestAssetMgrGetPowerValuesForCoordinates(t *testing.T) { FieldPriority: strings.Join(ue4Priority, ","), FieldConnected: true, } - err = am.CreateUe(ue4Id, ue1Name, ueData) + err = am.CreateUe(ue4Id, ue4Name, ueData) + if err != nil { + t.Fatalf("Failed to create UE: " + err.Error()) + } // Check an empty list of coordinates fmt.Println("Check an empty list of coordinates") @@ -1673,7 +1680,7 @@ func TestAssetMgrGetPowerValuesForCoordinates(t *testing.T) { // Check an one item list of coordinates fmt.Println("Check an one item list of coordinates") - r := regexp.MustCompile("\\[(?P.*),(?P.*)\\]") + r := regexp.MustCompile(`\[(?P.*),(?P.*)\]`) m := r.FindStringSubmatch(point1) if m == nil { t.Fatalf("Failed to resolv point") diff --git a/go-packages/meep-gis-asset-mgr/go.mod b/go-packages/meep-gis-asset-mgr/go.mod index 3bc784b71..aa1413ad9 100644 --- a/go-packages/meep-gis-asset-mgr/go.mod +++ b/go-packages/meep-gis-asset-mgr/go.mod @@ -3,7 +3,6 @@ module github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-asset-mgr go 1.12 require ( - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0-20211214133749-f203f7ab4f1c github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0 github.com/lib/pq v1.5.2 ) diff --git a/go-packages/meep-gis-asset-mgr/go.sum b/go-packages/meep-gis-asset-mgr/go.sum index eadf4fd9b..7fff39489 100644 --- a/go-packages/meep-gis-asset-mgr/go.sum +++ b/go-packages/meep-gis-asset-mgr/go.sum @@ -1,15 +1,15 @@ -github.com/InterDigitalInc/AdvantEDGE v1.8.1 h1:2jZJ/Hu6IDweJifEpbOD8PP9pX03AQlZGNnrhv1Die8= -github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0-20211214133749-f203f7ab4f1c h1:enMVVX7j6tb6KbI6Bp0iaCde1fbai8ddBefqVMmOo68= -github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0-20211214133749-f203f7ab4f1c/go.mod h1:IAOr9MhG0XgSEMTJOt6JA4iacKrNgTZuCxk7ofjrQBs= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw= github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/go-packages/meep-gis-cache/convert.go b/go-packages/meep-gis-cache/convert.go index 5cc6297d6..d3137b19e 100644 --- a/go-packages/meep-gis-cache/convert.go +++ b/go-packages/meep-gis-cache/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-gis-cache/gis-cache.go b/go-packages/meep-gis-cache/gis-cache.go index c532004a8..85988d000 100644 --- a/go-packages/meep-gis-cache/gis-cache.go +++ b/go-packages/meep-gis-cache/gis-cache.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -50,7 +50,8 @@ const ( const ( gisCacheKey = "gis-cache:" posKey = "pos:" - measKey = "meas:" + d2dMeasKey = "d2d-meas:" + poaMeasKey = "poa-meas:" ) type Position struct { @@ -58,11 +59,19 @@ type Position struct { Longitude float32 } -type UeMeasurement struct { - Measurements map[string]*Measurement +type UeD2DMeasurement struct { + Measurements map[string]*D2DMeasurement } -type Measurement struct { +type D2DMeasurement struct { + Distance float32 +} + +type UePoaMeasurement struct { + Measurements map[string]*PoaMeasurement +} + +type PoaMeasurement struct { Rssi float32 Rsrp float32 Rsrq float32 @@ -181,8 +190,90 @@ func (gc *GisCache) DelPosition(typ string, name string) { } // SetMeasurement - Create or update entry in DB -func (gc *GisCache) SetMeasurement(src string, srcType string, dest string, destType string, meas *Measurement) error { - key := gc.baseKey + measKey + src + ":" + dest +func (gc *GisCache) SetD2DMeasurement(src string, srcType string, dest string, destType string, meas *D2DMeasurement) error { + key := gc.baseKey + d2dMeasKey + src + ":" + dest + + // Prepare data + fields := make(map[string]interface{}) + fields[fieldSrc] = src + fields[fieldSrcType] = srcType + fields[fieldDest] = dest + fields[fieldDestType] = destType + fields[fieldDistance] = fmt.Sprintf("%f", meas.Distance) + + // Update entry in DB + err := gc.rc.SetEntry(key, fields) + if err != nil { + log.Error("Failed to set entry with error: ", err.Error()) + return err + } + return nil +} + +// GetAllD2DMeasurements - Return all UE measurements +func (gc *GisCache) GetAllD2DMeasurements() (measurementMap map[string]*UeD2DMeasurement, err error) { + keyMatchStr := gc.baseKey + d2dMeasKey + "*" + + // Create measurement map + measurementMap = make(map[string]*UeD2DMeasurement) + + // Get all measurement entry details + err = gc.rc.ForEachEntry(keyMatchStr, getD2DMeasurement, &measurementMap) + if err != nil { + log.Error("Failed to get all entries with error: ", err.Error()) + return nil, err + } + return measurementMap, nil +} + +// getD2DMeasurement - Return D2D measurement with provided name +func getD2DMeasurement(key string, fields map[string]string, userData interface{}) error { + measurementMap := *(userData.(*map[string]*UeD2DMeasurement)) + + // Retrieve UE & POA name from key + ueName := "" + d2dUeName := "" + d2dUePos := strings.LastIndex(key, ":") + if d2dUePos == -1 { + return nil + } + d2dUeName = key[d2dUePos+1:] + uePos := strings.LastIndex(key[:d2dUePos], ":") + if uePos == -1 { + return nil + } + ueName = key[uePos+1 : d2dUePos] + + // Prepare measurement + meas := new(D2DMeasurement) + if distance, err := strconv.ParseFloat(fields[fieldDistance], 32); err == nil { + meas.Distance = float32(distance) + } + + // Add measurement to map + ueD2DMeas, found := measurementMap[ueName] + if !found { + ueD2DMeas = &UeD2DMeasurement{ + Measurements: map[string]*D2DMeasurement{}, + } + measurementMap[ueName] = ueD2DMeas + } + ueD2DMeas.Measurements[d2dUeName] = meas + return nil +} + +// DelD2DMeasurement - Remove D2D measurement with provided name +func (gc *GisCache) DelD2DMeasurement(ue string, d2dUe string) { + key := gc.baseKey + d2dMeasKey + ue + ":" + d2dUe + err := gc.rc.DelEntry(key) + if err != nil { + log.Error("Failed to delete measurement for ue: ", ue, " and d2dUe: ", d2dUe, " with err: ", err.Error()) + } +} + +// SetPoaMeasurement - Create or update entry in DB +func (gc *GisCache) SetPoaMeasurement(src string, srcType string, dest string, destType string, meas *PoaMeasurement) error { + key := gc.baseKey + poaMeasKey + src + ":" + dest // Prepare data fields := make(map[string]interface{}) @@ -204,15 +295,15 @@ func (gc *GisCache) SetMeasurement(src string, srcType string, dest string, dest return nil } -// GetAllMeasurements - Return all UE measurements -func (gc *GisCache) GetAllMeasurements() (measurementMap map[string]*UeMeasurement, err error) { - keyMatchStr := gc.baseKey + measKey + "*" +// GetAllPoaMeasurements - Return all POA measurements +func (gc *GisCache) GetAllPoaMeasurements() (measurementMap map[string]*UePoaMeasurement, err error) { + keyMatchStr := gc.baseKey + poaMeasKey + "*" // Create measurement map - measurementMap = make(map[string]*UeMeasurement) + measurementMap = make(map[string]*UePoaMeasurement) - // Get all measurment entry details - err = gc.rc.ForEachEntry(keyMatchStr, getMeasurement, &measurementMap) + // Get all measurement entry details + err = gc.rc.ForEachEntry(keyMatchStr, getPoaMeasurement, &measurementMap) if err != nil { log.Error("Failed to get all entries with error: ", err.Error()) return nil, err @@ -220,8 +311,9 @@ func (gc *GisCache) GetAllMeasurements() (measurementMap map[string]*UeMeasureme return measurementMap, nil } -func getMeasurement(key string, fields map[string]string, userData interface{}) error { - measurementMap := *(userData.(*map[string]*UeMeasurement)) +// getPoaMeasurement - Return POA measurement with provided name +func getPoaMeasurement(key string, fields map[string]string, userData interface{}) error { + measurementMap := *(userData.(*map[string]*UePoaMeasurement)) // Retrieve UE & POA name from key ueName := "" @@ -238,7 +330,7 @@ func getMeasurement(key string, fields map[string]string, userData interface{}) ueName = key[uePos+1 : poaPos] // Prepare measurement - meas := new(Measurement) + meas := new(PoaMeasurement) if rssi, err := strconv.ParseFloat(fields[fieldRssi], 32); err == nil { meas.Rssi = float32(rssi) } @@ -253,19 +345,20 @@ func getMeasurement(key string, fields map[string]string, userData interface{}) } // Add measurement to map - ueMeas, found := measurementMap[ueName] + uePoaMeas, found := measurementMap[ueName] if !found { - ueMeas = new(UeMeasurement) - ueMeas.Measurements = make(map[string]*Measurement) - measurementMap[ueName] = ueMeas + uePoaMeas = &UePoaMeasurement{ + Measurements: map[string]*PoaMeasurement{}, + } + measurementMap[ueName] = uePoaMeas } - ueMeas.Measurements[poaName] = meas + uePoaMeas.Measurements[poaName] = meas return nil } -// DelMeasurements - Remove measurement with provided name -func (gc *GisCache) DelMeasurement(ue string, poa string) { - key := gc.baseKey + measKey + ue + ":" + poa +// DelPoaMeasurement - Remove POA measurement with provided name +func (gc *GisCache) DelPoaMeasurement(ue string, poa string) { + key := gc.baseKey + poaMeasKey + ue + ":" + poa err := gc.rc.DelEntry(key) if err != nil { log.Error("Failed to delete measurement for ue: ", ue, " and poa: ", poa, " with err: ", err.Error()) diff --git a/go-packages/meep-gis-engine-client/README.md b/go-packages/meep-gis-engine-client/README.md index fec0b4d94..066d6aed4 100644 --- a/go-packages/meep-gis-engine-client/README.md +++ b/go-packages/meep-gis-engine-client/README.md @@ -19,18 +19,18 @@ import "./client" All URIs are relative to *https://localhost/sandboxname/gis/v1* -| Class | Method | HTTP request | Description | -| ------------------- | ---------------------------------------------------------------------------------- | ----------------------------------------- | ---------------------------------------------------------------------------------- | -| *AutomationApi* | [**GetAutomationState**](docs/AutomationApi.md#getautomationstate) | **Get** /automation | Get automation state | -| *AutomationApi* | [**GetAutomationStateByName**](docs/AutomationApi.md#getautomationstatebyname) | **Get** /automation/{type} | Get automation state | -| *AutomationApi* | [**SetAutomationStateByName**](docs/AutomationApi.md#setautomationstatebyname) | **Post** /automation/{type} | Set automation state | -| *GeospatialDataApi* | [**DeleteGeoDataByName**](docs/GeospatialDataApi.md#deletegeodatabyname) | **Delete** /geodata/{assetName} | Delete geospatial data | -| *GeospatialDataApi* | [**GetAssetData**](docs/GeospatialDataApi.md#getassetdata) | **Get** /geodata | Get geospatial data | -| *GeospatialDataApi* | [**GetDistanceGeoDataByName**](docs/GeospatialDataApi.md#getdistancegeodatabyname) | **Post** /geodata/{assetName}/distanceTo | Get distance between geospatial data points | -| *GeospatialDataApi* | [**GetGeoDataByName**](docs/GeospatialDataApi.md#getgeodatabyname) | **Get** /geodata/{assetName} | Get geospatial data | -| *GeospatialDataApi* | [**GetGeoDataPowerValues**](docs/GeospatialDataApi.md#getgeodatapowervalues) | **Post** /geodata/cellularPower | Get RSRQ and RSRP values for a list of coordinates | -| *GeospatialDataApi* | [**GetWithinRangeByName**](docs/GeospatialDataApi.md#getwithinrangebyname) | **Post** /geodata/{assetName}/withinRange | Returns if a geospatial data points is within a specified distance from a location | -| *GeospatialDataApi* | [**UpdateGeoDataByName**](docs/GeospatialDataApi.md#updategeodatabyname) | **Post** /geodata/{assetName} | Create/Update geospatial data | +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*AutomationApi* | [**GetAutomationState**](docs/AutomationApi.md#getautomationstate) | **Get** /automation | Get automation state +*AutomationApi* | [**GetAutomationStateByName**](docs/AutomationApi.md#getautomationstatebyname) | **Get** /automation/{type} | Get automation state +*AutomationApi* | [**SetAutomationStateByName**](docs/AutomationApi.md#setautomationstatebyname) | **Post** /automation/{type} | Set automation state +*GeospatialDataApi* | [**DeleteGeoDataByName**](docs/GeospatialDataApi.md#deletegeodatabyname) | **Delete** /geodata/{assetName} | Delete geospatial data +*GeospatialDataApi* | [**GetAssetData**](docs/GeospatialDataApi.md#getassetdata) | **Get** /geodata | Get geospatial data +*GeospatialDataApi* | [**GetDistanceGeoDataByName**](docs/GeospatialDataApi.md#getdistancegeodatabyname) | **Post** /geodata/{assetName}/distanceTo | Get distance between geospatial data points +*GeospatialDataApi* | [**GetGeoDataByName**](docs/GeospatialDataApi.md#getgeodatabyname) | **Get** /geodata/{assetName} | Get geospatial data +*GeospatialDataApi* | [**GetGeoDataPowerValues**](docs/GeospatialDataApi.md#getgeodatapowervalues) | **Post** /geodata/cellularPower | Get RSRQ and RSRP values for a list of coordinates +*GeospatialDataApi* | [**GetWithinRangeByName**](docs/GeospatialDataApi.md#getwithinrangebyname) | **Post** /geodata/{assetName}/withinRange | Returns if a geospatial data points is within a specified distance from a location +*GeospatialDataApi* | [**UpdateGeoDataByName**](docs/GeospatialDataApi.md#updategeodatabyname) | **Post** /geodata/{assetName} | Create/Update geospatial data ## Documentation For Models @@ -43,13 +43,13 @@ All URIs are relative to *https://localhost/sandboxname/gis/v1* - [GeoCoordinate](docs/GeoCoordinate.md) - [GeoCoordinateList](docs/GeoCoordinateList.md) - [GeoData](docs/GeoData.md) - - [GeoDataAsset](docs/GeoDataAsset.md) - [GeoDataAssetList](docs/GeoDataAssetList.md) - [LineString](docs/LineString.md) - [Point](docs/Point.md) - [TargetPoint](docs/TargetPoint.md) - [TargetRange](docs/TargetRange.md) - [WithinRange](docs/WithinRange.md) + - [GeoDataAsset](docs/GeoDataAsset.md) ## Documentation For Authorization @@ -59,3 +59,4 @@ All URIs are relative to *https://localhost/sandboxname/gis/v1* ## Author AdvantEDGE@InterDigital.com + diff --git a/go-packages/meep-gis-engine-client/api/swagger.yaml b/go-packages/meep-gis-engine-client/api/swagger.yaml index 31eacbe66..8d249ea4a 100644 --- a/go-packages/meep-gis-engine-client/api/swagger.yaml +++ b/go-packages/meep-gis-engine-client/api/swagger.yaml @@ -32,7 +32,7 @@ paths: - "application/json" parameters: [] responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/AutomationStateList" @@ -65,11 +65,11 @@ paths: - "NETWORK-CHARACTERISTICS-UPDATE" x-exportParamName: "Type_" responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/AutomationState" - "500": + 500: description: "Internal server error" post: tags: @@ -105,9 +105,9 @@ paths: type: "boolean" x-exportParamName: "Run" responses: - "200": + 200: description: "OK" - "500": + 500: description: "Internal server error" /geodata: get: @@ -157,11 +157,11 @@ paths: x-exportParamName: "ExcludePath" x-optionalDataType: "String" responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/GeoDataAssetList" - "500": + 500: description: "Internal server error" /geodata/{assetName}: get: @@ -190,13 +190,13 @@ paths: x-exportParamName: "ExcludePath" x-optionalDataType: "String" responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/GeoDataAsset" - "404": + 404: description: "Not found" - "500": + 500: description: "Internal server error" post: tags: @@ -221,11 +221,11 @@ paths: $ref: "#/definitions/GeoDataAsset" x-exportParamName: "GeoData" responses: - "200": + 200: description: "OK" - "201": + 201: description: "Created" - "500": + 500: description: "Internal server error" delete: tags: @@ -243,11 +243,11 @@ paths: type: "string" x-exportParamName: "AssetName" responses: - "200": + 200: description: "OK" - "404": + 404: description: "Not found" - "500": + 500: description: "Internal server error" /geodata/{assetName}/distanceTo: post: @@ -274,13 +274,13 @@ paths: $ref: "#/definitions/TargetPoint" x-exportParamName: "TargetPoint" responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/Distance" - "404": + 404: description: "Not found" - "500": + 500: description: "Internal server error" /geodata/{assetName}/withinRange: post: @@ -308,21 +308,20 @@ paths: $ref: "#/definitions/TargetRange" x-exportParamName: "TargetRange" responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/WithinRange" - "404": + 404: description: "Not found" - "500": + 500: description: "Internal server error" /geodata/cellularPower: post: tags: - "Geospatial Data" summary: "Get RSRQ and RSRP values for a list of coordinates" - description: "Get geospatial data for the given asset and if it is within range\ - \ of another asset or geospatial coordinates" + description: "Get RSRQ and RSRP values for a list of coordinates" operationId: "getGeoDataPowerValues" produces: - "application/json" @@ -335,13 +334,13 @@ paths: $ref: "#/definitions/GeoCoordinateList" x-exportParamName: "Coordinates" responses: - "200": + 200: description: "OK" schema: $ref: "#/definitions/CoordinatePowerList" - "404": + 404: description: "Not found" - "500": + 500: description: "Internal server error" definitions: AutomationStateList: @@ -380,12 +379,23 @@ definitions: CoordinatePowerList: type: "object" properties: - CoordinatesPower: + coordinatesPower: type: "array" items: $ref: "#/definitions/CoordinatePower" description: "List of geo coordinates with RSRQ/RSRP values" - example: {} + example: + coordinatesPower: + - latitude: 43.73651 + longitude: 7.421802 + rsrq: 21 + rsrp: 63 + poaName: "4g-macro-cell-6" + - latitude: 43.747787 + longitude: 7.434856 + rsrq: 58 + rsrp: 60 + poaName: "5G-small-cell-15" CoordinatePower: required: - "latitude" @@ -404,12 +414,12 @@ definitions: description: "Longitude of a second element for query purpose." rsrq: type: "integer" - format: "uint8" + format: "int32" description: "Reference Signal Received Quality as defined in ETSI TS 136\ \ 214." rsrp: type: "integer" - format: "uint8" + format: "int32" description: "Reference Signal Received Power as defined in ETSI TS 136 214." poaName: type: "string" @@ -424,12 +434,17 @@ definitions: GeoCoordinateList: type: "object" properties: - GeoCoordinates: + geoCoordinates: type: "array" items: $ref: "#/definitions/GeoCoordinate" description: "List of geo-coordinates" - example: {} + example: + geoCoordinates: + - latitude: 43.73651 + longitude: 7.421802 + - latitude: 43.73736 + longitude: 7.42821 GeoCoordinate: type: "object" properties: @@ -626,6 +641,16 @@ definitions: velocity: type: "number" description: "Speed of movement along path in m/s" + d2dInRange: + type: "array" + items: + type: "string" + description: "D2D UEs visible to UE" + poaInRange: + type: "array" + items: + type: "string" + description: "POAs visible to UE" description: "Geographic data" Point: type: "object" diff --git a/go-packages/meep-gis-engine-client/api_automation.go b/go-packages/meep-gis-engine-client/api_automation.go index 87d2e8f2d..27d891278 100644 --- a/go-packages/meep-gis-engine-client/api_automation.go +++ b/go-packages/meep-gis-engine-client/api_automation.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/api_geospatial_data.go b/go-packages/meep-gis-engine-client/api_geospatial_data.go index f3c0be6cb..891541662 100644 --- a/go-packages/meep-gis-engine-client/api_geospatial_data.go +++ b/go-packages/meep-gis-engine-client/api_geospatial_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -411,7 +411,7 @@ func (a *GeospatialDataApiService) GetGeoDataByName(ctx context.Context, assetNa /* GeospatialDataApiService Get RSRQ and RSRP values for a list of coordinates -Get geospatial data for the given asset and if it is within range of another asset or geospatial coordinates +Get RSRQ and RSRP values for a list of coordinates * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param coordinates List of geo coordinates diff --git a/go-packages/meep-gis-engine-client/client.go b/go-packages/meep-gis-engine-client/client.go index 13021ff40..6be547351 100644 --- a/go-packages/meep-gis-engine-client/client.go +++ b/go-packages/meep-gis-engine-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/configuration.go b/go-packages/meep-gis-engine-client/configuration.go index 758da5d92..862e43478 100644 --- a/go-packages/meep-gis-engine-client/configuration.go +++ b/go-packages/meep-gis-engine-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/docs/GeoData.md b/go-packages/meep-gis-engine-client/docs/GeoData.md index 347ea89ab..f911776fb 100644 --- a/go-packages/meep-gis-engine-client/docs/GeoData.md +++ b/go-packages/meep-gis-engine-client/docs/GeoData.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **Path** | [***LineString**](LineString.md) | | [optional] [default to null] **EopMode** | **string** | End-of-Path mode: <li>LOOP: When path endpoint is reached, start over from the beginning <li>REVERSE: When path endpoint is reached, return on the reverse path | [optional] [default to null] **Velocity** | **float32** | Speed of movement along path in m/s | [optional] [default to null] +**D2dInRange** | **[]string** | | [optional] [default to null] +**PoaInRange** | **[]string** | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-gis-engine-client/docs/GeoDataAsset.md b/go-packages/meep-gis-engine-client/docs/GeoDataAsset.md index 5f23d9a61..b40263c96 100644 --- a/go-packages/meep-gis-engine-client/docs/GeoDataAsset.md +++ b/go-packages/meep-gis-engine-client/docs/GeoDataAsset.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **Path** | [***LineString**](LineString.md) | | [optional] [default to null] **EopMode** | **string** | End-of-Path mode: <li>LOOP: When path endpoint is reached, start over from the beginning <li>REVERSE: When path endpoint is reached, return on the reverse path | [optional] [default to null] **Velocity** | **float32** | Speed of movement along path in m/s | [optional] [default to null] +**D2dInRange** | **[]string** | | [optional] [default to null] +**PoaInRange** | **[]string** | | [optional] [default to null] **AssetName** | **string** | Name of geospatial asset | [default to null] **AssetType** | **string** | Asset type | [default to null] **SubType** | **string** | Asset sub-type | [optional] [default to null] diff --git a/go-packages/meep-gis-engine-client/docs/GeospatialDataApi.md b/go-packages/meep-gis-engine-client/docs/GeospatialDataApi.md index 3ffa3de3e..ebf9f7936 100644 --- a/go-packages/meep-gis-engine-client/docs/GeospatialDataApi.md +++ b/go-packages/meep-gis-engine-client/docs/GeospatialDataApi.md @@ -2,15 +2,15 @@ All URIs are relative to *https://localhost/sandboxname/gis/v1* -| Method | HTTP request | Description | -| ----------------------------------------------------------------------------- | ----------------------------------------- | ---------------------------------------------------------------------------------- | -| [**DeleteGeoDataByName**](GeospatialDataApi.md#DeleteGeoDataByName) | **Delete** /geodata/{assetName} | Delete geospatial data | -| [**GetAssetData**](GeospatialDataApi.md#GetAssetData) | **Get** /geodata | Get geospatial data | -| [**GetDistanceGeoDataByName**](GeospatialDataApi.md#GetDistanceGeoDataByName) | **Post** /geodata/{assetName}/distanceTo | Get distance between geospatial data points | -| [**GetGeoDataByName**](GeospatialDataApi.md#GetGeoDataByName) | **Get** /geodata/{assetName} | Get geospatial data | -| [**GetGeoDataPowerValues**](GeospatialDataApi.md#GetGeoDataPowerValues) | **Post** /geodata/cellularPower | Get RSRQ and RSRP values for a list of coordinates | -| [**GetWithinRangeByName**](GeospatialDataApi.md#GetWithinRangeByName) | **Post** /geodata/{assetName}/withinRange | Returns if a geospatial data points is within a specified distance from a location | -| [**UpdateGeoDataByName**](GeospatialDataApi.md#UpdateGeoDataByName) | **Post** /geodata/{assetName} | Create/Update geospatial data | +Method | HTTP request | Description +------------- | ------------- | ------------- +[**DeleteGeoDataByName**](GeospatialDataApi.md#DeleteGeoDataByName) | **Delete** /geodata/{assetName} | Delete geospatial data +[**GetAssetData**](GeospatialDataApi.md#GetAssetData) | **Get** /geodata | Get geospatial data +[**GetDistanceGeoDataByName**](GeospatialDataApi.md#GetDistanceGeoDataByName) | **Post** /geodata/{assetName}/distanceTo | Get distance between geospatial data points +[**GetGeoDataByName**](GeospatialDataApi.md#GetGeoDataByName) | **Get** /geodata/{assetName} | Get geospatial data +[**GetGeoDataPowerValues**](GeospatialDataApi.md#GetGeoDataPowerValues) | **Post** /geodata/cellularPower | Get RSRQ and RSRP values for a list of coordinates +[**GetWithinRangeByName**](GeospatialDataApi.md#GetWithinRangeByName) | **Post** /geodata/{assetName}/withinRange | Returns if a geospatial data points is within a specified distance from a location +[**UpdateGeoDataByName**](GeospatialDataApi.md#UpdateGeoDataByName) | **Post** /geodata/{assetName} | Create/Update geospatial data # **DeleteGeoDataByName** @@ -21,10 +21,10 @@ Delete geospatial data for the given asset ### Required Parameters -| Name | Type | Description | Notes | -| ------------- | ------------------- | --------------------------------------------------------------------------- | ----- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **assetName** | **string** | Name of geospatial asset | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **assetName** | **string**| Name of geospatial asset | ### Return type @@ -49,19 +49,19 @@ Get geospatial data for all assets present in database ### Required Parameters -| Name | Type | Description | Notes | -| ------------ | --------------------- | --------------------------------------------------------------------------- | -------------------- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **optional** | ***GetAssetDataOpts** | optional parameters | nil if no parameters | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **optional** | ***GetAssetDataOpts** | optional parameters | nil if no parameters ### Optional Parameters Optional parameters are passed through a pointer to a GetAssetDataOpts struct -| Name | Type | Description | Notes | -| --------------- | ------------------- | --------------------------------------------- | ----- | -| **assetType** | **optional.String** | Filter by asset type | -| **subType** | **optional.String** | Filter by asset sub type | -| **excludePath** | **optional.String** | Exclude UE paths in response (default: false) | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **assetType** | **optional.String**| Filter by asset type | + **subType** | **optional.String**| Filter by asset sub type | + **excludePath** | **optional.String**| Exclude UE paths in response (default: false) | ### Return type @@ -86,11 +86,11 @@ Get distance between geospatial data for the given asset and another asset or ge ### Required Parameters -| Name | Type | Description | Notes | -| --------------- | --------------------------------- | --------------------------------------------------------------------------- | ----- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **assetName** | **string** | Name of geospatial asset | -| **targetPoint** | [**TargetPoint**](TargetPoint.md) | Parameters of geospatial assets | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **assetName** | **string**| Name of geospatial asset | + **targetPoint** | [**TargetPoint**](TargetPoint.md)| Parameters of geospatial assets | ### Return type @@ -115,19 +115,19 @@ Get geospatial data for the given asset ### Required Parameters -| Name | Type | Description | Notes | -| ------------- | ------------------------- | --------------------------------------------------------------------------- | -------------------- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **assetName** | **string** | Name of geospatial asset | -| **optional** | ***GetGeoDataByNameOpts** | optional parameters | nil if no parameters | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **assetName** | **string**| Name of geospatial asset | + **optional** | ***GetGeoDataByNameOpts** | optional parameters | nil if no parameters ### Optional Parameters Optional parameters are passed through a pointer to a GetGeoDataByNameOpts struct -| Name | Type | Description | Notes | -| ---- | ---- | ----------- | ----- | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- - **excludePath** | **optional.String**| Exclude UE paths in response (default: false) | + **excludePath** | **optional.String**| Exclude UE paths in response (default: false) | ### Return type @@ -148,14 +148,14 @@ No authorization required > CoordinatePowerList GetGeoDataPowerValues(ctx, coordinates) Get RSRQ and RSRP values for a list of coordinates -Get geospatial data for the given asset and if it is within range of another asset or geospatial coordinates +Get RSRQ and RSRP values for a list of coordinates ### Required Parameters -| Name | Type | Description | Notes | -| --------------- | --------------------------------------------- | --------------------------------------------------------------------------- | ----- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **coordinates** | [**GeoCoordinateList**](GeoCoordinateList.md) | List of geo coordinates | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **coordinates** | [**GeoCoordinateList**](GeoCoordinateList.md)| List of geo coordinates | ### Return type @@ -180,11 +180,11 @@ Get geospatial data for the given asset and if it is within range of another ass ### Required Parameters -| Name | Type | Description | Notes | -| --------------- | --------------------------------- | --------------------------------------------------------------------------- | ----- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **assetName** | **string** | Name of geospatial asset | -| **targetRange** | [**TargetRange**](TargetRange.md) | Parameters of geospatial assets | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **assetName** | **string**| Name of geospatial asset | + **targetRange** | [**TargetRange**](TargetRange.md)| Parameters of geospatial assets | ### Return type @@ -209,11 +209,11 @@ Create/Update geospatial data for the given asset ### Required Parameters -| Name | Type | Description | Notes | -| ------------- | ----------------------------------- | --------------------------------------------------------------------------- | ----- | -| **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. | -| **assetName** | **string** | Name of geospatial asset | -| **geoData** | [**GeoDataAsset**](GeoDataAsset.md) | Geospatial data | +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. + **assetName** | **string**| Name of geospatial asset | + **geoData** | [**GeoDataAsset**](GeoDataAsset.md)| Geospatial data | ### Return type @@ -229,3 +229,4 @@ No authorization required - **Accept**: application/json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + diff --git a/go-packages/meep-gis-engine-client/model_automation_state.go b/go-packages/meep-gis-engine-client/model_automation_state.go index cd197e1e6..55aff52ab 100644 --- a/go-packages/meep-gis-engine-client/model_automation_state.go +++ b/go-packages/meep-gis-engine-client/model_automation_state.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_automation_state_list.go b/go-packages/meep-gis-engine-client/model_automation_state_list.go index 846c87714..28eb28d8d 100644 --- a/go-packages/meep-gis-engine-client/model_automation_state_list.go +++ b/go-packages/meep-gis-engine-client/model_automation_state_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_coordinate_power.go b/go-packages/meep-gis-engine-client/model_coordinate_power.go index 983c475eb..2d14f6135 100644 --- a/go-packages/meep-gis-engine-client/model_coordinate_power.go +++ b/go-packages/meep-gis-engine-client/model_coordinate_power.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_coordinate_power_list.go b/go-packages/meep-gis-engine-client/model_coordinate_power_list.go index c76314087..143a42304 100644 --- a/go-packages/meep-gis-engine-client/model_coordinate_power_list.go +++ b/go-packages/meep-gis-engine-client/model_coordinate_power_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,5 +26,5 @@ package client // List of geo coordinates with RSRQ/RSRP values type CoordinatePowerList struct { - CoordinatesPower []CoordinatePower `json:"CoordinatesPower,omitempty"` + CoordinatesPower []CoordinatePower `json:"coordinatesPower,omitempty"` } diff --git a/go-packages/meep-gis-engine-client/model_distance.go b/go-packages/meep-gis-engine-client/model_distance.go index e62b67de4..430568d0e 100644 --- a/go-packages/meep-gis-engine-client/model_distance.go +++ b/go-packages/meep-gis-engine-client/model_distance.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_geo_coordinate.go b/go-packages/meep-gis-engine-client/model_geo_coordinate.go index 068c60bb5..ffc2089f6 100644 --- a/go-packages/meep-gis-engine-client/model_geo_coordinate.go +++ b/go-packages/meep-gis-engine-client/model_geo_coordinate.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_geo_coordinate_list.go b/go-packages/meep-gis-engine-client/model_geo_coordinate_list.go index 5b0d2b2ad..d86624d42 100644 --- a/go-packages/meep-gis-engine-client/model_geo_coordinate_list.go +++ b/go-packages/meep-gis-engine-client/model_geo_coordinate_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,5 +26,5 @@ package client // List of geo-coordinates type GeoCoordinateList struct { - GeoCoordinates []GeoCoordinate `json:"GeoCoordinates,omitempty"` + GeoCoordinates []GeoCoordinate `json:"geoCoordinates,omitempty"` } diff --git a/go-packages/meep-gis-engine-client/model_geo_data.go b/go-packages/meep-gis-engine-client/model_geo_data.go index 595ffa258..0f6f4bb80 100644 --- a/go-packages/meep-gis-engine-client/model_geo_data.go +++ b/go-packages/meep-gis-engine-client/model_geo_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,5 +33,7 @@ type GeoData struct { // End-of-Path mode:
  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path EopMode string `json:"eopMode,omitempty"` // Speed of movement along path in m/s - Velocity float32 `json:"velocity,omitempty"` + Velocity float32 `json:"velocity,omitempty"` + D2dInRange []string `json:"d2dInRange,omitempty"` + PoaInRange []string `json:"poaInRange,omitempty"` } diff --git a/go-packages/meep-gis-engine-client/model_geo_data_asset.go b/go-packages/meep-gis-engine-client/model_geo_data_asset.go index d5e620640..ac6169972 100644 --- a/go-packages/meep-gis-engine-client/model_geo_data_asset.go +++ b/go-packages/meep-gis-engine-client/model_geo_data_asset.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,9 @@ type GeoDataAsset struct { // End-of-Path mode:
  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path EopMode string `json:"eopMode,omitempty"` // Speed of movement along path in m/s - Velocity float32 `json:"velocity,omitempty"` + Velocity float32 `json:"velocity,omitempty"` + D2dInRange []string `json:"d2dInRange,omitempty"` + PoaInRange []string `json:"poaInRange,omitempty"` // Name of geospatial asset AssetName string `json:"assetName"` // Asset type diff --git a/go-packages/meep-gis-engine-client/model_geo_data_asset_list.go b/go-packages/meep-gis-engine-client/model_geo_data_asset_list.go index c6b4f19f4..30e2b05f6 100644 --- a/go-packages/meep-gis-engine-client/model_geo_data_asset_list.go +++ b/go-packages/meep-gis-engine-client/model_geo_data_asset_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_line_string.go b/go-packages/meep-gis-engine-client/model_line_string.go index 48d8d2544..a83c897fa 100644 --- a/go-packages/meep-gis-engine-client/model_line_string.go +++ b/go-packages/meep-gis-engine-client/model_line_string.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_point.go b/go-packages/meep-gis-engine-client/model_point.go index e5b761a36..8fd94dcc2 100644 --- a/go-packages/meep-gis-engine-client/model_point.go +++ b/go-packages/meep-gis-engine-client/model_point.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_target_point.go b/go-packages/meep-gis-engine-client/model_target_point.go index 4e7526b18..b77fc8ab8 100644 --- a/go-packages/meep-gis-engine-client/model_target_point.go +++ b/go-packages/meep-gis-engine-client/model_target_point.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_target_range.go b/go-packages/meep-gis-engine-client/model_target_range.go index 68a7fb064..9b92dcbd0 100644 --- a/go-packages/meep-gis-engine-client/model_target_range.go +++ b/go-packages/meep-gis-engine-client/model_target_range.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/model_within_range.go b/go-packages/meep-gis-engine-client/model_within_range.go index 46ca3bd6f..e59eda684 100644 --- a/go-packages/meep-gis-engine-client/model_within_range.go +++ b/go-packages/meep-gis-engine-client/model_within_range.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-gis-engine-client/response.go b/go-packages/meep-gis-engine-client/response.go index 8061fcab0..2a8c44854 100644 --- a/go-packages/meep-gis-engine-client/response.go +++ b/go-packages/meep-gis-engine-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-http-logger/go.mod b/go-packages/meep-http-logger/go.mod index 6dcaf6dec..399886b78 100644 --- a/go-packages/meep-http-logger/go.mod +++ b/go-packages/meep-http-logger/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( 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-redis v0.0.0 + github.com/gorilla/context v1.1.1 ) replace ( diff --git a/go-packages/meep-http-logger/go.sum b/go-packages/meep-http-logger/go.sum index 21708bb5e..5cb6615b2 100644 --- a/go-packages/meep-http-logger/go.sum +++ b/go-packages/meep-http-logger/go.sum @@ -2,9 +2,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -43,6 +40,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -56,6 +54,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -93,11 +92,13 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -127,11 +128,10 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQltCyjXAqVVSZDArPEhUTg35hKwVIuXwtQo7eAMNQ= -github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d h1:/WZQPMZNsjZ7IlCpsLGdQBINg5bxKQ1K1sh6awxLtkA= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -147,10 +147,13 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= @@ -186,10 +189,10 @@ github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtb github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= @@ -209,6 +212,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -247,7 +251,6 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= @@ -265,6 +268,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -313,6 +317,7 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -325,7 +330,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -345,6 +349,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -363,6 +368,7 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -392,12 +398,15 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -405,6 +414,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/go-packages/meep-http-logger/httpLogger.go b/go-packages/meep-http-logger/httpLogger.go index 9381ee72c..dc0796a18 100644 --- a/go-packages/meep-http-logger/httpLogger.go +++ b/go-packages/meep-http-logger/httpLogger.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -28,16 +28,23 @@ import ( log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger" met "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics" + "github.com/gorilla/context" ) +type HttpLoggerHooks struct { + OnRequest func(*met.HttpMetric) + OnResponse func(*met.HttpMetric) + OnNotification func(*met.HttpMetric) +} + +const RequestSrc string = "requestSrc" + var nextUniqueId int32 = 1 var redisDBAddr string = "meep-redis-master.default.svc.cluster.local:6379" var influxDBAddr string = "http://meep-influxdb.default.svc.cluster.local:8086" var metricStore *met.MetricStore var logComponent = "" - -const DirectionRX = "RX" -const DirectionTX = "TX" +var loggerHooks HttpLoggerHooks func ReInit(loggerName string, namespace string, currentStoreName string, redisAddr string, influxAddr string) error { @@ -64,7 +71,73 @@ func ReInit(loggerName string, namespace string, currentStoreName string, redisA return nil } -func LogTx(url string, method string, body string, resp *http.Response, startTime time.Time) error { +func LogRx(inner http.Handler) http.Handler { + + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + start := time.Now() + + //use a recorder to record/intercept the response + rr := httptest.NewRecorder() + //consume the body and store it locally + rawBody, _ := ioutil.ReadAll(r.Body) + // Restore the io.ReadCloser to it's original state to be consumed in ServeHTTP + r.Body = ioutil.NopCloser(bytes.NewBuffer(rawBody)) + + inner.ServeHTTP(rr, r) + + if metricStore != nil { + var metric met.HttpMetric + metric.LoggerName = logComponent + metric.MsgType = met.HttpMsgTypeResponse + metric.Id = getNextUniqueId() + metric.Url = r.RequestURI + metric.Endpoint = strings.Split(r.RequestURI, "?")[0] + metric.Method = r.Method + metric.Src = logComponent + if dst, ok := context.Get(r, RequestSrc).(string); ok { + metric.Dst = dst + } + metric.Body = string(rawBody) + metric.RespBody = rr.Body.String() + metric.RespCode = strconv.Itoa(rr.Code) + metric.ProcTime = strconv.Itoa(int(time.Since(start) / time.Microsecond)) + + log.Debug( + "tags [name: ", metric.LoggerName, + " msg_type: ", metric.MsgType, + "] fields [id: ", metric.Id, + " url: ", metric.Url, + " endpoint: ", metric.Endpoint, + " method: ", metric.Method, + " src: ", metric.Src, + " dst: ", metric.Dst, + " body: ", metric.Body, + " resp_body: ", metric.RespBody, + " resp_code: ", metric.RespCode, + " proc_time: ", metric.ProcTime, + "]", + ) + err := metricStore.SetHttpMetric(metric) + if err != nil { + log.Error("Failed to set http metric: ", err) + } + } else { + log.Error("Metric store not initialised") + } + + // copy everything from response recorder + // to actual response writer + for k, v := range rr.Result().Header { + w.Header()[k] = v + } + w.WriteHeader(rr.Code) + + //writting deletes the content of the body, so log had to be done before that + _, _ = rr.Body.WriteTo(w) + }) +} + +func LogNotification(url string, method string, src string, dst string, body string, resp *http.Response, startTime time.Time) error { if metricStore == nil { err := errors.New("Metric store not initialised") @@ -72,12 +145,8 @@ func LogTx(url string, method string, body string, resp *http.Response, startTim return err } - uniqueId := nextUniqueId - nextUniqueId++ - responseBodyString := "" responseCode := "" - if resp != nil { if resp.Body != nil { responseData, _ := ioutil.ReadAll(resp.Body) @@ -90,16 +159,23 @@ func LogTx(url string, method string, body string, resp *http.Response, startTim var metric met.HttpMetric metric.LoggerName = logComponent - metric.Direction = DirectionTX - metric.Id = uniqueId + metric.MsgType = met.HttpMsgTypeNotification + metric.Id = getNextUniqueId() metric.Url = url metric.Endpoint = url //reusing the url info metric.Method = method + metric.Src = src + metric.Dst = dst metric.Body = body metric.RespBody = responseBodyString metric.RespCode = responseCode metric.ProcTime = strconv.Itoa(int(time.Since(startTime) / time.Microsecond)) + // Invoke notification hook + if loggerHooks.OnNotification != nil { + loggerHooks.OnNotification(&metric) + } + err := metricStore.SetHttpMetric(metric) if err != nil { log.Error("Failed to set http metric: ", err) @@ -107,72 +183,91 @@ func LogTx(url string, method string, body string, resp *http.Response, startTim return err } -func LogRx(inner http.Handler, dummy string) http.Handler { - - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - - start := time.Now() - - //use a recorder to record/intercept the response - rr := httptest.NewRecorder() - - //consume the body and store it locally - rawBody, _ := ioutil.ReadAll(r.Body) +// Log Request +func LogRequest(r *http.Request, body []byte, src string, dst string) error { - // Restore the io.ReadCloser to it's original state to be consumed in ServeHTTP - r.Body = ioutil.NopCloser(bytes.NewBuffer(rawBody)) + if metricStore != nil { + var metric met.HttpMetric + metric.LoggerName = logComponent + metric.MsgType = met.HttpMsgTypeRequest + metric.Id = getNextUniqueId() + metric.Url = r.RequestURI + metric.Endpoint = strings.Split(r.RequestURI, "?")[0] + metric.Method = r.Method + metric.Src = src + metric.Dst = dst + metric.Body = string(body) - inner.ServeHTTP(rr, r) - - if metricStore != nil { - endpoint := strings.Split(r.RequestURI, "?") - - uniqueId := nextUniqueId - nextUniqueId++ - - procTime := strconv.Itoa(int(time.Since(start) / time.Microsecond)) + log.Debug( + "tags [name: ", metric.LoggerName, + " msgType: ", metric.MsgType, + "] fields [id: ", metric.Id, + " url: ", metric.Url, + " endpoint: ", metric.Endpoint, + " method: ", metric.Method, + " src: ", metric.Src, + " dst: ", metric.Dst, + " body: ", metric.Body, + "]", + ) + err := metricStore.SetHttpMetric(metric) + if err != nil { + log.Error("Failed to set http metric: ", err) + } + } else { + log.Error("Metric store not initialised") + } + return nil +} - log.Debug( - "fields [id: ", uniqueId, - " url: ", r.RequestURI, - " endpoint: ", endpoint[0], - " method: ", r.Method, - " body: ", string(rawBody), - " resp_body: ", rr.Body.String(), - " resp_code: ", int32(rr.Code), - " proc_time: ", procTime, - "] tags [name: ", logComponent, - " direction: ", DirectionRX, - ) +// Log Response +func LogResponse(r *http.Request, src string, dst string, respBody []byte, respCode int, start *time.Time) error { - var metric met.HttpMetric - metric.LoggerName = logComponent - metric.Direction = DirectionRX - metric.Id = uniqueId - metric.Url = r.RequestURI - metric.Endpoint = endpoint[0] - metric.Method = r.Method - metric.Body = string(rawBody) - metric.RespBody = rr.Body.String() - metric.RespCode = strconv.Itoa(rr.Code) - metric.ProcTime = procTime + if metricStore != nil { + var metric met.HttpMetric + metric.LoggerName = logComponent + metric.MsgType = met.HttpMsgTypeResponse + metric.Id = getNextUniqueId() + metric.Url = r.RequestURI + metric.Endpoint = strings.Split(r.RequestURI, "?")[0] + metric.Method = r.Method + metric.Src = src + metric.Dst = dst + metric.RespBody = string(respBody) + metric.RespCode = strconv.Itoa(respCode) + metric.ProcTime = strconv.Itoa(int(time.Since(*start) / time.Microsecond)) - err := metricStore.SetHttpMetric(metric) - if err != nil { - log.Error("Failed to set http metric: ", err) - } - } else { - log.Error("Metric store not initialised") + // Invoke response hook + if loggerHooks.OnResponse != nil { + loggerHooks.OnResponse(&metric) } - // copy everything from response recorder - // to actual response writer - for k, v := range rr.Result().Header { - w.Header()[k] = v + log.Debug( + "tags [name: ", metric.LoggerName, + " msg_type: ", metric.MsgType, + "] fields [id: ", metric.Id, + " url: ", metric.Url, + " endpoint: ", metric.Endpoint, + " method: ", metric.Method, + " src: ", metric.Src, + " dst: ", metric.Dst, + " resp_body: ", metric.RespBody, + " resp_code: ", metric.RespCode, + " proc_time: ", metric.ProcTime, + "]", + ) + err := metricStore.SetHttpMetric(metric) + if err != nil { + log.Error("Failed to set http metric: ", err) } - w.WriteHeader(rr.Code) + } else { + log.Error("Metric store not initialised") + } + return nil +} - //writting deletes the content of the body, so log had to be done before that - _, _ = rr.Body.WriteTo(w) - }) +func getNextUniqueId() int32 { + uniqueId := nextUniqueId + nextUniqueId++ + return uniqueId } diff --git a/go-packages/meep-loc-serv-client/api/swagger.yaml b/go-packages/meep-loc-serv-client/api/swagger.yaml index db0542f53..d2a1bf878 100644 --- a/go-packages/meep-loc-serv-client/api/swagger.yaml +++ b/go-packages/meep-loc-serv-client/api/swagger.yaml @@ -1,6 +1,6 @@ openapi: 3.0.0 info: - title: AdvantEDGE Location Service REST API + title: AdvantEDGE Location API description: "Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013\ \ Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)\ \

    The API is based on the Open Mobile Alliance's specification RESTful Network\ @@ -18,7 +18,7 @@ info: version: 2.2.1 externalDocs: description: ETSI MEC013 V2.2.1 Location API - url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf + url: http://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf servers: - url: https://localhost/sandboxname/location/v2 tags: @@ -83,40 +83,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: queries @@ -172,40 +172,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: queries @@ -228,40 +228,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: queries @@ -294,40 +294,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: queries @@ -370,40 +370,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: queries @@ -445,40 +445,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: queries @@ -504,8 +504,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 checkImmediate: true enteringLeavingCriteria: Entering frequency: 10 @@ -534,8 +533,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 checkImmediate: true enteringLeavingCriteria: Entering frequency: 10 @@ -557,8 +555,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 checkImmediate: true enteringLeavingCriteria: Entering frequency: 10 @@ -571,40 +568,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' callbacks: @@ -676,8 +673,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 checkImmediate: true enteringLeavingCriteria: Entering frequency: 10 @@ -690,40 +686,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -757,8 +753,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 checkImmediate: true enteringLeavingCriteria: Entering frequency: 10 @@ -781,8 +776,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 checkImmediate: true enteringLeavingCriteria: Entering frequency: 10 @@ -795,34 +789,34 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -830,7 +824,7 @@ paths: \ conditional requests, e.g. when using ETags to avoid write conflicts\ \ when using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -843,21 +837,13 @@ paths: \ condition can also occur if the capabilities required by the request\ \ are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -885,27 +871,27 @@ paths: "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -938,8 +924,7 @@ paths: criteria: AllWithinDistance distance: 100 frequency: 10 - referenceAddress: - - acr:10.0.0.3 + referenceAddress: acr:10.0.0.3 trackingAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/distance/sub123 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/distance @@ -969,8 +954,7 @@ paths: criteria: AllWithinDistance distance: 100 frequency: 10 - referenceAddress: - - acr:10.0.0.3 + referenceAddress: acr:10.0.0.3 trackingAccuracy: 10 required: true responses: @@ -993,48 +977,47 @@ paths: criteria: AllWithinDistance distance: 100 frequency: 10 - referenceAddress: - - acr:10.0.0.3 + referenceAddress: acr:10.0.0.3 trackingAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/distance/subscription123 "400": description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' callbacks: @@ -1123,48 +1106,47 @@ paths: criteria: AllWithinDistance distance: 100 frequency: 10 - referenceAddress: - - acr:10.0.0.3 + referenceAddress: acr:10.0.0.3 trackingAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/distance/subscription123 "400": description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -1205,8 +1187,7 @@ paths: criteria: AllWithinDistance distance: 100 frequency: 10 - referenceAddress: - - acr:10.0.0.3 + referenceAddress: acr:10.0.0.3 trackingAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/distance/subscription123 required: true @@ -1230,42 +1211,41 @@ paths: criteria: AllWithinDistance distance: 100 frequency: 10 - referenceAddress: - - acr:10.0.0.3 + referenceAddress: acr:10.0.0.3 trackingAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/distance/subscription123 "400": description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -1273,7 +1253,7 @@ paths: \ conditional requests, e.g. when using ETags to avoid write conflicts\ \ when using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -1286,21 +1266,13 @@ paths: \ condition can also occur if the capabilities required by the request\ \ are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -1328,27 +1300,27 @@ paths: "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -1374,8 +1346,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 frequency: 10 requestedAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/periodic/subscription123 @@ -1398,8 +1369,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 frequency: 10 requestedAccuracy: 10 required: true @@ -1416,8 +1386,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 frequency: 10 requestedAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/periodic/subscription123 @@ -1425,40 +1394,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' callbacks: @@ -1529,8 +1498,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 frequency: 10 requestedAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/periodic/subscription123 @@ -1538,40 +1506,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -1605,8 +1573,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 frequency: 10 requestedAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/periodic/subscription123 @@ -1624,8 +1591,7 @@ paths: callbackReference: callbackData: "1234" notifyURL: http://clientApp.example.com/location_notifications/123456 - address: - - acr:10.0.0.1 + address: acr:10.0.0.1 frequency: 10 requestedAccuracy: 10 resourceURL: http://meAppServer.example.com/location/v2/subscriptions/periodic/subscription123 @@ -1633,34 +1599,34 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -1668,7 +1634,7 @@ paths: \ conditional requests, e.g. when using ETags to avoid write conflicts\ \ when using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -1681,21 +1647,13 @@ paths: \ condition can also occur if the capabilities required by the request\ \ are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -1723,27 +1681,27 @@ paths: "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -1822,40 +1780,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' callbacks: @@ -1930,40 +1888,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2021,34 +1979,34 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -2056,7 +2014,7 @@ paths: \ conditional requests, e.g. when using ETags to avoid write conflicts\ \ when using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -2069,21 +2027,13 @@ paths: \ condition can also occur if the capabilities required by the request\ \ are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2111,27 +2061,27 @@ paths: "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2210,40 +2160,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' callbacks: @@ -2318,40 +2268,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2409,34 +2359,34 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -2444,7 +2394,7 @@ paths: \ conditional requests, e.g. when using ETags to avoid write conflicts\ \ when using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -2457,21 +2407,13 @@ paths: \ condition can also occur if the capabilities required by the request\ \ are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2499,27 +2441,27 @@ paths: "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2594,40 +2536,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' callbacks: @@ -2703,40 +2645,40 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2796,34 +2738,34 @@ paths: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -2831,7 +2773,7 @@ paths: \ conditional requests, e.g. when using ETags to avoid write conflicts\ \ when using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -2844,21 +2786,13 @@ paths: \ condition can also occur if the capabilities required by the request\ \ are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -2886,27 +2820,27 @@ paths: "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot\ \ be mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' x-swagger-router-controller: subscriptions @@ -3439,21 +3373,22 @@ components: accuracy: type: integer description: "Horizontal accuracy / (semi-major) uncertainty of location\ - \ provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals\ - \ 4, 5 or 6" + \ provided in meters, as defined in ETSI TS 123 032 [14]. Present only\ + \ if \"shape\" equals 4, 5 or 6" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: UnsignedInt accuracyAltitude: type: integer description: "Altitude accuracy / uncertainty of location provided in meters,\ - \ as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 3 or 4" + \ as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals\ + \ 3 or 4" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: UnsignedInt accuracySemiMinor: type: integer description: "Horizontal accuracy / (semi-major) uncertainty of location\ - \ provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals\ - \ 4, 5 or 6" + \ provided in meters, as defined in ETSI TS 123 032 [14]. Present only\ + \ if \"shape\" equals 4, 5 or 6" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: UnsignedInt altitude: @@ -3507,14 +3442,14 @@ components: orientationMajorAxis: type: integer description: "Angle of orientation of the major axis, expressed in the range\ - \ 0° to 180°, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4 or\ - \ 6" + \ 0° to 180°, as defined in ETSI TS 123 032 [14]. Present only if \"shape\"\ + \ equals 4 or 6" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: UnsignedInt shape: type: integer - description: "Shape information, as detailed in ETSI TS 123 032 [14], associated with the\ - \ reported location coordinate:

    1 = ELLIPSOID_ARC

    2 = ELLIPSOID_POINT\ + description: "Shape information, as detailed in ETSI TS 123 032 [14], associated\ + \ with the reported location coordinate:

    1 = ELLIPSOID_ARC

    2 = ELLIPSOID_POINT\ \

    3 = ELLIPSOID_POINT_ALTITUDE

    4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID\ \

    5 = ELLIPSOID_POINT_UNCERT_CIRCLE

    6 = ELLIPSOID_POINT_UNCERT_ELLIPSE\ \

    7 = POLYGON" @@ -4048,14 +3983,14 @@ components: type: integer description: "The nanoseconds part of the time. Time is defined as Unix-time\ \ since January 1, 1970, 00:00:00 UTC." - format: int32 + format: uint32 x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 seconds: type: integer description: "The seconds part of the time. Time is defined as Unix-time\ \ since January 1, 1970, 00:00:00 UTC." - format: int32 + format: uint32 x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 example: @@ -5193,6 +5128,12 @@ components: description: This type represents the information that the MEC platform notifies the subscribed application instance about the corresponding application instance termination/stop. + OperationActionType: + type: string + description: Operation that is being performed on the MEC application instance. + enum: + - STOPPING + - TERMINATING LinkType: required: - href @@ -5204,12 +5145,6 @@ components: format: uri x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: URI - OperationActionType: - type: string - description: Operation that is being performed on the MEC application instance. - enum: - - STOPPING - - TERMINATING LocationInfo_velocity: required: - bearing @@ -5225,35 +5160,36 @@ components: x-etsi-mec-origin-type: UnsignedInt horizontalSpeed: type: integer - description: "Horizontal speed, expressed in km/h and defined in ETSI TS 123 032 [14]." + description: "Horizontal speed, expressed in km/h and defined in ETSI TS\ + \ 123 032 [14]." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: UnsignedInt uncertainty: type: integer - description: "Horizontal uncertainty, as defined in ETSI TS 123 032 [14]. Present only if\ - \ \"velocityType\" equals 3 or 4" + description: "Horizontal uncertainty, as defined in ETSI TS 123 032 [14].\ + \ Present only if \"velocityType\" equals 3 or 4" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: UnsignedInt velocityType: type: integer - description: "Velocity information, as detailed in ETSI TS 123 032 [14], associated with\ - \ the reported location coordinate:

    1 = HORIZONTAL

    2 = HORIZONTAL_VERTICAL\ - \

    3 = HORIZONTAL_UNCERT

    4 = HORIZONTAL_VERTICAL_UNCERT" + description: "Velocity information, as detailed in ETSI TS 123 032 [14],\ + \ associated with the reported location coordinate:

    1 = HORIZONTAL\ + \

    2 = HORIZONTAL_VERTICAL

    3 = HORIZONTAL_UNCERT

    4 = HORIZONTAL_VERTICAL_UNCERT" x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Enum_inlined verticalSpeed: type: integer - description: "Vertical speed, expressed in km/h and defined in ETSI TS 123 032 [14]. Present\ - \ only if \"velocityType\" equals 2 or 4" + description: "Vertical speed, expressed in km/h and defined in ETSI TS 123\ + \ 032 [14]. Present only if \"velocityType\" equals 2 or 4" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Int verticalUncertainty: type: integer - description: "Vertical uncertainty, as defined in ETSI TS 123 032 [14]. Present only if\ - \ \"velocityType\" equals 4" + description: "Vertical uncertainty, as defined in ETSI TS 123 032 [14].\ + \ Present only if \"velocityType\" equals 4" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: UnsignedInt - description: "Structure with attributes relating to the target entity\u2019s velocity,\ + description: "Structure with attributes relating to the target entity’s velocity,\ \ as defined in ETSI TS 123 032 [14]." example: verticalUncertainty: 4 @@ -5281,34 +5217,34 @@ components: description: "Bad Request : used to indicate that incorrect parameters were\ \ passed to the request." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "401": description: "Unauthorized : used when the client did not submit credentials." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "403": description: "Forbidden : operation is not allowed given the current status\ \ of the resource." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "404": description: "Not Found : used when a client provided a URI that cannot be\ \ mapped to a valid resource URI." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "406": description: "Not Acceptable : used to indicate that the server cannot provide\ \ the any of the content formats supported by the client." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "412": @@ -5316,7 +5252,7 @@ components: \ conditional requests, e.g. when using ETags to avoid write conflicts when\ \ using PUT" content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "414": @@ -5324,14 +5260,14 @@ components: \ process the request because the request URI is longer than the server is\ \ willing or able to process." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "415": description: "Unsupported Media Type : used to indicate that the server or\ \ the client does not support the content type of the entity body." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' "422": @@ -5343,21 +5279,13 @@ components: \ area for the request is considered too large. This error condition can also\ \ occur if the capabilities required by the request are not supported." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - ProblemDetails: - type: https://meAppServer.example.com/rni/v2/probs/too-many targets - title: Too many targets - status: "422" - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc "429": description: "Too Many Requests : used when a rate limiter has triggered." content: - application/json: + application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' parameters: diff --git a/go-packages/meep-loc-serv-client/api_location.go b/go-packages/meep-loc-serv-client/api_location.go index a9096b2d7..4579e3c01 100644 --- a/go-packages/meep-loc-serv-client/api_location.go +++ b/go-packages/meep-loc-serv-client/api_location.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * @@ -79,7 +79,7 @@ func (a *LocationApiService) ApByIdGET(ctx context.Context, zoneId string, acces } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -244,7 +244,7 @@ func (a *LocationApiService) ApGET(ctx context.Context, zoneId string, localVarO } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -398,7 +398,7 @@ func (a *LocationApiService) AreaCircleSubDELETE(ctx context.Context, subscripti } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -512,7 +512,7 @@ func (a *LocationApiService) AreaCircleSubGET(ctx context.Context, subscriptionI } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -753,7 +753,7 @@ func (a *LocationApiService) AreaCircleSubPOST(ctx context.Context, body InlineC } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -911,7 +911,7 @@ func (a *LocationApiService) AreaCircleSubPUT(ctx context.Context, body InlineCi } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1110,7 +1110,7 @@ func (a *LocationApiService) DistanceGET(ctx context.Context, address []string, } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1264,7 +1264,7 @@ func (a *LocationApiService) DistanceSubDELETE(ctx context.Context, subscription } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1378,7 +1378,7 @@ func (a *LocationApiService) DistanceSubGET(ctx context.Context, subscriptionId } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1619,7 +1619,7 @@ func (a *LocationApiService) DistanceSubPOST(ctx context.Context, body InlineDis } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -1777,7 +1777,7 @@ func (a *LocationApiService) DistanceSubPUT(ctx context.Context, body InlineDist } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2025,7 +2025,7 @@ func (a *LocationApiService) PeriodicSubDELETE(ctx context.Context, subscription } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2139,7 +2139,7 @@ func (a *LocationApiService) PeriodicSubGET(ctx context.Context, subscriptionId } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2380,7 +2380,7 @@ func (a *LocationApiService) PeriodicSubPOST(ctx context.Context, body InlinePer } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2538,7 +2538,7 @@ func (a *LocationApiService) PeriodicSubPUT(ctx context.Context, body InlinePeri } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2716,7 +2716,7 @@ func (a *LocationApiService) UserTrackingSubDELETE(ctx context.Context, subscrip } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -2830,7 +2830,7 @@ func (a *LocationApiService) UserTrackingSubGET(ctx context.Context, subscriptio } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3071,7 +3071,7 @@ func (a *LocationApiService) UserTrackingSubPOST(ctx context.Context, body Inlin } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3229,7 +3229,7 @@ func (a *LocationApiService) UserTrackingSubPUT(ctx context.Context, body Inline } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3426,7 +3426,7 @@ func (a *LocationApiService) UsersGET(ctx context.Context, localVarOptionals *Us } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3580,7 +3580,7 @@ func (a *LocationApiService) ZonalTrafficSubDELETE(ctx context.Context, subscrip } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3694,7 +3694,7 @@ func (a *LocationApiService) ZonalTrafficSubGET(ctx context.Context, subscriptio } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -3935,7 +3935,7 @@ func (a *LocationApiService) ZonalTrafficSubPOST(ctx context.Context, body Inlin } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4093,7 +4093,7 @@ func (a *LocationApiService) ZonalTrafficSubPUT(ctx context.Context, body Inline } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4271,7 +4271,7 @@ func (a *LocationApiService) ZoneStatusSubDELETE(ctx context.Context, subscripti } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4385,7 +4385,7 @@ func (a *LocationApiService) ZoneStatusSubGET(ctx context.Context, subscriptionI } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4626,7 +4626,7 @@ func (a *LocationApiService) ZoneStatusSubPOST(ctx context.Context, body InlineZ } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4784,7 +4784,7 @@ func (a *LocationApiService) ZoneStatusSubPUT(ctx context.Context, body InlineZo } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -4961,7 +4961,7 @@ func (a *LocationApiService) ZonesGET(ctx context.Context) (InlineZoneList, *htt } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) @@ -5116,7 +5116,7 @@ func (a *LocationApiService) ZonesGetById(ctx context.Context, zoneId string) (I } // to determine the Accept header - localVarHttpHeaderAccepts := []string{"application/json"} + localVarHttpHeaderAccepts := []string{"application/json", "application/problem+json"} // set Accept header localVarHttpHeaderAccept := selectHeaderAccept(localVarHttpHeaderAccepts) diff --git a/go-packages/meep-loc-serv-client/client.go b/go-packages/meep-loc-serv-client/client.go index 54924b4d9..4c15557ff 100644 --- a/go-packages/meep-loc-serv-client/client.go +++ b/go-packages/meep-loc-serv-client/client.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * @@ -52,7 +52,7 @@ var ( xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)") ) -// APIClient manages communication with the AdvantEDGE Location Service REST API API v2.2.1 +// APIClient manages communication with the AdvantEDGE Location API API v2.2.1 // In most cases there should be only one, shared, APIClient. type APIClient struct { cfg *Configuration diff --git a/go-packages/meep-loc-serv-client/configuration.go b/go-packages/meep-loc-serv-client/configuration.go index 07a01ee50..f8269187f 100644 --- a/go-packages/meep-loc-serv-client/configuration.go +++ b/go-packages/meep-loc-serv-client/configuration.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/docs/LocationApi.md b/go-packages/meep-loc-serv-client/docs/LocationApi.md index fd8879ac7..c7a10b4c4 100644 --- a/go-packages/meep-loc-serv-client/docs/LocationApi.md +++ b/go-packages/meep-loc-serv-client/docs/LocationApi.md @@ -68,7 +68,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -105,7 +105,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -133,7 +133,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -161,7 +161,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -213,7 +213,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -242,7 +242,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -281,7 +281,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -309,7 +309,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -337,7 +337,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -389,7 +389,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -418,7 +418,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -474,7 +474,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -502,7 +502,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -554,7 +554,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -583,7 +583,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -611,7 +611,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -639,7 +639,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -691,7 +691,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -720,7 +720,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -757,7 +757,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -785,7 +785,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -813,7 +813,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -865,7 +865,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -894,7 +894,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -922,7 +922,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -950,7 +950,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -1002,7 +1002,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -1031,7 +1031,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -1055,7 +1055,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -1083,7 +1083,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/problem+json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/go-packages/meep-loc-serv-client/docs/LocationInfo.md b/go-packages/meep-loc-serv-client/docs/LocationInfo.md index aa13ab12b..c8415f63f 100644 --- a/go-packages/meep-loc-serv-client/docs/LocationInfo.md +++ b/go-packages/meep-loc-serv-client/docs/LocationInfo.md @@ -3,18 +3,18 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Accuracy** | **int32** | Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6 | [optional] [default to null] -**AccuracyAltitude** | **int32** | Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 3 or 4 | [optional] [default to null] -**AccuracySemiMinor** | **int32** | Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6 | [optional] [default to null] +**Accuracy** | **int32** | Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4, 5 or 6 | [optional] [default to null] +**AccuracyAltitude** | **int32** | Altitude accuracy / uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 3 or 4 | [optional] [default to null] +**AccuracySemiMinor** | **int32** | Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4, 5 or 6 | [optional] [default to null] **Altitude** | **float32** | Location altitude relative to the WGS84 ellipsoid surface. | [optional] [default to null] -**Confidence** | **int32** | Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if \"shape\" equals 1, 4 or 6 | [optional] [default to null] +**Confidence** | **int32** | Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 1, 4 or 6 | [optional] [default to null] **IncludedAngle** | **int32** | Present only if \"shape\" equals 6 | [optional] [default to null] **InnerRadius** | **int32** | Present only if \"shape\" equals 6 | [optional] [default to null] **Latitude** | **[]float32** | Location latitude, expressed in the range -90° to +90°. Cardinality greater than one only if \"shape\" equals 7. | [default to null] **Longitude** | **[]float32** | Location longitude, expressed in the range -180° to +180°. Cardinality greater than one only if \"shape\" equals 7. | [default to null] **OffsetAngle** | **int32** | Present only if \"shape\" equals 6 | [optional] [default to null] -**OrientationMajorAxis** | **int32** | Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in [14]. Present only if \"shape\" equals 4 or 6 | [optional] [default to null] -**Shape** | **int32** | Shape information, as detailed in [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON | [default to null] +**OrientationMajorAxis** | **int32** | Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4 or 6 | [optional] [default to null] +**Shape** | **int32** | Shape information, as detailed in ETSI TS 123 032 [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON | [default to null] **Timestamp** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] **UncertaintyRadius** | **int32** | Present only if \"shape\" equals 6 | [optional] [default to null] **Velocity** | [***LocationInfoVelocity**](LocationInfo_velocity.md) | | [optional] [default to null] diff --git a/go-packages/meep-loc-serv-client/docs/LocationInfoVelocity.md b/go-packages/meep-loc-serv-client/docs/LocationInfoVelocity.md index ccee1171a..6b4bade93 100644 --- a/go-packages/meep-loc-serv-client/docs/LocationInfoVelocity.md +++ b/go-packages/meep-loc-serv-client/docs/LocationInfoVelocity.md @@ -3,12 +3,12 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Bearing** | **int32** | Bearing, expressed in the range 0° to 360°, as defined in [14]. | [default to null] -**HorizontalSpeed** | **int32** | Horizontal speed, expressed in km/h and defined in [14]. | [default to null] -**Uncertainty** | **int32** | Horizontal uncertainty, as defined in [14]. Present only if \"velocityType\" equals 3 or 4 | [optional] [default to null] -**VelocityType** | **int32** | Velocity information, as detailed in [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT | [default to null] -**VerticalSpeed** | **int32** | Vertical speed, expressed in km/h and defined in [14]. Present only if \"velocityType\" equals 2 or 4 | [optional] [default to null] -**VerticalUncertainty** | **int32** | Vertical uncertainty, as defined in [14]. Present only if \"velocityType\" equals 4 | [optional] [default to null] +**Bearing** | **int32** | Bearing, expressed in the range 0° to 360°, as defined in ETSI TS 123 032 [14]. | [default to null] +**HorizontalSpeed** | **int32** | Horizontal speed, expressed in km/h and defined in ETSI TS 123 032 [14]. | [default to null] +**Uncertainty** | **int32** | Horizontal uncertainty, as defined in ETSI TS 123 032 [14]. Present only if \"velocityType\" equals 3 or 4 | [optional] [default to null] +**VelocityType** | **int32** | Velocity information, as detailed in ETSI TS 123 032 [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT | [default to null] +**VerticalSpeed** | **int32** | Vertical speed, expressed in km/h and defined in ETSI TS 123 032 [14]. Present only if \"velocityType\" equals 2 or 4 | [optional] [default to null] +**VerticalUncertainty** | **int32** | Vertical uncertainty, as defined in ETSI TS 123 032 [14]. Present only if \"velocityType\" equals 4 | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-loc-serv-client/model_access_point_info.go b/go-packages/meep-loc-serv-client/model_access_point_info.go index 335a30997..45a16626e 100644 --- a/go-packages/meep-loc-serv-client/model_access_point_info.go +++ b/go-packages/meep-loc-serv-client/model_access_point_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_access_point_list.go b/go-packages/meep-loc-serv-client/model_access_point_list.go index 3998853e0..8ec7d2fc4 100644 --- a/go-packages/meep-loc-serv-client/model_access_point_list.go +++ b/go-packages/meep-loc-serv-client/model_access_point_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_app_termination_notification.go b/go-packages/meep-loc-serv-client/model_app_termination_notification.go index 22314a0dd..fde90d0e1 100644 --- a/go-packages/meep-loc-serv-client/model_app_termination_notification.go +++ b/go-packages/meep-loc-serv-client/model_app_termination_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_app_termination_notification__links.go b/go-packages/meep-loc-serv-client/model_app_termination_notification__links.go index 48db46220..4e0f91422 100644 --- a/go-packages/meep-loc-serv-client/model_app_termination_notification__links.go +++ b/go-packages/meep-loc-serv-client/model_app_termination_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_callback_reference.go b/go-packages/meep-loc-serv-client/model_callback_reference.go index fbdfc35f4..8442fd732 100644 --- a/go-packages/meep-loc-serv-client/model_callback_reference.go +++ b/go-packages/meep-loc-serv-client/model_callback_reference.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_circle_notification_subscription.go b/go-packages/meep-loc-serv-client/model_circle_notification_subscription.go index 655bc0ab1..df56d650a 100644 --- a/go-packages/meep-loc-serv-client/model_circle_notification_subscription.go +++ b/go-packages/meep-loc-serv-client/model_circle_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_connection_type.go b/go-packages/meep-loc-serv-client/model_connection_type.go index 0859d387a..b34d3494c 100644 --- a/go-packages/meep-loc-serv-client/model_connection_type.go +++ b/go-packages/meep-loc-serv-client/model_connection_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_distance_criteria.go b/go-packages/meep-loc-serv-client/model_distance_criteria.go index 6a49b1559..cf277c31b 100644 --- a/go-packages/meep-loc-serv-client/model_distance_criteria.go +++ b/go-packages/meep-loc-serv-client/model_distance_criteria.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_distance_notification_subscription.go b/go-packages/meep-loc-serv-client/model_distance_notification_subscription.go index fa69782da..76543f0e2 100644 --- a/go-packages/meep-loc-serv-client/model_distance_notification_subscription.go +++ b/go-packages/meep-loc-serv-client/model_distance_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_entering_leaving_criteria.go b/go-packages/meep-loc-serv-client/model_entering_leaving_criteria.go index 3b24ae293..d83fdb753 100644 --- a/go-packages/meep-loc-serv-client/model_entering_leaving_criteria.go +++ b/go-packages/meep-loc-serv-client/model_entering_leaving_criteria.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_access_point_info.go b/go-packages/meep-loc-serv-client/model_inline_access_point_info.go index d800cc2bd..946750dfe 100644 --- a/go-packages/meep-loc-serv-client/model_inline_access_point_info.go +++ b/go-packages/meep-loc-serv-client/model_inline_access_point_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_access_point_list.go b/go-packages/meep-loc-serv-client/model_inline_access_point_list.go index 804d03370..3345ff324 100644 --- a/go-packages/meep-loc-serv-client/model_inline_access_point_list.go +++ b/go-packages/meep-loc-serv-client/model_inline_access_point_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_circle_notification_subscription.go b/go-packages/meep-loc-serv-client/model_inline_circle_notification_subscription.go index 416f2c67e..e7a15bfe0 100644 --- a/go-packages/meep-loc-serv-client/model_inline_circle_notification_subscription.go +++ b/go-packages/meep-loc-serv-client/model_inline_circle_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_distance_notification_subscription.go b/go-packages/meep-loc-serv-client/model_inline_distance_notification_subscription.go index 3f22781f3..cc79d6ac4 100644 --- a/go-packages/meep-loc-serv-client/model_inline_distance_notification_subscription.go +++ b/go-packages/meep-loc-serv-client/model_inline_distance_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_notification_subscription_list.go b/go-packages/meep-loc-serv-client/model_inline_notification_subscription_list.go index e2042cd28..0271c55dc 100644 --- a/go-packages/meep-loc-serv-client/model_inline_notification_subscription_list.go +++ b/go-packages/meep-loc-serv-client/model_inline_notification_subscription_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_periodic_notification_subscription.go b/go-packages/meep-loc-serv-client/model_inline_periodic_notification_subscription.go index 981e648bf..3035eff4d 100644 --- a/go-packages/meep-loc-serv-client/model_inline_periodic_notification_subscription.go +++ b/go-packages/meep-loc-serv-client/model_inline_periodic_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_problem_details.go b/go-packages/meep-loc-serv-client/model_inline_problem_details.go index ec6f25b60..7303862b9 100644 --- a/go-packages/meep-loc-serv-client/model_inline_problem_details.go +++ b/go-packages/meep-loc-serv-client/model_inline_problem_details.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_problem_details_required.go b/go-packages/meep-loc-serv-client/model_inline_problem_details_required.go index 5a55234c9..3cc5ec24e 100644 --- a/go-packages/meep-loc-serv-client/model_inline_problem_details_required.go +++ b/go-packages/meep-loc-serv-client/model_inline_problem_details_required.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_subscription_notification.go b/go-packages/meep-loc-serv-client/model_inline_subscription_notification.go index fe527cba2..c9b0ab1d7 100644 --- a/go-packages/meep-loc-serv-client/model_inline_subscription_notification.go +++ b/go-packages/meep-loc-serv-client/model_inline_subscription_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_terminal_distance.go b/go-packages/meep-loc-serv-client/model_inline_terminal_distance.go index 6fa2db2c3..25ec76f92 100644 --- a/go-packages/meep-loc-serv-client/model_inline_terminal_distance.go +++ b/go-packages/meep-loc-serv-client/model_inline_terminal_distance.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_user_list.go b/go-packages/meep-loc-serv-client/model_inline_user_list.go index 94c7c6b9d..f36164ff6 100644 --- a/go-packages/meep-loc-serv-client/model_inline_user_list.go +++ b/go-packages/meep-loc-serv-client/model_inline_user_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_user_tracking_subscription.go b/go-packages/meep-loc-serv-client/model_inline_user_tracking_subscription.go index 8648a2204..3601c9c45 100644 --- a/go-packages/meep-loc-serv-client/model_inline_user_tracking_subscription.go +++ b/go-packages/meep-loc-serv-client/model_inline_user_tracking_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_zonal_presence_notification.go b/go-packages/meep-loc-serv-client/model_inline_zonal_presence_notification.go index 4df1cfdc4..e095285fa 100644 --- a/go-packages/meep-loc-serv-client/model_inline_zonal_presence_notification.go +++ b/go-packages/meep-loc-serv-client/model_inline_zonal_presence_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_zonal_traffic_subscription.go b/go-packages/meep-loc-serv-client/model_inline_zonal_traffic_subscription.go index 756102b74..734f53b35 100644 --- a/go-packages/meep-loc-serv-client/model_inline_zonal_traffic_subscription.go +++ b/go-packages/meep-loc-serv-client/model_inline_zonal_traffic_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_zone_info.go b/go-packages/meep-loc-serv-client/model_inline_zone_info.go index f6e4681b6..e649cac9a 100644 --- a/go-packages/meep-loc-serv-client/model_inline_zone_info.go +++ b/go-packages/meep-loc-serv-client/model_inline_zone_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_zone_list.go b/go-packages/meep-loc-serv-client/model_inline_zone_list.go index 0cbf33781..12c6ce7b4 100644 --- a/go-packages/meep-loc-serv-client/model_inline_zone_list.go +++ b/go-packages/meep-loc-serv-client/model_inline_zone_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_zone_status_notification.go b/go-packages/meep-loc-serv-client/model_inline_zone_status_notification.go index 0ff35ba37..925521d86 100644 --- a/go-packages/meep-loc-serv-client/model_inline_zone_status_notification.go +++ b/go-packages/meep-loc-serv-client/model_inline_zone_status_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_inline_zone_status_subscription.go b/go-packages/meep-loc-serv-client/model_inline_zone_status_subscription.go index 42a18459c..04c26a00f 100644 --- a/go-packages/meep-loc-serv-client/model_inline_zone_status_subscription.go +++ b/go-packages/meep-loc-serv-client/model_inline_zone_status_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_link.go b/go-packages/meep-loc-serv-client/model_link.go index 277c78bd3..847a82170 100644 --- a/go-packages/meep-loc-serv-client/model_link.go +++ b/go-packages/meep-loc-serv-client/model_link.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_link_type.go b/go-packages/meep-loc-serv-client/model_link_type.go index a89a3c3b1..c4e166857 100644 --- a/go-packages/meep-loc-serv-client/model_link_type.go +++ b/go-packages/meep-loc-serv-client/model_link_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_location_info.go b/go-packages/meep-loc-serv-client/model_location_info.go index 59528f068..613e61c67 100644 --- a/go-packages/meep-loc-serv-client/model_location_info.go +++ b/go-packages/meep-loc-serv-client/model_location_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * @@ -25,15 +25,15 @@ package client type LocationInfo struct { - // Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6 + // Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4, 5 or 6 Accuracy int32 `json:"accuracy,omitempty"` - // Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 3 or 4 + // Altitude accuracy / uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 3 or 4 AccuracyAltitude int32 `json:"accuracyAltitude,omitempty"` - // Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6 + // Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4, 5 or 6 AccuracySemiMinor int32 `json:"accuracySemiMinor,omitempty"` // Location altitude relative to the WGS84 ellipsoid surface. Altitude float32 `json:"altitude,omitempty"` - // Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if \"shape\" equals 1, 4 or 6 + // Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 1, 4 or 6 Confidence int32 `json:"confidence,omitempty"` // Present only if \"shape\" equals 6 IncludedAngle int32 `json:"includedAngle,omitempty"` @@ -45,9 +45,9 @@ type LocationInfo struct { Longitude []float32 `json:"longitude"` // Present only if \"shape\" equals 6 OffsetAngle int32 `json:"offsetAngle,omitempty"` - // Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in [14]. Present only if \"shape\" equals 4 or 6 + // Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4 or 6 OrientationMajorAxis int32 `json:"orientationMajorAxis,omitempty"` - // Shape information, as detailed in [14], associated with the reported location coordinate:

    1 = ELLIPSOID_ARC

    2 = ELLIPSOID_POINT

    3 = ELLIPSOID_POINT_ALTITUDE

    4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID

    5 = ELLIPSOID_POINT_UNCERT_CIRCLE

    6 = ELLIPSOID_POINT_UNCERT_ELLIPSE

    7 = POLYGON + // Shape information, as detailed in ETSI TS 123 032 [14], associated with the reported location coordinate:

    1 = ELLIPSOID_ARC

    2 = ELLIPSOID_POINT

    3 = ELLIPSOID_POINT_ALTITUDE

    4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID

    5 = ELLIPSOID_POINT_UNCERT_CIRCLE

    6 = ELLIPSOID_POINT_UNCERT_ELLIPSE

    7 = POLYGON Shape int32 `json:"shape"` Timestamp *TimeStamp `json:"timestamp,omitempty"` // Present only if \"shape\" equals 6 diff --git a/go-packages/meep-loc-serv-client/model_location_info_velocity.go b/go-packages/meep-loc-serv-client/model_location_info_velocity.go index 78040bb47..0744da683 100644 --- a/go-packages/meep-loc-serv-client/model_location_info_velocity.go +++ b/go-packages/meep-loc-serv-client/model_location_info_velocity.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * @@ -24,18 +24,18 @@ package client -// Structure with attributes relating to the target entity’s velocity, as defined in [14]. +// Structure with attributes relating to the target entity’s velocity, as defined in ETSI TS 123 032 [14]. type LocationInfoVelocity struct { - // Bearing, expressed in the range 0° to 360°, as defined in [14]. + // Bearing, expressed in the range 0° to 360°, as defined in ETSI TS 123 032 [14]. Bearing int32 `json:"bearing"` - // Horizontal speed, expressed in km/h and defined in [14]. + // Horizontal speed, expressed in km/h and defined in ETSI TS 123 032 [14]. HorizontalSpeed int32 `json:"horizontalSpeed"` - // Horizontal uncertainty, as defined in [14]. Present only if \"velocityType\" equals 3 or 4 + // Horizontal uncertainty, as defined in ETSI TS 123 032 [14]. Present only if \"velocityType\" equals 3 or 4 Uncertainty int32 `json:"uncertainty,omitempty"` - // Velocity information, as detailed in [14], associated with the reported location coordinate:

    1 = HORIZONTAL

    2 = HORIZONTAL_VERTICAL

    3 = HORIZONTAL_UNCERT

    4 = HORIZONTAL_VERTICAL_UNCERT + // Velocity information, as detailed in ETSI TS 123 032 [14], associated with the reported location coordinate:

    1 = HORIZONTAL

    2 = HORIZONTAL_VERTICAL

    3 = HORIZONTAL_UNCERT

    4 = HORIZONTAL_VERTICAL_UNCERT VelocityType int32 `json:"velocityType"` - // Vertical speed, expressed in km/h and defined in [14]. Present only if \"velocityType\" equals 2 or 4 + // Vertical speed, expressed in km/h and defined in ETSI TS 123 032 [14]. Present only if \"velocityType\" equals 2 or 4 VerticalSpeed int32 `json:"verticalSpeed,omitempty"` - // Vertical uncertainty, as defined in [14]. Present only if \"velocityType\" equals 4 + // Vertical uncertainty, as defined in ETSI TS 123 032 [14]. Present only if \"velocityType\" equals 4 VerticalUncertainty int32 `json:"verticalUncertainty,omitempty"` } diff --git a/go-packages/meep-loc-serv-client/model_notification_format.go b/go-packages/meep-loc-serv-client/model_notification_format.go index 060989778..276c0f3d1 100644 --- a/go-packages/meep-loc-serv-client/model_notification_format.go +++ b/go-packages/meep-loc-serv-client/model_notification_format.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_notification_subscription_list.go b/go-packages/meep-loc-serv-client/model_notification_subscription_list.go index 10a7e8dd7..73898e73f 100644 --- a/go-packages/meep-loc-serv-client/model_notification_subscription_list.go +++ b/go-packages/meep-loc-serv-client/model_notification_subscription_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_operation_action_type.go b/go-packages/meep-loc-serv-client/model_operation_action_type.go index 402d10eeb..73dd36f06 100644 --- a/go-packages/meep-loc-serv-client/model_operation_action_type.go +++ b/go-packages/meep-loc-serv-client/model_operation_action_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_operation_status.go b/go-packages/meep-loc-serv-client/model_operation_status.go index cdd11be05..8925b62a2 100644 --- a/go-packages/meep-loc-serv-client/model_operation_status.go +++ b/go-packages/meep-loc-serv-client/model_operation_status.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_periodic_notification_subscription.go b/go-packages/meep-loc-serv-client/model_periodic_notification_subscription.go index 6bb5649da..b60125210 100644 --- a/go-packages/meep-loc-serv-client/model_periodic_notification_subscription.go +++ b/go-packages/meep-loc-serv-client/model_periodic_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_problem_details.go b/go-packages/meep-loc-serv-client/model_problem_details.go index 1d83fd4a3..2744c763a 100644 --- a/go-packages/meep-loc-serv-client/model_problem_details.go +++ b/go-packages/meep-loc-serv-client/model_problem_details.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_retrieval_status.go b/go-packages/meep-loc-serv-client/model_retrieval_status.go index b09e0a408..1446a3891 100644 --- a/go-packages/meep-loc-serv-client/model_retrieval_status.go +++ b/go-packages/meep-loc-serv-client/model_retrieval_status.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_service_error.go b/go-packages/meep-loc-serv-client/model_service_error.go index cc10ede94..4c4ed9c39 100644 --- a/go-packages/meep-loc-serv-client/model_service_error.go +++ b/go-packages/meep-loc-serv-client/model_service_error.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_subscription_notification.go b/go-packages/meep-loc-serv-client/model_subscription_notification.go index 85224de93..ae3254ba3 100644 --- a/go-packages/meep-loc-serv-client/model_subscription_notification.go +++ b/go-packages/meep-loc-serv-client/model_subscription_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_terminal_distance.go b/go-packages/meep-loc-serv-client/model_terminal_distance.go index 1e935ed78..21d2f5605 100644 --- a/go-packages/meep-loc-serv-client/model_terminal_distance.go +++ b/go-packages/meep-loc-serv-client/model_terminal_distance.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_terminal_location.go b/go-packages/meep-loc-serv-client/model_terminal_location.go index c13285231..b5d43c1a3 100644 --- a/go-packages/meep-loc-serv-client/model_terminal_location.go +++ b/go-packages/meep-loc-serv-client/model_terminal_location.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_time_stamp.go b/go-packages/meep-loc-serv-client/model_time_stamp.go index af4219995..44f115e5e 100644 --- a/go-packages/meep-loc-serv-client/model_time_stamp.go +++ b/go-packages/meep-loc-serv-client/model_time_stamp.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_user_event_type.go b/go-packages/meep-loc-serv-client/model_user_event_type.go index 878dea5ec..bc4970174 100644 --- a/go-packages/meep-loc-serv-client/model_user_event_type.go +++ b/go-packages/meep-loc-serv-client/model_user_event_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_user_info.go b/go-packages/meep-loc-serv-client/model_user_info.go index 444ce2894..3f126f658 100644 --- a/go-packages/meep-loc-serv-client/model_user_info.go +++ b/go-packages/meep-loc-serv-client/model_user_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_user_list.go b/go-packages/meep-loc-serv-client/model_user_list.go index 92c6498f7..1c2e1023a 100644 --- a/go-packages/meep-loc-serv-client/model_user_list.go +++ b/go-packages/meep-loc-serv-client/model_user_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_user_tracking_subscription.go b/go-packages/meep-loc-serv-client/model_user_tracking_subscription.go index bb9cf0ac3..92a640f28 100644 --- a/go-packages/meep-loc-serv-client/model_user_tracking_subscription.go +++ b/go-packages/meep-loc-serv-client/model_user_tracking_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_zonal_presence_notification.go b/go-packages/meep-loc-serv-client/model_zonal_presence_notification.go index a4257dcb4..4881960fa 100644 --- a/go-packages/meep-loc-serv-client/model_zonal_presence_notification.go +++ b/go-packages/meep-loc-serv-client/model_zonal_presence_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_zonal_traffic_subscription.go b/go-packages/meep-loc-serv-client/model_zonal_traffic_subscription.go index a47aa7dfe..7d6cafaa1 100644 --- a/go-packages/meep-loc-serv-client/model_zonal_traffic_subscription.go +++ b/go-packages/meep-loc-serv-client/model_zonal_traffic_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_zone_info.go b/go-packages/meep-loc-serv-client/model_zone_info.go index 0f93ae598..f1db15e28 100644 --- a/go-packages/meep-loc-serv-client/model_zone_info.go +++ b/go-packages/meep-loc-serv-client/model_zone_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_zone_list.go b/go-packages/meep-loc-serv-client/model_zone_list.go index 9a3d3e812..4550ca6a2 100644 --- a/go-packages/meep-loc-serv-client/model_zone_list.go +++ b/go-packages/meep-loc-serv-client/model_zone_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_zone_status_notification.go b/go-packages/meep-loc-serv-client/model_zone_status_notification.go index 31605c752..8d924cef6 100644 --- a/go-packages/meep-loc-serv-client/model_zone_status_notification.go +++ b/go-packages/meep-loc-serv-client/model_zone_status_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/model_zone_status_subscription.go b/go-packages/meep-loc-serv-client/model_zone_status_subscription.go index 73915c9ed..2f4c25538 100644 --- a/go-packages/meep-loc-serv-client/model_zone_status_subscription.go +++ b/go-packages/meep-loc-serv-client/model_zone_status_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-loc-serv-client/response.go b/go-packages/meep-loc-serv-client/response.go index f38b572a0..487c8d25f 100644 --- a/go-packages/meep-loc-serv-client/response.go +++ b/go-packages/meep-loc-serv-client/response.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Location Service REST API + * AdvantEDGE Location API * * Location Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC013 Location API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)

    The API is based on the Open Mobile Alliance's specification RESTful Network API for Zonal Presence

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-loc-serv](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-loc-serv)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about Users (UE) and Zone locations

    **Note**
    AdvantEDGE supports all of Location API endpoints (see below). * diff --git a/go-packages/meep-logger/logger.go b/go-packages/meep-logger/logger.go index fa44b61c3..ab2427525 100644 --- a/go-packages/meep-logger/logger.go +++ b/go-packages/meep-logger/logger.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics-engine-notification-client/api_notifications.go b/go-packages/meep-metrics-engine-notification-client/api_notifications.go index 2f7773363..026529200 100644 --- a/go-packages/meep-metrics-engine-notification-client/api_notifications.go +++ b/go-packages/meep-metrics-engine-notification-client/api_notifications.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/client.go b/go-packages/meep-metrics-engine-notification-client/client.go index dd2c5b948..8ffa45d70 100644 --- a/go-packages/meep-metrics-engine-notification-client/client.go +++ b/go-packages/meep-metrics-engine-notification-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/configuration.go b/go-packages/meep-metrics-engine-notification-client/configuration.go index be10a05ae..8bae31cd2 100644 --- a/go-packages/meep-metrics-engine-notification-client/configuration.go +++ b/go-packages/meep-metrics-engine-notification-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/model_event_metric.go b/go-packages/meep-metrics-engine-notification-client/model_event_metric.go index a6fbaf539..eaabf7ce3 100644 --- a/go-packages/meep-metrics-engine-notification-client/model_event_metric.go +++ b/go-packages/meep-metrics-engine-notification-client/model_event_metric.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/model_event_metric_list.go b/go-packages/meep-metrics-engine-notification-client/model_event_metric_list.go index c3f31da71..24000b03a 100644 --- a/go-packages/meep-metrics-engine-notification-client/model_event_metric_list.go +++ b/go-packages/meep-metrics-engine-notification-client/model_event_metric_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/model_event_notification.go b/go-packages/meep-metrics-engine-notification-client/model_event_notification.go index d5c1575fa..6734ffb98 100644 --- a/go-packages/meep-metrics-engine-notification-client/model_event_notification.go +++ b/go-packages/meep-metrics-engine-notification-client/model_event_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/model_network_metric.go b/go-packages/meep-metrics-engine-notification-client/model_network_metric.go index aa684d213..c7da3eef3 100644 --- a/go-packages/meep-metrics-engine-notification-client/model_network_metric.go +++ b/go-packages/meep-metrics-engine-notification-client/model_network_metric.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/model_network_metric_list.go b/go-packages/meep-metrics-engine-notification-client/model_network_metric_list.go index 3703a8fbb..4567ab998 100644 --- a/go-packages/meep-metrics-engine-notification-client/model_network_metric_list.go +++ b/go-packages/meep-metrics-engine-notification-client/model_network_metric_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/model_network_notification.go b/go-packages/meep-metrics-engine-notification-client/model_network_notification.go index b4e3aa859..a1983d750 100644 --- a/go-packages/meep-metrics-engine-notification-client/model_network_notification.go +++ b/go-packages/meep-metrics-engine-notification-client/model_network_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics-engine-notification-client/response.go b/go-packages/meep-metrics-engine-notification-client/response.go index 568744a9d..e72170cfc 100644 --- a/go-packages/meep-metrics-engine-notification-client/response.go +++ b/go-packages/meep-metrics-engine-notification-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-metrics/convert.go b/go-packages/meep-metrics/convert.go index 8d1a5a1f7..4934a5c36 100644 --- a/go-packages/meep-metrics/convert.go +++ b/go-packages/meep-metrics/convert.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/events.go b/go-packages/meep-metrics/events.go index d8c63dea6..251a815d9 100644 --- a/go-packages/meep-metrics/events.go +++ b/go-packages/meep-metrics/events.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/events_test.go b/go-packages/meep-metrics/events_test.go index 0d9aa0b23..85211cacc 100644 --- a/go-packages/meep-metrics/events_test.go +++ b/go-packages/meep-metrics/events_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/gis.go b/go-packages/meep-metrics/gis.go index 46f5a0d53..ddc23c790 100644 --- a/go-packages/meep-metrics/gis.go +++ b/go-packages/meep-metrics/gis.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/http.go b/go-packages/meep-metrics/http.go index 5abe4e54a..0349c631a 100644 --- a/go-packages/meep-metrics/http.go +++ b/go-packages/meep-metrics/http.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -19,38 +19,50 @@ package metrics import ( "encoding/json" "errors" + "fmt" + "strings" + "time" log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger" ) const HttpLogMetricName = "http" const HttpLoggerName = "logger_name" -const HttpLoggerDirection = "direction" +const HttpLoggerMsgType = "msg_type" const HttpLogTime = "time" const HttpLogId = "id" const HttpUrl = "url" const HttpLogEndpoint = "endpoint" const HttpMethod = "method" +const HttpSrc = "src" +const HttpDst = "dst" const HttpBody = "body" const HttpRespBody = "resp_body" const HttpRespCode = "resp_code" const HttpProcTime = "proc_time" +const HttpMermaid = "mermaid" +const HttpSdorg = "sdorg" -const HttpRxDirection = "RX" -const HttpTxDirection = "TX" +const HttpMsgTypeRequest = "request" +const HttpMsgTypeResponse = "response" +const HttpMsgTypeNotification = "notification" type HttpMetric struct { LoggerName string - Direction string + MsgType string Id int32 Url string Endpoint string Method string + Src string + Dst string Body string RespBody string RespCode string ProcTime string Time interface{} + Mermaid string + Sdorg string } // SetHttpMetric @@ -58,22 +70,57 @@ func (ms *MetricStore) SetHttpMetric(h HttpMetric) error { metricList := make([]Metric, 1) metric := &metricList[0] metric.Name = HttpLogMetricName - metric.Tags = map[string]string{HttpLoggerName: h.LoggerName, HttpLoggerDirection: h.Direction} + metric.Tags = map[string]string{HttpLoggerName: h.LoggerName, HttpLoggerMsgType: h.MsgType} + var mermaidLogs string + var sdorgLogs string + mermaidLogs, sdorgLogs = ms.FormatMetrics(h) metric.Fields = map[string]interface{}{ HttpLogId: h.Id, HttpUrl: h.Url, HttpLogEndpoint: h.Endpoint, HttpMethod: h.Method, + HttpSrc: h.Src, + HttpDst: h.Dst, HttpBody: h.Body, HttpRespBody: h.RespBody, HttpRespCode: h.RespCode, HttpProcTime: h.ProcTime, + HttpMermaid: mermaidLogs, + HttpSdorg: sdorgLogs, } return ms.SetInfluxMetric(metricList) } +func (ms *MetricStore) FormatMetrics(h HttpMetric) (mermaidLogs string, sdorgLogs string) { + if h.Src != "" && h.Dst != "" { + // Format ProcTime + procTime := "" + if h.MsgType == HttpMsgTypeResponse { + procDuration, err := time.ParseDuration(h.ProcTime + "us") + if err != nil { + log.Error("Failed to parse processing time with error: ", err.Error()) + } + procTimeMs := float64(procDuration.Microseconds()) / 1000 + procTime = fmt.Sprintf(" (%.2f ms)", procTimeMs) + } + //Format Endpoint + endpoint := h.Endpoint + trimStr := "/sa6/v1/" + pos := strings.Index(endpoint, trimStr) + if pos != -1 { + endpoint = endpoint[pos+len(trimStr):] + } + src := strings.Replace(h.Src, "-", "_", 1) + dst := strings.Replace(h.Dst, "-", "_", 1) + mermaidLogs := src + " ->> " + dst + ": " + endpoint + procTime + sdorgLogs := src + " -> " + dst + ": " + endpoint + procTime + return mermaidLogs, sdorgLogs + } + return +} + // GetHttpMetric -func (ms *MetricStore) GetHttpMetric(loggerName string, direction string, duration string, count int) (metrics []HttpMetric, err error) { +func (ms *MetricStore) GetHttpMetric(loggerName string, msgType string, duration string, count int) (metrics []HttpMetric, err error) { // Make sure we have set a store if ms.name == "" { err = errors.New("Store name not specified") @@ -85,10 +132,10 @@ func (ms *MetricStore) GetHttpMetric(loggerName string, direction string, durati if loggerName != "" { tags[HttpLoggerName] = loggerName } - if direction != "" { - tags[HttpLoggerDirection] = direction + if msgType != "" { + tags[HttpLoggerMsgType] = msgType } - fields := []string{HttpLogId, HttpUrl, HttpLogEndpoint, HttpMethod, HttpBody, HttpRespBody, HttpRespCode, HttpProcTime} + fields := []string{HttpLoggerName, HttpLoggerMsgType, HttpLogId, HttpUrl, HttpLogEndpoint, HttpMethod, HttpSrc, HttpDst, HttpBody, HttpRespBody, HttpRespCode, HttpProcTime} var valuesArray []map[string]interface{} valuesArray, err = ms.GetInfluxMetric(HttpLogMetricName, tags, fields, duration, count) if err != nil { @@ -99,10 +146,16 @@ func (ms *MetricStore) GetHttpMetric(loggerName string, direction string, durati // Format http metrics metrics = make([]HttpMetric, len(valuesArray)) for index, values := range valuesArray { - metrics[index].LoggerName = loggerName - metrics[index].Direction = direction metrics[index].Time = values[HttpLogTime] metrics[index].Id = JsonNumToInt32(values[HttpLogId].(json.Number)) + // Tags + if val, ok := values[HttpLoggerName].(string); ok { + metrics[index].LoggerName = val + } + if val, ok := values[HttpLoggerMsgType].(string); ok { + metrics[index].MsgType = val + } + // Values if val, ok := values[HttpUrl].(string); ok { metrics[index].Url = val } @@ -112,6 +165,12 @@ func (ms *MetricStore) GetHttpMetric(loggerName string, direction string, durati if val, ok := values[HttpMethod].(string); ok { metrics[index].Method = val } + if val, ok := values[HttpSrc].(string); ok { + metrics[index].Src = val + } + if val, ok := values[HttpDst].(string); ok { + metrics[index].Dst = val + } if val, ok := values[HttpBody].(string); ok { metrics[index].Body = val } diff --git a/go-packages/meep-metrics/http_test.go b/go-packages/meep-metrics/http_test.go index fc880ebfc..9020b3914 100644 --- a/go-packages/meep-metrics/http_test.go +++ b/go-packages/meep-metrics/http_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -42,19 +42,19 @@ func TestHttpMetricsGetSet(t *testing.T) { ms.Flush() fmt.Println("Set http metrics") - err = ms.SetHttpMetric(HttpMetric{"logger1", "RX", 1, "url1", "endpoint1", "method1", "body1", "respBody1", "201", "101", nil}) + err = ms.SetHttpMetric(HttpMetric{"logger1", "RX", 1, "url1", "endpoint1", "method1", "src1", "dst1", "body1", "respBody1", "201", "101", "time", "memaid", "seuqence"}) if err != nil { t.Fatalf("Unable to set http metric") } - err = ms.SetHttpMetric(HttpMetric{"logger1", "TX", 2, "url2", "endpoint2", "method2", "body2", "respBody2", "202", "102", nil}) + err = ms.SetHttpMetric(HttpMetric{"logger1", "TX", 2, "url2", "endpoint2", "method2", "src2", "dst2", "body2", "respBody2", "202", "102", "time", "memaid", "seuqence"}) if err != nil { t.Fatalf("Unable to set http metric") } - err = ms.SetHttpMetric(HttpMetric{"logger1", "TX", 3, "url3", "endpoint3", "method3", "body3", "respBody3", "203", "103", nil}) + err = ms.SetHttpMetric(HttpMetric{"logger1", "TX", 3, "url3", "endpoint3", "method3", "src3", "dst3", "body3", "respBody3", "203", "103", "time", "memaid", "seuqence"}) if err != nil { t.Fatalf("Unable to set http metric") } - err = ms.SetHttpMetric(HttpMetric{"logger2", "RX", 4, "url4", "endpoint4", "method4", "body4", "respBody4", "204", "104", nil}) + err = ms.SetHttpMetric(HttpMetric{"logger2", "RX", 4, "url4", "endpoint4", "method4", "src4", "dst4", "body4", "respBody4", "204", "104", "time", "memaid", "seuqence"}) if err != nil { t.Fatalf("Unable to set http metric") } @@ -68,7 +68,7 @@ func TestHttpMetricsGetSet(t *testing.T) { if err != nil || len(hml) != 1 { t.Fatalf("Failed to get metric") } - if !validateHttpMetric(hml[0], "logger1", "RX", 1, "url1", "endpoint1", "method1", "body1", "respBody1", "201", "101") { + if !validateHttpMetric(hml[0], "logger1", "RX", 1, "url1", "endpoint1", "method1", "src1", "dst1", "body1", "respBody1", "201", "101") { t.Fatalf("Invalid http metric") } @@ -92,6 +92,6 @@ func TestHttpMetricsGetSet(t *testing.T) { // t.Fatalf("DONE") } -func validateHttpMetric(h HttpMetric, loggerName string, direction string, id int32, url string, endpoint string, method string, body string, respBody string, respCode string, procTime string) bool { - return h.LoggerName == loggerName && h.Direction == direction && h.Id == id && h.Url == url && h.Endpoint == endpoint && h.Method == method && h.Body == body && h.RespBody == respBody && h.RespCode == respCode && h.ProcTime == procTime +func validateHttpMetric(h HttpMetric, loggerName string, direction string, id int32, url string, endpoint string, method string, src string, dst string, body string, respBody string, respCode string, procTime string) bool { + return h.LoggerName == loggerName && h.Id == id && h.Url == url && h.Endpoint == endpoint && h.Method == method && h.Body == body && h.RespBody == respBody && h.RespCode == respCode && h.ProcTime == procTime && h.Src == src && h.Dst == dst } diff --git a/go-packages/meep-metrics/metric-store.go b/go-packages/meep-metrics/metric-store.go index 60f9904b3..0a22ecb43 100644 --- a/go-packages/meep-metrics/metric-store.go +++ b/go-packages/meep-metrics/metric-store.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -96,7 +96,7 @@ func NewMetricStore(name string, namespace string, influxAddr string, redisAddr } // Set store to use - err = ms.SetStore(name) + err = ms.SetStore(name, namespace, true) if err != nil { log.Error("Failed to set store: ", err.Error()) return nil, err @@ -133,16 +133,21 @@ func (ms *MetricStore) connectInfluxDB(addr string) error { } // SetStore - -func (ms *MetricStore) SetStore(name string) error { +func (ms *MetricStore) SetStore(name string, namespace string, createDb bool) error { var storeName string if name != "" { + // Use default namespace if none provided + if namespace == "" { + namespace = ms.namespace + } + // Create store name using format: '_' // Replace dashes with underscores - storeName = strings.Replace(ms.namespace+"_"+name, "-", "_", -1) + storeName = strings.Replace(namespace+"_"+name, "-", "_", -1) // Create new DB if necessary - if ms.influxClient != nil { + if createDb && ms.influxClient != nil { q := influx.NewQuery("CREATE DATABASE "+storeName, "", "") _, err := (*ms.influxClient).Query(q) if err != nil { diff --git a/go-packages/meep-metrics/metric-store_test.go b/go-packages/meep-metrics/metric-store_test.go index 66710ed5d..048085c9c 100644 --- a/go-packages/meep-metrics/metric-store_test.go +++ b/go-packages/meep-metrics/metric-store_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -82,18 +82,18 @@ func TestMetricStoreNew(t *testing.T) { } fmt.Println("Set store") - err = ms.SetStore(metricStore1Name) + err = ms.SetStore(metricStore1Name, metricStoreNamespace, true) if err != nil { t.Fatalf("Unable to set Store") } fmt.Println("Set store2") - err = ms.SetStore(metricStore2Name) + err = ms.SetStore(metricStore2Name, metricStoreNamespace, false) if err != nil { t.Fatalf("Unable to set Store2") } fmt.Println("Reset store") - err = ms.SetStore("") + err = ms.SetStore("", metricStoreNamespace, true) if err != nil { t.Fatalf("Unable to reset Store") } @@ -245,7 +245,7 @@ func TestMetricStoreCopyInflux(t *testing.T) { fmt.Println("Validate copied data") fmt.Println("Set store") - err = ms.SetStore(metricStore3Name) + err = ms.SetStore(metricStore3Name, metricStoreNamespace, true) if err != nil { t.Fatalf("Unable to set Store") } diff --git a/go-packages/meep-metrics/network.go b/go-packages/meep-metrics/network.go index 59cd08992..1fa8320b8 100644 --- a/go-packages/meep-metrics/network.go +++ b/go-packages/meep-metrics/network.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/network_test.go b/go-packages/meep-metrics/network_test.go index d9543ff1c..403c0a58e 100644 --- a/go-packages/meep-metrics/network_test.go +++ b/go-packages/meep-metrics/network_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -60,7 +60,7 @@ func TestNetworkMetricGetSet(t *testing.T) { } fmt.Println("Set store") - err = ms.SetStore(networkStoreName) + err = ms.SetStore(networkStoreName, networkStoreNamespace, true) if err != nil { t.Fatalf("Unable to set Store") } diff --git a/go-packages/meep-metrics/prometheus.go b/go-packages/meep-metrics/prometheus.go index 4daedde61..723c159c2 100644 --- a/go-packages/meep-metrics/prometheus.go +++ b/go-packages/meep-metrics/prometheus.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/sandbox.go b/go-packages/meep-metrics/sandbox.go index ddea5ae9e..efaf434bf 100644 --- a/go-packages/meep-metrics/sandbox.go +++ b/go-packages/meep-metrics/sandbox.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/sandbox_test.go b/go-packages/meep-metrics/sandbox_test.go index ea95341f2..5d63e69d8 100644 --- a/go-packages/meep-metrics/sandbox_test.go +++ b/go-packages/meep-metrics/sandbox_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/session.go b/go-packages/meep-metrics/session.go index 6904c4f56..29434d20f 100644 --- a/go-packages/meep-metrics/session.go +++ b/go-packages/meep-metrics/session.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-metrics/session_test.go b/go-packages/meep-metrics/session_test.go index 82d0a49c2..340e348e3 100644 --- a/go-packages/meep-metrics/session_test.go +++ b/go-packages/meep-metrics/session_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-mg-app-client/api_state_transfer.go b/go-packages/meep-mg-app-client/api_state_transfer.go index ba0e0d545..f567fd6b4 100644 --- a/go-packages/meep-mg-app-client/api_state_transfer.go +++ b/go-packages/meep-mg-app-client/api_state_transfer.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-app-client/client.go b/go-packages/meep-mg-app-client/client.go index ce6ed03d5..65ae08bad 100644 --- a/go-packages/meep-mg-app-client/client.go +++ b/go-packages/meep-mg-app-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-app-client/configuration.go b/go-packages/meep-mg-app-client/configuration.go index be76b61f3..d1f42ced0 100644 --- a/go-packages/meep-mg-app-client/configuration.go +++ b/go-packages/meep-mg-app-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-app-client/model_mobility_group_app_state.go b/go-packages/meep-mg-app-client/model_mobility_group_app_state.go index f0fa3d2f6..d3613d052 100644 --- a/go-packages/meep-mg-app-client/model_mobility_group_app_state.go +++ b/go-packages/meep-mg-app-client/model_mobility_group_app_state.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-app-client/model_mobility_group_event.go b/go-packages/meep-mg-app-client/model_mobility_group_event.go index 924c64b52..48979a9e4 100644 --- a/go-packages/meep-mg-app-client/model_mobility_group_event.go +++ b/go-packages/meep-mg-app-client/model_mobility_group_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-app-client/response.go b/go-packages/meep-mg-app-client/response.go index 7bced184a..d8783210e 100644 --- a/go-packages/meep-mg-app-client/response.go +++ b/go-packages/meep-mg-app-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/api_membership.go b/go-packages/meep-mg-manager-client/api_membership.go index 00157a0fb..50c3d52b5 100644 --- a/go-packages/meep-mg-manager-client/api_membership.go +++ b/go-packages/meep-mg-manager-client/api_membership.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/api_state_transfer.go b/go-packages/meep-mg-manager-client/api_state_transfer.go index be650f5f7..9f2bdc3f9 100644 --- a/go-packages/meep-mg-manager-client/api_state_transfer.go +++ b/go-packages/meep-mg-manager-client/api_state_transfer.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/client.go b/go-packages/meep-mg-manager-client/client.go index f5ad7463f..b2d20e567 100644 --- a/go-packages/meep-mg-manager-client/client.go +++ b/go-packages/meep-mg-manager-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/configuration.go b/go-packages/meep-mg-manager-client/configuration.go index aa65b5862..3750a2797 100644 --- a/go-packages/meep-mg-manager-client/configuration.go +++ b/go-packages/meep-mg-manager-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/model_mobility_group.go b/go-packages/meep-mg-manager-client/model_mobility_group.go index be55a0559..f89165a91 100644 --- a/go-packages/meep-mg-manager-client/model_mobility_group.go +++ b/go-packages/meep-mg-manager-client/model_mobility_group.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/model_mobility_group_app.go b/go-packages/meep-mg-manager-client/model_mobility_group_app.go index 327b315b2..25259bf33 100644 --- a/go-packages/meep-mg-manager-client/model_mobility_group_app.go +++ b/go-packages/meep-mg-manager-client/model_mobility_group_app.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/model_mobility_group_app_state.go b/go-packages/meep-mg-manager-client/model_mobility_group_app_state.go index 02f6f3588..b76433078 100644 --- a/go-packages/meep-mg-manager-client/model_mobility_group_app_state.go +++ b/go-packages/meep-mg-manager-client/model_mobility_group_app_state.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/model_mobility_group_ue.go b/go-packages/meep-mg-manager-client/model_mobility_group_ue.go index 4b75f4b4e..92fc38a17 100644 --- a/go-packages/meep-mg-manager-client/model_mobility_group_ue.go +++ b/go-packages/meep-mg-manager-client/model_mobility_group_ue.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-client/response.go b/go-packages/meep-mg-manager-client/response.go index 242344b26..ab2f1ffd5 100644 --- a/go-packages/meep-mg-manager-client/response.go +++ b/go-packages/meep-mg-manager-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_mobility_group.go b/go-packages/meep-mg-manager-model/model_mobility_group.go index 3f0b39ee5..4ec7271d3 100644 --- a/go-packages/meep-mg-manager-model/model_mobility_group.go +++ b/go-packages/meep-mg-manager-model/model_mobility_group.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_mobility_group_app.go b/go-packages/meep-mg-manager-model/model_mobility_group_app.go index d451d5234..5cdcf9dbb 100644 --- a/go-packages/meep-mg-manager-model/model_mobility_group_app.go +++ b/go-packages/meep-mg-manager-model/model_mobility_group_app.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_mobility_group_app_state.go b/go-packages/meep-mg-manager-model/model_mobility_group_app_state.go index c852d766e..473eef922 100644 --- a/go-packages/meep-mg-manager-model/model_mobility_group_app_state.go +++ b/go-packages/meep-mg-manager-model/model_mobility_group_app_state.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_mobility_group_event.go b/go-packages/meep-mg-manager-model/model_mobility_group_event.go index 07b339ec0..7a78b4486 100644 --- a/go-packages/meep-mg-manager-model/model_mobility_group_event.go +++ b/go-packages/meep-mg-manager-model/model_mobility_group_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_mobility_group_service_map.go b/go-packages/meep-mg-manager-model/model_mobility_group_service_map.go index 0d04f14f0..e71822b65 100644 --- a/go-packages/meep-mg-manager-model/model_mobility_group_service_map.go +++ b/go-packages/meep-mg-manager-model/model_mobility_group_service_map.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_mobility_group_ue.go b/go-packages/meep-mg-manager-model/model_mobility_group_ue.go index 3f58b19dd..c2d951158 100644 --- a/go-packages/meep-mg-manager-model/model_mobility_group_ue.go +++ b/go-packages/meep-mg-manager-model/model_mobility_group_ue.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_network_element.go b/go-packages/meep-mg-manager-model/model_network_element.go index b6ca73d67..9746c0979 100644 --- a/go-packages/meep-mg-manager-model/model_network_element.go +++ b/go-packages/meep-mg-manager-model/model_network_element.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-mg-manager-model/model_network_element_list.go b/go-packages/meep-mg-manager-model/model_network_element_list.go index c06ef1b22..675e21410 100644 --- a/go-packages/meep-mg-manager-model/model_network_element_list.go +++ b/go-packages/meep-mg-manager-model/model_network_element_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-model/minimize.go b/go-packages/meep-model/minimize.go index 3b3ea2e10..ef0da66dc 100644 --- a/go-packages/meep-model/minimize.go +++ b/go-packages/meep-model/minimize.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -22,8 +22,14 @@ import ( // minimizeScenario - Minimizes scenario func minimizeScenario(scenario *dataModel.Scenario) { - if scenario != nil && scenario.Deployment != nil { - deployment := scenario.Deployment + if scenario != nil { + minimizeDeployment(scenario.Deployment) + } +} + +// minimizeDeployment - Minimizes deployment +func minimizeDeployment(deployment *dataModel.Deployment) { + if deployment != nil { for i := range deployment.Domains { domain := &deployment.Domains[i] minimizeDomain(domain) diff --git a/go-packages/meep-model/model.go b/go-packages/meep-model/model.go index 0497130e4..97c1030be 100644 --- a/go-packages/meep-model/model.go +++ b/go-packages/meep-model/model.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -37,6 +37,7 @@ var redisTable int = 0 const ( NodeTypeScenario string = "SCENARIO" + NodeTypeDeployment string = "DEPLOYMENT" NodeTypeOperator string = "OPERATOR" NodeTypeOperatorCell string = "OPERATOR-CELLULAR" NodeTypeZone string = "ZONE" @@ -377,73 +378,75 @@ func (m *Model) UpdateNetChar(nc *dataModel.EventNetworkCharacteristicsUpdate, u ncName := nc.ElementName ncType := strings.ToUpper(nc.ElementType) + if ncType == NodeTypeScenario { + ncType = NodeTypeDeployment + } // Find the element - if ncType == NodeTypeScenario { - if m.scenario.Deployment.NetChar == nil { - m.scenario.Deployment.NetChar = new(dataModel.NetworkCharacteristics) + n := m.nodeMap.FindByName(ncName) + // fmt.Printf("+++ node: %+v\n", n) + if n == nil { + return errors.New("Did not find " + ncName + " in scenario " + m.name) + } + if IsDeployment(ncType) { + deployment := n.object.(*dataModel.Deployment) + if deployment.NetChar == nil { + deployment.NetChar = new(dataModel.NetworkCharacteristics) } - m.scenario.Deployment.NetChar = nc.NetChar + deployment.NetChar = nc.NetChar updated = true - } else { - n := m.nodeMap.FindByName(ncName) - // fmt.Printf("+++ node: %+v\n", n) - if n == nil { - return errors.New("Did not find " + ncName + " in scenario " + m.name) + } else if IsDomain(ncType) { + domain := n.object.(*dataModel.Domain) + if domain.NetChar == nil { + domain.NetChar = new(dataModel.NetworkCharacteristics) } - if IsDomain(ncType) { - domain := n.object.(*dataModel.Domain) - if domain.NetChar == nil { - domain.NetChar = new(dataModel.NetworkCharacteristics) - } - domain.NetChar = nc.NetChar - updated = true - } else if IsZone(ncType) { - zone := n.object.(*dataModel.Zone) - if zone.NetChar == nil { - zone.NetChar = new(dataModel.NetworkCharacteristics) - } - zone.NetChar = nc.NetChar - updated = true - } else if IsNetLoc(ncType) { - nl := n.object.(*dataModel.NetworkLocation) - if nl.NetChar == nil { - nl.NetChar = new(dataModel.NetworkCharacteristics) - } - nl.NetChar = nc.NetChar - updated = true - } else if IsPhyLoc(ncType) { - pl := n.object.(*dataModel.PhysicalLocation) - if pl.NetChar == nil { - pl.NetChar = new(dataModel.NetworkCharacteristics) - } - pl.NetChar = nc.NetChar - updated = true - } else if IsProc(ncType) { - proc := n.object.(*dataModel.Process) - if proc.NetChar == nil { - proc.NetChar = new(dataModel.NetworkCharacteristics) - } - proc.NetChar = nc.NetChar - updated = true - } else { - err = errors.New("Unsupported type " + ncType + ". Supported types: " + - NodeTypeScenario + ", " + - NodeTypeOperator + ", " + - NodeTypeOperatorCell + ", " + - NodeTypeZone + ", " + - NodeTypePoa + ", " + - NodeTypePoa4G + ", " + - NodeTypePoa5G + ", " + - NodeTypePoaWifi + ", " + - NodeTypeCloud + ", " + - NodeTypeEdge + ", " + - NodeTypeFog + ", " + - NodeTypeUE + ", " + - NodeTypeCloudApp + ", " + - NodeTypeEdgeApp + ", " + - NodeTypeUEApp) + domain.NetChar = nc.NetChar + updated = true + } else if IsZone(ncType) { + zone := n.object.(*dataModel.Zone) + if zone.NetChar == nil { + zone.NetChar = new(dataModel.NetworkCharacteristics) + } + zone.NetChar = nc.NetChar + updated = true + } else if IsNetLoc(ncType) { + nl := n.object.(*dataModel.NetworkLocation) + if nl.NetChar == nil { + nl.NetChar = new(dataModel.NetworkCharacteristics) + } + nl.NetChar = nc.NetChar + updated = true + } else if IsPhyLoc(ncType) { + pl := n.object.(*dataModel.PhysicalLocation) + if pl.NetChar == nil { + pl.NetChar = new(dataModel.NetworkCharacteristics) + } + pl.NetChar = nc.NetChar + updated = true + } else if IsProc(ncType) { + proc := n.object.(*dataModel.Process) + if proc.NetChar == nil { + proc.NetChar = new(dataModel.NetworkCharacteristics) } + proc.NetChar = nc.NetChar + updated = true + } else { + err = errors.New("Unsupported type " + ncType + ". Supported types: " + + NodeTypeScenario + ", " + + NodeTypeOperator + ", " + + NodeTypeOperatorCell + ", " + + NodeTypeZone + ", " + + NodeTypePoa + ", " + + NodeTypePoa4G + ", " + + NodeTypePoa5G + ", " + + NodeTypePoaWifi + ", " + + NodeTypeCloud + ", " + + NodeTypeEdge + ", " + + NodeTypeFog + ", " + + NodeTypeUE + ", " + + NodeTypeCloudApp + ", " + + NodeTypeEdgeApp + ", " + + NodeTypeUEApp) } if updated { err = m.refresh(EventNetChar, userData) @@ -987,6 +990,48 @@ func (m *Model) GetNodeContext(name string) (ctx *NodeContext) { return ctx } +// GetDeployment - Get deployment matching filter criteria +func (m *Model) GetDeployment(filter *NodeFilter) *dataModel.Deployment { + m.lock.RLock() + defer m.lock.RUnlock() + + // Get deployment nodes + nMap := make(map[string]*Node) + m.mergeNodeMap(nMap, m.nodeMap.FindAllByType(NodeTypeDeployment)) + + // Find nodes that match filter criteria + for _, node := range nMap { + if m.filterNode(node, Deployment, filter) { + var deployment dataModel.Deployment + + // Deep copy node if it needs to be modified + obj := node.object.(*dataModel.Deployment) + if filter != nil && (filter.ExcludeChildren || filter.Minimize) { + byt, _ := json.Marshal(obj) + err := json.Unmarshal(byt, &deployment) + if err != nil { + continue + } + + // Remove children + if filter.ExcludeChildren { + deployment.Domains = nil + } + // Minimize node + if filter.Minimize { + minimizeDeployment(&deployment) + } + } else { + deployment = *obj + } + + // NOTE: there should always be a single deployment + return &deployment + } + } + return nil +} + // GetDomains - Get domains matching filter criteria func (m *Model) GetDomains(filter *NodeFilter) dataModel.Domains { m.lock.RLock() @@ -1006,7 +1051,7 @@ func (m *Model) GetDomains(filter *NodeFilter) dataModel.Domains { // Deep copy node if it needs to be modified obj := node.object.(*dataModel.Domain) - if filter.ExcludeChildren || filter.Minimize { + if filter != nil && (filter.ExcludeChildren || filter.Minimize) { byt, _ := json.Marshal(obj) err := json.Unmarshal(byt, &domain) if err != nil { @@ -1050,7 +1095,7 @@ func (m *Model) GetZones(filter *NodeFilter) dataModel.Zones { // Deep copy node if it needs to be modified obj := node.object.(*dataModel.Zone) - if filter.ExcludeChildren || filter.Minimize { + if filter != nil && (filter.ExcludeChildren || filter.Minimize) { byt, _ := json.Marshal(obj) err := json.Unmarshal(byt, &zone) if err != nil { @@ -1097,7 +1142,7 @@ func (m *Model) GetNetworkLocations(filter *NodeFilter) dataModel.NetworkLocatio // Deep copy node if it needs to be modified obj := node.object.(*dataModel.NetworkLocation) - if filter.ExcludeChildren || filter.Minimize { + if filter != nil && (filter.ExcludeChildren || filter.Minimize) { byt, _ := json.Marshal(obj) err := json.Unmarshal(byt, &networkLocation) if err != nil { @@ -1144,7 +1189,7 @@ func (m *Model) GetPhysicalLocations(filter *NodeFilter) dataModel.PhysicalLocat // Deep copy node if it needs to be modified obj := node.object.(*dataModel.PhysicalLocation) - if filter.ExcludeChildren || filter.Minimize { + if filter != nil && (filter.ExcludeChildren || filter.Minimize) { byt, _ := json.Marshal(obj) err := json.Unmarshal(byt, &physicalLocation) if err != nil { @@ -1204,14 +1249,6 @@ func (m *Model) GetNetworkGraph() *dijkstra.Graph { return m.networkGraph.graph } -// GetConnectivityModel - Get the connectivity model -func (m *Model) GetConnectivityModel() string { - m.lock.RLock() - defer m.lock.RUnlock() - - return m.connectivityModel -} - //---Internal Funcs--- func (m *Model) parseNodes() (err error) { @@ -1224,7 +1261,7 @@ func (m *Model) parseNodes() (err error) { if m.scenario.Deployment != nil { deployment := m.scenario.Deployment deploymentCtx := NewNodeContext(m.scenario.Name, "", "", "", "") - m.nodeMap.AddNode(NewNode(m.scenario.Id, m.scenario.Name, "DEPLOYMENT", deployment, &deployment.Domains, m.scenario, deploymentCtx)) + m.nodeMap.AddNode(NewNode(m.scenario.Id, m.scenario.Name, NodeTypeDeployment, deployment, &deployment.Domains, m.scenario, deploymentCtx)) m.svcMap = make([]dataModel.NodeServiceMaps, 0) if deployment.Connectivity != nil { m.connectivityModel = deployment.Connectivity.Model @@ -1452,18 +1489,30 @@ func (m *Model) UpdateScenario() { } func (m *Model) filterNode(node *Node, typ string, filter *NodeFilter) bool { + // Validate filter + if filter == nil { + return true + } + + // Filter node var ctx *NodeContext = node.context.(*NodeContext) // Domain name if filter.DomainName != "" { - if ctx.Parents[Domain] != filter.DomainName { - return false + if typ == Deployment { + if _, found := ctx.Children[Domain][filter.DomainName]; !found { + return false + } + } else { + if ctx.Parents[Domain] != filter.DomainName { + return false + } } } // Zone Name if filter.ZoneName != "" { - if typ == Domain { + if typ == Deployment || typ == Domain { if _, found := ctx.Children[Zone][filter.ZoneName]; !found { return false } @@ -1476,7 +1525,7 @@ func (m *Model) filterNode(node *Node, typ string, filter *NodeFilter) bool { // Network Location Name if filter.NetworkLocationName != "" { - if typ == Domain || typ == Zone { + if typ == Deployment || typ == Domain || typ == Zone { if _, found := ctx.Children[NetLoc][filter.NetworkLocationName]; !found { return false } @@ -1489,7 +1538,7 @@ func (m *Model) filterNode(node *Node, typ string, filter *NodeFilter) bool { // Physical Location Name if filter.PhysicalLocationName != "" { - if typ == Domain || typ == Zone || typ == NetLoc { + if typ == Deployment || typ == Domain || typ == Zone || typ == NetLoc { if _, found := ctx.Children[PhyLoc][filter.PhysicalLocationName]; !found { return false } @@ -1502,7 +1551,7 @@ func (m *Model) filterNode(node *Node, typ string, filter *NodeFilter) bool { // Process Name if filter.ProcessName != "" { - if typ == Domain || typ == Zone || typ == NetLoc || typ == PhyLoc { + if typ == Deployment || typ == Domain || typ == Zone || typ == NetLoc || typ == PhyLoc { if _, found := ctx.Children[Proc][filter.ProcessName]; !found { return false } @@ -1519,11 +1568,23 @@ func (m *Model) filterNode(node *Node, typ string, filter *NodeFilter) bool { if node.nodeType != filter.DomainType { return false } - } else { + } else if typ == Proc || typ == PhyLoc || typ == NetLoc || typ == Zone { domain := m.nodeMap.FindByName(ctx.Parents[Domain]) if domain.nodeType != filter.DomainType { return false } + } else { + matchFound := false + for domainName := range ctx.Children[Domain] { + domain := m.nodeMap.FindByName(domainName) + if domain.nodeType == filter.DomainType { + matchFound = true + break + } + } + if !matchFound { + return false + } } } @@ -1617,6 +1678,10 @@ func IsScenario(typ string) bool { return typ == NodeTypeScenario } +func IsDeployment(typ string) bool { + return typ == NodeTypeDeployment +} + func IsDomain(typ string) bool { return typ == NodeTypeOperator || typ == NodeTypeOperatorCell } diff --git a/go-packages/meep-model/model_test.go b/go-packages/meep-model/model_test.go index cefd7c55b..c1352ae72 100644 --- a/go-packages/meep-model/model_test.go +++ b/go-packages/meep-model/model_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -38,8 +38,9 @@ const testScenario_v1_5_0 string = `{"version":"1.5.0","name":"demo1","deploymen const testScenario_v1_5_3 string = `{"version":"1.5.3","name":"demo1","deployment":{"netChar":{"latency":50,"latencyVariation":5,"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000},"domains":[{"id":"PUBLIC","name":"PUBLIC","type":"PUBLIC","netChar":{"latency":6,"latencyVariation":2,"throughputDl":1000000,"throughputUl":1000000},"zones":[{"id":"PUBLIC-COMMON","name":"PUBLIC-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"PUBLIC-COMMON-DEFAULT","name":"PUBLIC-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"cloud1","name":"cloud1","type":"DC","connected":true,"processes":[{"id":"cloud1-iperf","name":"cloud1-iperf","type":"CLOUD-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"cloud1-iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{}},{"id":"cloud1-svc","name":"cloud1-svc","type":"CLOUD-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=cloud1-svc, MGM_APP_ID=cloud1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"cloud1-svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{}}],"netChar":{}}]}]}]},{"id":"operator1","name":"operator1","type":"OPERATOR","netChar":{"latency":15,"latencyVariation":3,"throughputDl":1000,"throughputUl":1000},"zones":[{"id":"operator1-COMMON","name":"operator1-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"operator1-COMMON-DEFAULT","name":"operator1-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1}}]},{"id":"zone1","name":"zone1","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone1-DEFAULT","name":"zone1-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone1-edge1","name":"zone1-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone1-edge1-iperf","name":"zone1-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{}},{"id":"zone1-edge1-svc","name":"zone1-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{}}],"netChar":{}}]},{"id":"zone1-poa1","name":"zone1-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"physicalLocations":[{"id":"zone1-fog1","name":"zone1-fog1","type":"FOG","connected":true,"processes":[{"id":"zone1-fog1-iperf","name":"zone1-fog1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-fog1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{}},{"id":"zone1-fog1-svc","name":"zone1-fog1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-fog1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-fog1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{}}],"netChar":{}},{"id":"ue1","name":"ue1","type":"UE","connected":true,"wireless":true,"processes":[{"id":"ue1-iperf","name":"ue1-iperf","type":"UE-APP","image":"gophernet/iperf-client","commandArguments":"-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;","commandExe":"/bin/bash","netChar":{}}],"netChar":{}},{"id":"ue2-ext","name":"ue2-ext","type":"UE","isExternal":true,"connected":true,"wireless":true,"processes":[{"id":"ue2-svc","name":"ue2-svc","type":"UE-APP","isExternal":true,"externalConfig":{"ingressServiceMap":[{"name":"svc","port":80,"externalPort":31111,"protocol":"TCP"},{"name":"iperf","port":80,"externalPort":31222,"protocol":"UDP"},{"name":"cloud1-svc","port":80,"externalPort":31112,"protocol":"TCP"},{"name":"cloud1-iperf","port":80,"externalPort":31223,"protocol":"UDP"}]},"netChar":{}}],"netChar":{}}]},{"id":"zone1-poa2","name":"zone1-poa2","type":"POA","netChar":{"latency":10,"latencyVariation":2,"throughputDl":50,"throughputUl":50}}]},{"id":"zone2","name":"zone2","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone2-DEFAULT","name":"zone2-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone2-edge1","name":"zone2-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone2-edge1-iperf","name":"zone2-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone2-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{}},{"id":"zone2-edge1-svc","name":"zone2-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone2-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone2-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{}}],"netChar":{}}]},{"id":"zone2-poa1","name":"zone2-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":20,"throughputUl":20}}]}]}]}}` const testScenario_v1_6_6 string = `{"version":"1.6.6","name":"demo1","deployment":{"netChar":{"latency":50,"latencyVariation":5,"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000},"domains":[{"id":"PUBLIC","name":"PUBLIC","type":"PUBLIC","netChar":{"latency":6,"latencyVariation":2,"throughputDl":1000000,"throughputUl":1000000},"zones":[{"id":"PUBLIC-COMMON","name":"PUBLIC-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"PUBLIC-COMMON-DEFAULT","name":"PUBLIC-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"cloud1","name":"cloud1","type":"DC","connected":true,"processes":[{"id":"cloud1-iperf","name":"cloud1-iperf","type":"CLOUD-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"cloud1-iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"cloud1-svc","name":"cloud1-svc","type":"CLOUD-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=cloud1-svc, MGM_APP_ID=cloud1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"cloud1-svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]}]}]},{"id":"operator1","name":"operator1","type":"OPERATOR","netChar":{"latency":15,"latencyVariation":3,"throughputDl":1000,"throughputUl":1000},"zones":[{"id":"operator1-COMMON","name":"operator1-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"operator1-COMMON-DEFAULT","name":"operator1-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1}}]},{"id":"zone1","name":"zone1","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone1-DEFAULT","name":"zone1-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone1-edge1","name":"zone1-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone1-edge1-iperf","name":"zone1-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-edge1-svc","name":"zone1-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa1","name":"zone1-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"physicalLocations":[{"id":"zone1-fog1","name":"zone1-fog1","type":"FOG","connected":true,"processes":[{"id":"zone1-fog1-iperf","name":"zone1-fog1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-fog1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-fog1-svc","name":"zone1-fog1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-fog1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-fog1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue1","name":"ue1","type":"UE","connected":true,"wireless":true,"processes":[{"id":"ue1-iperf","name":"ue1-iperf","type":"UE-APP","image":"gophernet/iperf-client","commandArguments":"-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;","commandExe":"/bin/bash","netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue2-ext","name":"ue2-ext","type":"UE","isExternal":true,"connected":true,"wireless":true,"processes":[{"id":"ue2-svc","name":"ue2-svc","type":"UE-APP","isExternal":true,"externalConfig":{"ingressServiceMap":[{"name":"svc","port":80,"externalPort":31111,"protocol":"TCP"},{"name":"iperf","port":80,"externalPort":31222,"protocol":"UDP"},{"name":"cloud1-svc","port":80,"externalPort":31112,"protocol":"TCP"},{"name":"cloud1-iperf","port":80,"externalPort":31223,"protocol":"UDP"}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa2","name":"zone1-poa2","type":"POA","netChar":{"latency":10,"latencyVariation":2,"throughputDl":50,"throughputUl":50}}]},{"id":"zone2","name":"zone2","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone2-DEFAULT","name":"zone2-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone2-edge1","name":"zone2-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone2-edge1-iperf","name":"zone2-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone2-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone2-edge1-svc","name":"zone2-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone2-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone2-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone2-poa1","name":"zone2-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":20,"throughputUl":20}}]}]}]}}` const testScenario_v1_6_8 string = `{"version":"1.6.8","name":"demo1","deployment":{"netChar":{"latency":50,"latencyVariation":5,"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000},"connectivity":{"model":"OPEN"},"domains":[{"id":"PUBLIC","name":"PUBLIC","type":"PUBLIC","netChar":{"latency":6,"latencyVariation":2,"throughputDl":1000000,"throughputUl":1000000},"zones":[{"id":"PUBLIC-COMMON","name":"PUBLIC-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"PUBLIC-COMMON-DEFAULT","name":"PUBLIC-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"cloud1","name":"cloud1","type":"DC","connected":true,"processes":[{"id":"cloud1-iperf","name":"cloud1-iperf","type":"CLOUD-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"cloud1-iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"cloud1-svc","name":"cloud1-svc","type":"CLOUD-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=cloud1-svc, MGM_APP_ID=cloud1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"cloud1-svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]}]}]},{"id":"operator1","name":"operator1","type":"OPERATOR","netChar":{"latency":15,"latencyVariation":3,"throughputDl":1000,"throughputUl":1000},"zones":[{"id":"operator1-COMMON","name":"operator1-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"operator1-COMMON-DEFAULT","name":"operator1-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1}}]},{"id":"zone1","name":"zone1","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone1-DEFAULT","name":"zone1-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone1-edge1","name":"zone1-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone1-edge1-iperf","name":"zone1-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-edge1-svc","name":"zone1-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa1","name":"zone1-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"physicalLocations":[{"id":"zone1-fog1","name":"zone1-fog1","type":"FOG","connected":true,"processes":[{"id":"zone1-fog1-iperf","name":"zone1-fog1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-fog1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-fog1-svc","name":"zone1-fog1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-fog1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-fog1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue1","name":"ue1","type":"UE","connected":true,"wireless":true,"processes":[{"id":"ue1-iperf","name":"ue1-iperf","type":"UE-APP","image":"gophernet/iperf-client","commandArguments":"-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;","commandExe":"/bin/bash","netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue2-ext","name":"ue2-ext","type":"UE","isExternal":true,"connected":true,"wireless":true,"processes":[{"id":"ue2-svc","name":"ue2-svc","type":"UE-APP","isExternal":true,"externalConfig":{"ingressServiceMap":[{"name":"svc","port":80,"externalPort":31111,"protocol":"TCP"},{"name":"iperf","port":80,"externalPort":31222,"protocol":"UDP"},{"name":"cloud1-svc","port":80,"externalPort":31112,"protocol":"TCP"},{"name":"cloud1-iperf","port":80,"externalPort":31223,"protocol":"UDP"}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa2","name":"zone1-poa2","type":"POA","netChar":{"latency":10,"latencyVariation":2,"throughputDl":50,"throughputUl":50}}]},{"id":"zone2","name":"zone2","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone2-DEFAULT","name":"zone2-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone2-edge1","name":"zone2-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone2-edge1-iperf","name":"zone2-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone2-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone2-edge1-svc","name":"zone2-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone2-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone2-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone2-poa1","name":"zone2-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":20,"throughputUl":20}}]}]}]}}` -const testScenario string = `{"name":"demo1","deployment":{"netChar":{"latency":50,"latencyVariation":5,"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000},"connectivity":{"model":"OPEN"},"domains":[{"id":"PUBLIC","name":"PUBLIC","type":"PUBLIC","netChar":{"latency":6,"latencyVariation":2,"throughputDl":1000000,"throughputUl":1000000},"zones":[{"id":"PUBLIC-COMMON","name":"PUBLIC-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"PUBLIC-COMMON-DEFAULT","name":"PUBLIC-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"cloud1","name":"cloud1","type":"DC","connected":true,"processes":[{"id":"cloud1-iperf","name":"cloud1-iperf","type":"CLOUD-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"cloud1-iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"cloud1-svc","name":"cloud1-svc","type":"CLOUD-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=cloud1-svc, MGM_APP_ID=cloud1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"cloud1-svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]}]}]},{"id":"operator1","name":"operator1","type":"OPERATOR","netChar":{"latency":15,"latencyVariation":3,"throughputDl":1000,"throughputUl":1000},"zones":[{"id":"operator1-COMMON","name":"operator1-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"operator1-COMMON-DEFAULT","name":"operator1-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1}}]},{"id":"zone1","name":"zone1","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone1-DEFAULT","name":"zone1-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone1-edge1","name":"zone1-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone1-edge1-iperf","name":"zone1-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-edge1-svc","name":"zone1-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa1","name":"zone1-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"physicalLocations":[{"id":"zone1-fog1","name":"zone1-fog1","type":"FOG","connected":true,"processes":[{"id":"zone1-fog1-iperf","name":"zone1-fog1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-fog1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-fog1-svc","name":"zone1-fog1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-fog1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-fog1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue1","name":"ue1","type":"UE","connected":true,"wireless":true,"processes":[{"id":"ue1-iperf","name":"ue1-iperf","type":"UE-APP","image":"gophernet/iperf-client","commandArguments":"-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;","commandExe":"/bin/bash","netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue2-ext","name":"ue2-ext","type":"UE","isExternal":true,"connected":true,"wireless":true,"processes":[{"id":"ue2-svc","name":"ue2-svc","type":"UE-APP","isExternal":true,"externalConfig":{"ingressServiceMap":[{"name":"svc","port":80,"externalPort":31111,"protocol":"TCP"},{"name":"iperf","port":80,"externalPort":31222,"protocol":"UDP"},{"name":"cloud1-svc","port":80,"externalPort":31112,"protocol":"TCP"},{"name":"cloud1-iperf","port":80,"externalPort":31223,"protocol":"UDP"}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa2","name":"zone1-poa2","type":"POA","netChar":{"latency":10,"latencyVariation":2,"throughputDl":50,"throughputUl":50}}]},{"id":"zone2","name":"zone2","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone2-DEFAULT","name":"zone2-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone2-edge1","name":"zone2-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone2-edge1-iperf","name":"zone2-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone2-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone2-edge1-svc","name":"zone2-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone2-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone2-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone2-poa1","name":"zone2-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":20,"throughputUl":20}}]}]}]}}` -const latestTestScenario string = testScenario_v1_6_8 +const testScenario_v1_8_2 string = `{"version":"1.8.2","name":"demo1","deployment":{"netChar":{"latency":50,"latencyVariation":5,"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000},"connectivity":{"model":"OPEN"},"d2d":{"d2dMaxDistance":100},"domains":[{"id":"PUBLIC","name":"PUBLIC","type":"PUBLIC","netChar":{"latency":6,"latencyVariation":2,"throughputDl":1000000,"throughputUl":1000000},"zones":[{"id":"PUBLIC-COMMON","name":"PUBLIC-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"PUBLIC-COMMON-DEFAULT","name":"PUBLIC-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"cloud1","name":"cloud1","type":"DC","connected":true,"processes":[{"id":"cloud1-iperf","name":"cloud1-iperf","type":"CLOUD-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"cloud1-iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"cloud1-svc","name":"cloud1-svc","type":"CLOUD-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=cloud1-svc, MGM_APP_ID=cloud1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"cloud1-svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]}]}]},{"id":"operator1","name":"operator1","type":"OPERATOR","netChar":{"latency":15,"latencyVariation":3,"throughputDl":1000,"throughputUl":1000},"zones":[{"id":"operator1-COMMON","name":"operator1-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"operator1-COMMON-DEFAULT","name":"operator1-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1}}]},{"id":"zone1","name":"zone1","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone1-DEFAULT","name":"zone1-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone1-edge1","name":"zone1-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone1-edge1-iperf","name":"zone1-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-edge1-svc","name":"zone1-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa1","name":"zone1-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"physicalLocations":[{"id":"zone1-fog1","name":"zone1-fog1","type":"FOG","connected":true,"processes":[{"id":"zone1-fog1-iperf","name":"zone1-fog1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-fog1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-fog1-svc","name":"zone1-fog1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-fog1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-fog1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue1","name":"ue1","type":"UE","connected":true,"wireless":true,"processes":[{"id":"ue1-iperf","name":"ue1-iperf","type":"UE-APP","image":"gophernet/iperf-client","commandArguments":"-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;","commandExe":"/bin/bash","netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue2-ext","name":"ue2-ext","type":"UE","isExternal":true,"connected":true,"wireless":true,"processes":[{"id":"ue2-svc","name":"ue2-svc","type":"UE-APP","isExternal":true,"externalConfig":{"ingressServiceMap":[{"name":"svc","port":80,"externalPort":31111,"protocol":"TCP"},{"name":"iperf","port":80,"externalPort":31222,"protocol":"UDP"},{"name":"cloud1-svc","port":80,"externalPort":31112,"protocol":"TCP"},{"name":"cloud1-iperf","port":80,"externalPort":31223,"protocol":"UDP"}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa2","name":"zone1-poa2","type":"POA","netChar":{"latency":10,"latencyVariation":2,"throughputDl":50,"throughputUl":50}}]},{"id":"zone2","name":"zone2","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone2-DEFAULT","name":"zone2-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone2-edge1","name":"zone2-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone2-edge1-iperf","name":"zone2-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone2-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone2-edge1-svc","name":"zone2-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone2-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone2-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone2-poa1","name":"zone2-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":20,"throughputUl":20}}]}]}]}}` +const testScenario string = `{"name":"demo1","deployment":{"netChar":{"latency":50,"latencyVariation":5,"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000},"connectivity":{"model":"OPEN"},"d2d":{"d2dMaxDistance":100},"domains":[{"id":"PUBLIC","name":"PUBLIC","type":"PUBLIC","netChar":{"latency":6,"latencyVariation":2,"throughputDl":1000000,"throughputUl":1000000},"zones":[{"id":"PUBLIC-COMMON","name":"PUBLIC-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"PUBLIC-COMMON-DEFAULT","name":"PUBLIC-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"cloud1","name":"cloud1","type":"DC","connected":true,"processes":[{"id":"cloud1-iperf","name":"cloud1-iperf","type":"CLOUD-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"cloud1-iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"cloud1-svc","name":"cloud1-svc","type":"CLOUD-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=cloud1-svc, MGM_APP_ID=cloud1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"cloud1-svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]}]}]},{"id":"operator1","name":"operator1","type":"OPERATOR","netChar":{"latency":15,"latencyVariation":3,"throughputDl":1000,"throughputUl":1000},"zones":[{"id":"operator1-COMMON","name":"operator1-COMMON","type":"COMMON","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000000,"throughputUl":1000000},"networkLocations":[{"id":"operator1-COMMON-DEFAULT","name":"operator1-COMMON-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1}}]},{"id":"zone1","name":"zone1","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone1-DEFAULT","name":"zone1-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone1-edge1","name":"zone1-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone1-edge1-iperf","name":"zone1-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-edge1-svc","name":"zone1-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa1","name":"zone1-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"physicalLocations":[{"id":"zone1-fog1","name":"zone1-fog1","type":"FOG","connected":true,"processes":[{"id":"zone1-fog1-iperf","name":"zone1-fog1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone1-fog1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone1-fog1-svc","name":"zone1-fog1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone1-fog1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone1-fog1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue1","name":"ue1","type":"UE","connected":true,"wireless":true,"processes":[{"id":"ue1-iperf","name":"ue1-iperf","type":"UE-APP","image":"gophernet/iperf-client","commandArguments":"-c, export; iperf -u -c $IPERF_SERVICE_HOST -p $IPERF_SERVICE_PORT -t 3600 -b 50M;","commandExe":"/bin/bash","netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"ue2-ext","name":"ue2-ext","type":"UE","isExternal":true,"connected":true,"wireless":true,"processes":[{"id":"ue2-svc","name":"ue2-svc","type":"UE-APP","isExternal":true,"externalConfig":{"ingressServiceMap":[{"name":"svc","port":80,"externalPort":31111,"protocol":"TCP"},{"name":"iperf","port":80,"externalPort":31222,"protocol":"UDP"},{"name":"cloud1-svc","port":80,"externalPort":31112,"protocol":"TCP"},{"name":"cloud1-iperf","port":80,"externalPort":31223,"protocol":"UDP"}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone1-poa2","name":"zone1-poa2","type":"POA","netChar":{"latency":10,"latencyVariation":2,"throughputDl":50,"throughputUl":50}}]},{"id":"zone2","name":"zone2","type":"ZONE","netChar":{"latency":5,"latencyVariation":1,"throughputDl":1000,"throughputUl":1000},"networkLocations":[{"id":"zone2-DEFAULT","name":"zone2-DEFAULT","type":"DEFAULT","netChar":{"latency":1,"latencyVariation":1,"throughputDl":50000,"throughputUl":50000,"packetLoss":1},"physicalLocations":[{"id":"zone2-edge1","name":"zone2-edge1","type":"EDGE","connected":true,"processes":[{"id":"zone2-edge1-iperf","name":"zone2-edge1-iperf","type":"EDGE-APP","image":"gophernet/iperf-server","commandArguments":"-c, export; iperf -s -p $IPERF_SERVICE_PORT;","commandExe":"/bin/bash","serviceConfig":{"name":"zone2-edge1-iperf","meSvcName":"iperf","ports":[{"protocol":"UDP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}},{"id":"zone2-edge1-svc","name":"zone2-edge1-svc","type":"EDGE-APP","image":"meep-docker-registry:30001/demo-server","environment":"MGM_GROUP_NAME=svc, MGM_APP_ID=zone2-edge1-svc, MGM_APP_PORT=80","serviceConfig":{"name":"zone2-edge1-svc","meSvcName":"svc","ports":[{"protocol":"TCP","port":80}]},"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}],"netChar":{"latencyDistribution":"Normal","throughputDl":1000,"throughputUl":1000}}]},{"id":"zone2-poa1","name":"zone2-poa1","type":"POA","netChar":{"latency":1,"latencyVariation":1,"throughputDl":20,"throughputUl":20}}]}]}]}}` +const latestTestScenario string = testScenario_v1_8_2 func TestNewModel(t *testing.T) { fmt.Println("--- ", t.Name()) @@ -152,6 +153,12 @@ func TestGetSetActiveElements(t *testing.T) { filter.ProcessType = "EDGE-APP" //success path + fmt.Println("Get Deployment") + respDeployment := m.GetDeployment(&filter) + if respDeployment == nil { + t.Fatalf("Failed to get expected deployment") + } + fmt.Println("Get Domains") respDomain := m.GetDomains(&filter) if len(respDomain.Domains) != 1 { @@ -182,6 +189,12 @@ func TestGetSetActiveElements(t *testing.T) { } //failure path + fmt.Println("Get Deployment") + respDeployment = m.GetDeployment(&badFilter) + if respDeployment != nil { + t.Fatalf("Failed to get expected deployment") + } + fmt.Println("Get Domains") respDomain = m.GetDomains(&badFilter) if len(respDomain.Domains) != 0 { @@ -1242,7 +1255,7 @@ func TestValidateScenario(t *testing.T) { fmt.Println("--- ", t.Name()) log.MeepTextLogInit(t.Name()) - ValidatorVersion = semver.Version{Major: 1, Minor: 6, Patch: 8} + ValidatorVersion = semver.Version{Major: 1, Minor: 8, Patch: 2} // Incompatible scenarios fmt.Println("Validate empty scenario") @@ -1268,8 +1281,8 @@ func TestValidateScenario(t *testing.T) { t.Fatalf("validJsonScenario != latestTestScenario") } - fmt.Println("Validate scenario: scenarioVer[1.6.8] == validatorVer[latest]") - validJsonScenario, status, err = ValidateScenario([]byte(testScenario_v1_6_8), "") + fmt.Println("Validate scenario: scenarioVer[1.8.2] == validatorVer[latest]") + validJsonScenario, status, err = ValidateScenario([]byte(testScenario_v1_8_2), "") if validJsonScenario == nil || status != ValidatorStatusValid || err != nil { t.Fatalf("validJsonScenario should not be nil") } @@ -1277,6 +1290,15 @@ func TestValidateScenario(t *testing.T) { t.Fatalf("validJsonScenario != latestTestScenario") } + fmt.Println("Validate scenario: scenarioVer[1.6.8] < validatorVer[latest]") + validJsonScenario, status, err = ValidateScenario([]byte(testScenario_v1_6_8), "") + if validJsonScenario == nil || status != ValidatorStatusUpdated || err != nil { + t.Fatalf("validJsonScenario should not be nil") + } + if string(validJsonScenario) != latestTestScenario { + t.Fatalf("validJsonScenario != latestTestScenario") + } + fmt.Println("Validate scenario: scenarioVer[1.6.6] < validatorVer[latest]") validJsonScenario, status, err = ValidateScenario([]byte(testScenario_v1_6_6), "") if validJsonScenario == nil || status != ValidatorStatusUpdated || err != nil { diff --git a/go-packages/meep-model/networkGraph.go b/go-packages/meep-model/networkGraph.go index 9658f8c23..efabc864b 100644 --- a/go-packages/meep-model/networkGraph.go +++ b/go-packages/meep-model/networkGraph.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-model/nodeContext.go b/go-packages/meep-model/nodeContext.go index d735da8c9..cc01b73bc 100644 --- a/go-packages/meep-model/nodeContext.go +++ b/go-packages/meep-model/nodeContext.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-model/nodeMap.go b/go-packages/meep-model/nodeMap.go index cf09787b0..298fbb302 100644 --- a/go-packages/meep-model/nodeMap.go +++ b/go-packages/meep-model/nodeMap.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-model/nodeMap_test.go b/go-packages/meep-model/nodeMap_test.go index cd03efff4..2ebb57a1e 100644 --- a/go-packages/meep-model/nodeMap_test.go +++ b/go-packages/meep-model/nodeMap_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-model/validator.go b/go-packages/meep-model/validator.go index 4f62ca9e3..7b2b26be0 100644 --- a/go-packages/meep-model/validator.go +++ b/go-packages/meep-model/validator.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -42,7 +42,7 @@ const ( REGEX_NAME = `^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])+$` REGEX_VARIABLE_NAME = `^(([_a-z0-9A-Z][_-a-z0-9A-Z.]*)?[_a-z0-9A-Z])+$` REGEX_MAC_ADDRESS = `^(([_a-f0-9A-F][_-a-f0-9A-Z]*)?[_a-f0-9A-F])+$` - REGEX_WIRELESS_TYPE_LIST = `^((,\s*)?(wifi|5g|4g|other))+$` + REGEX_WIRELESS_TYPE_LIST = `^((,\s*)?(d2d|wifi|5g|4g|other))+$` REGEX_PATH = `[\^#%&$\*<>\?\{\|\} ]+` REGEX_DNN = `^(([a-z0-9A-Z][-a-z0-9A-Z.]*)?[a-z0-9A-Z])+$` REGEX_ECSP = `^(([a-z0-9A-Z][ a-z0-9A-Z]*)?[a-z0-9A-Z])+$` @@ -63,6 +63,8 @@ const ( VELOCITY_MAX = 1000000 RADIUS_MIN = 1 RADIUS_MAX = 1000000 + D2D_RADIUS_MIN = 1 + D2D_RADIUS_MAX = 10000 SERVICE_PORT_MIN = 1 SERVICE_PORT_MAX = 65535 SERVICE_NODE_PORT_MIN = 30000 @@ -87,7 +89,7 @@ var PROTOCOL_ENUM = []string{"UDP", "TCP"} var CONNECTIVITY_MODEL_ENUM = []string{"OPEN", "PDU"} // Current validator version -var ValidatorVersion = semver.Version{Major: 1, Minor: 8, Patch: 1} +var ValidatorVersion = semver.Version{Major: 1, Minor: 8, Patch: 2} // Versions requiring scenario update var Version130 = semver.Version{Major: 1, Minor: 3, Patch: 0} @@ -96,6 +98,7 @@ var Version150 = semver.Version{Major: 1, Minor: 5, Patch: 0} var Version151 = semver.Version{Major: 1, Minor: 5, Patch: 1} var Version153 = semver.Version{Major: 1, Minor: 5, Patch: 3} var Version168 = semver.Version{Major: 1, Minor: 6, Patch: 8} +var Version182 = semver.Version{Major: 1, Minor: 8, Patch: 2} // setNetChar - Creates a new netchar object if non-existent and migrate values from deprecated fields func createNetChar(lat int32, latVar int32, dist string, tputDl int32, tputUl int32, loss float64) *dataModel.NetworkCharacteristics { @@ -183,6 +186,12 @@ func ValidateScenario(jsonScenario []byte, name string) (validJsonScenario []byt scenarioVersion = Version168 scenarioUpdated = true } + // UPGRADE TO 1.8.2 + if scenarioVersion.LT(Version182) { + upgradeScenarioTo182(scenario) + scenarioVersion = Version182 + scenarioUpdated = true + } // Set current scenario version if scenarioVersion.LT(ValidatorVersion) { @@ -445,6 +454,21 @@ func upgradeScenarioTo168(scenario *dataModel.Scenario) { } } +func upgradeScenarioTo182(scenario *dataModel.Scenario) { + // Set updated version + scenario.Version = Version182.String() + + // Set default D2D Config + if scenario.Deployment != nil { + if scenario.Deployment.D2d == nil { + scenario.Deployment.D2d = &dataModel.D2dConfig{ + D2dMaxDistance: 100, + DisableD2dViaNetwork: false, + } + } + } +} + // Validate scenario func validateScenario(scenario *dataModel.Scenario) error { idMap := make(map[string]bool) @@ -564,6 +588,16 @@ func validateDeployment(deployment *dataModel.Deployment) (err error) { if err != nil { return errors.New("Invalid connectivity model: " + err.Error()) } + + // D2D + if deployment.D2d == nil { + return errors.New("d2d == nil") + } + err = validateFloat32Range(deployment.D2d.D2dMaxDistance, D2D_RADIUS_MIN, D2D_RADIUS_MAX) + if err != nil { + return errors.New("Invalid D2D radius: " + err.Error()) + } + return nil } diff --git a/go-packages/meep-model/validator_test.go b/go-packages/meep-model/validator_test.go index 671293b48..dd3c3a6d4 100644 --- a/go-packages/meep-model/validator_test.go +++ b/go-packages/meep-model/validator_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -274,6 +274,10 @@ func TestValidateWirelessTypeList(t *testing.T) { if err == nil { t.Fatalf("Wireless Type should be invalid") } + err = validateWirelessTypeList("d2d") + if err != nil { + t.Fatalf(err.Error()) + } err = validateWirelessTypeList("wifi") if err != nil { t.Fatalf(err.Error()) @@ -290,11 +294,11 @@ func TestValidateWirelessTypeList(t *testing.T) { if err != nil { t.Fatalf(err.Error()) } - err = validateWirelessTypeList("wifi,5g,4g,other") + err = validateWirelessTypeList("d2d,wifi,5g,4g,other") if err != nil { t.Fatalf(err.Error()) } - err = validateWirelessTypeList("wifi, 4g, 5g") + err = validateWirelessTypeList("d2d, wifi, 4g, 5g") if err != nil { t.Fatalf(err.Error()) } diff --git a/go-packages/meep-mq/mq.go b/go-packages/meep-mq/mq.go index 688e616d5..394f5915d 100644 --- a/go-packages/meep-mq/mq.go +++ b/go-packages/meep-mq/mq.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-mq/mq_test.go b/go-packages/meep-mq/mq_test.go index b92ae2311..9fee611f7 100644 --- a/go-packages/meep-mq/mq_test.go +++ b/go-packages/meep-mq/mq_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-net-char-mgr/algo-segment.go b/go-packages/meep-net-char-mgr/algo-segment.go index 42c8ab9a3..c0827602f 100644 --- a/go-packages/meep-net-char-mgr/algo-segment.go +++ b/go-packages/meep-net-char-mgr/algo-segment.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use algo file except in compliance with the License. @@ -19,6 +19,7 @@ package netchar import ( "errors" "fmt" + "sort" "strconv" "strings" "time" @@ -34,6 +35,11 @@ const MAX_THROUGHPUT = 9999999999 const THROUGHPUT_UNIT = 1000000 //convert from Mbps to bps const DEFAULT_THROUGHPUT_LINK = 1000.0 +const PoaTypeD2D string = "POA-D2D" +const ElemTypeD2D string = "elemD2D" +const DirUL string = "uplink" +const DirDL string = "downlink" + const metricsDb = 0 const metricsKey string = "metrics:" @@ -113,14 +119,17 @@ type SegAlgoNetElem struct { // SegmentAlgorithm - type SegmentAlgorithm struct { - Name string - Namespace string - BaseKey string - FlowMap map[string]*SegAlgoFlow - SegmentMap map[string]*SegAlgoSegment - ConnectivityModel string - Config SegAlgoConfig - rc *redis.Connector + Name string + Namespace string + BaseKey string + FlowMap map[string]*SegAlgoFlow + SegmentMap map[string]*SegAlgoSegment + ConnectivityModel string + D2DDeviceList map[string]string + D2DMaxDistance float32 + D2DViaNetworkDisabled bool + Config SegAlgoConfig + rc *redis.Connector } // NewSegmentAlgorithm - Create, Initialize and connect @@ -134,6 +143,9 @@ func NewSegmentAlgorithm(name string, namespace string, redisAddr string) (*Segm algo.FlowMap = make(map[string]*SegAlgoFlow) algo.SegmentMap = make(map[string]*SegAlgoSegment) algo.ConnectivityModel = mod.ConnectivityModelOpen + algo.D2DDeviceList = map[string]string{} + algo.D2DMaxDistance = 100 + algo.D2DViaNetworkDisabled = false algo.Config.MaxBwPerInactiveFlow = 20.0 algo.Config.MaxBwPerInactiveFlowFloor = 6.0 algo.Config.MinActivityThreshold = 0.3 @@ -156,7 +168,8 @@ func NewSegmentAlgorithm(name string, namespace string, redisAddr string) (*Segm } // ProcessScenario - -func (algo *SegmentAlgorithm) ProcessScenario(model *mod.Model, pduSessions map[string]map[string]*dataModel.PduSessionInfo) error { +func (algo *SegmentAlgorithm) ProcessScenario(model *mod.Model, pduSessions map[string]map[string]*dataModel.PduSessionInfo, + d2dSessions map[string]map[string]bool) error { var netElemList []SegAlgoNetElem // Process empty scenario @@ -167,13 +180,44 @@ func (algo *SegmentAlgorithm) ProcessScenario(model *mod.Model, pduSessions map[ algo.FlowMap = make(map[string]*SegAlgoFlow) } - // Get scenario connectivity model - algo.ConnectivityModel = model.GetConnectivityModel() + // Get deployment information + deploymentFilter := &mod.NodeFilter{ + ExcludeChildren: true, + Minimize: true, + } + deployment := model.GetDeployment(deploymentFilter) + if deployment != nil { + // Get scenario connectivity model + if deployment.Connectivity != nil { + algo.ConnectivityModel = deployment.Connectivity.Model + } + // Get scenario D2D configuration + if deployment.D2d != nil { + algo.D2DMaxDistance = deployment.D2d.D2dMaxDistance + algo.D2DViaNetworkDisabled = deployment.D2d.DisableD2dViaNetwork + } + } + + // Get D2D capable device list + algo.D2DDeviceList = map[string]string{} + phyLocsFilter := &mod.NodeFilter{ + ExcludeChildren: true, + Minimize: true, + } + phyLocs := model.GetPhysicalLocations(phyLocsFilter) + for _, pl := range phyLocs.PhysicalLocations { + priorityList := strings.Split(strings.TrimSpace(pl.WirelessType), ",") + for _, priority := range priorityList { + if priority == PoaTypeD2D { + algo.D2DDeviceList[pl.Name] = pl.Name + } + } + } // Clear segment & flow maps algo.SegmentMap = make(map[string]*SegAlgoSegment) // Process active scenario - procNames := model.GetNodeNames("CLOUD-APP", "EDGE-APP", "UE-APP") + procNames := model.GetNodeNames(mod.NodeTypeCloudApp, mod.NodeTypeEdgeApp, mod.NodeTypeUEApp) // Create NetElem for each scenario process for _, name := range procNames { @@ -202,10 +246,10 @@ func (algo *SegmentAlgorithm) ProcessScenario(model *mod.Model, pduSessions map[ // Type-specific values element.Type = model.GetNodeType(element.PhyLocName) - if element.Type == "UE" || element.Type == "FOG" { + if element.Type == mod.NodeTypeUE || element.Type == mod.NodeTypeFog { element.PoaName = ctx.Parents[mod.NetLoc] } - if element.Type != "DC" { + if element.Type != mod.NodeTypeCloud { element.ZoneName = ctx.Parents[mod.Zone] } @@ -235,7 +279,7 @@ func (algo *SegmentAlgorithm) ProcessScenario(model *mod.Model, pduSessions map[ for _, elemDest := range netElemList { if elemSrc.Name != elemDest.Name { // Create flow - algo.populateFlow(elemSrc.Name+":"+elemDest.Name, &elemSrc, &elemDest, 0, model, pduSessions) + algo.populateFlow(elemSrc.Name+":"+elemDest.Name, &elemSrc, &elemDest, netElemList, 0, model, pduSessions, d2dSessions) // Create DB entry to begin collecting metrics for this flow algo.createMetricsEntry(elemSrc.Name, elemDest.Name) @@ -399,8 +443,8 @@ func (algo *SegmentAlgorithm) deleteMetricsEntries() { } // populateFlow - Create/Update flow -func (algo *SegmentAlgorithm) populateFlow(flowName string, srcElement *SegAlgoNetElem, destElement *SegAlgoNetElem, maxBw float64, - model *mod.Model, pduSessions map[string]map[string]*dataModel.PduSessionInfo) { +func (algo *SegmentAlgorithm) populateFlow(flowName string, srcElement *SegAlgoNetElem, destElement *SegAlgoNetElem, netElemList []SegAlgoNetElem, + maxBw float64, model *mod.Model, pduSessions map[string]map[string]*dataModel.PduSessionInfo, d2dSessions map[string]map[string]bool) { // Use existing flow if present or Create new flow flow := algo.FlowMap[flowName] @@ -431,7 +475,7 @@ func (algo *SegmentAlgorithm) populateFlow(flowName string, srcElement *SegAlgoN flow.ConfiguredNetChar.PacketLoss = 0 // Create a new path for this flow oldPath := flow.Path - flow.Path = algo.createPath(flowName, srcElement, destElement, model, pduSessions) + flow.Path = algo.createPath(flowName, srcElement, destElement, model, pduSessions, d2dSessions) flow.UpdateRequired = algo.comparePath(oldPath, flow.Path) } @@ -455,7 +499,15 @@ func (algo *SegmentAlgorithm) comparePath(oldPath *SegAlgoPath, newPath *SegAlgo // createPath - func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNetElem, destElement *SegAlgoNetElem, - model *mod.Model, pduSessions map[string]map[string]*dataModel.PduSessionInfo) *SegAlgoPath { + model *mod.Model, pduSessions map[string]map[string]*dataModel.PduSessionInfo, d2dSessions map[string]map[string]bool) *SegAlgoPath { + + // Path creation algorithm: + // - Add D2D segment if the following conditions are met: + // - D2D enabled UEs in range (from gis cache) AND + // - Apps are on in range UEs OR + // - UE has no POA in range + // - Otherwise, go up layers until common parent is found + // - If D2D via network disabled, prevent inter-UE communication over network direction := "" var segment *SegAlgoSegment @@ -465,18 +517,18 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet path.Disconnected = false //app segment ul, dl - direction = "uplink" + direction = DirUL segment = algo.createSegment(srcElement.Name, direction, flowName, model) path.Segments = append(path.Segments, segment) - direction = "downlink" + direction = DirDL segment = algo.createSegment(destElement.Name, direction, flowName, model) path.Segments = append(path.Segments, segment) //node segment ul, dl - direction = "uplink" + direction = DirUL segment = algo.createSegment(srcElement.PhyLocName, direction, flowName, model) path.Segments = append(path.Segments, segment) - direction = "downlink" + direction = DirDL segment = algo.createSegment(destElement.PhyLocName, direction, flowName, model) path.Segments = append(path.Segments, segment) @@ -485,28 +537,156 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet return path } + // Check if apps are running on in-range D2D devices + if session, found := d2dSessions[srcElement.PhyLocName]; found { + if _, found = session[destElement.PhyLocName]; found { + // D2D segment ul, dl + direction = DirUL + segment = algo.createSegment(ElemTypeD2D+srcElement.PhyLocName, direction, flowName, model) + path.Segments = append(path.Segments, segment) + direction = DirDL + segment = algo.createSegment(ElemTypeD2D+srcElement.PhyLocName, direction, flowName, model) + path.Segments = append(path.Segments, segment) + + return path + } + } + // Check if src or dest Physical location is disconnected - // NOTE: Does not apply to apps on same physical node + var ok bool var srcPhyLoc *dataModel.PhysicalLocation srcPhyLocNode := model.GetNode(srcElement.PhyLocName) - if srcPhyLocNode != nil { - var ok bool - if srcPhyLoc, ok = srcPhyLocNode.(*dataModel.PhysicalLocation); ok { - path.Disconnected = path.Disconnected || !srcPhyLoc.Connected + if srcPhyLoc, ok = srcPhyLocNode.(*dataModel.PhysicalLocation); ok { + // If disconnected, search for an alternate path via D2D session + if !srcPhyLoc.Connected { + d2dUeSessions, found := d2dSessions[srcElement.PhyLocName] + if !found { + path.Disconnected = true + return path + } + + // Get ordered list of in-range D2D peers + d2dUeList := make([]string, 0, len(d2dUeSessions)) + for d2dUe := range d2dUeSessions { + d2dUeList = append(d2dUeList, d2dUe) + } + sort.Strings(d2dUeList) + + // Find first connected peer + d2dUeConnected := false + for _, d2dUe := range d2dUeList { + srcPhyLocNode = model.GetNode(d2dUe) + if srcPhyLoc, ok = srcPhyLocNode.(*dataModel.PhysicalLocation); ok { + if srcPhyLoc.Connected { + d2dUeConnected = true + break + } + } + } + if !d2dUeConnected { + path.Disconnected = true + return path + } + + // Retrieve srcPhyLoc context from model + ctx := model.GetNodeContext(srcPhyLoc.Name) + if ctx == nil { + log.Error("Error getting context for pl: ", srcPhyLoc.Name) + return path + } + + // Update source element information + newSrcElement := *srcElement + newSrcElement.PhyLocName = srcPhyLoc.Name + newSrcElement.PoaName = ctx.Parents[mod.NetLoc] + newSrcElement.ZoneName = ctx.Parents[mod.Zone] + newSrcElement.DomainName = ctx.Parents[mod.Domain] + srcElement = &newSrcElement + + // D2D segment ul, dl + direction = DirUL + segment = algo.createSegment(ElemTypeD2D+srcPhyLoc.Name, direction, flowName, model) + path.Segments = append(path.Segments, segment) + direction = DirDL + segment = algo.createSegment(ElemTypeD2D+srcPhyLoc.Name, direction, flowName, model) + path.Segments = append(path.Segments, segment) } } var destPhyLoc *dataModel.PhysicalLocation destPhyLocNode := model.GetNode(destElement.PhyLocName) - if destPhyLocNode != nil { - var ok bool - if destPhyLoc, ok = destPhyLocNode.(*dataModel.PhysicalLocation); ok { - path.Disconnected = path.Disconnected || !destPhyLoc.Connected + if destPhyLoc, ok = destPhyLocNode.(*dataModel.PhysicalLocation); ok { + // If disconnected, search for an alternate path via D2D session + if !destPhyLoc.Connected { + d2dUeSessions, found := d2dSessions[destElement.PhyLocName] + if !found { + path.Disconnected = true + return path + } + + // Get ordered list of in-range D2D peers + d2dUeList := make([]string, 0, len(d2dUeSessions)) + for d2dUe := range d2dUeSessions { + d2dUeList = append(d2dUeList, d2dUe) + } + sort.Strings(d2dUeList) + + // Find first connected peer + d2dUeConnected := false + for _, d2dUe := range d2dUeList { + destPhyLocNode = model.GetNode(d2dUe) + if destPhyLoc, ok = destPhyLocNode.(*dataModel.PhysicalLocation); ok { + if destPhyLoc.Connected { + d2dUeConnected = true + break + } + } + } + if !d2dUeConnected { + path.Disconnected = true + return path + } + + // Retrieve destPhyLoc context from model + ctx := model.GetNodeContext(destPhyLoc.Name) + if ctx == nil { + log.Error("Error getting context for pl: ", srcPhyLoc.Name) + return path + } + + // Update destination element information + newDestElement := *destElement + newDestElement.PhyLocName = destPhyLoc.Name + newDestElement.PoaName = ctx.Parents[mod.NetLoc] + newDestElement.ZoneName = ctx.Parents[mod.Zone] + newDestElement.DomainName = ctx.Parents[mod.Domain] + destElement = &newDestElement + + // D2D segment ul, dl + direction = DirUL + segment = algo.createSegment(ElemTypeD2D+destPhyLoc.Name, direction, flowName, model) + path.Segments = append(path.Segments, segment) + direction = DirDL + segment = algo.createSegment(ElemTypeD2D+destPhyLoc.Name, direction, flowName, model) + path.Segments = append(path.Segments, segment) + } + } + + //if on same D2D peer, return + if srcPhyLoc.Name == destPhyLoc.Name { + return path + } + + // If D2D via network is disabled, disable UE-to-UE paths via network + if algo.D2DViaNetworkDisabled { + if mod.IsUe(srcPhyLoc.Type_) && mod.IsUe(destPhyLoc.Type_) { + path.Disconnected = true + return path } } // If in PDU Connectivity mode, check if src or dest UE has PDU connectivity to DN // NOTE: For LADN, additionally verify that UE and edge app are in the same zone - if !path.Disconnected && algo.ConnectivityModel == mod.ConnectivityModelPdu { + if algo.ConnectivityModel == mod.ConnectivityModelPdu { if mod.IsUe(srcPhyLoc.Type_) { pduMap, ok := pduSessions[srcPhyLoc.Name] if !ok || mod.IsUe(destPhyLoc.Type_) || destPhyLoc.DataNetwork == nil { @@ -525,6 +705,7 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet } if !found { path.Disconnected = true + return path } } } @@ -547,20 +728,20 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet } if !found { path.Disconnected = true + return path } } } } //network location ul, dl - if srcElement.Type == "UE" { - direction = "uplink" + if srcElement.Type == mod.NodeTypeUE { + direction = DirUL segment = algo.createSegment(srcElement.PoaName, direction, flowName, model) path.Segments = append(path.Segments, segment) } - - if destElement.Type == "UE" { - direction = "downlink" + if destElement.Type == mod.NodeTypeUE { + direction = DirDL segment = algo.createSegment(destElement.PoaName, direction, flowName, model) path.Segments = append(path.Segments, segment) } @@ -571,18 +752,16 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet } //zone ul, dl - if srcElement.Type != "DC" { - direction = "uplink" + if srcElement.Type != mod.NodeTypeCloud { + direction = DirUL segment = algo.createSegment(srcElement.ZoneName, direction, flowName, model) path.Segments = append(path.Segments, segment) } - - if destElement.Type != "DC" { - direction = "downlink" + if destElement.Type != mod.NodeTypeCloud { + direction = DirDL segment = algo.createSegment(destElement.ZoneName, direction, flowName, model) path.Segments = append(path.Segments, segment) - } //if in same zone, return @@ -591,15 +770,14 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet } //domain ul, dl - if srcElement.Type != "DC" { - direction = "uplink" + if srcElement.Type != mod.NodeTypeCloud { + direction = DirUL segment = algo.createSegment(srcElement.DomainName, direction, flowName, model) path.Segments = append(path.Segments, segment) } - - if destElement.Type != "DC" { - direction = "downlink" + if destElement.Type != mod.NodeTypeCloud { + direction = DirDL segment = algo.createSegment(destElement.DomainName, direction, flowName, model) path.Segments = append(path.Segments, segment) @@ -613,11 +791,10 @@ func (algo *SegmentAlgorithm) createPath(flowName string, srcElement *SegAlgoNet //interdomain //computing twice while in the interdomain - direction = "uplink" + direction = DirUL segment = algo.createSegment(model.GetScenarioName(), direction, flowName, model) path.Segments = append(path.Segments, segment) - - direction = "downlink" + direction = DirDL segment = algo.createSegment(model.GetScenarioName(), direction, flowName, model) path.Segments = append(path.Segments, segment) @@ -636,7 +813,7 @@ func (algo *SegmentAlgorithm) createSegment(elemName string, direction string, f // Retrieve max throughput from model using model scenario element name nc := getNetChars(elemName, model) ncThroughput := 0.0 - if direction == "uplink" { + if direction == DirUL { ncThroughput = float64(nc.ThroughputUl) } else { ncThroughput = float64(nc.ThroughputDl) @@ -914,7 +1091,16 @@ func getNetChars(elemName string, model *mod.Model) *dataModel.NetworkCharacteri // Get Node node := model.GetNode(elemName) if node == nil { - log.Error("Error finding element: " + elemName) + // Check if D2D net chars + if strings.HasPrefix(elemName, ElemTypeD2D) { + nc = &dataModel.NetworkCharacteristics{ + Latency: 1, + ThroughputUl: DEFAULT_THROUGHPUT_LINK, + ThroughputDl: DEFAULT_THROUGHPUT_LINK, + } + } else { + log.Error("Error finding element: " + elemName) + } return nc } diff --git a/go-packages/meep-net-char-mgr/algo-segment_test.go b/go-packages/meep-net-char-mgr/algo-segment_test.go index 866f4220c..e2cb109d7 100644 --- a/go-packages/meep-net-char-mgr/algo-segment_test.go +++ b/go-packages/meep-net-char-mgr/algo-segment_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -73,7 +73,7 @@ func TestSegAlgoSegmentation(t *testing.T) { } fmt.Println("Process scenario model") - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -119,7 +119,7 @@ func TestSegAlgoSegmentation(t *testing.T) { if err != nil { t.Fatalf("Error updating net char") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -140,7 +140,7 @@ func TestSegAlgoSegmentation(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -173,7 +173,7 @@ func TestSegAlgoSegmentation(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -207,7 +207,7 @@ func TestSegAlgoSegmentation(t *testing.T) { t.Fatalf("Failed to create Model instance") } fmt.Println("Process empty scenario model") - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -254,7 +254,7 @@ func TestSegAlgoCalculation(t *testing.T) { t.Fatalf("Failed to create a SegAlgo object.") } fmt.Println("Process scenario model") - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -303,7 +303,7 @@ func TestSegAlgoCalculation(t *testing.T) { if err != nil { t.Fatalf("Error updating net char") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -336,7 +336,7 @@ func TestSegAlgoCalculation(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -398,7 +398,7 @@ func TestSegAlgoCalculation(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -478,7 +478,7 @@ func TestSegAlgoDisconnected(t *testing.T) { // Process model with no disconnected UEs fmt.Println("Process scenario model") - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -498,7 +498,7 @@ func TestSegAlgoDisconnected(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -518,7 +518,7 @@ func TestSegAlgoDisconnected(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -538,7 +538,7 @@ func TestSegAlgoDisconnected(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -558,7 +558,7 @@ func TestSegAlgoDisconnected(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -606,7 +606,7 @@ func TestSegAlgoPdu(t *testing.T) { // No PDU sessions fmt.Println("Process scenario model with no PDU sessions") - err = algo.ProcessScenario(activeModel, nil) + err = algo.ProcessScenario(activeModel, nil, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -644,7 +644,7 @@ func TestSegAlgoPdu(t *testing.T) { pduSessionsUe2["internet"] = &dataModel.PduSessionInfo{Dnn: "internet"} pduSessions["ue2-ext"] = pduSessionsUe2 - err = algo.ProcessScenario(activeModel, pduSessions) + err = algo.ProcessScenario(activeModel, pduSessions, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -671,7 +671,7 @@ func TestSegAlgoPdu(t *testing.T) { pduSessionsUe2["edn2"] = &dataModel.PduSessionInfo{Dnn: "edn2"} pduSessions["ue2-ext"] = pduSessionsUe2 - err = algo.ProcessScenario(activeModel, pduSessions) + err = algo.ProcessScenario(activeModel, pduSessions, nil) if err != nil { t.Fatalf("Failed to process scenario model") } @@ -725,7 +725,7 @@ func TestSegAlgoPdu(t *testing.T) { if err != nil { t.Fatalf("Error moving UE") } - err = algo.ProcessScenario(activeModel, pduSessions) + err = algo.ProcessScenario(activeModel, pduSessions, nil) if err != nil { t.Fatalf("Failed to process scenario model") } diff --git a/go-packages/meep-net-char-mgr/go.mod b/go-packages/meep-net-char-mgr/go.mod index 684185ae9..d19762b2b 100644 --- a/go-packages/meep-net-char-mgr/go.mod +++ b/go-packages/meep-net-char-mgr/go.mod @@ -5,16 +5,20 @@ go 1.12 require ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0 + github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-pdu-session-store v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0 + github.com/onsi/ginkgo v1.16.5 // indirect + github.com/onsi/gomega v1.20.2 // indirect ) replace ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr => ../../go-packages/meep-data-key-mgr github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model => ../../go-packages/meep-data-model + github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache => ../../go-packages/meep-gis-cache github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model => ../../go-packages/meep-model github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq => ../../go-packages/meep-mq diff --git a/go-packages/meep-net-char-mgr/go.sum b/go-packages/meep-net-char-mgr/go.sum index 71ebff427..9b564fb52 100644 --- a/go-packages/meep-net-char-mgr/go.sum +++ b/go-packages/meep-net-char-mgr/go.sum @@ -1,38 +1,159 @@ -github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y= -github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52 h1:trnwuu/Q8T59kgRjXcSDBODnyZP9wes+bnLn0lx4PgM= github.com/RyanCarrier/dijkstra v0.0.0-20190726134004-b51cadb5ae52/go.mod h1:DdR6ymcLl8+sN/XOVNjnYO1NDYfgHskGjreZUDuQCTY= +github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345 h1:fgSpoKViTSqRb4hjDNj10ig5wUvO0CayCzFdLf6fuRM= github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30= +github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72 h1:uGeGZl8PxSq8VZGG4QK5njJTFA4/G/x5CYORvQVXtAE= github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4= github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237 h1:acuCHBjzG7MFTugvx3buC4m5rLDLaKC9J8C9jtlraRc= github.com/mattomatic/dijkstra v0.0.0-20130617153013-6f6d134eb237/go.mod h1:UOnLAUmVG5paym8pD3C4B9BQylUDC2vXFJJpT7JrlEA= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY= +github.com/onsi/gomega v1.20.2/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go-packages/meep-net-char-mgr/net-char-mgr.go b/go-packages/meep-net-char-mgr/net-char-mgr.go index 8a803d250..971b22d8b 100644 --- a/go-packages/meep-net-char-mgr/net-char-mgr.go +++ b/go-packages/meep-net-char-mgr/net-char-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -18,12 +18,14 @@ package netchar import ( "errors" + "reflect" "strconv" "sync" "time" dkm "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr" dataModel "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model" + gc "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache" 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" @@ -50,7 +52,7 @@ type NetCharMgr interface { // NetCharAlgo type NetCharAlgo interface { - ProcessScenario(*mod.Model, map[string]map[string]*dataModel.PduSessionInfo) error + ProcessScenario(*mod.Model, map[string]map[string]*dataModel.PduSessionInfo, map[string]map[string]bool) error CalculateNetChar() []FlowNetChar SetConfigAttribute(string, string) } @@ -98,6 +100,8 @@ type NetCharManager struct { rc *redis.Connector pduSessionStore *pss.PduSessionStore pduSessions map[string]map[string]*dataModel.PduSessionInfo + gisCache *gc.GisCache + d2dSessions map[string]map[string]bool mutex sync.Mutex config NetCharConfig mqLocal *mq.MsgQueue @@ -123,6 +127,8 @@ func NewNetChar(name string, namespace string, redisAddr string) (*NetCharManage ncm.baseKey = dkm.GetKeyRoot(namespace) ncm.isStarted = false ncm.config.RecalculationPeriod = defaultTickerPeriod + ncm.pduSessions = map[string]map[string]*dataModel.PduSessionInfo{} + ncm.d2dSessions = map[string]map[string]bool{} // Create message queue ncm.mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(namespace), name, namespace, redisAddr) @@ -169,6 +175,14 @@ func NewNetChar(name string, namespace string, redisAddr string) (*NetCharManage } log.Info("Connected to PDU Session Store") + // Connect to GIS cache + ncm.gisCache, err = gc.NewGisCache(ncm.namespace, redisAddr) + if err != nil { + log.Error("Failed to GIS Cache: ", err.Error()) + return nil, err + } + log.Info("Connected to GIS Cache") + // Register Message Queue handler handler := mq.MsgHandler{Handler: ncm.msgHandler, UserData: nil} ncm.handlerId, err = ncm.mqLocal.RegisterHandler(handler) @@ -208,6 +222,9 @@ func (ncm *NetCharManager) Start() error { // Process current pdu sessions go ncm.processPduSessionUpdate() + // Process GIS Engine D2D sessions + go ncm.processGeUpdate() + // Process current scenario go ncm.processActiveScenarioUpdate() @@ -256,6 +273,9 @@ func (ncm *NetCharManager) msgHandler(msg *mq.Msg, userData interface{}) { case mq.MsgPduSessionCreated, mq.MsgPduSessionTerminated: log.Debug("RX MSG: ", mq.PrintMsg(msg)) ncm.processPduSessionUpdate() + case mq.MsgGeUpdate: + log.Debug("RX MSG: ", mq.PrintMsg(msg)) + ncm.processGeUpdate() default: log.Trace("Ignoring unsupported message: ", mq.PrintMsg(msg)) } @@ -283,7 +303,7 @@ func (ncm *NetCharManager) processActiveScenarioUpdate() { if ncm.isStarted { // Process updated scenario using algorithm - err := ncm.algo.ProcessScenario(ncm.activeModel, ncm.pduSessions) + err := ncm.algo.ProcessScenario(ncm.activeModel, ncm.pduSessions, ncm.d2dSessions) if err != nil { log.Error("Failed to process active model with error: ", err) return @@ -296,7 +316,6 @@ func (ncm *NetCharManager) processActiveScenarioUpdate() { // processPduSessionUpdate func (ncm *NetCharManager) processPduSessionUpdate() { - ncm.mutex.Lock() defer ncm.mutex.Unlock() @@ -310,7 +329,7 @@ func (ncm *NetCharManager) processPduSessionUpdate() { if ncm.isStarted { // Process updated scenario using algorithm - err := ncm.algo.ProcessScenario(ncm.activeModel, ncm.pduSessions) + err := ncm.algo.ProcessScenario(ncm.activeModel, ncm.pduSessions, ncm.d2dSessions) if err != nil { log.Error("Failed to process active model with error: ", err) return @@ -321,6 +340,46 @@ func (ncm *NetCharManager) processPduSessionUpdate() { } } +// processGeUpdate +func (ncm *NetCharManager) processGeUpdate() { + ncm.mutex.Lock() + defer ncm.mutex.Unlock() + + // Obtain D2D measurements from cache + ueD2DMeasurements, err := ncm.gisCache.GetAllD2DMeasurements() + if err != nil { + log.Error("Failed to retrieve D2D measurements with error: ", err) + return + } + + // Obtain local list of D2D sessions + d2dSessions := map[string]map[string]bool{} + for ueName, ueD2dMeas := range ueD2DMeasurements { + d2dSessions[ueName] = map[string]bool{} + for d2dUeName := range ueD2dMeas.Measurements { + d2dSessions[ueName][d2dUeName] = true + } + } + + // Update list if necessary + if !reflect.DeepEqual(d2dSessions, ncm.d2dSessions) { + log.Info("Updating D2D sessions") + ncm.d2dSessions = d2dSessions + + if ncm.isStarted { + // Process updated scenario using algorithm + err := ncm.algo.ProcessScenario(ncm.activeModel, ncm.pduSessions, ncm.d2dSessions) + if err != nil { + log.Error("Failed to process active model with error: ", err) + return + } + + // Recalculate network characteristics + ncm.updateNetChars() + } + } +} + // updateNetChars func (ncm *NetCharManager) updateNetChars() { // Recalculate network characteristics diff --git a/go-packages/meep-net-char-mgr/net-char-mgr_test.go b/go-packages/meep-net-char-mgr/net-char-mgr_test.go index 1694da070..99575380a 100644 --- a/go-packages/meep-net-char-mgr/net-char-mgr_test.go +++ b/go-packages/meep-net-char-mgr/net-char-mgr_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-pdu-session-store/pdu-session-store.go b/go-packages/meep-pdu-session-store/pdu-session-store.go index 6b7a7f55e..22e09a497 100644 --- a/go-packages/meep-pdu-session-store/pdu-session-store.go +++ b/go-packages/meep-pdu-session-store/pdu-session-store.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-pdu-session-store/pdu-session-store_test.go b/go-packages/meep-pdu-session-store/pdu-session-store_test.go index bbd29e50f..cccd3eaa3 100644 --- a/go-packages/meep-pdu-session-store/pdu-session-store_test.go +++ b/go-packages/meep-pdu-session-store/pdu-session-store_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-platform-ctrl-client/README.md b/go-packages/meep-platform-ctrl-client/README.md index c6cd2dee2..6231150de 100644 --- a/go-packages/meep-platform-ctrl-client/README.md +++ b/go-packages/meep-platform-ctrl-client/README.md @@ -41,6 +41,7 @@ Class | Method | HTTP request | Description - [CellularPoaConfig](docs/CellularPoaConfig.md) - [ConnectivityConfig](docs/ConnectivityConfig.md) - [CpuConfig](docs/CpuConfig.md) + - [D2dConfig](docs/D2dConfig.md) - [Deployment](docs/Deployment.md) - [DnConfig](docs/DnConfig.md) - [Domain](docs/Domain.md) diff --git a/go-packages/meep-platform-ctrl-client/api/swagger.yaml b/go-packages/meep-platform-ctrl-client/api/swagger.yaml index 51037f575..0ce527806 100644 --- a/go-packages/meep-platform-ctrl-client/api/swagger.yaml +++ b/go-packages/meep-platform-ctrl-client/api/swagger.yaml @@ -342,6 +342,8 @@ definitions: $ref: "#/definitions/NetworkCharacteristics" connectivity: $ref: "#/definitions/ConnectivityConfig" + d2d: + $ref: "#/definitions/D2dConfig" interDomainLatency: type: "integer" description: "**DEPRECATED** As of release 1.5.0, replaced by netChar latency" @@ -420,6 +422,16 @@ definitions: - "OPEN" - "PDU" example: {} + D2dConfig: + type: "object" + properties: + d2dMaxDistance: + type: "number" + description: "Maximum distance for D2D. Default distance is 100m" + disableD2dViaNetwork: + type: "boolean" + description: "Enable-Disable D2D via network. Default value is false" + description: "D2D config" Domain: type: "object" properties: @@ -671,6 +683,16 @@ definitions: velocity: type: "number" description: "Speed of movement along path in m/s" + d2dInRange: + type: "array" + items: + type: "string" + description: "D2D UEs visible to UE" + poaInRange: + type: "array" + items: + type: "string" + description: "POAs visible to UE" description: "Geographic data" Point: type: "object" diff --git a/go-packages/meep-platform-ctrl-client/api_sandbox_control.go b/go-packages/meep-platform-ctrl-client/api_sandbox_control.go index 2741e2988..965b40f47 100644 --- a/go-packages/meep-platform-ctrl-client/api_sandbox_control.go +++ b/go-packages/meep-platform-ctrl-client/api_sandbox_control.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/api_scenario_configuration.go b/go-packages/meep-platform-ctrl-client/api_scenario_configuration.go index c88c533d8..80f47c843 100644 --- a/go-packages/meep-platform-ctrl-client/api_scenario_configuration.go +++ b/go-packages/meep-platform-ctrl-client/api_scenario_configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/client.go b/go-packages/meep-platform-ctrl-client/client.go index 1456bd7ea..3a79c3d4e 100644 --- a/go-packages/meep-platform-ctrl-client/client.go +++ b/go-packages/meep-platform-ctrl-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/configuration.go b/go-packages/meep-platform-ctrl-client/configuration.go index 629a36089..5807c7eba 100644 --- a/go-packages/meep-platform-ctrl-client/configuration.go +++ b/go-packages/meep-platform-ctrl-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/docs/D2dConfig.md b/go-packages/meep-platform-ctrl-client/docs/D2dConfig.md new file mode 100644 index 000000000..c538be21f --- /dev/null +++ b/go-packages/meep-platform-ctrl-client/docs/D2dConfig.md @@ -0,0 +1,11 @@ +# D2dConfig + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**D2dMaxDistance** | **float32** | Maximum distance for D2D. Default distance is 100m | [optional] [default to null] +**DisableD2dViaNetwork** | **bool** | Enable-Disable D2D via network. Default value is false | [optional] [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-platform-ctrl-client/docs/Deployment.md b/go-packages/meep-platform-ctrl-client/docs/Deployment.md index 4dc93d961..9f079b0ff 100644 --- a/go-packages/meep-platform-ctrl-client/docs/Deployment.md +++ b/go-packages/meep-platform-ctrl-client/docs/Deployment.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **NetChar** | [***NetworkCharacteristics**](NetworkCharacteristics.md) | | [optional] [default to null] **Connectivity** | [***ConnectivityConfig**](ConnectivityConfig.md) | | [optional] [default to null] +**D2d** | [***D2dConfig**](D2dConfig.md) | | [optional] [default to null] **InterDomainLatency** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar latency | [optional] [default to null] **InterDomainLatencyVariation** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation | [optional] [default to null] **InterDomainThroughput** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar throughputUl and throughputDl | [optional] [default to null] diff --git a/go-packages/meep-platform-ctrl-client/docs/GeoData.md b/go-packages/meep-platform-ctrl-client/docs/GeoData.md index 347ea89ab..f911776fb 100644 --- a/go-packages/meep-platform-ctrl-client/docs/GeoData.md +++ b/go-packages/meep-platform-ctrl-client/docs/GeoData.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **Path** | [***LineString**](LineString.md) | | [optional] [default to null] **EopMode** | **string** | End-of-Path mode: <li>LOOP: When path endpoint is reached, start over from the beginning <li>REVERSE: When path endpoint is reached, return on the reverse path | [optional] [default to null] **Velocity** | **float32** | Speed of movement along path in m/s | [optional] [default to null] +**D2dInRange** | **[]string** | | [optional] [default to null] +**PoaInRange** | **[]string** | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-platform-ctrl-client/model_cellular_domain_config.go b/go-packages/meep-platform-ctrl-client/model_cellular_domain_config.go index 60ed65170..8b70aee14 100644 --- a/go-packages/meep-platform-ctrl-client/model_cellular_domain_config.go +++ b/go-packages/meep-platform-ctrl-client/model_cellular_domain_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_cellular_poa_config.go b/go-packages/meep-platform-ctrl-client/model_cellular_poa_config.go index f88de05df..9b24ce82c 100644 --- a/go-packages/meep-platform-ctrl-client/model_cellular_poa_config.go +++ b/go-packages/meep-platform-ctrl-client/model_cellular_poa_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_connectivity_config.go b/go-packages/meep-platform-ctrl-client/model_connectivity_config.go index 7ff900458..95f77d04a 100644 --- a/go-packages/meep-platform-ctrl-client/model_connectivity_config.go +++ b/go-packages/meep-platform-ctrl-client/model_connectivity_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_cpu_config.go b/go-packages/meep-platform-ctrl-client/model_cpu_config.go index 17ae08332..841cf5be8 100644 --- a/go-packages/meep-platform-ctrl-client/model_cpu_config.go +++ b/go-packages/meep-platform-ctrl-client/model_cpu_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_d2d_config.go b/go-packages/meep-platform-ctrl-client/model_d2d_config.go new file mode 100644 index 000000000..33b81a65d --- /dev/null +++ b/go-packages/meep-platform-ctrl-client/model_d2d_config.go @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Platform Controller REST API + * + * This API is the main Platform Controller API for scenario configuration & sandbox management

    **Micro-service**
    [meep-pfm-ctrl](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-platform-ctrl)

    **Type & Usage**
    Platform main interface used by controller software to configure scenarios and manage sandboxes in the AdvantEDGE platform

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// D2D config +type D2dConfig struct { + // Maximum distance for D2D. Default distance is 100m + D2dMaxDistance float32 `json:"d2dMaxDistance,omitempty"` + // Enable-Disable D2D via network. Default value is false + DisableD2dViaNetwork bool `json:"disableD2dViaNetwork,omitempty"` +} diff --git a/go-packages/meep-platform-ctrl-client/model_deployment.go b/go-packages/meep-platform-ctrl-client/model_deployment.go index 9ccc25e47..3194e653a 100644 --- a/go-packages/meep-platform-ctrl-client/model_deployment.go +++ b/go-packages/meep-platform-ctrl-client/model_deployment.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,6 +28,7 @@ package client type Deployment struct { NetChar *NetworkCharacteristics `json:"netChar,omitempty"` Connectivity *ConnectivityConfig `json:"connectivity,omitempty"` + D2d *D2dConfig `json:"d2d,omitempty"` // **DEPRECATED** As of release 1.5.0, replaced by netChar latency InterDomainLatency int32 `json:"interDomainLatency,omitempty"` // **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation diff --git a/go-packages/meep-platform-ctrl-client/model_dn_config.go b/go-packages/meep-platform-ctrl-client/model_dn_config.go index e0bc7918d..2541a80e1 100644 --- a/go-packages/meep-platform-ctrl-client/model_dn_config.go +++ b/go-packages/meep-platform-ctrl-client/model_dn_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_domain.go b/go-packages/meep-platform-ctrl-client/model_domain.go index 350b7d96f..95c116fe0 100644 --- a/go-packages/meep-platform-ctrl-client/model_domain.go +++ b/go-packages/meep-platform-ctrl-client/model_domain.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_egress_service.go b/go-packages/meep-platform-ctrl-client/model_egress_service.go index 3100920ba..d70232cd1 100644 --- a/go-packages/meep-platform-ctrl-client/model_egress_service.go +++ b/go-packages/meep-platform-ctrl-client/model_egress_service.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_external_config.go b/go-packages/meep-platform-ctrl-client/model_external_config.go index d5928452b..07c760ad7 100644 --- a/go-packages/meep-platform-ctrl-client/model_external_config.go +++ b/go-packages/meep-platform-ctrl-client/model_external_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_geo_data.go b/go-packages/meep-platform-ctrl-client/model_geo_data.go index 1b5c5742d..e79ef5e5c 100644 --- a/go-packages/meep-platform-ctrl-client/model_geo_data.go +++ b/go-packages/meep-platform-ctrl-client/model_geo_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,5 +33,7 @@ type GeoData struct { // End-of-Path mode:

  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path EopMode string `json:"eopMode,omitempty"` // Speed of movement along path in m/s - Velocity float32 `json:"velocity,omitempty"` + Velocity float32 `json:"velocity,omitempty"` + D2dInRange []string `json:"d2dInRange,omitempty"` + PoaInRange []string `json:"poaInRange,omitempty"` } diff --git a/go-packages/meep-platform-ctrl-client/model_gpu_config.go b/go-packages/meep-platform-ctrl-client/model_gpu_config.go index 692cdb16e..d0dff2001 100644 --- a/go-packages/meep-platform-ctrl-client/model_gpu_config.go +++ b/go-packages/meep-platform-ctrl-client/model_gpu_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_ingress_service.go b/go-packages/meep-platform-ctrl-client/model_ingress_service.go index c631048ee..8f0dab46c 100644 --- a/go-packages/meep-platform-ctrl-client/model_ingress_service.go +++ b/go-packages/meep-platform-ctrl-client/model_ingress_service.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_line_string.go b/go-packages/meep-platform-ctrl-client/model_line_string.go index 718d98af0..f93b398d8 100644 --- a/go-packages/meep-platform-ctrl-client/model_line_string.go +++ b/go-packages/meep-platform-ctrl-client/model_line_string.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_memory_config.go b/go-packages/meep-platform-ctrl-client/model_memory_config.go index 609a0a0dd..60f6ec23d 100644 --- a/go-packages/meep-platform-ctrl-client/model_memory_config.go +++ b/go-packages/meep-platform-ctrl-client/model_memory_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_network_characteristics.go b/go-packages/meep-platform-ctrl-client/model_network_characteristics.go index cb0fb9ce3..251c2cbea 100644 --- a/go-packages/meep-platform-ctrl-client/model_network_characteristics.go +++ b/go-packages/meep-platform-ctrl-client/model_network_characteristics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_network_location.go b/go-packages/meep-platform-ctrl-client/model_network_location.go index ef08d6ecf..e2bab324d 100644 --- a/go-packages/meep-platform-ctrl-client/model_network_location.go +++ b/go-packages/meep-platform-ctrl-client/model_network_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_physical_location.go b/go-packages/meep-platform-ctrl-client/model_physical_location.go index b0d92ccbd..421bc1b44 100644 --- a/go-packages/meep-platform-ctrl-client/model_physical_location.go +++ b/go-packages/meep-platform-ctrl-client/model_physical_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_poa4_g_config.go b/go-packages/meep-platform-ctrl-client/model_poa4_g_config.go index 8e618126f..a68346cc2 100644 --- a/go-packages/meep-platform-ctrl-client/model_poa4_g_config.go +++ b/go-packages/meep-platform-ctrl-client/model_poa4_g_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_poa5_g_config.go b/go-packages/meep-platform-ctrl-client/model_poa5_g_config.go index 5bb2bcbff..c893f2d8c 100644 --- a/go-packages/meep-platform-ctrl-client/model_poa5_g_config.go +++ b/go-packages/meep-platform-ctrl-client/model_poa5_g_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_poa_wifi_config.go b/go-packages/meep-platform-ctrl-client/model_poa_wifi_config.go index 2e1adbadc..81e600273 100644 --- a/go-packages/meep-platform-ctrl-client/model_poa_wifi_config.go +++ b/go-packages/meep-platform-ctrl-client/model_poa_wifi_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_point.go b/go-packages/meep-platform-ctrl-client/model_point.go index de8fbb342..d9c1f79ce 100644 --- a/go-packages/meep-platform-ctrl-client/model_point.go +++ b/go-packages/meep-platform-ctrl-client/model_point.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_process.go b/go-packages/meep-platform-ctrl-client/model_process.go index 3cf86e55f..ffc7f6041 100644 --- a/go-packages/meep-platform-ctrl-client/model_process.go +++ b/go-packages/meep-platform-ctrl-client/model_process.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_sandbox.go b/go-packages/meep-platform-ctrl-client/model_sandbox.go index c7cdda4c1..763baaa2d 100644 --- a/go-packages/meep-platform-ctrl-client/model_sandbox.go +++ b/go-packages/meep-platform-ctrl-client/model_sandbox.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_sandbox_config.go b/go-packages/meep-platform-ctrl-client/model_sandbox_config.go index d445ce5a6..fb9765a82 100644 --- a/go-packages/meep-platform-ctrl-client/model_sandbox_config.go +++ b/go-packages/meep-platform-ctrl-client/model_sandbox_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_sandbox_list.go b/go-packages/meep-platform-ctrl-client/model_sandbox_list.go index 44af7bcee..f860bf1a6 100644 --- a/go-packages/meep-platform-ctrl-client/model_sandbox_list.go +++ b/go-packages/meep-platform-ctrl-client/model_sandbox_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_scenario.go b/go-packages/meep-platform-ctrl-client/model_scenario.go index 86f1794d7..f0bae8cb7 100644 --- a/go-packages/meep-platform-ctrl-client/model_scenario.go +++ b/go-packages/meep-platform-ctrl-client/model_scenario.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_scenario_config.go b/go-packages/meep-platform-ctrl-client/model_scenario_config.go index cf5b565dd..425ead43b 100644 --- a/go-packages/meep-platform-ctrl-client/model_scenario_config.go +++ b/go-packages/meep-platform-ctrl-client/model_scenario_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_scenario_list.go b/go-packages/meep-platform-ctrl-client/model_scenario_list.go index 97a5b568c..f804c48fb 100644 --- a/go-packages/meep-platform-ctrl-client/model_scenario_list.go +++ b/go-packages/meep-platform-ctrl-client/model_scenario_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_service_config.go b/go-packages/meep-platform-ctrl-client/model_service_config.go index 6b2556d16..c2f65e127 100644 --- a/go-packages/meep-platform-ctrl-client/model_service_config.go +++ b/go-packages/meep-platform-ctrl-client/model_service_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_service_port.go b/go-packages/meep-platform-ctrl-client/model_service_port.go index ca7f67468..108d710f6 100644 --- a/go-packages/meep-platform-ctrl-client/model_service_port.go +++ b/go-packages/meep-platform-ctrl-client/model_service_port.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/model_zone.go b/go-packages/meep-platform-ctrl-client/model_zone.go index 531290bf8..9246ca4ee 100644 --- a/go-packages/meep-platform-ctrl-client/model_zone.go +++ b/go-packages/meep-platform-ctrl-client/model_zone.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-platform-ctrl-client/response.go b/go-packages/meep-platform-ctrl-client/response.go index a5c8efc09..1c96726ed 100644 --- a/go-packages/meep-platform-ctrl-client/response.go +++ b/go-packages/meep-platform-ctrl-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-redis/db.go b/go-packages/meep-redis/db.go index 9f66f0604..48f02b5ba 100644 --- a/go-packages/meep-redis/db.go +++ b/go-packages/meep-redis/db.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-replay-manager/replayMgr.go b/go-packages/meep-replay-manager/replayMgr.go index 2c678b9c5..32c11bac4 100644 --- a/go-packages/meep-replay-manager/replayMgr.go +++ b/go-packages/meep-replay-manager/replayMgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-rnis-client/README.md b/go-packages/meep-rnis-client/README.md index 98795f6a3..df22ef802 100644 --- a/go-packages/meep-rnis-client/README.md +++ b/go-packages/meep-rnis-client/README.md @@ -125,7 +125,6 @@ Class | Method | HTTP request | Description - [SubscriptionLinkList](docs/SubscriptionLinkList.md) - [SubscriptionLinkListLinks](docs/SubscriptionLinkListLinks.md) - [SubscriptionLinkListLinksSubscription](docs/SubscriptionLinkListLinksSubscription.md) - - [TestNotification](docs/TestNotification.md) - [TimeStamp](docs/TimeStamp.md) - [Trigger](docs/Trigger.md) - [TriggerNr](docs/TriggerNr.md) diff --git a/go-packages/meep-rnis-client/api/swagger.yaml b/go-packages/meep-rnis-client/api/swagger.yaml index 208a813f9..7f11ffed5 100644 --- a/go-packages/meep-rnis-client/api/swagger.yaml +++ b/go-packages/meep-rnis-client/api/swagger.yaml @@ -1,8 +1,7 @@ openapi: 3.0.0 info: - title: AdvantEDGE Radio Network Information Service REST API - description: - "Radio Network Information Service is AdvantEDGE's implementation of\ + title: AdvantEDGE Radio Network Information API + description: "Radio Network Information Service is AdvantEDGE's implementation of\ \ [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)\ \

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)\ \

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)\ @@ -20,65 +19,227 @@ info: url: https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE version: 2.2.1 externalDocs: - description: "ETSI GS MEC 012 Radio Network Information API, V2.2.1" - url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf + description: ETSI MEC012 V2.2.1 Radio Network Information API + url: http://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_mec012v020201p.pdf servers: - - url: https://localhost/sandboxname/rni/v2 +- url: https://localhost/sandboxname/rni/v2 tags: -- name: 'rni' -- name: 'unsupported' +- name: rni paths: /queries/rab_info: get: tags: - - 'rni' - summary: 'Retrieve information on Radio Access Bearers' - description: 'Queries information about the Radio Access Bearers' + - rni + summary: Retrieve information on Radio Access Bearers + description: Queries information about the Radio Access Bearers operationId: rab_infoGET parameters: - - $ref: '#/components/parameters/Query.AppInsId' - - $ref: '#/components/parameters/Query.CellId' - - $ref: '#/components/parameters/Query.UeIpv4Address' - - $ref: '#/components/parameters/Query.UeIpv6Address' - - $ref: '#/components/parameters/Query.NatedIpAddress' - - $ref: '#/components/parameters/Query.GtpTeid' - - $ref: '#/components/parameters/Query.ErabId' - - $ref: '#/components/parameters/Query.Qci' - - $ref: '#/components/parameters/Query.ErabMbrDl' - - $ref: '#/components/parameters/Query.ErabMbrUl' - - $ref: '#/components/parameters/Query.ErabGbrDl' - - $ref: '#/components/parameters/Query.ErabGbrUl' + - name: app_ins_id + in: query + description: Application instance identifier + required: false + style: form + explode: true + schema: + type: string + x-exportParamName: AppInsId + x-optionalDataType: String + - name: cell_id + in: query + description: Comma separated list of E-UTRAN Cell Identities + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: CellId + - name: ue_ipv4_address + in: query + description: Comma separated list of IE IPv4 addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv4Address + - name: ue_ipv6_address + in: query + description: Comma separated list of IE IPv6 addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv6Address + - name: nated_ip_address + in: query + description: Comma separated list of IE NATed IP addresses as defined for + the type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: NatedIpAddress + - name: gtp_teid + in: query + description: Comma separated list of GTP TEID addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: GtpTeid + - name: erab_id + in: query + description: E-RAB identifier + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabId + x-optionalDataType: Int32 + - name: qci + in: query + description: QoS Class Identifier as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: Qci + x-optionalDataType: Int32 + - name: erab_mbr_dl + in: query + description: Maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabMbrDl + x-optionalDataType: Int32 + - name: erab_mbr_ul + in: query + description: Maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabMbrUl + x-optionalDataType: Int32 + - name: erab_gbr_dl + in: query + description: Guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 + 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabGbrDl + x-optionalDataType: Int32 + - name: erab_gbr_ul + in: query + description: Guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabGbrUl + x-optionalDataType: Int32 responses: - '200': + "200": description: Successful response to rab_info request content: application/json: schema: $ref: '#/components/schemas/RabInfo' - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "queries" + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: queries /queries/plmn_info: get: tags: - - 'rni' - summary: 'Retrieve information on the underlying Mobile Network that the MEC application is associated to' - description: 'Queries information about the Mobile Network' + - rni + summary: Retrieve information on the underlying Mobile Network that the MEC + application is associated to + description: Queries information about the Mobile Network operationId: plmn_infoGET parameters: - - $ref: '#/components/parameters/Query.AppInsIdArr' + - name: app_ins_id + in: query + description: Comma separated list of Application instance identifiers + required: true + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: AppInsIdArr responses: - '200': + "200": description: Successful response to plmn_info request content: application/json: @@ -86,135 +247,672 @@ paths: type: array items: $ref: '#/components/schemas/PlmnInfo' - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "queries" + x-content-type: application/json + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: queries /queries/s1_bearer_info: get: tags: - - 'unsupported' - summary: 'Retrieve S1-U bearer information related to specific UE(s)' - description: 'Queries information about the S1 bearer(s)' + - unsupported + summary: Retrieve S1-U bearer information related to specific UE(s) + description: Queries information about the S1 bearer(s) operationId: s1_bearer_infoGET parameters: - - $ref: '#/components/parameters/Query.TempUeId' - - $ref: '#/components/parameters/Query.UeIpv4Address' - - $ref: '#/components/parameters/Query.UeIpv6Address' - - $ref: '#/components/parameters/Query.NatedIpAddress' - - $ref: '#/components/parameters/Query.GtpTeid' - - $ref: '#/components/parameters/Query.CellId' - - $ref: '#/components/parameters/Query.ErabIdArr' + - name: temp_ue_id + in: query + description: Comma separated list of temporary identifiers allocated for the + specific UE as defined in ETSI TS 136 413 + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: TempUeId + - name: ue_ipv4_address + in: query + description: Comma separated list of IE IPv4 addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv4Address + - name: ue_ipv6_address + in: query + description: Comma separated list of IE IPv6 addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv6Address + - name: nated_ip_address + in: query + description: Comma separated list of IE NATed IP addresses as defined for + the type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: NatedIpAddress + - name: gtp_teid + in: query + description: Comma separated list of GTP TEID addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: GtpTeid + - name: cell_id + in: query + description: Comma separated list of E-UTRAN Cell Identities + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: CellId + - name: erab_id + in: query + description: Comma separated list of E-RAB identifiers + required: false + style: form + explode: true + schema: + type: array + items: + type: integer + format: int32 + x-exportParamName: ErabIdArr responses: - '200': + "200": description: Successful response to s1_bearer_info request content: application/json: schema: $ref: '#/components/schemas/S1BearerInfo' - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "queries" + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: queries /queries/layer2_meas: get: tags: - - 'rni' - summary: 'Retrieve information on layer 2 measurements' - description: 'Queries information about the layer 2 measurements.' + - rni + summary: Retrieve information on layer 2 measurements + description: Queries information about the layer 2 measurements. operationId: layer2_meas_infoGET parameters: - - $ref: '#/components/parameters/Query.AppInsId' - - $ref: '#/components/parameters/Query.CellId' - - $ref: '#/components/parameters/Query.UeIpv4Address' - - $ref: '#/components/parameters/Query.UeIpv6Address' - - $ref: '#/components/parameters/Query.NatedIpAddress' - - $ref: '#/components/parameters/Query.GtpTeid' - - $ref: '#/components/parameters/Query.DlGbrPrbUsageCell' - - $ref: '#/components/parameters/Query.UlGbrPrbUsageCell' - - $ref: '#/components/parameters/Query.DlNonGbrPrbUsageCell' - - $ref: '#/components/parameters/Query.UlNonGbrPrbUsageCell' - - $ref: '#/components/parameters/Query.DlTotalPrbUsageCell' - - $ref: '#/components/parameters/Query.UlTotalPrbUsageCell' - - $ref: '#/components/parameters/Query.ReceivedDedicatedPreamblesCell' - - $ref: '#/components/parameters/Query.ReceivedRandomPreamblesLowRangeCell' - - $ref: '#/components/parameters/Query.ReceivedRandomPreamblesHighRangeCell' - - $ref: '#/components/parameters/Query.NumberOfActiveUeDlGbrCell' - - $ref: '#/components/parameters/Query.NumberOfActiveUeUlGbrCell' - - $ref: '#/components/parameters/Query.NumberOfActiveUeDlNonGbrCell' - - $ref: '#/components/parameters/Query.NumberOfActiveUeUlNonGbrCell' - - $ref: '#/components/parameters/Query.DlGbrPdrCell' - - $ref: '#/components/parameters/Query.UlGbrPdrCell' - - $ref: '#/components/parameters/Query.DlNonGbrPdrCell' - - $ref: '#/components/parameters/Query.UlNonGbrPdrCell' - - $ref: '#/components/parameters/Query.DlGbrDelayUe' - - $ref: '#/components/parameters/Query.UlGbrDelayUe' - - $ref: '#/components/parameters/Query.DlNonGbrDelayUe' - - $ref: '#/components/parameters/Query.UlNonGbrDelayUe' - - $ref: '#/components/parameters/Query.DlGbrPdrUe' - - $ref: '#/components/parameters/Query.UlGbrPdrUe' - - $ref: '#/components/parameters/Query.DlNonGbrPdrUe' - - $ref: '#/components/parameters/Query.UlNonGbrPdrUe' - - $ref: '#/components/parameters/Query.DlGbrThroughputUe' - - $ref: '#/components/parameters/Query.UlGbrThroughputUe' - - $ref: '#/components/parameters/Query.DlNonGbrThroughputUe' - - $ref: '#/components/parameters/Query.UlNonGbrThroughputUe' - - $ref: '#/components/parameters/Query.DlGbrDataVolumeUe' - - $ref: '#/components/parameters/Query.UlGbrDataVolumeUe' - - $ref: '#/components/parameters/Query.DlNonGbrDataVolumeUe' - - $ref: '#/components/parameters/Query.UlNonGbrDataVolumeUe' + - name: app_ins_id + in: query + description: Application instance identifier + required: false + style: form + explode: true + schema: + type: string + x-exportParamName: AppInsId + x-optionalDataType: String + - name: cell_id + in: query + description: Comma separated list of E-UTRAN Cell Identities + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: CellId + - name: ue_ipv4_address + in: query + description: Comma separated list of IE IPv4 addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv4Address + - name: ue_ipv6_address + in: query + description: Comma separated list of IE IPv6 addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv6Address + - name: nated_ip_address + in: query + description: Comma separated list of IE NATed IP addresses as defined for + the type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: NatedIpAddress + - name: gtp_teid + in: query + description: Comma separated list of GTP TEID addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: GtpTeid + - name: dl_gbr_prb_usage_cell + in: query + description: PRB usage for downlink GBR traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrPrbUsageCell + - name: ul_gbr_prb_usage_cell + in: query + description: PRB usage for uplink GBR traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrPrbUsageCell + - name: dl_nongbr_prb_usage_cell + in: query + description: PRB usage for downlink non-GBR traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrPrbUsageCell + - name: ul_nongbr_prb_usage_cell + in: query + description: PRB usage for uplink non-GBR traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrPrbUsageCell + - name: dl_total_prb_usage_cell + in: query + description: PRB usage for total downlink traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlTotalPrbUsageCell + - name: ul_total_prb_usage_cell + in: query + description: PRB usage for total uplink traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlTotalPrbUsageCell + - name: received_dedicated_preambles_cell + in: query + description: Received dedicated preambles in percentage as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: ReceivedDedicatedPreamblesCell + - name: received_randomly_selected_preambles_low_range_cell + in: query + description: Received randomly selected preambles in the low range in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: ReceivedRandomPreamblesLowRangeCell + - name: received_randomly_selected_preambles_high_range_cell + in: query + description: Received rendomly selected preambles in the high range in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: ReceivedRandomPreamblesHighRangeCell + - name: number_of_active_ue_dl_gbr_cell + in: query + description: Number of active UEs with downlink GBR traffic as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeDlGbrCell + - name: number_of_active_ue_ul_gbr_cell + in: query + description: Number of active UEs with uplink GBR traffic as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeUlGbrCell + - name: number_of_active_ue_dl_nongbr_cell + in: query + description: Number of active UEs with downlink non-GBR traffic as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeDlNonGbrCell + - name: number_of_active_ue_ul_nongbr_cell + in: query + description: Number of active UEs with uplink non-GBR traffic as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeUlNonGbrCell + - name: dl_gbr_pdr_cell + in: query + description: Packet discard rate for downlink GBR traffic in percentage as + defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrPdrCell + - name: ul_gbr_pdr_cell + in: query + description: Packet discard rate for uplink GBR traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrPdrCell + - name: dl_nongbr_pdr_cell + in: query + description: Packet discard rate for downlink non-GBR traffic in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrPdrCell + - name: ul_nongbr_pdr_cell + in: query + description: Packet discard rate for uplink non-GBR traffic in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrPdrCell + - name: dl_gbr_delay_ue + in: query + description: Packet delay of downlink GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrDelayUe + - name: ul_gbr_delay_ue + in: query + description: Packet delay of uplink GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrDelayUe + - name: dl_nongbr_delay_ue + in: query + description: Packet delay of downlink non-GBR traffic of a UE as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrDelayUe + - name: ul_nongbr_delay_ue + in: query + description: Packet delay of uplink non-GBR traffic of a UE as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrDelayUe + - name: dl_gbr_pdr_ue + in: query + description: Packet discard rate of downlink GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrPdrUe + - name: ul_gbr_pdr_ue + in: query + description: Packet discard rate of uplink GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrPdrUe + - name: dl_nongbr_pdr_ue + in: query + description: Packet discard rate of downlink non-GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrPdrUe + - name: ul_nongbr_pdr_ue + in: query + description: Packet discard rate of uplink non-GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrPdrUe + - name: dl_gbr_throughput_ue + in: query + description: Scheduled throughput of downlink GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrThroughputUe + - name: ul_gbr_throughput_ue + in: query + description: Scheduled throughput of uplink GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrThroughputUe + - name: dl_nongbr_throughput_ue + in: query + description: Scheduled throughput of downlink non-GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrThroughputUe + - name: ul_nongbr_throughput_ue + in: query + description: Scheduled throughput of uplink non-GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrThroughputUe + - name: dl_gbr_data_volume_ue + in: query + description: Data volume of downlink GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrDataVolumeUe + - name: ul_gbr_data_volume_ue + in: query + description: Data volume of uplink GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrDataVolumeUe + - name: dl_nongbr_data_volume_ue + in: query + description: Data volume of downlink non-GBR traffic of a UE as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrDataVolumeUe + - name: ul_nongbr_data_volume_ue + in: query + description: Data volume of uplink non-GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrDataVolumeUe responses: - '200': + "200": description: Successful response to layer2 measurements info request content: application/json: schema: $ref: '#/components/schemas/L2Meas' - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '414': - $ref: '#/components/responses/414' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "queries" + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "414": + description: "URI Too Long : used to indicate that the server is refusing\ + \ to process the request because the request URI is longer than the server\ + \ is willing or able to process." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: queries /subscriptions: get: tags: - - 'rni' - summary: 'Retrieve information on subscriptions for notifications' - description: 'Queries information on subscriptions for notifications' + - rni + summary: Retrieve information on subscriptions for notifications + description: Queries information on subscriptions for notifications operationId: subscriptionLinkList_subscriptionsGET parameters: - - $ref: '#/components/parameters/Query.SubscriptionType' + - name: subscription_type + in: query + description: "Filter on a specific subscription type. Permitted values: cell_change,\ + \ rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue,\ + \ ca_reconf, s1_bearer." + required: false + style: form + explode: true + schema: + type: string + x-exportParamName: SubscriptionType responses: - '200': - description: 'Response body contains the list of links to requestors subscriptions.' + "200": + description: Response body contains the list of links to requestors subscriptions. content: application/json: schema: @@ -222,60 +920,88 @@ paths: example: _links: self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions' + href: http://meAppServer.example.com/rni/v2/subscriptions subscription: - - _links: - self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' - subscriptionType: CellChangeSubscription - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "subscriptions" + - _links: + self: + href: http://meAppServer.example.com/rni/v2/subscriptions/sub123 + callbackReference: http://my.callback.com/rni-cell-change/some-id + subscriptionType: CellChangeSubscription + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: subscriptions post: tags: - - 'rni' - summary: 'Create a new subscription' - description: 'Creates a new subscription to Radio Network Information notifications' + - rni + summary: Create a new subscription + description: Creates a new subscription to Radio Network Information notifications operationId: subscriptionsPOST requestBody: description: Subscription to be created - required: true content: application/json: schema: $ref: '#/components/schemas/InlineSubscription' example: subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + callbackReference: http://my.callback.com/rni-cell-change/some-id filterCriteriaAssocHo: - appInstanceId: 'myApp' + appInstanceId: myApp associateId: - type: 1 - value: '10.100.0.1' + value: 10.100.0.1 ecgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' + mnc: "01" + mcc: "001" + cellId: ACBDEFA hoStatus: - 1 - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 + required: true responses: - '201': + "201": description: Successful subscription content: application/json: @@ -283,52 +1009,104 @@ paths: $ref: '#/components/schemas/InlineSubscription' example: subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + callbackReference: http://my.callback.com/rni-cell-change/some-id _links: self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + href: http://meAppServer.example.com/rni/v2/subscriptions/sub123 filterCriteriaAssocHo: - appInstanceId: 'myApp' + appInstanceId: myApp associateId: - type: 1 - value: '10.100.0.1' + value: 10.100.0.1 ecgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' + mnc: "01" + mcc: "001" + cellId: ACBDEFA hoStatus: - 1 - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '415': - $ref: '#/components/responses/412' - '422': - $ref: '#/components/responses/422' - '429': - $ref: '#/components/responses/429' + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "415": + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts\ + \ when using PUT" + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "422": + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + example: + application/problem+json: + type: https://meAppServer.example.com/rni/v2/probs/too-many targets + title: Too many targets + status: "422" + detail: The target area for the request is considered too large + instance: /meAppClient.example.com/77777/msgs/abc + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' callbacks: notification: '{$request.body#/notificationSubscription.callbackReference}': post: - summary: 'Callback POST used to send a notification' - description: 'Notification from RNIS, content based on subscription type' + summary: Callback POST used to send a notification + description: "Notification from RNIS, content based on subscription\ + \ type" operationId: notificationPOST requestBody: description: Subscription notification - required: true content: application/json: schema: @@ -337,39 +1115,51 @@ paths: notificationType: CellChangeNotification associateId: - type: 1 - value: '10.100.0.1' + value: 10.100.0.1 hoStatus: 1 srcEcgi: plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' + mnc: "01" + mcc: "001" + cellId: ACBDEFA tempUeId: mmec: 1 - mtmsi: 001011231231234 + mtmsi: 69967622812 timeStamp: seconds: 1977836800 nanoseconds: 0 trgEcgi: plmn: - mnc: '01' - mcc: '001' - cellId: 'FEDCBAA' + mnc: "01" + mcc: "001" + cellId: FEDCBAA + required: true responses: - '204': - $ref: '#/components/responses/204' - x-swagger-router-controller: "subscriptions" - '/subscriptions/{subscriptionId}': + "204": + description: No Content + x-swagger-router-controller: subscriptions + /subscriptions/{subscriptionId}: get: tags: - - 'rni' - summary: 'Retrieve information on current specific subscription' - description: 'Queries information about an existing subscription, identified by its self-referring URI returned on creation (initial POST)' + - rni + summary: Retrieve information on current specific subscription + description: "Queries information about an existing subscription, identified\ + \ by its self-referring URI returned on creation (initial POST)" operationId: subscriptionsGET parameters: - - $ref: '#/components/parameters/Path.subscrId' + - name: subscriptionId + in: path + description: "Subscription Id, specifically the \"Self-referring URI\" returned\ + \ in the subscription request" + required: true + style: simple + explode: false + schema: + type: string + format: uri + x-exportParamName: SubscriptionId responses: - '200': + "200": description: Subscription information regarding subscription notifications content: application/json: @@ -377,78 +1167,117 @@ paths: $ref: '#/components/schemas/InlineSubscription' example: subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + callbackReference: http://my.callback.com/rni-cell-change/some-id _links: self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + href: http://meAppServer.example.com/rni/v2/subscriptions/sub123 filterCriteriaAssocHo: - appInstanceId: 'myApp' + appInstanceId: myApp associateId: - type: 1 - value: '10.100.0.1' + value: 10.100.0.1 ecgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' + mnc: "01" + mcc: "001" + cellId: ACBDEFA hoStatus: - 1 - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "subscriptions" + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: subscriptions put: tags: - - 'rni' - summary: 'Modify an existing subscription' - description: 'Updates an existing subscription, identified by its self-referring URI returned on creation (initial POST)' + - rni + summary: Modify an existing subscription + description: "Updates an existing subscription, identified by its self-referring\ + \ URI returned on creation (initial POST)" operationId: subscriptionsPUT + parameters: + - name: subscriptionId + in: path + description: "Subscription Id, specifically the \"Self-referring URI\" returned\ + \ in the subscription request" + required: true + style: simple + explode: false + schema: + type: string + format: uri + x-exportParamName: SubscriptionId requestBody: description: Subscription to be modified - required: true content: application/json: schema: $ref: '#/components/schemas/InlineSubscription' example: subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + callbackReference: http://my.callback.com/rni-cell-change/some-id _links: self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + href: http://meAppServer.example.com/rni/v2/subscriptions/sub123 filterCriteriaAssocHo: - appInstanceId: 'myApp' + appInstanceId: myApp associateId: - type: 1 - value: '10.100.0.1' + value: 10.100.0.1 ecgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' + mnc: "01" + mcc: "001" + cellId: ACBDEFA hoStatus: - 1 - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 - parameters: - - $ref: '#/components/parameters/Path.subscrId' + required: true responses: - '200': + "200": description: Successful subscription to response to subscription notifications content: application/json: @@ -456,3334 +1285,1674 @@ paths: $ref: '#/components/schemas/InlineSubscription' example: subscriptionType: CellChangeSubscription - callbackReference: 'http://my.callback.com/rni-cell-change/some-id' + callbackReference: http://my.callback.com/rni-cell-change/some-id _links: self: - href: 'http://meAppServer.example.com/rni/v2/subscriptions/sub123' + href: http://meAppServer.example.com/rni/v2/subscriptions/sub123 filterCriteriaAssocHo: - appInstanceId: 'myApp' + appInstanceId: myApp associateId: - type: 1 - value: '10.100.0.1' + value: 10.100.0.1 ecgi: - plmn: - mnc: '01' - mcc: '001' - cellId: 'ACBDEFA' + mnc: "01" + mcc: "001" + cellId: ACBDEFA hoStatus: - 1 - 2 expiryDeadline: seconds: 1977836800 nanoseconds: 0 - '400': - $ref: '#/components/responses/400' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '406': - $ref: '#/components/responses/406' - '412': - $ref: '#/components/responses/412' - '422': - $ref: '#/components/responses/422' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "subscriptions" - delete: - tags: - - 'rni' - summary: 'Cancel an existing subscription' - description: 'Cancels an existing subscription, identified by its self-referring URI returned on creation (initial POST)' - operationId: subscriptionsDELETE - parameters: - - $ref: '#/components/parameters/Path.subscrId' + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "412": + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts\ + \ when using PUT" + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "422": + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + example: + application/problem+json: + type: https://meAppServer.example.com/rni/v2/probs/too-many targets + title: Too many targets + status: "422" + detail: The target area for the request is considered too large + instance: /meAppClient.example.com/77777/msgs/abc + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: subscriptions + delete: + tags: + - rni + summary: Cancel an existing subscription + description: "Cancels an existing subscription, identified by its self-referring\ + \ URI returned on creation (initial POST)" + operationId: subscriptionsDELETE + parameters: + - name: subscriptionId + in: path + description: "Subscription Id, specifically the \"Self-referring URI\" returned\ + \ in the subscription request" + required: true + style: simple + explode: false + schema: + type: string + format: uri + x-exportParamName: SubscriptionId responses: - '204': - $ref: '#/components/responses/204' - '401': - $ref: '#/components/responses/401' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '429': - $ref: '#/components/responses/429' - x-swagger-router-controller: "subscriptions" + "204": + description: No Content + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + x-swagger-router-controller: subscriptions /notifications/mec011/appTermination: post: tags: - - 'rni' - summary: 'MEC011 Application Termination notification for self termination' - description: 'Terminates itself.' + - rni + summary: MEC011 Application Termination notification for self termination + description: Terminates itself. operationId: mec011AppTerminationPOST requestBody: - description: 'Termination notification details' - required: true + description: Termination notification details content: application/json: schema: $ref: '#/components/schemas/AppTerminationNotification' example: - notificationType: 'AppTerminationNotification' - operationAction: 'TERMINATING' - maxGracefulTimeout: 10 - links: - subscription: - href: 'http://mec011Server.example.com/mec_app_support/v1/applications/appId1234/subscriptions/sub123' - confirmTermination: - href: 'http://mec011Server.example.com/mec_app_support/v1/confirm_termination' + notificationType: AppTerminationNotification + operationAction: TERMINATING + maxGracefulTimeout: 10 + links: + subscription: + href: http://mec011Server.example.com/mec_app_support/v1/applications/appId1234/subscriptions/sub123 + confirmTermination: + href: http://mec011Server.example.com/mec_app_support/v1/confirm_termination + required: true responses: - '204': + "204": description: No Content - x-swagger-router-controller: 'notifications' + x-swagger-router-controller: notifications components: - responses: - 204: - description: No Content - 400: - description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 401: - description: 'Unauthorized : used when the client did not submit credentials.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 403: - description: 'Forbidden : operation is not allowed given the current status of the resource.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 404: - description: 'Not Found : used when a client provided a URI that cannot be mapped to a valid resource URI.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 406: - description: 'Not Acceptable : used to indicate that the server cannot provide the any of the content formats supported by the client.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 412: - description: 'Precondition failed : used when a condition has failed during conditional requests, e.g. when - using ETags to avoid write conflicts when using PUT' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 414: - description: 'URI Too Long : used to indicate that the server is refusing to process the request because the request URI is - longer than the server is willing or able to process.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 415: - description: 'Unsupported Media Type : used to indicate that the server or the client does not support the content type of the entity body.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - 422: - description: 'Unprocessable Entity : used to indicate that the server understands the content type of the request entity and that the - syntax of the request entity is correct but that the server is unable to process the contained instructions. This error condition can occur if an - JSON request body is syntactically correct but semantically incorrect, for example if the target area for the request is considered too large. This - error condition can also occur if the capabilities required by the request are not supported.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - example: - application/problem+json: - type: 'https://meAppServer.example.com/rni/v2/probs/too-many targets' - title: Too many targets - status: '422' - detail: The target area for the request is considered too large - instance: /meAppClient.example.com/77777/msgs/abc - 429: - description: 'Too Many Requests : used when a rate limiter has triggered.' - content: - application/problem+json: - schema: - $ref: '#/components/schemas/ProblemDetails' - parameters: - Path.subscrId: - name: subscriptionId - in: path - description: 'Subscription Id, specifically the "Self-referring URI" returned in the subscription request' - required: true - schema: - type: string - format: uri - x-exportParamName: SubscriptionId - Query.AppInsId: - name: app_ins_id - in: query - description: Application instance identifier - required: false - schema: - type: string - x-exportParamName: AppInsId - x-optionalDataType: String - Query.AppInsIdArr: - name: app_ins_id - in: query - description: 'Comma separated list of Application instance identifiers' - required: true - schema: + schemas: + AssociateId: + properties: + type: + type: integer + description: "Numeric value (0-255) corresponding to specified type of identifier\ + \ as following:

    0 = reserved.

    1 = UE_IPv4_ADDRESS.

    2 = UE_IPV6_ADDRESS.\ + \

    3 = NATED_IP_ADDRESS.

    4 = GTP_TEID." + enum: + - 0 + - 1 + - 2 + - 3 + - 4 + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Enum + value: + type: string + description: Value for the identifier. + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + example: + type: 0 + value: value + CaReconfNotification: + required: + - _links + - ecgi + - notificationType + type: object + properties: + associateId: + minItems: 0 type: array + description: 0 to N identifiers to associate the event for a specific UE + or flow. items: - type: string - x-exportParamName: AppInsIdArr - Query.CellId: - name: cell_id - in: query - description: 'Comma separated list of E-UTRAN Cell Identities' - required: false - schema: - type: array - items: - type: string - x-exportParamName: CellId - Query.UeIpv4Address: - name: ue_ipv4_address - in: query - description: 'Comma separated list of IE IPv4 addresses as defined for the type for AssociateId' - required: false - schema: - type: array - items: - type: string - x-exportParamName: UeIpv4Address - Query.UeIpv6Address: - name: ue_ipv6_address - in: query - description: 'Comma separated list of IE IPv6 addresses as defined for the type for AssociateId' - required: false - schema: - type: array - items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + carrierAggregationMeasInfo: + minItems: 0 + required: + - cellIdNei + - cellIdSrv + type: array + description: This parameter can be repeated to contain information of all + the carriers assign for Carrier Aggregation up to M. + items: + $ref: '#/components/schemas/CaReconfNotification_carrierAggregationMeasInfo' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Structure (inlined) + ecgi: + $ref: '#/components/schemas/Ecgi' + notificationType: type: string - x-exportParamName: UeIpv6Address - Query.NatedIpAddress: - name: nated_ip_address - in: query - description: 'Comma separated list of IE NATed IP addresses as defined for the type for AssociateId' - required: false - schema: - type: array - items: + description: Shall be set to "CaReConfNotification". + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + secondaryCellAdd: + minItems: 0 + required: + - ecgi + type: array + items: + $ref: '#/components/schemas/CaReconfNotification_secondaryCellAdd' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Structure (inlined) + secondaryCellRemove: + minItems: 0 + required: + - ecgi + type: array + items: + $ref: '#/components/schemas/CaReconfNotification_secondaryCellAdd' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Structure (inlined) + timeStamp: + $ref: '#/components/schemas/TimeStamp' + _links: + $ref: '#/components/schemas/CaReconfNotification__links' + x-etsi-ref: 6.4.8 + CaReconfSubscription: + title: CaReconfSubscription + required: + - callbackReference + - filterCriteriaAssoc + - subscriptionType + type: object + properties: + _links: + $ref: '#/components/schemas/CaReconfSubscription__links' + callbackReference: type: string - x-exportParamName: NatedIpAddress - Query.GtpTeid: - name: gtp_teid - in: query - description: 'Comma separated list of GTP TEID addresses as defined for the type for AssociateId' - required: false - schema: - type: array - items: + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: URI + websockNotifConfig: + $ref: '#/components/schemas/WebsockNotifConfig' + requestTestNotification: + type: boolean + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." + expiryDeadline: + $ref: '#/components/schemas/TimeStamp' + filterCriteriaAssoc: + $ref: '#/components/schemas/CaReconfSubscription_filterCriteriaAssoc' + subscriptionType: type: string - x-exportParamName: GtpTeid - Query.ErabId: - name: erab_id - in: query - description: E-RAB identifier - required: false - schema: - type: integer - format: int32 - x-exportParamName: ErabId - x-optionalDataType: Int32 - Query.ErabIdArr: - name: erab_id - in: query - description: 'Comma separated list of E-RAB identifiers' - required: false - schema: - type: array - items: + description: Shall be set to "CaReconfSubscription". + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + description: "This type represents a subscription to UE carrier aggregation\ + \ reconfiguration notifications from Radio Network Information Service.\n\ + NOTE: At least one of callbackReference and websockNotifConfig shall be provided\ + \ by the service consumer.\n If both are provided, it is up to RNIS to\ + \ choose an alternative and return only that alternative in the response,\n\ + \ specified in ETSI GS MEC 009 [6], as described in clause 6.12a.\n" + x-etsi-ref: 6.3.8 + CellChangeNotification: + required: + - _links + - hoStatus + - notificationType + - srcEcgi + - trgEcgi + type: object + properties: + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the event for a specific UE + or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + hoStatus: type: integer - format: int32 - x-exportParamName: ErabIdArr - Query.Qci: - name: qci - in: query - description: 'QoS Class Identifier as defined in ETSI TS 123 401' - required: false - schema: - type: integer - format: int32 - x-exportParamName: Qci - x-optionalDataType: Int32 - Query.ErabMbrDl: - name: erab_mbr_dl - in: query - description: 'Maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401' - required: false - schema: - type: integer - format: int32 - x-exportParamName: ErabMbrDl - x-optionalDataType: Int32 - Query.ErabMbrUl: - name: erab_mbr_ul - in: query - description: 'Maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401' - required: false - schema: - type: integer - format: int32 - x-exportParamName: ErabMbrUl - x-optionalDataType: Int32 - Query.ErabGbrDl: - name: erab_gbr_dl - in: query - description: 'Guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401' - required: false - schema: - type: integer - format: int32 - x-exportParamName: ErabGbrDl - x-optionalDataType: Int32 - Query.ErabGbrUl: - name: erab_gbr_ul - in: query - description: 'Guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401' - required: false - schema: - type: integer - format: int32 - x-exportParamName: ErabGbrUl - x-optionalDataType: Int32 - Query.TempUeId: - name: temp_ue_id - in: query - description: 'Comma separated list of temporary identifiers allocated for the specific UE as defined in ETSI TS 136 413' - required: false - schema: - type: array - items: + description: "Indicate the status of the UE handover procedure. Values are\ + \ defined as following:

    1 = IN_PREPARATION.

    2 = IN_EXECUTION.

    3\ + \ = COMPLETED.

    4 = REJECTED.

    5 = CANCELLED." + enum: + - 1 + - 2 + - 3 + - 4 + - 5 + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Enum + notificationType: type: string - x-exportParamName: TempUeId - Query.DlGbrPrbUsageCell: - name: dl_gbr_prb_usage_cell - in: query - description: 'PRB usage for downlink GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlGbrPrbUsageCell - Query.UlGbrPrbUsageCell: - name: ul_gbr_prb_usage_cell - in: query - description: 'PRB usage for uplink GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlGbrPrbUsageCell - Query.DlNonGbrPrbUsageCell: - name: dl_nongbr_prb_usage_cell - in: query - description: 'PRB usage for downlink non-GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlNonGbrPrbUsageCell - Query.UlNonGbrPrbUsageCell: - name: ul_nongbr_prb_usage_cell - in: query - description: 'PRB usage for uplink non-GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlNonGbrPrbUsageCell - Query.DlTotalPrbUsageCell: - name: dl_total_prb_usage_cell - in: query - description: 'PRB usage for total downlink traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlTotalPrbUsageCell - Query.UlTotalPrbUsageCell: - name: ul_total_prb_usage_cell - in: query - description: 'PRB usage for total uplink traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlTotalPrbUsageCell - Query.ReceivedDedicatedPreamblesCell: - name: received_dedicated_preambles_cell - in: query - description: 'Received dedicated preambles in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: ReceivedDedicatedPreamblesCell - Query.ReceivedRandomPreamblesLowRangeCell: - name: received_randomly_selected_preambles_low_range_cell - in: query - description: 'Received randomly selected preambles in the low range in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: ReceivedRandomPreamblesLowRangeCell - Query.ReceivedRandomPreamblesHighRangeCell: - name: received_randomly_selected_preambles_high_range_cell - in: query - description: 'Received rendomly selected preambles in the high range in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: ReceivedRandomPreamblesHighRangeCell - Query.NumberOfActiveUeDlGbrCell: - name: number_of_active_ue_dl_gbr_cell - in: query - description: 'Number of active UEs with downlink GBR traffic as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: NumberOfActiveUeDlGbrCell - Query.NumberOfActiveUeUlGbrCell: - name: number_of_active_ue_ul_gbr_cell - in: query - description: 'Number of active UEs with uplink GBR traffic as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: NumberOfActiveUeUlGbrCell - Query.NumberOfActiveUeDlNonGbrCell: - name: number_of_active_ue_dl_nongbr_cell - in: query - description: 'Number of active UEs with downlink non-GBR traffic as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: NumberOfActiveUeDlNonGbrCell - Query.NumberOfActiveUeUlNonGbrCell: - name: number_of_active_ue_ul_nongbr_cell - in: query - description: 'Number of active UEs with uplink non-GBR traffic as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: NumberOfActiveUeUlNonGbrCell - Query.DlGbrPdrCell: - name: dl_gbr_pdr_cell - in: query - description: 'Packet discard rate for downlink GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlGbrPdrCell - Query.UlGbrPdrCell: - name: ul_gbr_pdr_cell - in: query - description: 'Packet discard rate for uplink GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlGbrPdrCell - Query.DlNonGbrPdrCell: - name: dl_nongbr_pdr_cell - in: query - description: 'Packet discard rate for downlink non-GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlNonGbrPdrCell - Query.UlNonGbrPdrCell: - name: ul_nongbr_pdr_cell - in: query - description: 'Packet discard rate for uplink non-GBR traffic in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlNonGbrPdrCell - Query.DlGbrDelayUe: - name: dl_gbr_delay_ue - in: query - description: 'Packet delay of downlink GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlGbrDelayUe - Query.UlGbrDelayUe: - name: ul_gbr_delay_ue - in: query - description: 'Packet delay of uplink GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlGbrDelayUe - Query.DlNonGbrDelayUe: - name: dl_nongbr_delay_ue - in: query - description: 'Packet delay of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlNonGbrDelayUe - Query.UlNonGbrDelayUe: - name: ul_nongbr_delay_ue - in: query - description: 'Packet delay of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlNonGbrDelayUe - Query.DlGbrPdrUe: - name: dl_gbr_pdr_ue - in: query - description: 'Packet discard rate of downlink GBR traffic of a UE in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlGbrPdrUe - Query.UlGbrPdrUe: - name: ul_gbr_pdr_ue - in: query - description: 'Packet discard rate of uplink GBR traffic of a UE in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlGbrPdrUe - Query.DlNonGbrPdrUe: - name: dl_nongbr_pdr_ue - in: query - description: 'Packet discard rate of downlink non-GBR traffic of a UE in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlNonGbrPdrUe - Query.UlNonGbrPdrUe: - name: ul_nongbr_pdr_ue - in: query - description: 'Packet discard rate of uplink non-GBR traffic of a UE in percentage as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlNonGbrPdrUe - Query.DlGbrThroughputUe: - name: dl_gbr_throughput_ue - in: query - description: 'Scheduled throughput of downlink GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlGbrThroughputUe - Query.UlGbrThroughputUe: - name: ul_gbr_throughput_ue - in: query - description: 'Scheduled throughput of uplink GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlGbrThroughputUe - Query.DlNonGbrThroughputUe: - name: dl_nongbr_throughput_ue - in: query - description: 'Scheduled throughput of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlNonGbrThroughputUe - Query.UlNonGbrThroughputUe: - name: ul_nongbr_throughput_ue - in: query - description: 'Scheduled throughput of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlNonGbrThroughputUe - Query.DlGbrDataVolumeUe: - name: dl_gbr_data_volume_ue - in: query - description: 'Data volume of downlink GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlGbrDataVolumeUe - Query.UlGbrDataVolumeUe: - name: ul_gbr_data_volume_ue - in: query - description: 'Data volume of uplink GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlGbrDataVolumeUe - Query.DlNonGbrDataVolumeUe: - name: dl_nongbr_data_volume_ue - in: query - description: 'Data volume of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: DlNonGbrDataVolumeUe - Query.UlNonGbrDataVolumeUe: - name: ul_nongbr_data_volume_ue - in: query - description: 'Data volume of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314' - required: false - schema: - type: integer - x-exportParamName: UlNonGbrDataVolumeUe - Query.SubscriptionType: - name: subscription_type - in: query - description: 'Filter on a specific subscription type. Permitted values: cell_change, rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue, ca_reconf, s1_bearer.' - required: false - schema: - type: string - x-exportParamName: SubscriptionType - schemas: - AssociateId: - properties: - type: - description: 'Numeric value (0-255) corresponding to specified type of identifier as following:

    0 = reserved.

    1 = UE_IPv4_ADDRESS.

    2 = UE_IPV6_ADDRESS.

    3 = NATED_IP_ADDRESS.

    4 = GTP_TEID.' - enum: - - 0 - - 1 - - 2 - - 3 - - 4 - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Enum - value: - description: Value for the identifier. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - CaReconfNotification: - properties: - associateId: - description: 0 to N identifiers to associate the event for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - carrierAggregationMeasInfo: - description: This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. - items: - type: object - properties: - cellIdNei: - # description': E-UTRAN Cell Identity of the best neighbouring cell associated with the Carrier Aggregation serving cell. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': CellId - $ref: '#/components/schemas/CellId' - cellIdSrv: - # description': E-UTRAN Cell Identity of a Carrier Aggregation serving cell. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': CellId - $ref: '#/components/schemas/CellId' - rsrpNei: - description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint32 - rsrpSrv: - description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint32 - rsrqNei: - description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint32 - rsrqSrv: - description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint32 - minItems: 0 - required: - - cellIdSrv - - cellIdNei - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Structure (inlined) - ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi - $ref: '#/components/schemas/Ecgi' - notificationType: - description: Shall be set to "CaReConfNotification". - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - secondaryCellAdd: - description: '' - items: - type: object - properties: - ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi - $ref: '#/components/schemas/Ecgi' - minItems: 0 - required: - - ecgi - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Structure (inlined) - secondaryCellRemove: - description: '' - items: - type: object - properties: - ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi - $ref: '#/components/schemas/Ecgi' - minItems: 0 - required: - - ecgi - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Structure (inlined) - timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp - $ref: '#/components/schemas/TimeStamp' - _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: 1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - ecgi - - _links - type: object - x-etsi-ref: 6.4.8 - CaReconfSubscription: - title: CaReconfSubscription - description: > - This type represents a subscription to UE carrier aggregation reconfiguration notifications from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. - properties: - _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: URI - websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. - $ref: '#/components/schemas/WebsockNotifConfig' - requestTestNotification: - type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. - expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp - $ref: '#/components/schemas/TimeStamp' - filterCriteriaAssoc: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - associateId: - description: 0 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - subscriptionType: - description: Shall be set to "CaReconfSubscription". - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaAssoc - type: object - x-etsi-ref: 6.3.8 - CellChangeNotification: - properties: - associateId: - description: 0 to N identifiers to associate the event for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - hoStatus: - description: 'Indicate the status of the UE handover procedure. Values are defined as following: -

    1 = IN_PREPARATION. -

    2 = IN_EXECUTION. -

    3 = COMPLETED. -

    4 = REJECTED. -

    5 = CANCELLED.' - enum: - - 1 - - 2 - - 3 - - 4 - - 5 - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Enum - notificationType: description: Shall be set to "CellChangeNotification". - type: string - x-etsi-mec-cardinality: '1' + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String srcEcgi: - # description': E-UTRAN Cell Global Identifier of the source cell. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' tempUeId: - description: The temporary identifier allocated for the specific UE as defined below. - properties: - mmec: - description: MMEC as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - mtmsi: - description: M-TMSI as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - mmec - - mtmsi - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CellChangeNotification_tempUeId' timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' trgEcgi: - description: 'E-UTRAN Cell Global Identifier of the target cell. See note. - - NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION, REJECTED and CANCELLED.' - items: - $ref: '#/components/schemas/Ecgi' minItems: 1 type: array + description: "E-UTRAN Cell Global Identifier of the target cell. See note.\n\ + NOTE: Cardinality N is valid only in case of statuses IN_PREPARATION,\ + \ REJECTED and CANCELLED." + items: + $ref: '#/components/schemas/Ecgi' x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Ecgi _links: - description: Links to resources related to this notification. - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - required: - - notificationType - - srcEcgi - - trgEcgi - - hoStatus - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.2 CellChangeSubscription: title: CellChangeSubscription - description: > - This type represents a subscription to cell change notifications from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + required: + - callbackReference + - filterCriteriaAssocHo + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri type: string + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." filterCriteriaAssocHo: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - associateId: - description: 0 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - hoStatus: - description: 'In case hoStatus is not included in the subscription request, the default value 3 = COMPLETED shall be used and included in the response: -

    1 = IN_PREPARATION. -

    2 = IN_EXECUTION. -

    3 = COMPLETED. -

    4 = REJECTED. -

    5 = CANCELLED.' - items: - $ref: '#/components/schemas/Enum' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Enum - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CellChangeSubscription_filterCriteriaAssocHo' subscriptionType: - description: Shall be set to "CellChangeSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "CellChangeSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaAssocHo - type: object + description: "This type represents a subscription to cell change notifications\ + \ from Radio Network Information Service.\nNOTE: At least one of callbackReference\ + \ and websockNotifConfig shall be provided by the service consumer.\n \ + \ If both are provided, it is up to RNIS to choose an alternative and return\ + \ only that alternative in the response,\n specified in ETSI GS MEC 009\ + \ [6], as described in clause 6.12a.\n" x-etsi-ref: 6.3.2 CellId: - description: String representing the E-UTRAN Cell Identity. Encoded as a bit string (size (28)) as defined in ETSI TS 136 413 [i.3]. type: string + description: "String representing the E-UTRAN Cell Identity. Encoded as a bit\ + \ string (size (28)) as defined in ETSI TS 136 413 [i.3]." Ecgi: + required: + - cellId + - plmn + type: object properties: cellId: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': CellId $ref: '#/components/schemas/CellId' plmn: - # description': Public Land Mobile Network Identity. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Plmn $ref: '#/components/schemas/Plmn' - required: - - plmn - - cellId - type: object + example: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId x-etsi-ref: 6.5.6 Enum: type: integer ExpiryNotification: + required: + - _links + - expiryDeadline + - notificationType + type: object properties: _links: - description: List of hyperlinks related to the resource. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: 1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/ExpiryNotification__links' expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' timeStamp: - # description': Shall be set to "ExpiryNotification" - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' notificationType: - description: Shall be set to "ExpiryNotification" type: string - x-etsi-mec-cardinality': '1' + description: Shall be set to "ExpiryNotification" + x-etsi-mec-cardinality': "1" x-etsi-mec-origin-type': String - required: - - _links - - expiryDeadline - - notificationType - type: object x-etsi-ref: 6.4.9 L2Meas: + type: object properties: cellInfo: - description: The per cell measurement information as defined below. - items: - type: object - properties: - dl_gbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the downlink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - dl_gbr_prb_usage_cell: - description: It indicates the PRB usage for downlink GBR traffic, as defined in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - dl_nongbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the downlink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - dl_nongbr_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for downlink non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423 [i.12]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - dl_total_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for total downlink traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423 [i.12]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ecgi: - $ref: '#/components/schemas/Ecgi' - number_of_active_ue_dl_gbr_cell: - description: It indicates the number of active UEs with downlink GBR traffic, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - number_of_active_ue_dl_nongbr_cell: - description: "It indicates the number of active UEs with downlink non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - number_of_active_ue_ul_gbr_cell: - description: It indicates the number of active UEs with uplink GBR traffic, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - number_of_active_ue_ul_nongbr_cell: - description: "It indicates the number of active UEs with uplink non-GBR traffic, as defined in ETSI TS\_136\_314\_[i.11]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - received_dedicated_preambles_cell: - description: It indicates (in percentage) the received dedicated preamples, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - received_randomly_selected_preambles_high_range_cell: - description: It indicates (in percentage) the received randomly selected preambles in the high range, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - received_randomly_selected_preambles_low_range_cell: - description: It indicates (in percentage) the received randomly selected preambles in the low range, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_gbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the uplink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_gbr_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for uplink GBR traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136 423 [i.12]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_nongbr_pdr_cell: - description: It indicates the packet discard rate in percentage of the uplink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_nongbr_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for uplink non-GBR traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423 [i.12]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_total_prb_usage_cell: - description: "It indicates (in percentage) the PRB usage for total uplink traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136\_423 [i.12]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) minItems: 0 required: - ecgi type: array + description: The per cell measurement information as defined below. + items: + $ref: '#/components/schemas/L2Meas_cellInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) cellUEInfo: - description: The per cell per UE layer 2 measurements information as defined below. - items: - type: object - properties: - associateId: - $ref: '#/components/schemas/AssociateId' - dl_gbr_data_volume_ue: - description: It indicates the data volume of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - dl_gbr_delay_ue: - description: It indicates the packet delay of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - dl_gbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - dl_gbr_throughput_ue: - description: It indicates the scheduled throughput of the downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - dl_nongbr_data_volume_ue: - description: "It indicates the data volume of the downlink non-GBR traffic of a UE, as defined in ETSI TS\_136\_314\_[i.11]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - dl_nongbr_delay_ue: - description: "It indicates the packet delay of the downlink non-GBR traffic of a UE, as defined in ETSI TS\_136\_314\_[i.11]." - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - dl_nongbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - dl_nongbr_throughput_ue: - description: It indicates the scheduled throughput of the downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - ecgi: - $ref: '#/components/schemas/Ecgi' - ul_gbr_data_volume_ue: - description: It indicates the data volume of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - ul_gbr_delay_ue: - description: It indicates the packet delay of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - ul_gbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_gbr_throughput_ue: - description: It indicates the scheduled throughput of the uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - ul_nongbr_data_volume_ue: - description: It indicates the data volume of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - ul_nongbr_delay_ue: - description: It indicates the packet delay of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer - ul_nongbr_pdr_ue: - description: It indicates the packet discard rate in percentage of the uplink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer (0..100) - ul_nongbr_throughput_ue: - description: It indicates the scheduled throughput of the uplink non-GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]. - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Integer minItems: 0 required: - - ecgi - associateId + - ecgi type: array + description: The per cell per UE layer 2 measurements information as defined + below. + items: + $ref: '#/components/schemas/L2Meas_cellUEInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: $ref: '#/components/schemas/TimeStamp' - type: object + example: + timeStamp: + seconds: 3 + nanoSeconds: 9 + cellUEInfo: + - dl_gbr_delay_ue: 4 + ul_nongbr_data_volume_ue: 2 + dl_nongbr_delay_ue: 6 + ul_gbr_delay_ue: 3 + ul_gbr_throughput_ue: 1 + ul_nongbr_delay_ue: 6 + dl_nongbr_throughput_ue: 9 + ul_gbr_data_volume_ue: 6 + dl_nongbr_data_volume_ue: 9 + ecgi: null + dl_gbr_data_volume_ue: 1 + associateId: + type: 0 + value: value + dl_gbr_throughput_ue: 9 + dl_nongbr_pdr_ue: 8 + ul_nongbr_throughput_ue: 5 + ul_nongbr_pdr_ue: 6 + dl_gbr_pdr_ue: 5 + ul_gbr_pdr_ue: 6 + - dl_gbr_delay_ue: 4 + ul_nongbr_data_volume_ue: 2 + dl_nongbr_delay_ue: 6 + ul_gbr_delay_ue: 3 + ul_gbr_throughput_ue: 1 + ul_nongbr_delay_ue: 6 + dl_nongbr_throughput_ue: 9 + ul_gbr_data_volume_ue: 6 + dl_nongbr_data_volume_ue: 9 + ecgi: null + dl_gbr_data_volume_ue: 1 + associateId: + type: 0 + value: value + dl_gbr_throughput_ue: 9 + dl_nongbr_pdr_ue: 8 + ul_nongbr_throughput_ue: 5 + ul_nongbr_pdr_ue: 6 + dl_gbr_pdr_ue: 5 + ul_gbr_pdr_ue: 6 + cellInfo: + - number_of_active_ue_dl_nongbr_cell: 7 + ul_total_prb_usage_cell: 7 + received_dedicated_preambles_cell: 2 + dl_total_prb_usage_cell: 5 + ul_gbr_prb_usage_cell: 1 + dl_gbr_pdr_cell: 0 + number_of_active_ue_ul_gbr_cell: 9 + ul_nongbr_pdr_cell: 1 + dl_nongbr_pdr_cell: 1 + number_of_active_ue_dl_gbr_cell: 2 + ecgi: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId + ul_gbr_pdr_cell: 1 + ul_nongbr_prb_usage_cell: 6 + received_randomly_selected_preambles_low_range_cell: 7 + number_of_active_ue_ul_nongbr_cell: 3 + received_randomly_selected_preambles_high_range_cell: 4 + dl_nongbr_prb_usage_cell: 5 + dl_gbr_prb_usage_cell: 6 + - number_of_active_ue_dl_nongbr_cell: 7 + ul_total_prb_usage_cell: 7 + received_dedicated_preambles_cell: 2 + dl_total_prb_usage_cell: 5 + ul_gbr_prb_usage_cell: 1 + dl_gbr_pdr_cell: 0 + number_of_active_ue_ul_gbr_cell: 9 + ul_nongbr_pdr_cell: 1 + dl_nongbr_pdr_cell: 1 + number_of_active_ue_dl_gbr_cell: 2 + ecgi: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId + ul_gbr_pdr_cell: 1 + ul_nongbr_prb_usage_cell: 6 + received_randomly_selected_preambles_low_range_cell: 7 + number_of_active_ue_ul_nongbr_cell: 3 + received_randomly_selected_preambles_high_range_cell: 4 + dl_nongbr_prb_usage_cell: 5 + dl_gbr_prb_usage_cell: 6 x-etsi-ref: 6.2.4a LinkType: + required: + - href + type: object properties: href: + type: string description: URI referring to a resource format: uri - type: string - x-etsi-mec-cardinality: '1' + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uri - required: - - href - type: object + example: + href: http://example.com/aeiou x-etsi-ref: 6.5.2 MeasQuantityResultsNr: + type: object properties: rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_138 331 [i.13]." - format: int32 type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_138\ + \ 331 [i.13]." + format: int32 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - description: Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13]. - format: int32 type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 138\ + \ 331 [i.13]." + format: int32 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinr: - description: Reference Signal to Interference & Noise Ratio as defined in ETSI TS 138 331 [i.13]. - format: int32 type: integer + description: "Reference Signal to Interference & Noise Ratio as defined\ + \ in ETSI TS 138 331 [i.13]." + format: int32 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 - type: object x-etsi-ref: 6.5.11 MeasRepUeNotification: + required: + - _links + - ecgi + - notificationType + - rsrp + - rsrq + - trigger + type: object properties: associateId: - description: 0 to N identifiers to associate the event for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' minItems: 0 type: array + description: 0 to N identifiers to associate the event for a specific UE + or flow. + items: + $ref: '#/components/schemas/AssociateId' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId carrierAggregationMeasInfo: - description: This parameter can be repeated to contain information of all the carriers assign for Carrier Aggregation up to M. - items: - type: object - properties: - cellIdNei: - # description': E-UTRAN Cell Identity of the best neighbouring cell (NCell) associated with the SCell, as defined in ETSI TS 136 331 [i.7]. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': CellId - $ref: '#/components/schemas/CellId' - cellIdSrv: - # description': E-UTRAN Cell Identity of a Secondary serving Cell (SCell), as defined in ETSI TS 136 331 [i.7]. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': CellId - $ref: '#/components/schemas/CellId' - rsrpNei: - description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrpNeiEx: - description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrpSrv: - description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrpSrvEx: - description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrqNei: - description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrqNeiEx: - description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrqSrv: - description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrqSrvEx: - description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - sinrNei: - description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - sinrSrv: - description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 minItems: 0 required: - cellIdSrv type: array + description: This parameter can be repeated to contain information of all + the carriers assign for Carrier Aggregation up to M. + items: + $ref: '#/components/schemas/MeasRepUeNotification_carrierAggregationMeasInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) ecgi: - # description': E-UTRAN Cell Global Identifier of the Primary serving Cell (PCell), as defined in ETSI TS 136 331 [i.7]. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' eutranNeighbourCellMeasInfo: - description: This parameter can be repeated to contain information of all the neighbouring cells up to N. - items: - type: object - properties: - ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi - $ref: '#/components/schemas/Ecgi' - rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrpEx: - description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrq: - description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrqEx: - description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - sinr: - description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 minItems: 0 required: - ecgi type: array + description: This parameter can be repeated to contain information of all + the neighbouring cells up to N. + items: + $ref: '#/components/schemas/MeasRepUeNotification_eutranNeighbourCellMeasInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) heightUe: - description: Indicates height of the UE in meters relative to the sea level as defined in ETSI TS 136.331 [i.7]. type: integer + description: "Indicates height of the UE in meters relative to the sea level\ + \ as defined in ETSI TS 136.331 [i.7]." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Int newRadioMeasInfo: - description: 5G New Radio secondary serving cells measurement information. - items: - type: object - properties: - nrBNCs: - description: Measurement quantities concerning the best neighbours of the secondary serving cells - properties: - nrBNCellInfo: - description: Best neighbours of the secondary serving cell(s) info - items: - type: object - properties: - nrBNCellGId: - # description': Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': NrCellId - $ref: '#/components/schemas/NrCellId' - nrBNCellPlmn: - description: Public land mobile network identities - items: - $ref: '#/components/schemas/Plmn' - minItems: 1 - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Plmn - minItems: 1 - required: - - nrBNCellPlmn - - nrBNCellGId - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Structure (inlined) - nrBNCellRsrp: - description: Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - nrBNCellRsrq: - description: Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - nrBNCellRssi: - description: Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - required: - - nrBNCellInfo - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - nrCarrierFreq: - description: "ARFCN applicable for a downlink, uplink or bi-directional (TDD) NR carrier frequency, as defined in ETSI TS\_138.101 [i.15]." - format: int32 - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Uint32 - nrSCs: - description: Measurement quantities concerning the secondary serving cells. - properties: - nrSCellInfo: - description: Secondary serving cell(s) info. - items: - type: object - properties: - nrSCellGId: - # description': Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': NrCellId - $ref: '#/components/schemas/NrCellId' - nrSCellPlmn: - description: Public land mobile network identities. - items: - $ref: '#/components/schemas/Plmn' - minItems: 1 - type: array - x-etsi-mec-cardinality: 1..P - x-etsi-mec-origin-type: Plmn - minItems: 1 - required: - - nrSCellPlmn - - nrSCellGId - type: array - x-etsi-mec-cardinality: 1..P - x-etsi-mec-origin-type: Structure (inlined) - nrSCellRsrp: - description: Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - nrSCellRsrq: - description: Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - nrSCellRssi: - description: Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - required: - - nrSCellInfo - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) minItems: 0 required: - nrCarrierFreq - nrSCs type: array + description: 5G New Radio secondary serving cells measurement information. + items: + $ref: '#/components/schemas/MeasRepUeNotification_newRadioMeasInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) newRadioMeasNeiInfo: - description: Measurement quantities concerning the 5G NR neighbours. - items: - type: object - properties: - nrNCellInfo: - description: 5G NR neighbour cell info. - items: - type: object - properties: - nrNCellGId: - # description': Cell Global Identifier, as defined in ETSI TS 138 331 [i.13]. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': NrCellId - $ref: '#/components/schemas/NrCellId' - nrNCellPlmn: - description: Public land mobile network identities. - items: - $ref: '#/components/schemas/Plmn' - minItems: 1 - type: array - x-etsi-mec-cardinality: 1..P - x-etsi-mec-origin-type: Plmn - minItems: 1 - required: - - nrNCellPlmn - - nrNCellGId - type: array - x-etsi-mec-cardinality: 1..P - x-etsi-mec-origin-type: Structure (inlined) - nrNCellRsrp: - description: Reference Signal Received Power measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - nrNCellRsrq: - description: Reference Signal Received Quality measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - nrNCellRssi: - description: Reference signal SINR measurement according to mapping table in ETSI TS 138.133 [i.14]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsIndexResults: - # description': Beam level measurements results of a NR cell. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': RsIndexResults - $ref: '#/components/schemas/RsIndexResults' minItems: 0 required: - nrNCellInfo type: array + description: Measurement quantities concerning the 5G NR neighbours. + items: + $ref: '#/components/schemas/MeasRepUeNotification_newRadioMeasNeiInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) notificationType: - description: Shall be set to "MeasRepUeNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "MeasRepUeNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_136 214 [i.5]." - format: int32 type: integer - x-etsi-mec-cardinality: '1' + description: "Reference Signal Received Power as defined in ETSI TS\_136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint8 rsrpEx: - description: Extended Reference Signal Received Power, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 type: integer + description: "Extended Reference Signal Received Power, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: - description: Reference Signal Received Quality as defined in ETSI TS 136 214 [i.5]. - format: int32 type: integer - x-etsi-mec-cardinality: '1' + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint8 rsrqEx: - description: Extended Reference Signal Received Quality, with value mapping defined in ETSI TS 136 133 [i.16]. - format: int32 type: integer + description: "Extended Reference Signal Received Quality, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 sinr: - description: "Reference Signal \"Signal to Interference plus Noise Ratio\", with value mapping defined in ETSI TS\_136\_133\_[i.16]." - format: int32 type: integer + description: "Reference Signal \"Signal to Interference plus Noise Ratio\"\ + , with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' trigger: - # description': Corresponds to a specific E-UTRAN UE Measurement Report trigger. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Trigger $ref: '#/components/schemas/Trigger' _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - ecgi - - rsrp - - rsrq - - trigger - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.6 MeasRepUeSubscription: title: MeasRepUeSubscription - description: > - This type represents a subscription to UE measurement report notifications from Radio Network Information Service for UEs served by E-UTRA Cells. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to RNIS to select the method to be used for notifications and to return only that method in the response. + required: + - callbackReference + - filterCriteriaAssocTri + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. - format: uri type: string + description: "URI selected by the service consumer to receive notifications\ + \ on the subscribed RNIS information. This shall be included both in the\ + \ request and in response. If not present, the service consumer is requesting\ + \ the use of a Websocket for notifications. See note." + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications, either in place of the callbackReference URI or if it is not reachable via the test notification. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications. + description: Set to TRUE by the service consumer to request a test notification + on the callbackReference URI to determine if it is reachable by RNIS for + notifications. expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteriaAssocTri: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - associateId: - description: 0 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - trigger: - description: Corresponds to a specific E-UTRAN UE Measurement Report trigger. - items: - $ref: '#/components/schemas/Trigger' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Trigger - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/MeasRepUeSubscription_filterCriteriaAssocTri' subscriptionType: - description: Shall be set to "MeasRepUeSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "MeasRepUeSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaAssocTri - type: object + description: "This type represents a subscription to UE measurement report notifications\ + \ from Radio Network Information Service for UEs served by E-UTRA Cells.\n\ + NOTE: At least one of callbackReference and websockNotifConfig shall be provided\ + \ by the service consumer. If both are provided, it is up to RNIS to select\ + \ the method to be used for notifications and to return only that method in\ + \ the response.\n" x-etsi-ref: 6.3.6 MeasTaNotification: + required: + - _links + - ecgi + - notificationType + - timingAdvance + type: object properties: associateId: - description: 0 to N identifiers to associate the event for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' minItems: 0 type: array + description: 0 to N identifiers to associate the event for a specific UE + or flow. + items: + $ref: '#/components/schemas/AssociateId' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' notificationType: - description: Shall be set to "MeasTaNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "MeasTaNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' timingAdvance: - description: The timing advance as defined in ETSI TS 136 214 [i.5]. - format: int32 type: integer - x-etsi-mec-cardinality: '1' + description: "The timing advance as defined in ETSI TS 136 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - ecgi - - timingAdvance - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.7 MeasTaSubscription: title: MeasTaSubscription - description: > - This type represents a subscription to UE timing advance notifications from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + required: + - callbackReference + - filterCriteriaAssoc + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri type: string + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteriaAssoc: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - associateId: - description: 0 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription_filterCriteriaAssoc' subscriptionType: - description: Shall be set to "MeasTaSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "MeasTaSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaAssoc - type: object + description: "This type represents a subscription to UE timing advance notifications\ + \ from Radio Network Information Service.\nNOTE: At least one of callbackReference\ + \ and websockNotifConfig shall be provided by the service consumer.\n \ + \ If both are provided, it is up to RNIS to choose an alternative and return\ + \ only that alternative in the response,\n specified in ETSI GS MEC 009\ + \ [6], as described in clause 6.12a.\n" x-etsi-ref: 6.3.7 Nrcgi: + required: + - nrcellId + - plmn + type: object properties: nrcellId: - # description': NR Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': NrCellId $ref: '#/components/schemas/NrCellId' plmn: - # description': Public Land Mobile Network Identity. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Plmn $ref: '#/components/schemas/Plmn' - required: - - plmn - - nrcellId - type: object x-etsi-ref: 6.5.7 NrCellId: - description: String representing the NR Cell Identity. Encoded as a bit string (size (36)) as defined in ETSI TS 138 423 [i.17]. type: string + description: "String representing the NR Cell Identity. Encoded as a bit string\ + \ (size (36)) as defined in ETSI TS 138 423 [i.17]." NrMeasRepUeNotification: + required: + - _links + - notificationType + - triggerNr + type: object properties: associateId: - description: 0 to N identifiers to associate the event for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' minItems: 0 type: array + description: 0 to N identifiers to associate the event for a specific UE + or flow. + items: + $ref: '#/components/schemas/AssociateId' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId eutraNeighCellMeasInfo: - description: This parameter can be repeated to contain measurement information of all the neighbouring cells up to N. It shall not be included if nrNeighCellMeasInfo is included. - items: - type: object - properties: - ecgi: - # description': Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi - $ref: '#/components/schemas/Ecgi' - rsrp: - description: "Reference Signal Received Power as defined in ETSI TS\_138 331 [i.13]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - rsrq: - description: Reference Signal Received Quality as defined in ETSI TS 138 331 [i.13]. - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 - sinr: - description: "Reference Signal plus Interference Noise Ratio as defined in ETSI TS\_138\_331\_[i.13]." - format: int32 - type: integer - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uint8 minItems: 0 required: - ecgi type: array + description: This parameter can be repeated to contain measurement information + of all the neighbouring cells up to N. It shall not be included if nrNeighCellMeasInfo + is included. + items: + $ref: '#/components/schemas/NrMeasRepUeNotification_eutraNeighCellMeasInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) notificationType: - description: Shall be set to "NrMeasRepUeNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "NrMeasRepUeNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String nrNeighCellMeasInfo: - description: This parameter can be repeated to contain measurement information of all the neighbouring cells up to N. It shall not be included if eutraNeighCellMeasInfo is included. - items: - type: object - properties: - measQuantityResultsCsiRsCell: - # description': Measurement quantity results relating to the Channel State Information Reference Signal of the neighbouring cells. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' - measQuantityResultsSsbCell: - # description': Measurement quantity results relating to the Synchronization Signal Block of the neighbouring cells. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' - nrcgi: - # description': Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': NrCellId - $ref: '#/components/schemas/Nrcgi' - rsIndexResults: - # description': Beam level measurement information. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': RsIndexResults - $ref: '#/components/schemas/RsIndexResults' minItems: 0 required: - nrcgi type: array + description: This parameter can be repeated to contain measurement information + of all the neighbouring cells up to N. It shall not be included if eutraNeighCellMeasInfo + is included. + items: + $ref: '#/components/schemas/NrMeasRepUeNotification_nrNeighCellMeasInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) servCellMeasInfo: - description: This parameter can be repeated to contain information of all the serving cells up to N. - items: - type: object - properties: - nCell: - description: Measurement information relating to the best neighbour of this serving cell. - properties: - measQuantityResultsCsiRsCell: - # description': Measurement quantity results relating to the Channel State Information Reference Signal. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' - measQuantityResultsSsbCell: - # description': Measurement quantity results relating to the Synchronization Signal Block. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' - rsIndexResults: - # description': Beam level measurement information - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': RsIndexResults - $ref: '#/components/schemas/RsIndexResults' - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - nrcgi: - # description': NR Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Nrcgi - $ref: '#/components/schemas/Nrcgi' - sCell: - description: Measurement information relating to this serving cell. - properties: - measQuantityResultsCsiRsCell: - # description': Measurement quantity results relating to the Channel State Information Reference Signal. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' - measQuantityResultsSsbCell: - # description': Measurement quantity results relating to the Synchronization Signal Block. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' - rsIndexResults: - # description': Beam level measurement information - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': RsIndexResults - $ref: '#/components/schemas/RsIndexResults' - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) minItems: 0 required: - nrcgi - sCell type: array + description: This parameter can be repeated to contain information of all + the serving cells up to N. + items: + $ref: '#/components/schemas/NrMeasRepUeNotification_servCellMeasInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' triggerNr: - # description': Corresponds to a specific 5G UE Measurement Report trigger. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': TriggerNr $ref: '#/components/schemas/TriggerNr' _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: 1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - triggerNr - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.11 NrMeasRepUeSubscription: title: NrMeasRepUeSubscription - description: > - This type represents a subscription to 5G UE measurement report notifications from Radio Network Information Service for UEs served by NR Cells. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + required: + - callbackReference + - filterCriteriaNrMrs + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self-referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri type: string + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteriaNrMrs: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - associateId: - description: 0 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - nrcgi: - description: NR Cell Global Identier. - items: - $ref: '#/components/schemas/Nrcgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Nrcgi - triggerNr: - description: Corresponds to a specific 5G UE Measurement Report trigger. - items: - $ref: '#/components/schemas/TriggerNr' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: TriggerNr - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/NrMeasRepUeSubscription_filterCriteriaNrMrs' subscriptionType: - description: Shall be set to "NrMeasRepUeSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "NrMeasRepUeSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaNrMrs - type: object + description: "This type represents a subscription to 5G UE measurement report\ + \ notifications from Radio Network Information Service for UEs served by NR\ + \ Cells.\nNOTE: At least one of callbackReference and websockNotifConfig shall\ + \ be provided by the service consumer.\n If both are provided, it is\ + \ up to RNIS to choose an alternative and return only that alternative in\ + \ the response,\n specified in ETSI GS MEC 009 [6], as described in clause\ + \ 6.12a.\n" x-etsi-ref: 6.3.11 Plmn: + required: + - mcc + - mnc + type: object properties: mcc: - description: The Mobile Country Code part of PLMN Identity as defined in ETSI TS 136 413 [i.3]. type: string - x-etsi-mec-cardinality: '1' + description: "The Mobile Country Code part of PLMN Identity as defined in\ + \ ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String mnc: - description: The Mobile Network Code part of PLMN Identity as defined in ETSI TS 136 413 [i.3]. type: string - x-etsi-mec-cardinality: '1' + description: "The Mobile Network Code part of PLMN Identity as defined in\ + \ ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - mcc - - mnc - type: object + example: + mnc: mnc + mcc: mcc x-etsi-ref: 6.5.5 PlmnInfo: + required: + - appInstanceId + - plmn + type: object properties: appInstanceId: - description: Unique identifier for the MEC application instance. type: string - x-etsi-mec-cardinality: '1' + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String plmn: + minItems: 1 + type: array description: Public Land Mobile Network Identity. items: $ref: '#/components/schemas/Plmn' - minItems: 1 - type: array x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Plmn timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - required: - - appInstanceId - - plmn - type: object + example: + appInstanceId: appInstanceId + timeStamp: + seconds: 3 + nanoSeconds: 9 + plmn: + - mnc: mnc + mcc: mcc + - mnc: mnc + mcc: mcc x-etsi-ref: 6.2.2 ProblemDetails: + required: + - detail + - status + type: object properties: detail: - description: A human-readable explanation specific to this occurrence of the problem type: string + description: A human-readable explanation specific to this occurrence of + the problem x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String instance: - description: A URI reference that identifies the specific occurrence of the problem - format: uri type: string + description: A URI reference that identifies the specific occurrence of + the problem + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI status: + type: integer description: The HTTP status code for this occurrence of the problem format: int32 - type: integer x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint32 title: - description: A short, human-readable summary of the problem type type: string + description: "A short, human-readable summary of the problem type" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String type: - description: A URI reference according to IETF RFC 3986 that identifies the problem type - format: uri type: string + description: A URI reference according to IETF RFC 3986 that identifies + the problem type + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI + RabEstNotification: required: - - status - - detail + - _links + - ecgi + - erabId + - notificationType type: object - RabEstNotification: properties: associateId: - description: '0 to N identifiers to bind the event for a specific UE or flow. ' - items: - $ref: '#/components/schemas/AssociateId' minItems: 0 type: array + description: '0 to N identifiers to bind the event for a specific UE or + flow. ' + items: + $ref: '#/components/schemas/AssociateId' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' erabId: - description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer - x-etsi-mec-cardinality: '1' + description: "The attribute that uniquely identifies a Radio Access bearer\ + \ for specific UE as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Integer erabQosParameters: - description: QoS parameters for the E-RAB as defined below. - properties: - qci: - description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - qosInformation: - description: The QoS information for the E-RAB. - properties: - erabGbrDl: - description: This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabGbrUl: - description: This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabMbrDl: - description: This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabMbrUl: - description: This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - erabMbrDl - - erabMbrUl - - erabGbrDl - - erabGbrUl - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - qci - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabEstNotification_erabQosParameters' notificationType: - description: Shall be set to "RabEstNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "RabEstNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String tempUeId: - description: 'The temporary identifier allocated for the specific UE as defined below. ' - properties: - mmec: - description: MMEC as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - mtmsi: - description: M-TMSI as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - mmec - - mtmsi - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabEstNotification_tempUeId' _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfNotification__links' timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - required: - - notificationType - - ecgi - - erabId - - _links - type: object x-etsi-ref: 6.4.3 RabEstSubscription: title: RabEstSubscription - description: > - This type represents a subscription to RAB establishment notifications from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + required: + - callbackReference + - filterCriteriaQci + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri type: string + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." filterCriteriaQci: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - qci: - description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - qci - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabEstSubscription_filterCriteriaQci' subscriptionType: - description: Shall be set to "RabEstSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "RabEstSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaQci - type: object + description: "This type represents a subscription to RAB establishment notifications\ + \ from Radio Network Information Service.\nNOTE: At least one of callbackReference\ + \ and websockNotifConfig shall be provided by the service consumer.\n \ + \ If both are provided, it is up to RNIS to choose an alternative and return\ + \ only that alternative in the response,\n specified in ETSI GS MEC 009\ + \ [6], as described in clause 6.12a.\n" x-etsi-ref: 6.3.3 RabInfo: + required: + - appInstanceId + - requestId + type: object properties: appInstanceId: - description: Unique identifier for the MEC application instance. type: string - x-etsi-mec-cardinality: '1' + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String cellUserInfo: - description: The information on users per cell as defined below. - items: - type: object - properties: - ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi - $ref: '#/components/schemas/Ecgi' - ueInfo: - description: Information on UEs in the specific cell as defined below. - items: - type: object - properties: - associateId: - description: 0 to N identifiers to associate the event for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - erabInfo: - description: Information on E-RAB as defined below. - items: - type: object - properties: - erabId: - description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabQosParameters: - description: QoS parameters for the E-RAB as defined below. - properties: - qci: - description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - qosInformation: - description: The QoS information for the E-RAB. - properties: - erabGbrDl: - description: This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabGbrUl: - description: This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabMbrDl: - description: This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabMbrUl: - description: This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - erabMbrDl - - erabMbrUl - - erabGbrDl - - erabGbrUl - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - qci - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - minItems: 1 - required: - - erabId - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Structure (inlined) - minItems: 1 - required: - - erabInfo - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Structure (inlined) minItems: 0 required: - ecgi - ueInfo type: array + description: The information on users per cell as defined below. + items: + $ref: '#/components/schemas/RabInfo_cellUserInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inlined) requestId: - description: Unique identifier allocated by the service consumer for the RAB Information request. type: string - x-etsi-mec-cardinality: '1' + description: Unique identifier allocated by the service consumer for the + RAB Information request. + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' - required: - - appInstanceId - - requestId - type: object + example: + appInstanceId: appInstanceId + cellUserInfo: + - ueInfo: + - associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + ecgi: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId + - ueInfo: + - associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + ecgi: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId + timeStamp: + seconds: 3 + nanoSeconds: 9 + requestId: requestId x-etsi-ref: 6.2.3 RabModNotification: - properties: - associateId: - description: '0 to N identifiers to bind the event for a specific UE or flow. ' - items: - $ref: '#/components/schemas/AssociateId' + required: + - _links + - ecgi + - erabId + - notificationType + type: object + properties: + associateId: minItems: 0 type: array + description: '0 to N identifiers to bind the event for a specific UE or + flow. ' + items: + $ref: '#/components/schemas/AssociateId' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' erabId: - description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. type: integer - x-etsi-mec-cardinality: '1' + description: "The attribute that uniquely identifies a Radio Access bearer\ + \ for specific UE as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Integer erabQosParameters: - description: The QoS parameters for the E-RAB as defined below. - properties: - qci: - description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - qosInformation: - description: The QoS Information for the E-RAB as defined below. - properties: - erabGbrDl: - description: This attribute indicates the guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabGbrUl: - description: This attribute indicates the guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabMbrDl: - description: This attribute indicates the maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - erabMbrUl: - description: This attribute indicates the maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 [i.4] for this bearer. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - erabMbrDl - - erabMbrUl - - erabGbrDl - - erabGbrUl - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - qci - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabModNotification_erabQosParameters' notificationType: - description: Shall be set to "RabModNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "RabModNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - ecgi - - erabId - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.4 RabModSubscription: title: RabModSubscription - description: > - This type represents a subscription to RAB modification notifications from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + required: + - callbackReference + - filterCriteriaQci + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri type: string + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteriaQci: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - erabId: - description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - qci: - description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - erabId - - qci - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabModSubscription_filterCriteriaQci' subscriptionType: - description: Shall be set to "RabModSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "RabModSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaQci - type: object + description: "This type represents a subscription to RAB modification notifications\ + \ from Radio Network Information Service.\nNOTE: At least one of callbackReference\ + \ and websockNotifConfig shall be provided by the service consumer.\n \ + \ If both are provided, it is up to RNIS to choose an alternative and return\ + \ only that alternative in the response,\n specified in ETSI GS MEC 009\ + \ [6], as described in clause 6.12a.\n" x-etsi-ref: 6.3.4 RabRelNotification: + required: + - _links + - ecgi + - erabReleaseInfo + - notificationType + type: object properties: associateId: - description: 0 to N identifiers to bind the event for a specific UE or flow as defined below. - items: - $ref: '#/components/schemas/AssociateId' minItems: 0 type: array + description: 0 to N identifiers to bind the event for a specific UE or flow + as defined below. + items: + $ref: '#/components/schemas/AssociateId' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: AssociateId ecgi: - # description': E-UTRAN Cell Global Identifier. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': Ecgi $ref: '#/components/schemas/Ecgi' erabReleaseInfo: - description: The release information for the E-RAB as defined below. - properties: - erabId: - description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - erabId - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabRelNotification_erabReleaseInfo' notificationType: - description: Shall be set to "RabRelNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "RabRelNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - ecgi - - erabReleaseInfo - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.5 RabRelSubscription: title: RabRelSubscription - description: > - This type represents a subscription to RAB release notifications from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to select the method to be used for notifications and to return only that method in the response. + required: + - callbackReference + - filterCriteriaQci + - subscriptionType + type: object properties: _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. - format: uri type: string + description: "URI selected by the service consumer to receive notifications\ + \ on the subscribed RNIS information. This shall be included both in the\ + \ request and in response. If not present, the service consumer is requesting\ + \ the use of a Websocket for notifications. See note." + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' filterCriteriaQci: - description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. - properties: - appInstanceId: - description: Unique identifier for the MEC application instance. - type: string - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: String - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - erabId: - description: The attribute that uniquely identifies a Radio Access bearer for specific UE as defined in ETSI TS 136 413 [i.3]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - qci: - description: QoS Class Identifier as defined in ETSI TS 123 401 [i.4]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - required: - - erabId - - qci - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/RabModSubscription_filterCriteriaQci' subscriptionType: - description: Shall be set to "RabRelSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "RabRelSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - filterCriteriaQci - type: object + description: "This type represents a subscription to RAB release notifications\ + \ from Radio Network Information Service.\nNOTE: At least one of callbackReference\ + \ and websockNotifConfig shall be provided by the service consumer.\n \ + \ If both are provided, it is up to RNIS to select the method to be used\ + \ for notifications and to return only that method in the response.\n" x-etsi-ref: 6.3.5 ResultsPerCsiRsIndex: - description: '' + required: + - csiRsIndex + type: object properties: csiRsIndex: - description: '' type: integer - x-etsi-mec-cardinality: '1' + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint8 csiRsResults: $ref: '#/components/schemas/MeasQuantityResultsNr' - required: - - csiRsIndex - type: object ResultsPerCsiRsIndexList: + type: object properties: resultsPerCsiRsIndex: - description: '' - items: - type: object - properties: - csiRsIndex: - description: '' - format: int32 - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Uint8 - csiRsResults: - # description': '' - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' minItems: 0 required: - csiRsIndex type: array - x-etsi-mec-cardinality: "0..N" + items: + $ref: '#/components/schemas/ResultsPerCsiRsIndexList_resultsPerCsiRsIndex' + x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inline) - type: object x-etsi-ref: 6.5.10 ResultsPerSsbIndex: - description: '' + required: + - ssbIndex + type: object properties: ssbIndex: - description: '' type: integer - x-etsi-mec-cardinality: '1' + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint8 ssbResults: $ref: '#/components/schemas/MeasQuantityResultsNr' - required: - - ssbIndex - type: object ResultsPerSsbIndexList: + type: object properties: resultsPerSsbIndex: - description: '' - items: - type: object - properties: - ssbIndex: - description: '' - format: int32 - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Uint8 - ssbResults: - # description': '' - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': MeasQuantityResultsNr - $ref: '#/components/schemas/MeasQuantityResultsNr' minItems: 0 required: - ssbIndex type: array + items: + $ref: '#/components/schemas/ResultsPerSsbIndexList_resultsPerSsbIndex' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Structure (inline) - type: object x-etsi-ref: 6.5.9 RsIndexResults: + required: + - resultsCsiRsIndexes + - resultsSsbIndexes + type: object properties: resultsCsiRsIndexes: - # description': Beam level measurement results based on CSI-RS related measurements. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': ResultsPerCsiRsIndexList $ref: '#/components/schemas/ResultsPerCsiRsIndexList' resultsSsbIndexes: - # description': Beam level measurement results based on SS/PBCH related measurements. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': ResultsPerSsbIndexList $ref: '#/components/schemas/ResultsPerSsbIndexList' - required: - - resultsSsbIndexes - - resultsCsiRsIndexes - type: object x-etsi-ref: 6.5.8 S1BearerInfo: + required: + - s1UeInfo + type: object properties: s1UeInfo: - description: Information on a specific UE as defined below. - items: - properties: - associateId: - description: 1 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 1 - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 1 - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Ecgi - s1BearerInfoDetailed: - description: S1 bearer information as defined below. - items: - type: object - properties: - enbInfo: - description: S1 bearer information on eNB side as defined below. - properties: - ipAddress: - description: eNB transport layer address of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - tunnelId: - description: eNB GTP-U TEID of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - ipAddress - - tunnelId - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - erabId: - description: The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - sGwInfo: - description: S1 bearer information on GW side as defined below. - properties: - ipAddress: - description: SGW transport layer address of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - tunnelId: - description: SGW GTP-U TEID of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - ipAddress - - tunnelId - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - minItems: 1 - required: - - erabId - - enbInfo - - sGwInfo - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Structure (inlined) - tempUeId: - description: The temporary identifier allocated for the specific UE as defined below. - properties: - mmec: - description: MMEC as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - mtmsi: - description: M-TMSI as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - mmec - - mtmsi - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - type: object minItems: 1 required: - associateId - ecgi - s1BearerInfoDetailed type: array + description: Information on a specific UE as defined below. + items: + $ref: '#/components/schemas/S1BearerInfo_s1UeInfo' x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' + example: + timeStamp: + seconds: 3 + nanoSeconds: 9 + s1UeInfo: + - associateId: + - type: 0 + value: value + - type: 0 + value: value + s1BearerInfoDetailed: + - erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + - erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + ecgi: + - plmn: + mnc: mnc + mcc: mcc + cellId: cellId + - plmn: + mnc: mnc + mcc: mcc + cellId: cellId + tempUeId: + mtmsi: mtmsi + mmec: mmec + - associateId: + - type: 0 + value: value + - type: 0 + value: value + s1BearerInfoDetailed: + - erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + - erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + ecgi: + - plmn: + mnc: mnc + mcc: mcc + cellId: cellId + - plmn: + mnc: mnc + mcc: mcc + cellId: cellId + tempUeId: + mtmsi: mtmsi + mmec: mmec + x-etsi-ref: 6.2.4 + S1BearerNotification: required: + - _links + - notificationType + - s1Event - s1UeInfo type: object - x-etsi-ref: 6.2.4 - S1BearerNotification: properties: notificationType: - description: Shall be set to "S1BearerNotification". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "S1BearerNotification". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String s1Event: - description: The subscribed event that triggered this notification in S1BearerSubscription. type: integer - x-etsi-mec-cardinality: '1' + description: The subscribed event that triggered this notification in S1BearerSubscription. + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Enum s1UeInfo: - description: Information on specific UE that matches the criteria in S1BearerSubscription as defined below. - properties: - associateId: - description: 0 to N identifiers to associate the information for a specific UE or flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 1 - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Ecgi - s1BearerInfo: - description: S1 bearer information as defined below. - items: - type: object - properties: - enbInfo: - description: S1 bearer information on eNB side as defined below. - properties: - ipAddress: - description: eNB transport layer address of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - tunnelId: - description: eNB GTP-U TEID of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - ipAddress - - tunnelId - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - erabId: - description: The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. - type: integer - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Integer - sGwInfo: - description: S1 bearer information on GW side as defined below. - properties: - ipAddress: - description: SGW transport layer address of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - tunnelId: - description: SGW GTP-U TEID of this S1 bearer. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - ipAddress - - tunnelId - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) - minItems: 1 - required: - - erabId - - enbInfo - - sGwInfo - type: array - x-etsi-mec-cardinality: 1..N - x-etsi-mec-origin-type: Structure (inlined) - tempUeId: - description: The temporary identifier allocated for the specific UE as defined below. - properties: - mmec: - description: MMEC as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - mtmsi: - description: M-TMSI as defined in ETSI TS 136 413 [i.3]. - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - required: - - mmec - - mtmsi - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - ecgi - - s1BearerInfo - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/S1BearerNotification_s1UeInfo' timeStamp: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' _links: - description: Links to resources related to this notification. - required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: 1 - x-etsi-mec-origin-type: Structure (inlined) - required: - - notificationType - - s1Event - - s1UeInfo - - _links - type: object + $ref: '#/components/schemas/CaReconfNotification__links' x-etsi-ref: 6.4.10 S1BearerSubscription: title: S1BearerSubscription - description: > - This type represents a subscription to S1-U bearer information notification from Radio Network Information Service. - - NOTE: At least one of callbackReference and websockNotifConfig shall be provided by the service consumer. - If both are provided, it is up to RNIS to choose an alternative and return only that alternative in the response, - specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + required: + - S1BearerSubscriptionCriteria + - callbackReference + - eventType + - subscriptionType + type: object properties: S1BearerSubscriptionCriteria: - description: As defined below. - properties: - associateId: - description: 0 to N identifiers to associate the events for a specific UE or a flow. - items: - $ref: '#/components/schemas/AssociateId' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: AssociateId - ecgi: - description: E-UTRAN Cell Global Identifier. - items: - $ref: '#/components/schemas/Ecgi' - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Ecgi - erabId: - description: The attribute that uniquely identifies a S1 bearer for a specific UE, as defined in ETSI TS 136 413 [i.3]. - items: - type: integer - minItems: 0 - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Integer - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/S1BearerSubscription_S1BearerSubscriptionCriteria' _links: - description: Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. - properties: - self: - # description': Self referring URI. The URI shall be unique within the RNI API as it acts as an ID for the subscription. - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - required: - - self - type: object - x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Structure (inlined) + $ref: '#/components/schemas/CaReconfSubscription__links' callbackReference: - description: URI exposed by the client on which to receive notifications via HTTP. See note. - format: uri type: string + description: URI exposed by the client on which to receive notifications + via HTTP. See note. + format: uri x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: URI websockNotifConfig: - description: Provides details to negotiate and signal the use of a Websocket connection between RNIS and the service consumer for notifications. See note. $ref: '#/components/schemas/WebsockNotifConfig' requestTestNotification: type: boolean - description: Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, specified in\ + \ ETSI GS MEC 009 [6], as described in clause 6.12a." eventType: - description: 'Description of the subscribed event. The event is included both in the request and in the response. \nFor the eventType, the following values are currently defined:

    0 = RESERVED.

    1 = S1_BEARER_ESTABLISH.

    2 = S1_BEARER_MODIFY.

    3 = S1_BEARER_RELEASE.' - items: - $ref: '#/components/schemas/Enum' minItems: 1 type: array + description: "Description of the subscribed event. The event is included\ + \ both in the request and in the response. \\nFor the eventType, the following\ + \ values are currently defined:

    0 = RESERVED.

    1 = S1_BEARER_ESTABLISH.\ + \

    2 = S1_BEARER_MODIFY.

    3 = S1_BEARER_RELEASE." + items: + $ref: '#/components/schemas/Enum' x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Enum expiryDeadline: - # description': Time stamp. - # x-etsi-mec-cardinality': 0..1 - # x-etsi-mec-origin-type': TimeStamp $ref: '#/components/schemas/TimeStamp' subscriptionType: - description: Shall be set to "S1BearerSubscription". type: string - x-etsi-mec-cardinality: '1' + description: Shall be set to "S1BearerSubscription". + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - required: - - subscriptionType - - eventType - - S1BearerSubscriptionCriteria - type: object + description: "This type represents a subscription to S1-U bearer information\ + \ notification from Radio Network Information Service.\nNOTE: At least one\ + \ of callbackReference and websockNotifConfig shall be provided by the service\ + \ consumer.\n If both are provided, it is up to RNIS to choose an alternative\ + \ and return only that alternative in the response,\n specified in ETSI\ + \ GS MEC 009 [6], as described in clause 6.12a.\n" x-etsi-ref: 6.3.9 SubscriptionLinkList: - properties: - _links: - description: List of hyperlinks related to the resource. - properties: - self: - # description': '' - # x-etsi-mec-cardinality': '1' - # x-etsi-mec-origin-type': LinkType - $ref: '#/components/schemas/LinkType' - subscription: - description: A link to a subscription. - items: - type: object - properties: - href: - description: The URI referring to the subscription. - format: uri - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: URI - subscriptionType: - description: "Type of the subscription. The string shall be set according to the \"subscriptionType\" attribute of the associated subscription data type event defined in clause\_6.3." - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - minItems: 0 - required: - - href - - subscriptionType - type: array - x-etsi-mec-cardinality: 0..N - x-etsi-mec-origin-type: Structure (inlined) - required: - - self - type: object - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: Structure (inlined) required: - _links type: object + properties: + _links: + $ref: '#/components/schemas/SubscriptionLinkList__links' + example: + _links: + self: + href: http://example.com/aeiou + subscription: + - subscriptionType: subscriptionType + href: http://example.com/aeiou + - subscriptionType: subscriptionType + href: http://example.com/aeiou x-etsi-ref: 6.3.10 TimeStamp: + required: + - nanoSeconds + - seconds + type: object properties: nanoSeconds: - description: The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC. - format: int32 type: integer - x-etsi-mec-cardinality: '1' + description: "The nanoseconds part of the time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC." + format: int32 + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 seconds: - description: The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC. - format: int32 type: integer - x-etsi-mec-cardinality: '1' + description: "The seconds part of the time. Time is defined as Unixtime\ + \ since January 1, 1970, 00:00:00 UTC." + format: int32 + x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 - required: - - seconds - - nanoSeconds - type: object + example: + seconds: 3 + nanoSeconds: 9 x-etsi-ref: 6.5.3 Trigger: - description: As defined in Ref ETSI TS 136 331 [i.7]

    0 = NOT_AVAILABLE

    1 = PERIODICAL_REPORT_STRONGEST_CELLS

    2 = PERIODICAL_REPORT_STRONGEST_CELLS_FOR_SON

    3 = PERIODICAL_REPORT_CGI

    4 = INTRA_PERIODICAL_REPORT_STRONGEST_CELLS

    5 = INTRA_PERIODICAL_REPORT_CGI

    10 = EVENT_A1

    11 = EVENT_A2

    12 = EVENT_A3

    13 = EVENT_A4

    14 = EVENT_A5

    15 = EVENT_A6

    20 = EVENT_B1

    21 = EVENT_B2

    20 = EVENT_B1-NR

    21 = EVENT_B2-NR

    30 = EVENT_C1

    31 = EVENT_C2

    40 = EVENT_W1

    41 = EVENT_W2

    42 = EVENT_W3

    50 = EVENT_V1

    51 = EVENT_V2

    60 = EVENT_H1

    61 = EVENT_H2 + type: integer + description: "As defined in Ref ETSI TS 136 331 [i.7]

    0 = NOT_AVAILABLE

    1\ + \ = PERIODICAL_REPORT_STRONGEST_CELLS

    2 = PERIODICAL_REPORT_STRONGEST_CELLS_FOR_SON\ + \

    3 = PERIODICAL_REPORT_CGI

    4 = INTRA_PERIODICAL_REPORT_STRONGEST_CELLS\ + \

    5 = INTRA_PERIODICAL_REPORT_CGI

    10 = EVENT_A1

    11 = EVENT_A2

    12\ + \ = EVENT_A3

    13 = EVENT_A4

    14 = EVENT_A5

    15 = EVENT_A6

    20 = EVENT_B1\ + \

    21 = EVENT_B2

    20 = EVENT_B1-NR

    21 = EVENT_B2-NR

    30 = EVENT_C1\ + \

    31 = EVENT_C2

    40 = EVENT_W1

    41 = EVENT_W2

    42 = EVENT_W3

    50\ + \ = EVENT_V1

    51 = EVENT_V2

    60 = EVENT_H1

    61 = EVENT_H2" enum: - 0 - 1 @@ -3808,9 +2977,14 @@ components: - 51 - 60 - 61 - type: integer TriggerNr: - description: The enumeration Trigger represents specified triggers for a 5G UE Measurement Report. Full details can be found in ETSI TS 138 331 [i.13]).

    0 = NOT_AVAILABLE

    1 = NR_PERIODICAL

    2 = NR_CGI

    10 = EVENT_A1

    11 = EVENT_A2

    12 = EVENT_A3

    13 = EVENT_A4

    14 = EVENT_A5

    15 = EVENT_A6

    20 = INTER_RAT_PERIODICAL

    21 = INTER_RAT_CGI

    30 = EVENT_B1

    31 = EVENT_B2 + type: integer + description: "The enumeration Trigger represents specified triggers for a 5G\ + \ UE Measurement Report. Full details can be found in ETSI TS 138 331 [i.13]).\ + \

    0 = NOT_AVAILABLE

    1 = NR_PERIODICAL

    2 = NR_CGI

    10 = EVENT_A1\ + \

    11 = EVENT_A2

    12 = EVENT_A3

    13 = EVENT_A4

    14 = EVENT_A5

    15\ + \ = EVENT_A6

    20 = INTER_RAT_PERIODICAL

    21 = INTER_RAT_CGI

    30 = EVENT_B1\ + \

    31 = EVENT_B2" enum: - 0 - 1 @@ -3825,8 +2999,9 @@ components: - 21 - 30 - 31 - type: integer InlineSubscription: + discriminator: + propertyName: SubscriptionType oneOf: - $ref: '#/components/schemas/CellChangeSubscription' - $ref: '#/components/schemas/RabEstSubscription' @@ -3837,9 +3012,9 @@ components: - $ref: '#/components/schemas/MeasTaSubscription' - $ref: '#/components/schemas/CaReconfSubscription' - $ref: '#/components/schemas/S1BearerSubscription' - discriminator: - propertyName: subscriptionType InlineNotification: + discriminator: + propertyName: NotificationType oneOf: - $ref: '#/components/schemas/CellChangeNotification' - $ref: '#/components/schemas/RabEstNotification' @@ -3850,90 +3025,2143 @@ components: - $ref: '#/components/schemas/MeasTaNotification' - $ref: '#/components/schemas/CaReconfNotification' - $ref: '#/components/schemas/S1BearerNotification' - discriminator: - propertyName: notificationType - - AppTerminationNotification: - description: >- - This type represents the information that the MEC platform - notifies the subscribed application instance about the corresponding - application instance termination/stop. + WebsockNotifConfig: + title: WebsockNotifConfig type: object + properties: + websocketUri: + type: string + description: Set by RNIS to indicate to the service consumer the Websocket + URI to be used for delivering notifications. + format: uri + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uri + requestWebsocketUri: + type: boolean + description: Set to true by the service consumer to indicate that Websocket + delivery is requested. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uri + description: "This type represents configuration for the delivery of subscription\ + \ notifications over Websockets per the pattern defined in defined in clause\ + \ 6.12a of ETSI GS MEC 009 [6].\n" + x-etsi-ref: 6.3.12 + AppTerminationNotification: required: - - notificationType - - operationAction - - maxGracefulTimeout - - _links + - _links + - maxGracefulTimeout + - notificationType + - operationAction + type: object properties: notificationType: - description: Shall be set to AppTerminationNotification. type: string + description: Shall be set to AppTerminationNotification. operationAction: $ref: '#/components/schemas/OperationActionType' maxGracefulTimeout: - description: >- - Maximum timeout value in seconds for graceful termination or graceful - stop of an application instance. type: integer + description: Maximum timeout value in seconds for graceful termination or + graceful stop of an application instance. format: uint32 _links: - description: >- - Object containing hyperlinks related to the resource. - type: object - required: - - subscription - properties: - subscription: - $ref: '#/components/schemas/LinkType' - confirmTermination: - $ref: '#/components/schemas/LinkType' + $ref: '#/components/schemas/AppTerminationNotification__links' + description: This type represents the information that the MEC platform notifies + the subscribed application instance about the corresponding application instance + termination/stop. OperationActionType: - description: Operation that is being performed on the MEC application instance. type: string + description: Operation that is being performed on the MEC application instance. enum: - - STOPPING - - TERMINATING - WebsockNotifConfig: - title: WebsockNotifConfig - description: > - This type represents configuration for the delivery of subscription notifications over Websockets per the pattern defined in defined in clause 6.12a of ETSI GS MEC 009 [6]. + - STOPPING + - TERMINATING + CaReconfNotification_carrierAggregationMeasInfo: type: object properties: - websocketUri: - format: uri - type: string + cellIdNei: + $ref: '#/components/schemas/CellId' + cellIdSrv: + $ref: '#/components/schemas/CellId' + rsrpNei: + type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_136\ + \ 214 [i.5]." + format: int32 x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uri - description: Set by RNIS to indicate to the service consumer the Websocket URI to be used for delivering notifications. - requestWebsocketUri: - type: boolean + x-etsi-mec-origin-type: Uint32 + rsrpSrv: + type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_136\ + \ 214 [i.5]." + format: int32 x-etsi-mec-cardinality: 0..1 - x-etsi-mec-origin-type: Uri - description: Set to true by the service consumer to indicate that Websocket delivery is requested. - x-etsi-ref: 6.3.12 - - TestNotification: - description: > - This type represents a test notification from a Radio Network Information service to determine if the Websocket method is to be utilized for the RNIS to issue notifications for a subscription, as defined in clause 6.12a of ETSI GS MEC 009 [6]. + x-etsi-mec-origin-type: Uint32 + rsrqNei: + type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint32 + rsrqSrv: + type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint32 + CaReconfNotification_secondaryCellAdd: type: object + properties: + ecgi: + $ref: '#/components/schemas/Ecgi' + CaReconfNotification__links: required: - - _links - - notificationType + - subscription + type: object properties: - notificationType: - description: Shall be set to "RabEstNotification". - type: string - x-etsi-mec-cardinality: '1' - x-etsi-mec-origin-type: String - _links: - description: Links to resources related to this notification. + subscription: + $ref: '#/components/schemas/LinkType' + description: Links to resources related to this notification. + CaReconfSubscription__links: + required: + - self + type: object + properties: + self: + $ref: '#/components/schemas/LinkType' + description: Hyperlink related to the resource. This shall be only included + in the HTTP responses and in HTTP PUT requests. + CaReconfSubscription_filterCriteriaAssoc: + type: object + properties: + appInstanceId: + type: string + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the information for a specific + UE or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + ecgi: + minItems: 0 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Ecgi + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." + CellChangeNotification_tempUeId: + required: + - mmec + - mtmsi + type: object + properties: + mmec: + type: string + description: "MMEC as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + mtmsi: + type: string + description: "M-TMSI as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + description: The temporary identifier allocated for the specific UE as defined + below. + example: + mtmsi: mtmsi + mmec: mmec + CellChangeSubscription_filterCriteriaAssocHo: + type: object + properties: + appInstanceId: + type: string + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the information for a specific + UE or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + ecgi: + minItems: 0 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Ecgi + hoStatus: + minItems: 0 + type: array + description: "In case hoStatus is not included in the subscription request,\ + \ the default value 3 = COMPLETED shall be used and included in the response:\ + \

    1 = IN_PREPARATION.

    2 = IN_EXECUTION.

    3 = COMPLETED.

    4 =\ + \ REJECTED.

    5 = CANCELLED." + items: + $ref: '#/components/schemas/Enum' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Enum + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." + ExpiryNotification__links: + required: + - subscription + type: object + properties: + subscription: + $ref: '#/components/schemas/LinkType' + description: List of hyperlinks related to the resource. + L2Meas_cellInfo: + type: object + properties: + dl_gbr_pdr_cell: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ downlink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + dl_gbr_prb_usage_cell: + type: integer + description: "It indicates the PRB usage for downlink GBR traffic, as defined\ + \ in ETSI TS 136 314 [i.11] and ETSI TS 136 423 [i.12]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + dl_nongbr_pdr_cell: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ downlink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + dl_nongbr_prb_usage_cell: + type: integer + description: "It indicates (in percentage) the PRB usage for downlink non-GBR\ + \ traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423\ + \ [i.12]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + dl_total_prb_usage_cell: + type: integer + description: "It indicates (in percentage) the PRB usage for total downlink\ + \ traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423\ + \ [i.12]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ecgi: + $ref: '#/components/schemas/Ecgi' + number_of_active_ue_dl_gbr_cell: + type: integer + description: "It indicates the number of active UEs with downlink GBR traffic,\ + \ as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + number_of_active_ue_dl_nongbr_cell: + type: integer + description: "It indicates the number of active UEs with downlink non-GBR\ + \ traffic, as defined in ETSI TS\_136\_314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + number_of_active_ue_ul_gbr_cell: + type: integer + description: "It indicates the number of active UEs with uplink GBR traffic,\ + \ as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + number_of_active_ue_ul_nongbr_cell: + type: integer + description: "It indicates the number of active UEs with uplink non-GBR\ + \ traffic, as defined in ETSI TS\_136\_314\_[i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + received_dedicated_preambles_cell: + type: integer + description: "It indicates (in percentage) the received dedicated preamples,\ + \ as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + received_randomly_selected_preambles_high_range_cell: + type: integer + description: "It indicates (in percentage) the received randomly selected\ + \ preambles in the high range, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + received_randomly_selected_preambles_low_range_cell: + type: integer + description: "It indicates (in percentage) the received randomly selected\ + \ preambles in the low range, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_gbr_pdr_cell: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ uplink GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_gbr_prb_usage_cell: + type: integer + description: "It indicates (in percentage) the PRB usage for uplink GBR\ + \ traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136 423\ + \ [i.12]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_nongbr_pdr_cell: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ uplink non-GBR traffic in a cell, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_nongbr_prb_usage_cell: + type: integer + description: "It indicates (in percentage) the PRB usage for uplink non-GBR\ + \ traffic, as defined in ETSI TS\_136\_314 [i.11] and ETSI TS\_136 423\ + \ [i.12]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_total_prb_usage_cell: + type: integer + description: "It indicates (in percentage) the PRB usage for total uplink\ + \ traffic, as defined in ETSI TS\_136\_314\_[i.11] and ETSI TS\_136\_\ + 423 [i.12]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + example: + number_of_active_ue_dl_nongbr_cell: 7 + ul_total_prb_usage_cell: 7 + received_dedicated_preambles_cell: 2 + dl_total_prb_usage_cell: 5 + ul_gbr_prb_usage_cell: 1 + dl_gbr_pdr_cell: 0 + number_of_active_ue_ul_gbr_cell: 9 + ul_nongbr_pdr_cell: 1 + dl_nongbr_pdr_cell: 1 + number_of_active_ue_dl_gbr_cell: 2 + ecgi: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId + ul_gbr_pdr_cell: 1 + ul_nongbr_prb_usage_cell: 6 + received_randomly_selected_preambles_low_range_cell: 7 + number_of_active_ue_ul_nongbr_cell: 3 + received_randomly_selected_preambles_high_range_cell: 4 + dl_nongbr_prb_usage_cell: 5 + dl_gbr_prb_usage_cell: 6 + L2Meas_cellUEInfo: + type: object + properties: + associateId: + $ref: '#/components/schemas/AssociateId' + dl_gbr_data_volume_ue: + type: integer + description: "It indicates the data volume of the downlink GBR traffic of\ + \ a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + dl_gbr_delay_ue: + type: integer + description: "It indicates the packet delay of the downlink GBR traffic\ + \ of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + dl_gbr_pdr_ue: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ downlink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + dl_gbr_throughput_ue: + type: integer + description: "It indicates the scheduled throughput of the downlink GBR\ + \ traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + dl_nongbr_data_volume_ue: + type: integer + description: "It indicates the data volume of the downlink non-GBR traffic\ + \ of a UE, as defined in ETSI TS\_136\_314\_[i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + dl_nongbr_delay_ue: + type: integer + description: "It indicates the packet delay of the downlink non-GBR traffic\ + \ of a UE, as defined in ETSI TS\_136\_314\_[i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + dl_nongbr_pdr_ue: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ downlink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + dl_nongbr_throughput_ue: + type: integer + description: "It indicates the scheduled throughput of the downlink nonGBR\ + \ traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + ecgi: + $ref: '#/components/schemas/Ecgi' + ul_gbr_data_volume_ue: + type: integer + description: "It indicates the data volume of the uplink GBR traffic of\ + \ a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + ul_gbr_delay_ue: + type: integer + description: "It indicates the packet delay of the uplink GBR traffic of\ + \ a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + ul_gbr_pdr_ue: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ uplink GBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_gbr_throughput_ue: + type: integer + description: "It indicates the scheduled throughput of the uplink GBR traffic\ + \ of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + ul_nongbr_data_volume_ue: + type: integer + description: "It indicates the data volume of the uplink non-GBR traffic\ + \ of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + ul_nongbr_delay_ue: + type: integer + description: "It indicates the packet delay of the uplink non-GBR traffic\ + \ of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + ul_nongbr_pdr_ue: + type: integer + description: "It indicates the packet discard rate in percentage of the\ + \ uplink nonGBR traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer (0..100) + ul_nongbr_throughput_ue: + type: integer + description: "It indicates the scheduled throughput of the uplink non-GBR\ + \ traffic of a UE, as defined in ETSI TS 136 314 [i.11]." + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Integer + example: + dl_gbr_delay_ue: 4 + ul_nongbr_data_volume_ue: 2 + dl_nongbr_delay_ue: 6 + ul_gbr_delay_ue: 3 + ul_gbr_throughput_ue: 1 + ul_nongbr_delay_ue: 6 + dl_nongbr_throughput_ue: 9 + ul_gbr_data_volume_ue: 6 + dl_nongbr_data_volume_ue: 9 + ecgi: null + dl_gbr_data_volume_ue: 1 + associateId: + type: 0 + value: value + dl_gbr_throughput_ue: 9 + dl_nongbr_pdr_ue: 8 + ul_nongbr_throughput_ue: 5 + ul_nongbr_pdr_ue: 6 + dl_gbr_pdr_ue: 5 + ul_gbr_pdr_ue: 6 + MeasRepUeNotification_carrierAggregationMeasInfo: + type: object + properties: + cellIdNei: + $ref: '#/components/schemas/CellId' + cellIdSrv: + $ref: '#/components/schemas/CellId' + rsrpNei: + type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrpNeiEx: + type: integer + description: "Extended Reference Signal Received Power, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrpSrv: + type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrpSrvEx: + type: integer + description: "Extended Reference Signal Received Power, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrqNei: + type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrqNeiEx: + type: integer + description: "Extended Reference Signal Received Quality, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrqSrv: + type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrqSrvEx: + type: integer + description: "Extended Reference Signal Received Quality, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + sinrNei: + type: integer + description: "Reference Signal \"Signal to Interference plus Noise Ratio\"\ + , with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + sinrSrv: + type: integer + description: "Reference Signal \"Signal to Interference plus Noise Ratio\"\ + , with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + MeasRepUeNotification_eutranNeighbourCellMeasInfo: + type: object + properties: + ecgi: + $ref: '#/components/schemas/Ecgi' + rsrp: + type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrpEx: + type: integer + description: "Extended Reference Signal Received Power, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrq: + type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.5]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrqEx: + type: integer + description: "Extended Reference Signal Received Quality, with value mapping\ + \ defined in ETSI TS 136 133 [i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + sinr: + type: integer + description: "Reference Signal \"Signal to Interference plus Noise Ratio\"\ + , with value mapping defined in ETSI TS\_136\_133\_[i.16]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + MeasRepUeNotification_nrBNCs_nrBNCellInfo: + type: object + properties: + nrBNCellGId: + $ref: '#/components/schemas/NrCellId' + nrBNCellPlmn: + minItems: 1 + type: array + description: Public land mobile network identities + items: + $ref: '#/components/schemas/Plmn' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Plmn + MeasRepUeNotification_nrBNCs: + required: + - nrBNCellInfo + type: object + properties: + nrBNCellInfo: + minItems: 1 required: - - subscription - properties: - subscription: - description: A link to the related subscription. - $ref: '#/components/schemas/LinkType' - type: object - x-etsi-mec-cardinality: 1 + - nrBNCellGId + - nrBNCellPlmn + type: array + description: Best neighbours of the secondary serving cell(s) info + items: + $ref: '#/components/schemas/MeasRepUeNotification_nrBNCs_nrBNCellInfo' + x-etsi-mec-cardinality: 1..N x-etsi-mec-origin-type: Structure (inlined) - x-etsi-ref: 6.4.12 \ No newline at end of file + nrBNCellRsrp: + type: integer + description: "Reference Signal Received Power measurement according to mapping\ + \ table in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + nrBNCellRsrq: + type: integer + description: "Reference Signal Received Quality measurement according to\ + \ mapping table in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + nrBNCellRssi: + type: integer + description: "Reference signal SINR measurement according to mapping table\ + \ in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + description: Measurement quantities concerning the best neighbours of the secondary + serving cells + MeasRepUeNotification_nrSCs_nrSCellInfo: + type: object + properties: + nrSCellGId: + $ref: '#/components/schemas/NrCellId' + nrSCellPlmn: + minItems: 1 + type: array + description: Public land mobile network identities. + items: + $ref: '#/components/schemas/Plmn' + x-etsi-mec-cardinality: 1..P + x-etsi-mec-origin-type: Plmn + MeasRepUeNotification_nrSCs: + required: + - nrSCellInfo + type: object + properties: + nrSCellInfo: + minItems: 1 + required: + - nrSCellGId + - nrSCellPlmn + type: array + description: Secondary serving cell(s) info. + items: + $ref: '#/components/schemas/MeasRepUeNotification_nrSCs_nrSCellInfo' + x-etsi-mec-cardinality: 1..P + x-etsi-mec-origin-type: Structure (inlined) + nrSCellRsrp: + type: integer + description: "Reference Signal Received Power measurement according to mapping\ + \ table in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + nrSCellRsrq: + type: integer + description: "Reference Signal Received Quality measurement according to\ + \ mapping table in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + nrSCellRssi: + type: integer + description: "Reference signal SINR measurement according to mapping table\ + \ in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + description: Measurement quantities concerning the secondary serving cells. + MeasRepUeNotification_newRadioMeasInfo: + type: object + properties: + nrBNCs: + $ref: '#/components/schemas/MeasRepUeNotification_nrBNCs' + nrCarrierFreq: + type: integer + description: "ARFCN applicable for a downlink, uplink or bi-directional\ + \ (TDD) NR carrier frequency, as defined in ETSI TS\_138.101 [i.15]." + format: int32 + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Uint32 + nrSCs: + $ref: '#/components/schemas/MeasRepUeNotification_nrSCs' + MeasRepUeNotification_nrNCellInfo: + type: object + properties: + nrNCellGId: + $ref: '#/components/schemas/NrCellId' + nrNCellPlmn: + minItems: 1 + type: array + description: Public land mobile network identities. + items: + $ref: '#/components/schemas/Plmn' + x-etsi-mec-cardinality: 1..P + x-etsi-mec-origin-type: Plmn + MeasRepUeNotification_newRadioMeasNeiInfo: + type: object + properties: + nrNCellInfo: + minItems: 1 + required: + - nrNCellGId + - nrNCellPlmn + type: array + description: 5G NR neighbour cell info. + items: + $ref: '#/components/schemas/MeasRepUeNotification_nrNCellInfo' + x-etsi-mec-cardinality: 1..P + x-etsi-mec-origin-type: Structure (inlined) + nrNCellRsrp: + type: integer + description: "Reference Signal Received Power measurement according to mapping\ + \ table in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + nrNCellRsrq: + type: integer + description: "Reference Signal Received Quality measurement according to\ + \ mapping table in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + nrNCellRssi: + type: integer + description: "Reference signal SINR measurement according to mapping table\ + \ in ETSI TS 138.133 [i.14]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsIndexResults: + $ref: '#/components/schemas/RsIndexResults' + MeasRepUeSubscription_filterCriteriaAssocTri: + type: object + properties: + appInstanceId: + type: string + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the information for a specific + UE or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + ecgi: + minItems: 0 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Ecgi + trigger: + minItems: 0 + type: array + description: Corresponds to a specific E-UTRAN UE Measurement Report trigger. + items: + $ref: '#/components/schemas/Trigger' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Trigger + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." + NrMeasRepUeNotification_eutraNeighCellMeasInfo: + type: object + properties: + ecgi: + $ref: '#/components/schemas/Ecgi' + rsrp: + type: integer + description: "Reference Signal Received Power as defined in ETSI TS\_138\ + \ 331 [i.13]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + rsrq: + type: integer + description: "Reference Signal Received Quality as defined in ETSI TS 138\ + \ 331 [i.13]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + sinr: + type: integer + description: "Reference Signal plus Interference Noise Ratio as defined\ + \ in ETSI TS\_138\_331\_[i.13]." + format: int32 + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: Uint8 + NrMeasRepUeNotification_nrNeighCellMeasInfo: + type: object + properties: + measQuantityResultsCsiRsCell: + $ref: '#/components/schemas/MeasQuantityResultsNr' + measQuantityResultsSsbCell: + $ref: '#/components/schemas/MeasQuantityResultsNr' + nrcgi: + $ref: '#/components/schemas/Nrcgi' + rsIndexResults: + $ref: '#/components/schemas/RsIndexResults' + NrMeasRepUeNotification_nCell: + type: object + properties: + measQuantityResultsCsiRsCell: + $ref: '#/components/schemas/MeasQuantityResultsNr' + measQuantityResultsSsbCell: + $ref: '#/components/schemas/MeasQuantityResultsNr' + rsIndexResults: + $ref: '#/components/schemas/RsIndexResults' + description: Measurement information relating to the best neighbour of this + serving cell. + NrMeasRepUeNotification_sCell: + type: object + properties: + measQuantityResultsCsiRsCell: + $ref: '#/components/schemas/MeasQuantityResultsNr' + measQuantityResultsSsbCell: + $ref: '#/components/schemas/MeasQuantityResultsNr' + rsIndexResults: + $ref: '#/components/schemas/RsIndexResults' + description: Measurement information relating to this serving cell. + NrMeasRepUeNotification_servCellMeasInfo: + type: object + properties: + nCell: + $ref: '#/components/schemas/NrMeasRepUeNotification_nCell' + nrcgi: + $ref: '#/components/schemas/Nrcgi' + sCell: + $ref: '#/components/schemas/NrMeasRepUeNotification_sCell' + NrMeasRepUeSubscription_filterCriteriaNrMrs: + type: object + properties: + appInstanceId: + type: string + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the information for a specific + UE or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + nrcgi: + minItems: 0 + type: array + description: NR Cell Global Identier. + items: + $ref: '#/components/schemas/Nrcgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Nrcgi + triggerNr: + minItems: 0 + type: array + description: Corresponds to a specific 5G UE Measurement Report trigger. + items: + $ref: '#/components/schemas/TriggerNr' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: TriggerNr + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." + RabEstNotification_erabQosParameters_qosInformation: + required: + - erabGbrDl + - erabGbrUl + - erabMbrDl + - erabMbrUl + type: object + properties: + erabGbrDl: + type: integer + description: "This attribute indicates the guaranteed downlink E-RAB Bit\ + \ Rate as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabGbrUl: + type: integer + description: "This attribute indicates the guaranteed uplink E-RAB Bit Rate\ + \ as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabMbrDl: + type: integer + description: "This attribute indicates the maximum downlink E-RAB Bit Rate\ + \ as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabMbrUl: + type: integer + description: "This attribute indicates the maximum uplink E-RAB Bit Rate\ + \ as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + description: The QoS information for the E-RAB. + example: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + RabEstNotification_erabQosParameters: + required: + - qci + type: object + properties: + qci: + type: integer + description: "QoS Class Identifier as defined in ETSI TS 123 401 [i.4]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + qosInformation: + $ref: '#/components/schemas/RabEstNotification_erabQosParameters_qosInformation' + description: QoS parameters for the E-RAB as defined below. + example: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + RabEstNotification_tempUeId: + required: + - mmec + - mtmsi + type: object + properties: + mmec: + type: string + description: "MMEC as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + mtmsi: + type: string + description: "M-TMSI as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + description: 'The temporary identifier allocated for the specific UE as defined + below. ' + RabEstSubscription_filterCriteriaQci: + required: + - qci + type: object + properties: + appInstanceId: + type: string + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + ecgi: + minItems: 0 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Ecgi + qci: + type: integer + description: "QoS Class Identifier as defined in ETSI TS 123 401 [i.4]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." + RabInfo_erabInfo: + type: object + properties: + erabId: + type: integer + description: "The attribute that uniquely identifies a Radio Access bearer\ + \ for specific UE as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabQosParameters: + $ref: '#/components/schemas/RabEstNotification_erabQosParameters' + example: + erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + RabInfo_ueInfo: + type: object + properties: + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the event for a specific UE + or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + erabInfo: + minItems: 1 + required: + - erabId + type: array + description: Information on E-RAB as defined below. + items: + $ref: '#/components/schemas/RabInfo_erabInfo' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Structure (inlined) + example: + associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + RabInfo_cellUserInfo: + type: object + properties: + ecgi: + $ref: '#/components/schemas/Ecgi' + ueInfo: + minItems: 1 + required: + - erabInfo + type: array + description: Information on UEs in the specific cell as defined below. + items: + $ref: '#/components/schemas/RabInfo_ueInfo' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Structure (inlined) + example: + ueInfo: + - associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - associateId: + - type: 0 + value: value + - type: 0 + value: value + erabInfo: + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + - erabId: 6 + erabQosParameters: + qosInformation: + erabGbrDl: 5 + erabGbrUl: 5 + erabMbrUl: 7 + erabMbrDl: 2 + qci: 1 + ecgi: + plmn: + mnc: mnc + mcc: mcc + cellId: cellId + RabModNotification_erabQosParameters_qosInformation: + required: + - erabGbrDl + - erabGbrUl + - erabMbrDl + - erabMbrUl + type: object + properties: + erabGbrDl: + type: integer + description: "This attribute indicates the guaranteed downlink E-RAB Bit\ + \ Rate as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabGbrUl: + type: integer + description: "This attribute indicates the guaranteed uplink E-RAB Bit Rate\ + \ as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabMbrDl: + type: integer + description: "This attribute indicates the maximum downlink E-RAB Bit Rate\ + \ as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + erabMbrUl: + type: integer + description: "This attribute indicates the maximum uplink E-RAB Bit Rate\ + \ as defined in ETSI TS 123 401 [i.4] for this bearer." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + description: The QoS Information for the E-RAB as defined below. + RabModNotification_erabQosParameters: + required: + - qci + type: object + properties: + qci: + type: integer + description: "QoS Class Identifier as defined in ETSI TS 123 401 [i.4]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + qosInformation: + $ref: '#/components/schemas/RabModNotification_erabQosParameters_qosInformation' + description: The QoS parameters for the E-RAB as defined below. + RabModSubscription_filterCriteriaQci: + required: + - erabId + - qci + type: object + properties: + appInstanceId: + type: string + description: Unique identifier for the MEC application instance. + x-etsi-mec-cardinality: 0..1 + x-etsi-mec-origin-type: String + ecgi: + minItems: 0 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Ecgi + erabId: + type: integer + description: "The attribute that uniquely identifies a Radio Access bearer\ + \ for specific UE as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + qci: + type: integer + description: "QoS Class Identifier as defined in ETSI TS 123 401 [i.4]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." + RabRelNotification_erabReleaseInfo: + required: + - erabId + type: object + properties: + erabId: + type: integer + description: "The attribute that uniquely identifies a Radio Access bearer\ + \ for specific UE as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + description: The release information for the E-RAB as defined below. + ResultsPerCsiRsIndexList_resultsPerCsiRsIndex: + type: object + properties: + csiRsIndex: + type: integer + format: int32 + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Uint8 + csiRsResults: + $ref: '#/components/schemas/MeasQuantityResultsNr' + ResultsPerSsbIndexList_resultsPerSsbIndex: + type: object + properties: + ssbIndex: + type: integer + format: int32 + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Uint8 + ssbResults: + $ref: '#/components/schemas/MeasQuantityResultsNr' + S1BearerInfo_enbInfo: + required: + - ipAddress + - tunnelId + type: object + properties: + ipAddress: + type: string + description: eNB transport layer address of this S1 bearer. + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + tunnelId: + type: string + description: eNB GTP-U TEID of this S1 bearer. + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + description: S1 bearer information on eNB side as defined below. + example: + tunnelId: tunnelId + ipAddress: ipAddress + S1BearerInfo_sGwInfo: + required: + - ipAddress + - tunnelId + type: object + properties: + ipAddress: + type: string + description: SGW transport layer address of this S1 bearer. + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + tunnelId: + type: string + description: SGW GTP-U TEID of this S1 bearer. + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + description: S1 bearer information on GW side as defined below. + example: + tunnelId: tunnelId + ipAddress: ipAddress + S1BearerInfo_s1BearerInfoDetailed: + type: object + properties: + enbInfo: + $ref: '#/components/schemas/S1BearerInfo_enbInfo' + erabId: + type: integer + description: "The attribute that uniquely identifies a S1 bearer for a specific\ + \ UE, as defined in ETSI TS 136 413 [i.3]." + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: Integer + sGwInfo: + $ref: '#/components/schemas/S1BearerInfo_sGwInfo' + example: + erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + S1BearerInfo_s1UeInfo: + type: object + properties: + associateId: + minItems: 1 + type: array + description: 1 to N identifiers to associate the information for a specific + UE or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: AssociateId + ecgi: + minItems: 1 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Ecgi + s1BearerInfoDetailed: + minItems: 1 + required: + - enbInfo + - erabId + - sGwInfo + type: array + description: S1 bearer information as defined below. + items: + $ref: '#/components/schemas/S1BearerInfo_s1BearerInfoDetailed' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Structure (inlined) + tempUeId: + $ref: '#/components/schemas/CellChangeNotification_tempUeId' + example: + associateId: + - type: 0 + value: value + - type: 0 + value: value + s1BearerInfoDetailed: + - erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + - erabId: 0 + enbInfo: + tunnelId: tunnelId + ipAddress: ipAddress + sGwInfo: + tunnelId: tunnelId + ipAddress: ipAddress + ecgi: + - plmn: + mnc: mnc + mcc: mcc + cellId: cellId + - plmn: + mnc: mnc + mcc: mcc + cellId: cellId + tempUeId: + mtmsi: mtmsi + mmec: mmec + S1BearerNotification_s1UeInfo: + required: + - ecgi + - s1BearerInfo + type: object + properties: + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the information for a specific + UE or flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + ecgi: + minItems: 1 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Ecgi + s1BearerInfo: + minItems: 1 + required: + - enbInfo + - erabId + - sGwInfo + type: array + description: S1 bearer information as defined below. + items: + $ref: '#/components/schemas/S1BearerInfo_s1BearerInfoDetailed' + x-etsi-mec-cardinality: 1..N + x-etsi-mec-origin-type: Structure (inlined) + tempUeId: + $ref: '#/components/schemas/CellChangeNotification_tempUeId' + description: Information on specific UE that matches the criteria in S1BearerSubscription + as defined below. + S1BearerSubscription_S1BearerSubscriptionCriteria: + type: object + properties: + associateId: + minItems: 0 + type: array + description: 0 to N identifiers to associate the events for a specific UE + or a flow. + items: + $ref: '#/components/schemas/AssociateId' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: AssociateId + ecgi: + minItems: 0 + type: array + description: E-UTRAN Cell Global Identifier. + items: + $ref: '#/components/schemas/Ecgi' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Ecgi + erabId: + minItems: 0 + type: array + description: "The attribute that uniquely identifies a S1 bearer for a specific\ + \ UE, as defined in ETSI TS 136 413 [i.3]." + items: + type: integer + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Integer + description: As defined below. + SubscriptionLinkList__links_subscription: + type: object + properties: + href: + type: string + description: The URI referring to the subscription. + format: uri + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: URI + subscriptionType: + type: string + description: Type of the subscription. The string shall be set according + to the "subscriptionType" attribute of the associated subscription data + type event defined in clause 6.3. + x-etsi-mec-cardinality: "1" + x-etsi-mec-origin-type: String + example: + subscriptionType: subscriptionType + href: http://example.com/aeiou + SubscriptionLinkList__links: + required: + - self + type: object + properties: + self: + $ref: '#/components/schemas/LinkType' + subscription: + minItems: 0 + required: + - href + - subscriptionType + type: array + description: A link to a subscription. + items: + $ref: '#/components/schemas/SubscriptionLinkList__links_subscription' + x-etsi-mec-cardinality: 0..N + x-etsi-mec-origin-type: Structure (inlined) + description: List of hyperlinks related to the resource. + example: + self: + href: http://example.com/aeiou + subscription: + - subscriptionType: subscriptionType + href: http://example.com/aeiou + - subscriptionType: subscriptionType + href: http://example.com/aeiou + AppTerminationNotification__links: + required: + - subscription + type: object + properties: + subscription: + $ref: '#/components/schemas/LinkType' + confirmTermination: + $ref: '#/components/schemas/LinkType' + description: Object containing hyperlinks related to the resource. + responses: + "204": + description: No Content + "400": + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "401": + description: "Unauthorized : used when the client did not submit credentials." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: "Not Found : used when a client provided a URI that cannot be\ + \ mapped to a valid resource URI." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "406": + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "412": + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts when\ + \ using PUT" + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "414": + description: "URI Too Long : used to indicate that the server is refusing to\ + \ process the request because the request URI is longer than the server is\ + \ willing or able to process." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "415": + description: "Unsupported Media Type : used to indicate that the server or\ + \ the client does not support the content type of the entity body." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "422": + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body is\ + \ syntactically correct but semantically incorrect, for example if the target\ + \ area for the request is considered too large. This error condition can also\ + \ occur if the capabilities required by the request are not supported." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + example: + application/problem+json: + type: https://meAppServer.example.com/rni/v2/probs/too-many targets + title: Too many targets + status: "422" + detail: The target area for the request is considered too large + instance: /meAppClient.example.com/77777/msgs/abc + "429": + description: "Too Many Requests : used when a rate limiter has triggered." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + parameters: + Path.subscrId: + name: subscriptionId + in: path + description: "Subscription Id, specifically the \"Self-referring URI\" returned\ + \ in the subscription request" + required: true + style: simple + explode: false + schema: + type: string + format: uri + x-exportParamName: SubscriptionId + Query.AppInsId: + name: app_ins_id + in: query + description: Application instance identifier + required: false + style: form + explode: true + schema: + type: string + x-exportParamName: AppInsId + x-optionalDataType: String + Query.AppInsIdArr: + name: app_ins_id + in: query + description: Comma separated list of Application instance identifiers + required: true + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: AppInsIdArr + Query.CellId: + name: cell_id + in: query + description: Comma separated list of E-UTRAN Cell Identities + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: CellId + Query.UeIpv4Address: + name: ue_ipv4_address + in: query + description: Comma separated list of IE IPv4 addresses as defined for the type + for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv4Address + Query.UeIpv6Address: + name: ue_ipv6_address + in: query + description: Comma separated list of IE IPv6 addresses as defined for the type + for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: UeIpv6Address + Query.NatedIpAddress: + name: nated_ip_address + in: query + description: Comma separated list of IE NATed IP addresses as defined for the + type for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: NatedIpAddress + Query.GtpTeid: + name: gtp_teid + in: query + description: Comma separated list of GTP TEID addresses as defined for the type + for AssociateId + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: GtpTeid + Query.ErabId: + name: erab_id + in: query + description: E-RAB identifier + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabId + x-optionalDataType: Int32 + Query.ErabIdArr: + name: erab_id + in: query + description: Comma separated list of E-RAB identifiers + required: false + style: form + explode: true + schema: + type: array + items: + type: integer + format: int32 + x-exportParamName: ErabIdArr + Query.Qci: + name: qci + in: query + description: QoS Class Identifier as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: Qci + x-optionalDataType: Int32 + Query.ErabMbrDl: + name: erab_mbr_dl + in: query + description: Maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabMbrDl + x-optionalDataType: Int32 + Query.ErabMbrUl: + name: erab_mbr_ul + in: query + description: Maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabMbrUl + x-optionalDataType: Int32 + Query.ErabGbrDl: + name: erab_gbr_dl + in: query + description: Guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabGbrDl + x-optionalDataType: Int32 + Query.ErabGbrUl: + name: erab_gbr_ul + in: query + description: Guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401 + required: false + style: form + explode: true + schema: + type: integer + format: int32 + x-exportParamName: ErabGbrUl + x-optionalDataType: Int32 + Query.TempUeId: + name: temp_ue_id + in: query + description: Comma separated list of temporary identifiers allocated for the + specific UE as defined in ETSI TS 136 413 + required: false + style: form + explode: true + schema: + type: array + items: + type: string + x-exportParamName: TempUeId + Query.DlGbrPrbUsageCell: + name: dl_gbr_prb_usage_cell + in: query + description: PRB usage for downlink GBR traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrPrbUsageCell + Query.UlGbrPrbUsageCell: + name: ul_gbr_prb_usage_cell + in: query + description: PRB usage for uplink GBR traffic in percentage as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrPrbUsageCell + Query.DlNonGbrPrbUsageCell: + name: dl_nongbr_prb_usage_cell + in: query + description: PRB usage for downlink non-GBR traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrPrbUsageCell + Query.UlNonGbrPrbUsageCell: + name: ul_nongbr_prb_usage_cell + in: query + description: PRB usage for uplink non-GBR traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrPrbUsageCell + Query.DlTotalPrbUsageCell: + name: dl_total_prb_usage_cell + in: query + description: PRB usage for total downlink traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlTotalPrbUsageCell + Query.UlTotalPrbUsageCell: + name: ul_total_prb_usage_cell + in: query + description: PRB usage for total uplink traffic in percentage as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlTotalPrbUsageCell + Query.ReceivedDedicatedPreamblesCell: + name: received_dedicated_preambles_cell + in: query + description: Received dedicated preambles in percentage as defined in ETSI TS + 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: ReceivedDedicatedPreamblesCell + Query.ReceivedRandomPreamblesLowRangeCell: + name: received_randomly_selected_preambles_low_range_cell + in: query + description: Received randomly selected preambles in the low range in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: ReceivedRandomPreamblesLowRangeCell + Query.ReceivedRandomPreamblesHighRangeCell: + name: received_randomly_selected_preambles_high_range_cell + in: query + description: Received rendomly selected preambles in the high range in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: ReceivedRandomPreamblesHighRangeCell + Query.NumberOfActiveUeDlGbrCell: + name: number_of_active_ue_dl_gbr_cell + in: query + description: Number of active UEs with downlink GBR traffic as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeDlGbrCell + Query.NumberOfActiveUeUlGbrCell: + name: number_of_active_ue_ul_gbr_cell + in: query + description: Number of active UEs with uplink GBR traffic as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeUlGbrCell + Query.NumberOfActiveUeDlNonGbrCell: + name: number_of_active_ue_dl_nongbr_cell + in: query + description: Number of active UEs with downlink non-GBR traffic as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeDlNonGbrCell + Query.NumberOfActiveUeUlNonGbrCell: + name: number_of_active_ue_ul_nongbr_cell + in: query + description: Number of active UEs with uplink non-GBR traffic as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: NumberOfActiveUeUlNonGbrCell + Query.DlGbrPdrCell: + name: dl_gbr_pdr_cell + in: query + description: Packet discard rate for downlink GBR traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrPdrCell + Query.UlGbrPdrCell: + name: ul_gbr_pdr_cell + in: query + description: Packet discard rate for uplink GBR traffic in percentage as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrPdrCell + Query.DlNonGbrPdrCell: + name: dl_nongbr_pdr_cell + in: query + description: Packet discard rate for downlink non-GBR traffic in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrPdrCell + Query.UlNonGbrPdrCell: + name: ul_nongbr_pdr_cell + in: query + description: Packet discard rate for uplink non-GBR traffic in percentage as + defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrPdrCell + Query.DlGbrDelayUe: + name: dl_gbr_delay_ue + in: query + description: Packet delay of downlink GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrDelayUe + Query.UlGbrDelayUe: + name: ul_gbr_delay_ue + in: query + description: Packet delay of uplink GBR traffic of a UE as defined in ETSI TS + 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrDelayUe + Query.DlNonGbrDelayUe: + name: dl_nongbr_delay_ue + in: query + description: Packet delay of downlink non-GBR traffic of a UE as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrDelayUe + Query.UlNonGbrDelayUe: + name: ul_nongbr_delay_ue + in: query + description: Packet delay of uplink non-GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrDelayUe + Query.DlGbrPdrUe: + name: dl_gbr_pdr_ue + in: query + description: Packet discard rate of downlink GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrPdrUe + Query.UlGbrPdrUe: + name: ul_gbr_pdr_ue + in: query + description: Packet discard rate of uplink GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrPdrUe + Query.DlNonGbrPdrUe: + name: dl_nongbr_pdr_ue + in: query + description: Packet discard rate of downlink non-GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrPdrUe + Query.UlNonGbrPdrUe: + name: ul_nongbr_pdr_ue + in: query + description: Packet discard rate of uplink non-GBR traffic of a UE in percentage + as defined in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrPdrUe + Query.DlGbrThroughputUe: + name: dl_gbr_throughput_ue + in: query + description: Scheduled throughput of downlink GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrThroughputUe + Query.UlGbrThroughputUe: + name: ul_gbr_throughput_ue + in: query + description: Scheduled throughput of uplink GBR traffic of a UE as defined in + ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrThroughputUe + Query.DlNonGbrThroughputUe: + name: dl_nongbr_throughput_ue + in: query + description: Scheduled throughput of downlink non-GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrThroughputUe + Query.UlNonGbrThroughputUe: + name: ul_nongbr_throughput_ue + in: query + description: Scheduled throughput of uplink non-GBR traffic of a UE as defined + in ETSI TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrThroughputUe + Query.DlGbrDataVolumeUe: + name: dl_gbr_data_volume_ue + in: query + description: Data volume of downlink GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlGbrDataVolumeUe + Query.UlGbrDataVolumeUe: + name: ul_gbr_data_volume_ue + in: query + description: Data volume of uplink GBR traffic of a UE as defined in ETSI TS + 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlGbrDataVolumeUe + Query.DlNonGbrDataVolumeUe: + name: dl_nongbr_data_volume_ue + in: query + description: Data volume of downlink non-GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: DlNonGbrDataVolumeUe + Query.UlNonGbrDataVolumeUe: + name: ul_nongbr_data_volume_ue + in: query + description: Data volume of uplink non-GBR traffic of a UE as defined in ETSI + TS 136 314 + required: false + style: form + explode: true + schema: + type: integer + x-exportParamName: UlNonGbrDataVolumeUe + Query.SubscriptionType: + name: subscription_type + in: query + description: "Filter on a specific subscription type. Permitted values: cell_change,\ + \ rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue,\ + \ ca_reconf, s1_bearer." + required: false + style: form + explode: true + schema: + type: string + x-exportParamName: SubscriptionType diff --git a/go-packages/meep-rnis-client/api_rni.go b/go-packages/meep-rnis-client/api_rni.go index 08676a2fa..c73f51a65 100644 --- a/go-packages/meep-rnis-client/api_rni.go +++ b/go-packages/meep-rnis-client/api_rni.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/api_unsupported.go b/go-packages/meep-rnis-client/api_unsupported.go index 5a1e9af3e..9ce8044e3 100644 --- a/go-packages/meep-rnis-client/api_unsupported.go +++ b/go-packages/meep-rnis-client/api_unsupported.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/client.go b/go-packages/meep-rnis-client/client.go index 106099b4a..9d56281b9 100644 --- a/go-packages/meep-rnis-client/client.go +++ b/go-packages/meep-rnis-client/client.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -52,7 +52,7 @@ var ( xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)") ) -// APIClient manages communication with the AdvantEDGE Radio Network Information Service REST API API v2.1.1 +// APIClient manages communication with the AdvantEDGE Radio Network Information API API v2.2.1 // In most cases there should be only one, shared, APIClient. type APIClient struct { cfg *Configuration diff --git a/go-packages/meep-rnis-client/configuration.go b/go-packages/meep-rnis-client/configuration.go index 8f09436b8..9ea5ca5b4 100644 --- a/go-packages/meep-rnis-client/configuration.go +++ b/go-packages/meep-rnis-client/configuration.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/docs/CaReconfSubscription.md b/go-packages/meep-rnis-client/docs/CaReconfSubscription.md index 2f9475fc7..016b721f4 100644 --- a/go-packages/meep-rnis-client/docs/CaReconfSubscription.md +++ b/go-packages/meep-rnis-client/docs/CaReconfSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/CellChangeSubscription.md b/go-packages/meep-rnis-client/docs/CellChangeSubscription.md index f85db8bc0..ce3f7108a 100644 --- a/go-packages/meep-rnis-client/docs/CellChangeSubscription.md +++ b/go-packages/meep-rnis-client/docs/CellChangeSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/MeasRepUeSubscription.md b/go-packages/meep-rnis-client/docs/MeasRepUeSubscription.md index 25171e980..b1e94cda4 100644 --- a/go-packages/meep-rnis-client/docs/MeasRepUeSubscription.md +++ b/go-packages/meep-rnis-client/docs/MeasRepUeSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications. | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/MeasTaSubscription.md b/go-packages/meep-rnis-client/docs/MeasTaSubscription.md index f8b7324c7..9b81cfd28 100644 --- a/go-packages/meep-rnis-client/docs/MeasTaSubscription.md +++ b/go-packages/meep-rnis-client/docs/MeasTaSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/NrMeasRepUeSubscription.md b/go-packages/meep-rnis-client/docs/NrMeasRepUeSubscription.md index f823747b1..51594777e 100644 --- a/go-packages/meep-rnis-client/docs/NrMeasRepUeSubscription.md +++ b/go-packages/meep-rnis-client/docs/NrMeasRepUeSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/RabEstSubscription.md b/go-packages/meep-rnis-client/docs/RabEstSubscription.md index 910c8573e..d4291cb4d 100644 --- a/go-packages/meep-rnis-client/docs/RabEstSubscription.md +++ b/go-packages/meep-rnis-client/docs/RabEstSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/RabModSubscription.md b/go-packages/meep-rnis-client/docs/RabModSubscription.md index 8db0c984c..b24d31fdd 100644 --- a/go-packages/meep-rnis-client/docs/RabModSubscription.md +++ b/go-packages/meep-rnis-client/docs/RabModSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/RabRelSubscription.md b/go-packages/meep-rnis-client/docs/RabRelSubscription.md index ce670009b..fd155c231 100644 --- a/go-packages/meep-rnis-client/docs/RabRelSubscription.md +++ b/go-packages/meep-rnis-client/docs/RabRelSubscription.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **ExpiryDeadline** | [***TimeStamp**](TimeStamp.md) | | [optional] [default to null] @@ -13,3 +13,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/RniApi.md b/go-packages/meep-rnis-client/docs/RniApi.md index 94a6e4ca0..f46bfd00d 100644 --- a/go-packages/meep-rnis-client/docs/RniApi.md +++ b/go-packages/meep-rnis-client/docs/RniApi.md @@ -1,4 +1,4 @@ -# {{classname}} +# \RniApi All URIs are relative to *https://localhost/sandboxname/rni/v2* @@ -14,6 +14,7 @@ Method | HTTP request | Description [**SubscriptionsPOST**](RniApi.md#SubscriptionsPOST) | **Post** /subscriptions | Create a new subscription [**SubscriptionsPUT**](RniApi.md#SubscriptionsPUT) | **Put** /subscriptions/{subscriptionId} | Modify an existing subscription + # **Layer2MeasInfoGET** > L2Meas Layer2MeasInfoGET(ctx, optional) Retrieve information on layer 2 measurements @@ -25,10 +26,11 @@ Queries information about the layer 2 measurements. Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***RniApiLayer2MeasInfoGETOpts** | optional parameters | nil if no parameters + **optional** | ***Layer2MeasInfoGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a RniApiLayer2MeasInfoGETOpts struct +Optional parameters are passed through a pointer to a Layer2MeasInfoGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **appInsId** | **optional.String**| Application instance identifier | @@ -153,10 +155,11 @@ Queries information about the Radio Access Bearers Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***RniApiRabInfoGETOpts** | optional parameters | nil if no parameters + **optional** | ***RabInfoGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a RniApiRabInfoGETOpts struct +Optional parameters are passed through a pointer to a RabInfoGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **appInsId** | **optional.String**| Application instance identifier | @@ -198,10 +201,11 @@ Queries information on subscriptions for notifications Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***RniApiSubscriptionLinkListSubscriptionsGETOpts** | optional parameters | nil if no parameters + **optional** | ***SubscriptionLinkListSubscriptionsGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a RniApiSubscriptionLinkListSubscriptionsGETOpts struct +Optional parameters are passed through a pointer to a SubscriptionLinkListSubscriptionsGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **subscriptionType** | **optional.String**| Filter on a specific subscription type. Permitted values: cell_change, rab_est, rab_mod, rab_rel, meas_rep_ue, nr_meas_rep_ue, timing_advance_ue, ca_reconf, s1_bearer. | diff --git a/go-packages/meep-rnis-client/docs/S1BearerSubscription.md b/go-packages/meep-rnis-client/docs/S1BearerSubscription.md index c98d54301..bd9e905bf 100644 --- a/go-packages/meep-rnis-client/docs/S1BearerSubscription.md +++ b/go-packages/meep-rnis-client/docs/S1BearerSubscription.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **S1BearerSubscriptionCriteria** | [***S1BearerSubscriptionS1BearerSubscriptionCriteria**](S1BearerSubscription_S1BearerSubscriptionCriteria.md) | | [default to null] **Links** | [***CaReconfSubscriptionLinks**](CaReconfSubscription__links.md) | | [optional] [default to null] -**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [optional] [default to null] +**CallbackReference** | **string** | URI exposed by the client on which to receive notifications via HTTP. See note. | [default to null] **WebsockNotifConfig** | [***WebsockNotifConfig**](WebsockNotifConfig.md) | | [optional] [default to null] **RequestTestNotification** | **bool** | Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. | [optional] [default to null] **EventType** | **[]int32** | Description of the subscribed event. The event is included both in the request and in the response. \\nFor the eventType, the following values are currently defined: <p>0 = RESERVED. <p>1 = S1_BEARER_ESTABLISH. <p>2 = S1_BEARER_MODIFY. <p>3 = S1_BEARER_RELEASE. | [default to null] @@ -14,3 +14,4 @@ Name | Type | Description | Notes [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/go-packages/meep-rnis-client/docs/UnsupportedApi.md b/go-packages/meep-rnis-client/docs/UnsupportedApi.md index 451a96ccb..6067bf529 100644 --- a/go-packages/meep-rnis-client/docs/UnsupportedApi.md +++ b/go-packages/meep-rnis-client/docs/UnsupportedApi.md @@ -1,4 +1,4 @@ -# {{classname}} +# \UnsupportedApi All URIs are relative to *https://localhost/sandboxname/rni/v2* @@ -6,6 +6,7 @@ Method | HTTP request | Description ------------- | ------------- | ------------- [**S1BearerInfoGET**](UnsupportedApi.md#S1BearerInfoGET) | **Get** /queries/s1_bearer_info | Retrieve S1-U bearer information related to specific UE(s) + # **S1BearerInfoGET** > S1BearerInfo S1BearerInfoGET(ctx, optional) Retrieve S1-U bearer information related to specific UE(s) @@ -17,10 +18,11 @@ Queries information about the S1 bearer(s) Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***UnsupportedApiS1BearerInfoGETOpts** | optional parameters | nil if no parameters + **optional** | ***S1BearerInfoGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a UnsupportedApiS1BearerInfoGETOpts struct +Optional parameters are passed through a pointer to a S1BearerInfoGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **tempUeId** | [**optional.Interface of []string**](string.md)| Comma separated list of temporary identifiers allocated for the specific UE as defined in ETSI TS 136 413 | diff --git a/go-packages/meep-rnis-client/go.mod b/go-packages/meep-rnis-client/go.mod index 341267150..7c9da0883 100644 --- a/go-packages/meep-rnis-client/go.mod +++ b/go-packages/meep-rnis-client/go.mod @@ -3,7 +3,7 @@ module github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client go 1.12 require ( - github.com/antihax/optional v1.0.0 - golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 - golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 + golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a ) + diff --git a/go-packages/meep-rnis-client/go.sum b/go-packages/meep-rnis-client/go.sum deleted file mode 100644 index f04cf1014..000000000 --- a/go-packages/meep-rnis-client/go.sum +++ /dev/null @@ -1,15 +0,0 @@ -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/go-packages/meep-rnis-client/model_app_termination_notification.go b/go-packages/meep-rnis-client/model_app_termination_notification.go index c713f3c59..03cf31aab 100644 --- a/go-packages/meep-rnis-client/model_app_termination_notification.go +++ b/go-packages/meep-rnis-client/model_app_termination_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_app_termination_notification__links.go b/go-packages/meep-rnis-client/model_app_termination_notification__links.go index e1f8b5ced..7d000f407 100644 --- a/go-packages/meep-rnis-client/model_app_termination_notification__links.go +++ b/go-packages/meep-rnis-client/model_app_termination_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_associate_id.go b/go-packages/meep-rnis-client/model_associate_id.go index 66f394753..0bcf4abb9 100644 --- a/go-packages/meep-rnis-client/model_associate_id.go +++ b/go-packages/meep-rnis-client/model_associate_id.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ca_reconf_notification.go b/go-packages/meep-rnis-client/model_ca_reconf_notification.go index 01527a008..a05d5d193 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_notification.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ca_reconf_notification__links.go b/go-packages/meep-rnis-client/model_ca_reconf_notification__links.go index 38ebf00e4..ead03e3a1 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_notification__links.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ca_reconf_notification_carrier_aggregation_meas_info.go b/go-packages/meep-rnis-client/model_ca_reconf_notification_carrier_aggregation_meas_info.go index 59937ed62..556cc6558 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_notification_carrier_aggregation_meas_info.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_notification_carrier_aggregation_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ca_reconf_notification_secondary_cell_add.go b/go-packages/meep-rnis-client/model_ca_reconf_notification_secondary_cell_add.go index 60ebdf9ad..7b5a1dbe8 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_notification_secondary_cell_add.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_notification_secondary_cell_add.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ca_reconf_subscription.go b/go-packages/meep-rnis-client/model_ca_reconf_subscription.go index 22b1c5aa3..dcac5847e 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_subscription.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type CaReconfSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_ca_reconf_subscription__links.go b/go-packages/meep-rnis-client/model_ca_reconf_subscription__links.go index 67aa027f1..e4adf0828 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_subscription__links.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_subscription__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ca_reconf_subscription_filter_criteria_assoc.go b/go-packages/meep-rnis-client/model_ca_reconf_subscription_filter_criteria_assoc.go index 63b8e7acb..fb269d88c 100644 --- a/go-packages/meep-rnis-client/model_ca_reconf_subscription_filter_criteria_assoc.go +++ b/go-packages/meep-rnis-client/model_ca_reconf_subscription_filter_criteria_assoc.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_cell_change_notification.go b/go-packages/meep-rnis-client/model_cell_change_notification.go index 40ca19bd2..eb6ded7bb 100644 --- a/go-packages/meep-rnis-client/model_cell_change_notification.go +++ b/go-packages/meep-rnis-client/model_cell_change_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_cell_change_notification_temp_ue_id.go b/go-packages/meep-rnis-client/model_cell_change_notification_temp_ue_id.go index 7072134ea..aad787b03 100644 --- a/go-packages/meep-rnis-client/model_cell_change_notification_temp_ue_id.go +++ b/go-packages/meep-rnis-client/model_cell_change_notification_temp_ue_id.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_cell_change_subscription.go b/go-packages/meep-rnis-client/model_cell_change_subscription.go index 04da1bc5f..80bd9ae69 100644 --- a/go-packages/meep-rnis-client/model_cell_change_subscription.go +++ b/go-packages/meep-rnis-client/model_cell_change_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type CellChangeSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. diff --git a/go-packages/meep-rnis-client/model_cell_change_subscription_filter_criteria_assoc_ho.go b/go-packages/meep-rnis-client/model_cell_change_subscription_filter_criteria_assoc_ho.go index 5af54326f..25cd8962f 100644 --- a/go-packages/meep-rnis-client/model_cell_change_subscription_filter_criteria_assoc_ho.go +++ b/go-packages/meep-rnis-client/model_cell_change_subscription_filter_criteria_assoc_ho.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_ecgi.go b/go-packages/meep-rnis-client/model_ecgi.go index 8ca936a98..58d4c5a2e 100644 --- a/go-packages/meep-rnis-client/model_ecgi.go +++ b/go-packages/meep-rnis-client/model_ecgi.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_expiry_notification.go b/go-packages/meep-rnis-client/model_expiry_notification.go index 21db96d17..5e0d85ea0 100644 --- a/go-packages/meep-rnis-client/model_expiry_notification.go +++ b/go-packages/meep-rnis-client/model_expiry_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_expiry_notification__links.go b/go-packages/meep-rnis-client/model_expiry_notification__links.go index a1e72b3fe..35d6eaaec 100644 --- a/go-packages/meep-rnis-client/model_expiry_notification__links.go +++ b/go-packages/meep-rnis-client/model_expiry_notification__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_inline_notification.go b/go-packages/meep-rnis-client/model_inline_notification.go index 2eb3dcab4..6d3761d60 100644 --- a/go-packages/meep-rnis-client/model_inline_notification.go +++ b/go-packages/meep-rnis-client/model_inline_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_inline_subscription.go b/go-packages/meep-rnis-client/model_inline_subscription.go index 4eecad4a4..1caf12bac 100644 --- a/go-packages/meep-rnis-client/model_inline_subscription.go +++ b/go-packages/meep-rnis-client/model_inline_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_l2_meas.go b/go-packages/meep-rnis-client/model_l2_meas.go index 22236ba9a..04af6798d 100644 --- a/go-packages/meep-rnis-client/model_l2_meas.go +++ b/go-packages/meep-rnis-client/model_l2_meas.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_l2_meas_cell_info.go b/go-packages/meep-rnis-client/model_l2_meas_cell_info.go index a11e83587..38e27786b 100644 --- a/go-packages/meep-rnis-client/model_l2_meas_cell_info.go +++ b/go-packages/meep-rnis-client/model_l2_meas_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_l2_meas_cell_ue_info.go b/go-packages/meep-rnis-client/model_l2_meas_cell_ue_info.go index da5a177db..03a390e30 100644 --- a/go-packages/meep-rnis-client/model_l2_meas_cell_ue_info.go +++ b/go-packages/meep-rnis-client/model_l2_meas_cell_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_link_type.go b/go-packages/meep-rnis-client/model_link_type.go index 4e1eb9950..39b8ce2df 100644 --- a/go-packages/meep-rnis-client/model_link_type.go +++ b/go-packages/meep-rnis-client/model_link_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_quantity_results_nr.go b/go-packages/meep-rnis-client/model_meas_quantity_results_nr.go index 4f888ec3f..c6a9be747 100644 --- a/go-packages/meep-rnis-client/model_meas_quantity_results_nr.go +++ b/go-packages/meep-rnis-client/model_meas_quantity_results_nr.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification.go index 512981fa0..be2738472 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go index a68ba9ef6..01d402cac 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_carrier_aggregation_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go index 3935dfde5..b8dc0c3d1 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_eutran_neighbour_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_info.go index 535ed9775..aa46fa839 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_nei_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_nei_info.go index e76b7a678..f03033212 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_nei_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_new_radio_meas_nei_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs.go index e68311559..dd4ed8a34 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go index 9958f1149..faf5b60c5 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_bn_cs_nr_bn_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_n_cell_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_n_cell_info.go index 72fbf0000..0cc0f2249 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_n_cell_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_n_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs.go index 40021f766..6685212e4 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go index 32df47e29..347a577bd 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_notification_nr_s_cs_nr_s_cell_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_subscription.go b/go-packages/meep-rnis-client/model_meas_rep_ue_subscription.go index b89002673..74ecc1688 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_subscription.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type MeasRepUeSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by RNIS for notifications. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go b/go-packages/meep-rnis-client/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go index 89dc68a04..fe27e44de 100644 --- a/go-packages/meep-rnis-client/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go +++ b/go-packages/meep-rnis-client/model_meas_rep_ue_subscription_filter_criteria_assoc_tri.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_ta_notification.go b/go-packages/meep-rnis-client/model_meas_ta_notification.go index ce7b57084..4a46caab4 100644 --- a/go-packages/meep-rnis-client/model_meas_ta_notification.go +++ b/go-packages/meep-rnis-client/model_meas_ta_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_meas_ta_subscription.go b/go-packages/meep-rnis-client/model_meas_ta_subscription.go index d9be1e6b1..40eb3e776 100644 --- a/go-packages/meep-rnis-client/model_meas_ta_subscription.go +++ b/go-packages/meep-rnis-client/model_meas_ta_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type MeasTaSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification.go index 06d02ccf5..1d9f09666 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go index bb0aef91c..5ac6b812a 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_eutra_neigh_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_n_cell.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_n_cell.go index d99d6361b..270d8c799 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_n_cell.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_n_cell.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go index e991d6114..5d1375a9b 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_nr_neigh_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_s_cell.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_s_cell.go index 58701ac6b..97e525892 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_s_cell.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_s_cell.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go index 977550204..007586ddc 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_notification_serv_cell_meas_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription.go index 42770ab53..27ee04d2c 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type NrMeasRepUeSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go index 588d9f970..ee6ce98ae 100644 --- a/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go +++ b/go-packages/meep-rnis-client/model_nr_meas_rep_ue_subscription_filter_criteria_nr_mrs.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_nrcgi.go b/go-packages/meep-rnis-client/model_nrcgi.go index 87b33b6f9..332d80d4a 100644 --- a/go-packages/meep-rnis-client/model_nrcgi.go +++ b/go-packages/meep-rnis-client/model_nrcgi.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_one_of_inline_notification.go b/go-packages/meep-rnis-client/model_one_of_inline_notification.go index df7551f78..a1a295afc 100644 --- a/go-packages/meep-rnis-client/model_one_of_inline_notification.go +++ b/go-packages/meep-rnis-client/model_one_of_inline_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,13 +25,4 @@ package client type OneOfInlineNotification struct { - CellChangeNotification - RabEstNotification - RabModNotification - RabRelNotification - MeasRepUeNotification - NrMeasRepUeNotification - MeasTaNotification - CaReconfNotification - S1BearerNotification } diff --git a/go-packages/meep-rnis-client/model_one_of_inline_subscription.go b/go-packages/meep-rnis-client/model_one_of_inline_subscription.go index b0504f624..7f83d3406 100644 --- a/go-packages/meep-rnis-client/model_one_of_inline_subscription.go +++ b/go-packages/meep-rnis-client/model_one_of_inline_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -25,13 +25,4 @@ package client type OneOfInlineSubscription struct { - CellChangeSubscription - RabEstSubscription - RabModSubscription - RabRelSubscription - MeasRepUeSubscription - NrMeasRepUeSubscription - MeasTaSubscription - CaReconfSubscription - S1BearerSubscription } diff --git a/go-packages/meep-rnis-client/model_operation_action_type.go b/go-packages/meep-rnis-client/model_operation_action_type.go index 823e7e7a3..d830dbfa1 100644 --- a/go-packages/meep-rnis-client/model_operation_action_type.go +++ b/go-packages/meep-rnis-client/model_operation_action_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_plmn.go b/go-packages/meep-rnis-client/model_plmn.go index 88a272663..14cee9408 100644 --- a/go-packages/meep-rnis-client/model_plmn.go +++ b/go-packages/meep-rnis-client/model_plmn.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_plmn_info.go b/go-packages/meep-rnis-client/model_plmn_info.go index f72ea4a1a..f201fc03f 100644 --- a/go-packages/meep-rnis-client/model_plmn_info.go +++ b/go-packages/meep-rnis-client/model_plmn_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_problem_details.go b/go-packages/meep-rnis-client/model_problem_details.go index 4c04ad589..96033749d 100644 --- a/go-packages/meep-rnis-client/model_problem_details.go +++ b/go-packages/meep-rnis-client/model_problem_details.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_est_notification.go b/go-packages/meep-rnis-client/model_rab_est_notification.go index e4eb11b7c..b15bf46f6 100644 --- a/go-packages/meep-rnis-client/model_rab_est_notification.go +++ b/go-packages/meep-rnis-client/model_rab_est_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters.go b/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters.go index 864a302b7..7b87995ff 100644 --- a/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters.go +++ b/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters_qos_information.go b/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters_qos_information.go index 9df2bbf36..9e2351145 100644 --- a/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters_qos_information.go +++ b/go-packages/meep-rnis-client/model_rab_est_notification_erab_qos_parameters_qos_information.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_est_notification_temp_ue_id.go b/go-packages/meep-rnis-client/model_rab_est_notification_temp_ue_id.go index 2443a2fa7..c394de307 100644 --- a/go-packages/meep-rnis-client/model_rab_est_notification_temp_ue_id.go +++ b/go-packages/meep-rnis-client/model_rab_est_notification_temp_ue_id.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_est_subscription.go b/go-packages/meep-rnis-client/model_rab_est_subscription.go index d4f9f1d89..8742a5144 100644 --- a/go-packages/meep-rnis-client/model_rab_est_subscription.go +++ b/go-packages/meep-rnis-client/model_rab_est_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type RabEstSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. diff --git a/go-packages/meep-rnis-client/model_rab_est_subscription_filter_criteria_qci.go b/go-packages/meep-rnis-client/model_rab_est_subscription_filter_criteria_qci.go index 5663af1ce..e2a574195 100644 --- a/go-packages/meep-rnis-client/model_rab_est_subscription_filter_criteria_qci.go +++ b/go-packages/meep-rnis-client/model_rab_est_subscription_filter_criteria_qci.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_info.go b/go-packages/meep-rnis-client/model_rab_info.go index b29dcd5c6..f4201d669 100644 --- a/go-packages/meep-rnis-client/model_rab_info.go +++ b/go-packages/meep-rnis-client/model_rab_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_info_cell_user_info.go b/go-packages/meep-rnis-client/model_rab_info_cell_user_info.go index 2cd778f92..4c00ed1c0 100644 --- a/go-packages/meep-rnis-client/model_rab_info_cell_user_info.go +++ b/go-packages/meep-rnis-client/model_rab_info_cell_user_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_info_erab_info.go b/go-packages/meep-rnis-client/model_rab_info_erab_info.go index 9aa29a1da..08e119687 100644 --- a/go-packages/meep-rnis-client/model_rab_info_erab_info.go +++ b/go-packages/meep-rnis-client/model_rab_info_erab_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_info_ue_info.go b/go-packages/meep-rnis-client/model_rab_info_ue_info.go index 628acecb1..bb54abf34 100644 --- a/go-packages/meep-rnis-client/model_rab_info_ue_info.go +++ b/go-packages/meep-rnis-client/model_rab_info_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_mod_notification.go b/go-packages/meep-rnis-client/model_rab_mod_notification.go index c281ae70e..efd9553fb 100644 --- a/go-packages/meep-rnis-client/model_rab_mod_notification.go +++ b/go-packages/meep-rnis-client/model_rab_mod_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters.go b/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters.go index 2e59e58d7..79c386b5f 100644 --- a/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters.go +++ b/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters_qos_information.go b/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters_qos_information.go index dd864b9c6..84b27614e 100644 --- a/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters_qos_information.go +++ b/go-packages/meep-rnis-client/model_rab_mod_notification_erab_qos_parameters_qos_information.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_mod_subscription.go b/go-packages/meep-rnis-client/model_rab_mod_subscription.go index 17ca2744a..910d59c6f 100644 --- a/go-packages/meep-rnis-client/model_rab_mod_subscription.go +++ b/go-packages/meep-rnis-client/model_rab_mod_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type RabModSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_rab_mod_subscription_filter_criteria_qci.go b/go-packages/meep-rnis-client/model_rab_mod_subscription_filter_criteria_qci.go index 69a53022c..e1ef9630f 100644 --- a/go-packages/meep-rnis-client/model_rab_mod_subscription_filter_criteria_qci.go +++ b/go-packages/meep-rnis-client/model_rab_mod_subscription_filter_criteria_qci.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_rel_notification.go b/go-packages/meep-rnis-client/model_rab_rel_notification.go index 33f7c0cba..8593cd0cb 100644 --- a/go-packages/meep-rnis-client/model_rab_rel_notification.go +++ b/go-packages/meep-rnis-client/model_rab_rel_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_rel_notification_erab_release_info.go b/go-packages/meep-rnis-client/model_rab_rel_notification_erab_release_info.go index 2bd91afb4..118efb24e 100644 --- a/go-packages/meep-rnis-client/model_rab_rel_notification_erab_release_info.go +++ b/go-packages/meep-rnis-client/model_rab_rel_notification_erab_release_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rab_rel_subscription.go b/go-packages/meep-rnis-client/model_rab_rel_subscription.go index 4e5d7f9e9..08d4c4b6f 100644 --- a/go-packages/meep-rnis-client/model_rab_rel_subscription.go +++ b/go-packages/meep-rnis-client/model_rab_rel_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -28,7 +28,7 @@ package client type RabRelSubscription struct { Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI selected by the service consumer to receive notifications on the subscribed RNIS information. This shall be included both in the request and in response. If not present, the service consumer is requesting the use of a Websocket for notifications. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_results_per_csi_rs_index.go b/go-packages/meep-rnis-client/model_results_per_csi_rs_index.go index 548c6ce80..2a2bc352d 100644 --- a/go-packages/meep-rnis-client/model_results_per_csi_rs_index.go +++ b/go-packages/meep-rnis-client/model_results_per_csi_rs_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list.go b/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list.go index f0826b88e..1aa8892a8 100644 --- a/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list.go +++ b/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go b/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go index 179779b00..4ff30219e 100644 --- a/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go +++ b/go-packages/meep-rnis-client/model_results_per_csi_rs_index_list_results_per_csi_rs_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_results_per_ssb_index.go b/go-packages/meep-rnis-client/model_results_per_ssb_index.go index d4cfe2788..8e32697f5 100644 --- a/go-packages/meep-rnis-client/model_results_per_ssb_index.go +++ b/go-packages/meep-rnis-client/model_results_per_ssb_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_results_per_ssb_index_list.go b/go-packages/meep-rnis-client/model_results_per_ssb_index_list.go index 9821f7db8..07fd28ef0 100644 --- a/go-packages/meep-rnis-client/model_results_per_ssb_index_list.go +++ b/go-packages/meep-rnis-client/model_results_per_ssb_index_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_results_per_ssb_index_list_results_per_ssb_index.go b/go-packages/meep-rnis-client/model_results_per_ssb_index_list_results_per_ssb_index.go index e85275423..89d9c79e5 100644 --- a/go-packages/meep-rnis-client/model_results_per_ssb_index_list_results_per_ssb_index.go +++ b/go-packages/meep-rnis-client/model_results_per_ssb_index_list_results_per_ssb_index.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_rs_index_results.go b/go-packages/meep-rnis-client/model_rs_index_results.go index 01fc4aafb..0314e16ee 100644 --- a/go-packages/meep-rnis-client/model_rs_index_results.go +++ b/go-packages/meep-rnis-client/model_rs_index_results.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_info.go b/go-packages/meep-rnis-client/model_s1_bearer_info.go index fc23c2174..0f20d767e 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_info.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_info_enb_info.go b/go-packages/meep-rnis-client/model_s1_bearer_info_enb_info.go index db3b521cb..a63cc03d5 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_info_enb_info.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_info_enb_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_info_s1_bearer_info_detailed.go b/go-packages/meep-rnis-client/model_s1_bearer_info_s1_bearer_info_detailed.go index 497ff12c4..267864739 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_info_s1_bearer_info_detailed.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_info_s1_bearer_info_detailed.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_info_s1_ue_info.go b/go-packages/meep-rnis-client/model_s1_bearer_info_s1_ue_info.go index eaf245918..af18eabdb 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_info_s1_ue_info.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_info_s1_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_info_s_gw_info.go b/go-packages/meep-rnis-client/model_s1_bearer_info_s_gw_info.go index 62306a6dc..61cfe49ed 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_info_s_gw_info.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_info_s_gw_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_notification.go b/go-packages/meep-rnis-client/model_s1_bearer_notification.go index 97390a21c..a9bfebfa5 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_notification.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_notification_s1_ue_info.go b/go-packages/meep-rnis-client/model_s1_bearer_notification_s1_ue_info.go index d76bea8de..6599ea3c3 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_notification_s1_ue_info.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_notification_s1_ue_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_s1_bearer_subscription.go b/go-packages/meep-rnis-client/model_s1_bearer_subscription.go index 10f3daf6f..b08ac9459 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_subscription.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * @@ -29,7 +29,7 @@ type S1BearerSubscription struct { S1BearerSubscriptionCriteria *S1BearerSubscriptionS1BearerSubscriptionCriteria `json:"S1BearerSubscriptionCriteria"` Links *CaReconfSubscriptionLinks `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` + CallbackReference string `json:"callbackReference"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, specified in ETSI GS MEC 009 [6], as described in clause 6.12a. RequestTestNotification bool `json:"requestTestNotification,omitempty"` diff --git a/go-packages/meep-rnis-client/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go b/go-packages/meep-rnis-client/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go index 6bb28d2b3..4ff8bb3b4 100644 --- a/go-packages/meep-rnis-client/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go +++ b/go-packages/meep-rnis-client/model_s1_bearer_subscription_s1_bearer_subscription_criteria.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_subscription_link_list.go b/go-packages/meep-rnis-client/model_subscription_link_list.go index 5200542bf..0aba77e40 100644 --- a/go-packages/meep-rnis-client/model_subscription_link_list.go +++ b/go-packages/meep-rnis-client/model_subscription_link_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_subscription_link_list__links.go b/go-packages/meep-rnis-client/model_subscription_link_list__links.go index 39426bee9..12cce985f 100644 --- a/go-packages/meep-rnis-client/model_subscription_link_list__links.go +++ b/go-packages/meep-rnis-client/model_subscription_link_list__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_subscription_link_list__links_subscription.go b/go-packages/meep-rnis-client/model_subscription_link_list__links_subscription.go index f20253d3f..72064594b 100644 --- a/go-packages/meep-rnis-client/model_subscription_link_list__links_subscription.go +++ b/go-packages/meep-rnis-client/model_subscription_link_list__links_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_test_notification.go b/go-packages/meep-rnis-client/model_test_notification.go deleted file mode 100644 index e0a104d5e..000000000 --- a/go-packages/meep-rnis-client/model_test_notification.go +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022 InterDigital Communications, Inc - * - * Licensed under the Apache License, Version 2.0 (the \"License\"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * AdvantEDGE Radio Network Information Service REST API - * - * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription - * - * API version: 2.2.1 - * Contact: AdvantEDGE@InterDigital.com - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package client - -// This type represents a test notification from a Radio Network Information service to determine if the Websocket method is to be utilized for the RNIS to issue notifications for a subscription, as defined in clause 6.12a of ETSI GS MEC 009 [6]. -type TestNotification struct { - // Shall be set to \"RabEstNotification\". - NotificationType string `json:"notificationType"` - Links *CaReconfNotificationLinks `json:"_links"` -} diff --git a/go-packages/meep-rnis-client/model_time_stamp.go b/go-packages/meep-rnis-client/model_time_stamp.go index 3989a759a..a62cfdfc7 100644 --- a/go-packages/meep-rnis-client/model_time_stamp.go +++ b/go-packages/meep-rnis-client/model_time_stamp.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_trigger.go b/go-packages/meep-rnis-client/model_trigger.go index dd9a46061..8169d78a0 100644 --- a/go-packages/meep-rnis-client/model_trigger.go +++ b/go-packages/meep-rnis-client/model_trigger.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_trigger_nr.go b/go-packages/meep-rnis-client/model_trigger_nr.go index 4f2f2933d..cf902a09f 100644 --- a/go-packages/meep-rnis-client/model_trigger_nr.go +++ b/go-packages/meep-rnis-client/model_trigger_nr.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/model_websock_notif_config.go b/go-packages/meep-rnis-client/model_websock_notif_config.go index 7dd02fcc4..630960fe9 100644 --- a/go-packages/meep-rnis-client/model_websock_notif_config.go +++ b/go-packages/meep-rnis-client/model_websock_notif_config.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-rnis-client/response.go b/go-packages/meep-rnis-client/response.go index 92daa87e7..94fa25bf2 100644 --- a/go-packages/meep-rnis-client/response.go +++ b/go-packages/meep-rnis-client/response.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE Radio Network Information Service REST API + * AdvantEDGE Radio Network Information API * * Radio Network Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC012 RNI API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/012/02.02.01_60/gs_MEC012v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-rnis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-rnis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types.

    Supported subscriptions:

    - CellChangeSubscription

    - RabEstSubscription

    - RabRelSubscription

    - MeasRepUeSubscription

    - NrMeasRepUeSubscription * diff --git a/go-packages/meep-sandbox-ctrl-client/README.md b/go-packages/meep-sandbox-ctrl-client/README.md index a233cd632..7f3baee5a 100644 --- a/go-packages/meep-sandbox-ctrl-client/README.md +++ b/go-packages/meep-sandbox-ctrl-client/README.md @@ -60,6 +60,7 @@ Class | Method | HTTP request | Description - [CellularPoaConfig](docs/CellularPoaConfig.md) - [ConnectivityConfig](docs/ConnectivityConfig.md) - [CpuConfig](docs/CpuConfig.md) + - [D2dConfig](docs/D2dConfig.md) - [Deployment](docs/Deployment.md) - [DnConfig](docs/DnConfig.md) - [Domain](docs/Domain.md) diff --git a/go-packages/meep-sandbox-ctrl-client/api/swagger.yaml b/go-packages/meep-sandbox-ctrl-client/api/swagger.yaml index ca997156a..bda013240 100644 --- a/go-packages/meep-sandbox-ctrl-client/api/swagger.yaml +++ b/go-packages/meep-sandbox-ctrl-client/api/swagger.yaml @@ -1320,6 +1320,8 @@ definitions: $ref: "#/definitions/NetworkCharacteristics" connectivity: $ref: "#/definitions/ConnectivityConfig" + d2d: + $ref: "#/definitions/D2dConfig" interDomainLatency: type: "integer" description: "**DEPRECATED** As of release 1.5.0, replaced by netChar latency" @@ -1398,6 +1400,16 @@ definitions: - "OPEN" - "PDU" example: {} + D2dConfig: + type: "object" + properties: + d2dMaxDistance: + type: "number" + description: "Maximum distance for D2D. Default distance is 100m" + disableD2dViaNetwork: + type: "boolean" + description: "Enable-Disable D2D via network. Default value is false" + description: "D2D config" Domain: type: "object" properties: @@ -1649,6 +1661,16 @@ definitions: velocity: type: "number" description: "Speed of movement along path in m/s" + d2dInRange: + type: "array" + items: + type: "string" + description: "D2D UEs visible to UE" + poaInRange: + type: "array" + items: + type: "string" + description: "POAs visible to UE" description: "Geographic data" Point: type: "object" diff --git a/go-packages/meep-sandbox-ctrl-client/api_active_scenario.go b/go-packages/meep-sandbox-ctrl-client/api_active_scenario.go index 7f064842c..e357f9535 100644 --- a/go-packages/meep-sandbox-ctrl-client/api_active_scenario.go +++ b/go-packages/meep-sandbox-ctrl-client/api_active_scenario.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/api_applications.go b/go-packages/meep-sandbox-ctrl-client/api_applications.go index 0de42bb8b..e3c2f9a6c 100644 --- a/go-packages/meep-sandbox-ctrl-client/api_applications.go +++ b/go-packages/meep-sandbox-ctrl-client/api_applications.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/api_connectivity.go b/go-packages/meep-sandbox-ctrl-client/api_connectivity.go index 8759c7514..e3ba06938 100644 --- a/go-packages/meep-sandbox-ctrl-client/api_connectivity.go +++ b/go-packages/meep-sandbox-ctrl-client/api_connectivity.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/api_event_replay.go b/go-packages/meep-sandbox-ctrl-client/api_event_replay.go index c6bb8f133..db190775d 100644 --- a/go-packages/meep-sandbox-ctrl-client/api_event_replay.go +++ b/go-packages/meep-sandbox-ctrl-client/api_event_replay.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/api_events.go b/go-packages/meep-sandbox-ctrl-client/api_events.go index 8dabeb9a7..9c4772326 100644 --- a/go-packages/meep-sandbox-ctrl-client/api_events.go +++ b/go-packages/meep-sandbox-ctrl-client/api_events.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/api_services.go b/go-packages/meep-sandbox-ctrl-client/api_services.go index 7c2ed4fb3..12dbb39bb 100644 --- a/go-packages/meep-sandbox-ctrl-client/api_services.go +++ b/go-packages/meep-sandbox-ctrl-client/api_services.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/client.go b/go-packages/meep-sandbox-ctrl-client/client.go index a6d7e1a45..518da1006 100644 --- a/go-packages/meep-sandbox-ctrl-client/client.go +++ b/go-packages/meep-sandbox-ctrl-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/configuration.go b/go-packages/meep-sandbox-ctrl-client/configuration.go index ef7afb22a..af69428e4 100644 --- a/go-packages/meep-sandbox-ctrl-client/configuration.go +++ b/go-packages/meep-sandbox-ctrl-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md b/go-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md new file mode 100644 index 000000000..c538be21f --- /dev/null +++ b/go-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md @@ -0,0 +1,11 @@ +# D2dConfig + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**D2dMaxDistance** | **float32** | Maximum distance for D2D. Default distance is 100m | [optional] [default to null] +**DisableD2dViaNetwork** | **bool** | Enable-Disable D2D via network. Default value is false | [optional] [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-sandbox-ctrl-client/docs/Deployment.md b/go-packages/meep-sandbox-ctrl-client/docs/Deployment.md index 4dc93d961..9f079b0ff 100644 --- a/go-packages/meep-sandbox-ctrl-client/docs/Deployment.md +++ b/go-packages/meep-sandbox-ctrl-client/docs/Deployment.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **NetChar** | [***NetworkCharacteristics**](NetworkCharacteristics.md) | | [optional] [default to null] **Connectivity** | [***ConnectivityConfig**](ConnectivityConfig.md) | | [optional] [default to null] +**D2d** | [***D2dConfig**](D2dConfig.md) | | [optional] [default to null] **InterDomainLatency** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar latency | [optional] [default to null] **InterDomainLatencyVariation** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation | [optional] [default to null] **InterDomainThroughput** | **int32** | **DEPRECATED** As of release 1.5.0, replaced by netChar throughputUl and throughputDl | [optional] [default to null] diff --git a/go-packages/meep-sandbox-ctrl-client/docs/GeoData.md b/go-packages/meep-sandbox-ctrl-client/docs/GeoData.md index 347ea89ab..f911776fb 100644 --- a/go-packages/meep-sandbox-ctrl-client/docs/GeoData.md +++ b/go-packages/meep-sandbox-ctrl-client/docs/GeoData.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **Path** | [***LineString**](LineString.md) | | [optional] [default to null] **EopMode** | **string** | End-of-Path mode: <li>LOOP: When path endpoint is reached, start over from the beginning <li>REVERSE: When path endpoint is reached, return on the reverse path | [optional] [default to null] **Velocity** | **float32** | Speed of movement along path in m/s | [optional] [default to null] +**D2dInRange** | **[]string** | | [optional] [default to null] +**PoaInRange** | **[]string** | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-sandbox-ctrl-client/model_activation_info.go b/go-packages/meep-sandbox-ctrl-client/model_activation_info.go index a195086d6..9303ad4df 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_activation_info.go +++ b/go-packages/meep-sandbox-ctrl-client/model_activation_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_application_info.go b/go-packages/meep-sandbox-ctrl-client/model_application_info.go index 7b4684ecf..80eae78b9 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_application_info.go +++ b/go-packages/meep-sandbox-ctrl-client/model_application_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_cellular_domain_config.go b/go-packages/meep-sandbox-ctrl-client/model_cellular_domain_config.go index 4ae791535..769e96b7a 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_cellular_domain_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_cellular_domain_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_cellular_poa_config.go b/go-packages/meep-sandbox-ctrl-client/model_cellular_poa_config.go index 43294162c..2224d413a 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_cellular_poa_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_cellular_poa_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_connectivity_config.go b/go-packages/meep-sandbox-ctrl-client/model_connectivity_config.go index 4fc04943e..08b7a2644 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_connectivity_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_connectivity_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_cpu_config.go b/go-packages/meep-sandbox-ctrl-client/model_cpu_config.go index 392f80288..99b7636cb 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_cpu_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_cpu_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_d2d_config.go b/go-packages/meep-sandbox-ctrl-client/model_d2d_config.go new file mode 100644 index 000000000..fcf3f6651 --- /dev/null +++ b/go-packages/meep-sandbox-ctrl-client/model_d2d_config.go @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Sandbox Controller REST API + * + * This API is the main Sandbox Controller API for scenario deployment & event injection

    **Micro-service**
    [meep-sandbox-ctrl](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-sandbox-ctrl)

    **Type & Usage**
    Platform runtime interface to manage active scenarios and inject events in AdvantEDGE platform

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * API version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// D2D config +type D2dConfig struct { + // Maximum distance for D2D. Default distance is 100m + D2dMaxDistance float32 `json:"d2dMaxDistance,omitempty"` + // Enable-Disable D2D via network. Default value is false + DisableD2dViaNetwork bool `json:"disableD2dViaNetwork,omitempty"` +} diff --git a/go-packages/meep-sandbox-ctrl-client/model_deployment.go b/go-packages/meep-sandbox-ctrl-client/model_deployment.go index b8bb15723..1d25ce9b7 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_deployment.go +++ b/go-packages/meep-sandbox-ctrl-client/model_deployment.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,6 +28,7 @@ package client type Deployment struct { NetChar *NetworkCharacteristics `json:"netChar,omitempty"` Connectivity *ConnectivityConfig `json:"connectivity,omitempty"` + D2d *D2dConfig `json:"d2d,omitempty"` // **DEPRECATED** As of release 1.5.0, replaced by netChar latency InterDomainLatency int32 `json:"interDomainLatency,omitempty"` // **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation diff --git a/go-packages/meep-sandbox-ctrl-client/model_dn_config.go b/go-packages/meep-sandbox-ctrl-client/model_dn_config.go index c462c5e3b..ba2e7a618 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_dn_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_dn_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_domain.go b/go-packages/meep-sandbox-ctrl-client/model_domain.go index 31633f657..4caa73c80 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_domain.go +++ b/go-packages/meep-sandbox-ctrl-client/model_domain.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_domains.go b/go-packages/meep-sandbox-ctrl-client/model_domains.go index 156f97cca..3bd87c1bd 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_domains.go +++ b/go-packages/meep-sandbox-ctrl-client/model_domains.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_egress_service.go b/go-packages/meep-sandbox-ctrl-client/model_egress_service.go index 77b54cce1..eb5ee4689 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_egress_service.go +++ b/go-packages/meep-sandbox-ctrl-client/model_egress_service.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_event.go b/go-packages/meep-sandbox-ctrl-client/model_event.go index 0d4ce85ab..1ce1bd47e 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_event.go +++ b/go-packages/meep-sandbox-ctrl-client/model_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_event_mobility.go b/go-packages/meep-sandbox-ctrl-client/model_event_mobility.go index 74bc28c9a..ea5fe8ab2 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_event_mobility.go +++ b/go-packages/meep-sandbox-ctrl-client/model_event_mobility.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_event_network_characteristics_update.go b/go-packages/meep-sandbox-ctrl-client/model_event_network_characteristics_update.go index ffabbb92b..11dd2ae4d 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_event_network_characteristics_update.go +++ b/go-packages/meep-sandbox-ctrl-client/model_event_network_characteristics_update.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_event_pdu_session.go b/go-packages/meep-sandbox-ctrl-client/model_event_pdu_session.go index ccf5d421f..f26641dad 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_event_pdu_session.go +++ b/go-packages/meep-sandbox-ctrl-client/model_event_pdu_session.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_event_poas_in_range.go b/go-packages/meep-sandbox-ctrl-client/model_event_poas_in_range.go index caba2f309..546fa86fd 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_event_poas_in_range.go +++ b/go-packages/meep-sandbox-ctrl-client/model_event_poas_in_range.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_event_scenario_update.go b/go-packages/meep-sandbox-ctrl-client/model_event_scenario_update.go index 6cf1d2f60..ed09a04ac 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_event_scenario_update.go +++ b/go-packages/meep-sandbox-ctrl-client/model_event_scenario_update.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_external_config.go b/go-packages/meep-sandbox-ctrl-client/model_external_config.go index a9eea0f90..39cbc3646 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_external_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_external_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_geo_data.go b/go-packages/meep-sandbox-ctrl-client/model_geo_data.go index b4e2479b7..59f869784 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_geo_data.go +++ b/go-packages/meep-sandbox-ctrl-client/model_geo_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,5 +33,7 @@ type GeoData struct { // End-of-Path mode:

  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path EopMode string `json:"eopMode,omitempty"` // Speed of movement along path in m/s - Velocity float32 `json:"velocity,omitempty"` + Velocity float32 `json:"velocity,omitempty"` + D2dInRange []string `json:"d2dInRange,omitempty"` + PoaInRange []string `json:"poaInRange,omitempty"` } diff --git a/go-packages/meep-sandbox-ctrl-client/model_gpu_config.go b/go-packages/meep-sandbox-ctrl-client/model_gpu_config.go index 8f58a13b3..e3ccafa59 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_gpu_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_gpu_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_ingress_service.go b/go-packages/meep-sandbox-ctrl-client/model_ingress_service.go index c8e3d35b4..b2ef0b081 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_ingress_service.go +++ b/go-packages/meep-sandbox-ctrl-client/model_ingress_service.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_line_string.go b/go-packages/meep-sandbox-ctrl-client/model_line_string.go index 5bc1392ff..f5b015b70 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_line_string.go +++ b/go-packages/meep-sandbox-ctrl-client/model_line_string.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_memory_config.go b/go-packages/meep-sandbox-ctrl-client/model_memory_config.go index 936f1bfa6..ab6e01f62 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_memory_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_memory_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_network_characteristics.go b/go-packages/meep-sandbox-ctrl-client/model_network_characteristics.go index 1cef4dc21..b2ac83c89 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_network_characteristics.go +++ b/go-packages/meep-sandbox-ctrl-client/model_network_characteristics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_network_location.go b/go-packages/meep-sandbox-ctrl-client/model_network_location.go index 623a614f0..16b307acd 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_network_location.go +++ b/go-packages/meep-sandbox-ctrl-client/model_network_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_network_locations.go b/go-packages/meep-sandbox-ctrl-client/model_network_locations.go index 3683664b5..b6d5f9300 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_network_locations.go +++ b/go-packages/meep-sandbox-ctrl-client/model_network_locations.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_node_data_union.go b/go-packages/meep-sandbox-ctrl-client/model_node_data_union.go index c74083151..817249d07 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_node_data_union.go +++ b/go-packages/meep-sandbox-ctrl-client/model_node_data_union.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_node_service_maps.go b/go-packages/meep-sandbox-ctrl-client/model_node_service_maps.go index 1326d4513..849907a86 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_node_service_maps.go +++ b/go-packages/meep-sandbox-ctrl-client/model_node_service_maps.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_pdu_session.go b/go-packages/meep-sandbox-ctrl-client/model_pdu_session.go index 26884c4bb..1f9171fc4 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_pdu_session.go +++ b/go-packages/meep-sandbox-ctrl-client/model_pdu_session.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_pdu_session_info.go b/go-packages/meep-sandbox-ctrl-client/model_pdu_session_info.go index 82fa74ca6..74430693a 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_pdu_session_info.go +++ b/go-packages/meep-sandbox-ctrl-client/model_pdu_session_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_pdu_session_list.go b/go-packages/meep-sandbox-ctrl-client/model_pdu_session_list.go index 7a82c5905..81d01ad34 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_pdu_session_list.go +++ b/go-packages/meep-sandbox-ctrl-client/model_pdu_session_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_physical_location.go b/go-packages/meep-sandbox-ctrl-client/model_physical_location.go index 2567d6920..89d9facc2 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_physical_location.go +++ b/go-packages/meep-sandbox-ctrl-client/model_physical_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_physical_locations.go b/go-packages/meep-sandbox-ctrl-client/model_physical_locations.go index 04cf378f5..ad10b1906 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_physical_locations.go +++ b/go-packages/meep-sandbox-ctrl-client/model_physical_locations.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_poa4_g_config.go b/go-packages/meep-sandbox-ctrl-client/model_poa4_g_config.go index 6331f63ce..1b65c737d 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_poa4_g_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_poa4_g_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_poa5_g_config.go b/go-packages/meep-sandbox-ctrl-client/model_poa5_g_config.go index c1a81a2bb..bfd6c82f3 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_poa5_g_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_poa5_g_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_poa_wifi_config.go b/go-packages/meep-sandbox-ctrl-client/model_poa_wifi_config.go index 5c2a8ff83..9b9692d1b 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_poa_wifi_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_poa_wifi_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_point.go b/go-packages/meep-sandbox-ctrl-client/model_point.go index c514fc0a4..fdb5e470d 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_point.go +++ b/go-packages/meep-sandbox-ctrl-client/model_point.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_process.go b/go-packages/meep-sandbox-ctrl-client/model_process.go index 974a2f923..cc52ba8fa 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_process.go +++ b/go-packages/meep-sandbox-ctrl-client/model_process.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_processes.go b/go-packages/meep-sandbox-ctrl-client/model_processes.go index 880066adc..44e3efedd 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_processes.go +++ b/go-packages/meep-sandbox-ctrl-client/model_processes.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_replay.go b/go-packages/meep-sandbox-ctrl-client/model_replay.go index 01e9ab064..c98ab4f39 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_replay.go +++ b/go-packages/meep-sandbox-ctrl-client/model_replay.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_replay_event.go b/go-packages/meep-sandbox-ctrl-client/model_replay_event.go index 574a2338a..06d853903 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_replay_event.go +++ b/go-packages/meep-sandbox-ctrl-client/model_replay_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_replay_file_list.go b/go-packages/meep-sandbox-ctrl-client/model_replay_file_list.go index 1245edecd..25cedac42 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_replay_file_list.go +++ b/go-packages/meep-sandbox-ctrl-client/model_replay_file_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_replay_info.go b/go-packages/meep-sandbox-ctrl-client/model_replay_info.go index b2e79957c..524ea899e 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_replay_info.go +++ b/go-packages/meep-sandbox-ctrl-client/model_replay_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_replay_status.go b/go-packages/meep-sandbox-ctrl-client/model_replay_status.go index f514aeb7d..9bc894305 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_replay_status.go +++ b/go-packages/meep-sandbox-ctrl-client/model_replay_status.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_scenario.go b/go-packages/meep-sandbox-ctrl-client/model_scenario.go index bd30854e3..ebd3f3899 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_scenario.go +++ b/go-packages/meep-sandbox-ctrl-client/model_scenario.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_scenario_config.go b/go-packages/meep-sandbox-ctrl-client/model_scenario_config.go index d23bb1701..421e5e7d8 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_scenario_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_scenario_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_scenario_node.go b/go-packages/meep-sandbox-ctrl-client/model_scenario_node.go index a981a5b2a..ac9d5dde4 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_scenario_node.go +++ b/go-packages/meep-sandbox-ctrl-client/model_scenario_node.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_service_config.go b/go-packages/meep-sandbox-ctrl-client/model_service_config.go index 8b482e575..d9667732e 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_service_config.go +++ b/go-packages/meep-sandbox-ctrl-client/model_service_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_service_info.go b/go-packages/meep-sandbox-ctrl-client/model_service_info.go index 2f9db4540..8e63cdc41 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_service_info.go +++ b/go-packages/meep-sandbox-ctrl-client/model_service_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_service_port.go b/go-packages/meep-sandbox-ctrl-client/model_service_port.go index 657c81a95..61ffdc256 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_service_port.go +++ b/go-packages/meep-sandbox-ctrl-client/model_service_port.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_zone.go b/go-packages/meep-sandbox-ctrl-client/model_zone.go index b394dd5b9..ff51d0f73 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_zone.go +++ b/go-packages/meep-sandbox-ctrl-client/model_zone.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/model_zones.go b/go-packages/meep-sandbox-ctrl-client/model_zones.go index 70a457cb1..555cb1e2b 100644 --- a/go-packages/meep-sandbox-ctrl-client/model_zones.go +++ b/go-packages/meep-sandbox-ctrl-client/model_zones.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-ctrl-client/response.go b/go-packages/meep-sandbox-ctrl-client/response.go index aab66b7c3..dee2b6467 100644 --- a/go-packages/meep-sandbox-ctrl-client/response.go +++ b/go-packages/meep-sandbox-ctrl-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-sandbox-store/sandbox-store.go b/go-packages/meep-sandbox-store/sandbox-store.go index 93d7c75fe..7c42678a5 100644 --- a/go-packages/meep-sandbox-store/sandbox-store.go +++ b/go-packages/meep-sandbox-store/sandbox-store.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-sandbox-store/sandbox-store_test.go b/go-packages/meep-sandbox-store/sandbox-store_test.go index a41bcf9f7..1e2b687b9 100644 --- a/go-packages/meep-sandbox-store/sandbox-store_test.go +++ b/go-packages/meep-sandbox-store/sandbox-store_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-service-mgmt-client/README.md b/go-packages/meep-service-mgmt-client/README.md index bc8659e16..96703f6df 100644 --- a/go-packages/meep-service-mgmt-client/README.md +++ b/go-packages/meep-service-mgmt-client/README.md @@ -55,6 +55,7 @@ Class | Method | HTTP request | Description - [SerAvailabilityNotificationSubscriptionFilteringCriteria](docs/SerAvailabilityNotificationSubscriptionFilteringCriteria.md) - [SerializerType](docs/SerializerType.md) - [ServiceAvailabilityNotification](docs/ServiceAvailabilityNotification.md) + - [ServiceAvailabilityNotificationChangeType](docs/ServiceAvailabilityNotificationChangeType.md) - [ServiceAvailabilityNotificationServiceReferences](docs/ServiceAvailabilityNotificationServiceReferences.md) - [ServiceInfo](docs/ServiceInfo.md) - [ServiceInfoLinks](docs/ServiceInfoLinks.md) diff --git a/go-packages/meep-service-mgmt-client/api/swagger.yaml b/go-packages/meep-service-mgmt-client/api/swagger.yaml index 213514cfb..cb551f5fd 100644 --- a/go-packages/meep-service-mgmt-client/api/swagger.yaml +++ b/go-packages/meep-service-mgmt-client/api/swagger.yaml @@ -1,6 +1,6 @@ -openapi: 3.0.2 +openapi: 3.0.0 info: - title: AdvantEDGE MEC Service Management API + title: AdvantEDGE Service Management API description: "MEC Service Management Service is AdvantEDGE's implementation of [ETSI\ \ MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)\ \

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)\ @@ -16,602 +16,1111 @@ info: url: https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE version: 2.2.1 externalDocs: - description: "ETSI GS MEC011 Application Enablement API, V2.2.1" - url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf + description: ETSI MEC011 V2.2.1 Service Management API + url: http://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_mec011v020201p.pdf servers: - url: https://localhost/sandboxname/mec_service_mgmt/v1 tags: - - name: mec_service_mgmt +- name: mec_service_mgmt paths: - '/services': + /services: get: - description: >- - This method retrieves information about a list of mecService resources. + tags: + - mec_service_mgmt + description: This method retrieves information about a list of mecService resources. This method is typically used in "service availability query" procedure operationId: Services_GET - tags: - - mec_service_mgmt parameters: - - $ref: '#/components/parameters/Query.SerInstanceId' - - $ref: '#/components/parameters/Query.SerName' - - $ref: '#/components/parameters/Query.SerCategoryId' - - $ref: '#/components/parameters/Query.ConsumedLocalOnly' - - $ref: '#/components/parameters/Query.IsLocal' - - $ref: '#/components/parameters/Query.LocalityType' + - name: ser_instance_id + in: query + description: A MEC application instance may use multiple ser_instance_ids + as an input parameter to query the availability of a list of MEC service + instances. Either "ser_instance_id" or "ser_name" or "ser_category_id" or + none of them shall be present. + required: false + style: form + explode: true + schema: + type: array + items: + type: string + - name: ser_name + in: query + description: A MEC application instance may use multiple ser_names as an input + parameter to query the availability of a list of MEC service instances. + Either "ser_instance_id" or "ser_name" or "ser_category_id" or none of them + shall be present. + required: false + style: form + explode: true + schema: + type: array + items: + type: string + - name: ser_category_id + in: query + description: A MEC application instance may use ser_category_id as an input + parameter to query the availability of a list of MEC service instances in + a serCategory. Either "ser_instance_id" or "ser_name" or "ser_category_id" + or none of them shall be present. + required: false + style: form + explode: true + schema: + type: string + - name: consumed_local_only + in: query + description: Indicate whether the service can only be consumed by the MEC + applications located in the same locality (as defined by scopeOfLocality) + as this service instance. + required: false + style: form + explode: true + schema: + type: boolean + - name: is_local + in: query + description: Indicate whether the service is located in the same locality + (as defined by scopeOfLocality) as the consuming MEC application. + required: false + style: form + explode: true + schema: + type: boolean + - name: scope_of_locality + in: query + description: A MEC application instance may use scope_of_locality as an input + parameter to query the availability of a list of MEC service instances with + a certain scope of locality. + required: false + style: form + explode: true + schema: + type: string responses: - '200': - $ref: '#/components/responses/Services200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '414': - $ref: '#/components/responses/414' - '/services/{serviceId}': - parameters: - - $ref: '#/components/parameters/Path.ServiceId' + "200": + description: It is used to indicate nonspecific success. The response body + contains a representation of the resource. + content: + application/json: + schema: + minItems: 0 + type: array + items: + $ref: '#/components/schemas/ServiceInfo' + x-content-type: application/json + links: + getIndividualmecService: + $ref: '#/components/links/GetIndividualmecService' + putIndividualmecService: + $ref: '#/components/links/PutIndividualmecService' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "414": + description: It is used to indicate that the server is refusing to process + the request because the request URI is longer than the server is willing + or able to process. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + /services/{serviceId}: get: - description: >- - This method retrieves information about a mecService resource. This - method is typically used in "service availability query" procedure - operationId: ServicesServiceId_GET tags: - - mec_service_mgmt + - mec_service_mgmt + description: This method retrieves information about a mecService resource. + This method is typically used in "service availability query" procedure + operationId: ServicesServiceId_GET + parameters: + - name: serviceId + in: path + description: Represents a MEC service instance. + required: true + style: simple + explode: false + schema: + type: string responses: - '200': - $ref: '#/components/responses/ServicesServiceId200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '/applications/{appInstanceId}/services': - parameters: - - $ref: '#/components/parameters/Path.AppInstanceId' + "200": + description: It is used to indicate nonspecific success. The response body + contains a representation of the resource. + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceInfo' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + /applications/{appInstanceId}/services: get: - description: >- - This method retrieves information about a list of mecService resources. + tags: + - mec_service_mgmt + description: This method retrieves information about a list of mecService resources. This method is typically used in "service availability query" procedure operationId: AppServices_GET - tags: - - mec_service_mgmt parameters: - - $ref: '#/components/parameters/Query.SerInstanceId' - - $ref: '#/components/parameters/Query.SerName' - - $ref: '#/components/parameters/Query.SerCategoryId' - - $ref: '#/components/parameters/Query.ConsumedLocalOnly' - - $ref: '#/components/parameters/Query.IsLocal' - - $ref: '#/components/parameters/Query.LocalityType' + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: ser_instance_id + in: query + description: A MEC application instance may use multiple ser_instance_ids + as an input parameter to query the availability of a list of MEC service + instances. Either "ser_instance_id" or "ser_name" or "ser_category_id" or + none of them shall be present. + required: false + style: form + explode: true + schema: + type: array + items: + type: string + - name: ser_name + in: query + description: A MEC application instance may use multiple ser_names as an input + parameter to query the availability of a list of MEC service instances. + Either "ser_instance_id" or "ser_name" or "ser_category_id" or none of them + shall be present. + required: false + style: form + explode: true + schema: + type: array + items: + type: string + - name: ser_category_id + in: query + description: A MEC application instance may use ser_category_id as an input + parameter to query the availability of a list of MEC service instances in + a serCategory. Either "ser_instance_id" or "ser_name" or "ser_category_id" + or none of them shall be present. + required: false + style: form + explode: true + schema: + type: string + - name: consumed_local_only + in: query + description: Indicate whether the service can only be consumed by the MEC + applications located in the same locality (as defined by scopeOfLocality) + as this service instance. + required: false + style: form + explode: true + schema: + type: boolean + - name: is_local + in: query + description: Indicate whether the service is located in the same locality + (as defined by scopeOfLocality) as the consuming MEC application. + required: false + style: form + explode: true + schema: + type: boolean + - name: scope_of_locality + in: query + description: A MEC application instance may use scope_of_locality as an input + parameter to query the availability of a list of MEC service instances with + a certain scope of locality. + required: false + style: form + explode: true + schema: + type: string responses: - '200': - $ref: '#/components/responses/Services200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '414': - $ref: '#/components/responses/414' + "200": + description: It is used to indicate nonspecific success. The response body + contains a representation of the resource. + content: + application/json: + schema: + minItems: 0 + type: array + items: + $ref: '#/components/schemas/ServiceInfo' + x-content-type: application/json + links: + getIndividualmecService: + $ref: '#/components/links/GetIndividualmecService' + putIndividualmecService: + $ref: '#/components/links/PutIndividualmecService' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "414": + description: It is used to indicate that the server is refusing to process + the request because the request URI is longer than the server is willing + or able to process. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' post: - description: >- - This method is used to create a mecService resource. This method is - typically used in "service availability update and new service - registration" procedure - operationId: AppServices_POST tags: - - mec_service_mgmt - responses: - '201': - $ref: '#/components/responses/Services201' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' + - mec_service_mgmt + description: This method is used to create a mecService resource. This method + is typically used in "service availability update and new service registration" + procedure + operationId: AppServices_POST + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string requestBody: $ref: '#/components/requestBodies/ServicesPost' - '/applications/{appInstanceId}/services/{serviceId}': - parameters: - - $ref: '#/components/parameters/Path.AppInstanceId' - - $ref: '#/components/parameters/Path.ServiceId' + responses: + "201": + description: "Upon success, the HTTP response shall include a Location HTTP\ + \ header that contains the resource URI of the created resource." + headers: + location: + description: The resource URI of the created resource + style: simple + explode: false + schema: + type: string + format: uri + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceInfo' + links: + getIndividualmecService: + $ref: '#/components/links/GetIndividualmecService' + putIndividualmecService: + $ref: '#/components/links/PutIndividualmecService' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + /applications/{appInstanceId}/services/{serviceId}: get: - description: >- - This method retrieves information about a mecService resource. This - method is typically used in "service availability query" procedure - operationId: AppServicesServiceId_GET tags: - - mec_service_mgmt + - mec_service_mgmt + description: This method retrieves information about a mecService resource. + This method is typically used in "service availability query" procedure + operationId: AppServicesServiceId_GET + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: serviceId + in: path + description: Represents a MEC service instance. + required: true + style: simple + explode: false + schema: + type: string responses: - '200': - $ref: '#/components/responses/ServicesServiceId200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' + "200": + description: It is used to indicate nonspecific success. The response body + contains a representation of the resource. + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceInfo' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' put: + tags: + - mec_service_mgmt description: This method updates the information about a mecService resource operationId: AppServicesServiceId_PUT - tags: - - mec_service_mgmt - responses: - '200': - $ref: '#/components/responses/ServicesServiceId200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '412': - $ref: '#/components/responses/412' + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: serviceId + in: path + description: Represents a MEC service instance. + required: true + style: simple + explode: false + schema: + type: string requestBody: $ref: '#/components/requestBodies/ServicesServiceId' + responses: + "200": + description: It is used to indicate nonspecific success. The response body + contains a representation of the resource. + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceInfo' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "412": + description: "Precondition Failed. It is used when a condition has failed\ + \ during conditional requests, e.g. when using ETags to avoid write conflicts." + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' delete: - description: >- - This method deletes a mecService resource. This method is typically used in the service deregistration procedure. - operationId: AppServicesServiceId_DELETE tags: - - mec_service_mgmt + - mec_service_mgmt + description: This method deletes a mecService resource. This method is typically + used in the service deregistration procedure. + operationId: AppServicesServiceId_DELETE + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: serviceId + in: path + description: Represents a MEC service instance. + required: true + style: simple + explode: false + schema: + type: string responses: - '204': + "204": description: No Content - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '/applications/{appInstanceId}/subscriptions': - parameters: - - $ref: '#/components/parameters/Path.AppInstanceId' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + /applications/{appInstanceId}/subscriptions: get: - description: >- - The GET method may be used to request information about all - subscriptions for this requestor. Upon success, the response contains - entity body with all the subscriptions for the requestor. - operationId: ApplicationsSubscriptions_GET tags: - - mec_service_mgmt + - mec_service_mgmt + description: "The GET method may be used to request information about all subscriptions\ + \ for this requestor. Upon success, the response contains entity body with\ + \ all the subscriptions for the requestor." + operationId: ApplicationsSubscriptions_GET + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string responses: - '200': - $ref: '#/components/responses/ApplicationsSubscriptions200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' + "200": + description: "Upon success, a response body containing the list of links\ + \ to the requested subscriptions is returned." + content: + application/json: + schema: + $ref: '#/components/schemas/SubscriptionLinkList' + links: + getIndividualmecSerMgmtApiSubscriptionLinkList: + $ref: '#/components/links/GetIndividualmecSerMgmtApiSubscriptionLinkList' + delIndividualmecSerMgmtApiSubscriptionLinkList: + $ref: '#/components/links/DelIndividualmecSerMgmtApiSubscriptionLinkList' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' post: - description: >- - The POST method may be used to create a new subscription. One example - use case is to create a new subscription to the MEC service - availability notifications. Upon success, the response contains entity - body describing the created subscription. - operationId: ApplicationsSubscriptions_POST tags: - - mec_service_mgmt - responses: - '201': - $ref: '#/components/responses/ApplicationsSubscriptions201' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' + - mec_service_mgmt + description: "The POST method may be used to create a new subscription. One\ + \ example use case is to create a new subscription to the MEC service availability\ + \ notifications. Upon success, the response contains entity body describing\ + \ the created subscription." + operationId: ApplicationsSubscriptions_POST + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string requestBody: $ref: '#/components/requestBodies/ApplicationsSubscriptions' + responses: + "201": + description: Entity body in the request contains a subscription to the MEC + service availability notifications that is to be created. + headers: + location: + description: The resource URI of the created resource + style: simple + explode: false + schema: + type: string + format: uri + content: + application/json: + schema: + $ref: '#/components/schemas/SerAvailabilityNotificationSubscription' + links: + getIndividualmecSerMgmtApiSubscription: + $ref: '#/components/links/GetIndividualmecSerMgmtApiSubscription' + delIndividualmecSerMgmtApiSubscription: + $ref: '#/components/links/DelIndividualmecSerMgmtApiSubscription' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' callbacks: serviceAvailabilityNotification: $ref: '#/components/callbacks/ServiceAvailabilityNotification' - '/applications/{appInstanceId}/subscriptions/{subscriptionId}': - parameters: - - $ref: '#/components/parameters/Path.AppInstanceId' - - $ref: '#/components/parameters/Path.SubscriptionId' + /applications/{appInstanceId}/subscriptions/{subscriptionId}: get: - description: >- - The GET method requests information about a subscription for this - requestor. Upon success, the response contains entity body with the - subscription for the requestor. - operationId: ApplicationsSubscription_GET tags: - - mec_service_mgmt + - mec_service_mgmt + description: "The GET method requests information about a subscription for this\ + \ requestor. Upon success, the response contains entity body with the subscription\ + \ for the requestor." + operationId: ApplicationsSubscription_GET + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: subscriptionId + in: path + description: Represents a subscription to the notifications from the MEC platform. + required: true + style: simple + explode: false + schema: + type: string responses: - '200': - $ref: '#/components/responses/ApplicationsSubscription200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' + "200": + description: "Upon success, a response body containing the requested subscription\ + \ is returned." + content: + application/json: + schema: + $ref: '#/components/schemas/SerAvailabilityNotificationSubscription' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' delete: - description: >- - This method deletes a mecSrvMgmtSubscription. This method is typically used - in "Unsubscribing from service availability event notifications" - procedure. - operationId: ApplicationsSubscription_DELETE tags: - - mec_service_mgmt + - mec_service_mgmt + description: This method deletes a mecSrvMgmtSubscription. This method is typically + used in "Unsubscribing from service availability event notifications" procedure. + operationId: ApplicationsSubscription_DELETE + parameters: + - name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + - name: subscriptionId + in: path + description: Represents a subscription to the notifications from the MEC platform. + required: true + style: simple + explode: false + schema: + type: string responses: - '204': + "204": description: No Content - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' - '/transports': + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + /transports: get: - description: >- - This method retrieves information about a list of available transports. - This method is typically used by a service-producing application to - discover transports provided by the MEC platform in the - "transport information query" procedure - operationId: Transports_GET tags: - - mec_service_mgmt + - mec_service_mgmt + description: This method retrieves information about a list of available transports. + This method is typically used by a service-producing application to discover + transports provided by the MEC platform in the "transport information query" + procedure + operationId: Transports_GET responses: - '200': - $ref: '#/components/responses/Transports200' - '400': - $ref: '#/components/responses/400' - '403': - $ref: '#/components/responses/403' - '404': - $ref: '#/components/responses/404' + "200": + description: It is used to indicate nonspecific success. The response body + contains a representation of the resource. + content: + application/json: + schema: + minItems: 0 + type: array + items: + $ref: '#/components/schemas/TransportInfo' + x-content-type: application/json + links: + getTransportInfo: + $ref: '#/components/links/GetTransportInfo' + "400": + description: Bad Request. It is used to indicate that incorrect parameters + were passed to the request. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ProblemDetails' components: schemas: CategoryRef: - description: This type represents the category reference - type: object required: - - href - - id - - name - - version + - href + - id + - name + - version + type: object properties: href: - description: Reference of the catalogue type: string + description: Reference of the catalogue format: uri id: - description: Unique identifier of the category type: string + description: Unique identifier of the category name: - description: Name of the category, example values include RNI, Location & Bandwidth Management type: string + description: "Name of the category, example values include RNI, Location\ + \ & Bandwidth Management" version: - description: Category version type: string + description: Category version + description: This type represents the category reference + example: + name: name + href: http://example.com/aeiou + id: id + version: version CategoryRefs: - description: Categories of services about which to report events. - type: array minItems: 0 - items: + type: array + description: Categories of services about which to report events. + items: $ref: '#/components/schemas/CategoryRef' + x-schema-name: CategoryRefs EndPointInfoAddresses: - description: >- - Entry point information of the service as one or more pairs of IP - address and port - type: object required: - - addresses + - addresses + type: object properties: addresses: - type: array minItems: 0 + type: array items: - description: A IP address and port pair - type: object - required: - - host - - port - properties: - host: - description: Host portion of the address - type: string - port: - description: Port portion of the address - type: integer - format: uint32 + $ref: '#/components/schemas/EndPointInfoAddresses_addresses' + description: Entry point information of the service as one or more pairs of + IP address and port EndPointInfoAlternative: - description: >- - Entry point information of the service in a format defined by an - implementation, or in an external specification. - type: object required: - - alternative - properties: + - alternative + type: object + properties: alternative: type: object + description: "Entry point information of the service in a format defined by\ + \ an implementation, or in an external specification." EndPointInfoUris: - description: >- - Entry point information of the service as string, formatted according to - URI syntax - type: object required: - - uris + - uris + type: object properties: uris: - type: array minItems: 0 + type: array items: - description: Entry point information of the service type: string + description: Entry point information of the service format: uri + description: "Entry point information of the service as string, formatted according\ + \ to URI syntax" LinkType: - description: This type represents a type of link and may be referenced from data structures type: object properties: - href: - description: URI referring to a resource + href: type: string + description: URI referring to a resource format: uri - example: '/mecSerMgmtApi/example' + example: /mecSerMgmtApi/example + description: This type represents a type of link and may be referenced from + data structures + example: + href: /mecSerMgmtApi/example SubscriptionLinkList: - description: >- - This type represents a list of links related to currently existing - subscriptions for a MEC application instance. This information - is returned when sending a request to receive current subscriptions. - type: object required: - - _links + - _links + type: object properties: _links: - description: Self-referring URI. - type: object - required: - - self - properties: - self: - $ref: '#/components/schemas/LinkType' - subscriptions: - description: The MEC application instance's subscriptions - type: array - items: - description: A link to a subscription. - type: object - required: - - href - - subscriptionType - properties: - href: - description: URI referring to a resource - type: string - format: uri - subscriptionType: - description: >- - Type of the subscription. The values are as defined in - the "subscriptionType" attribute for each different Mp1 - event subscription data type. - type: string + $ref: '#/components/schemas/SubscriptionLinkList__links' + description: This type represents a list of links related to currently existing + subscriptions for a MEC application instance. This information is returned + when sending a request to receive current subscriptions. + example: + _links: + subscriptions: + - subscriptionType: subscriptionType + href: http://example.com/aeiou + - subscriptionType: subscriptionType + href: http://example.com/aeiou + self: + href: /mecSerMgmtApi/example ProblemDetails: + required: + - detail + - status type: object properties: type: type: string + description: A URI reference according to IETF RFC 3986 that identifies + the problem type format: uri - description: >- - A URI reference according to IETF RFC 3986 that identifies the problem - type title: type: string - description: 'A short, human-readable summary of the problem type' + description: "A short, human-readable summary of the problem type" status: type: integer - format: uint32 description: The HTTP status code for this occurrence of the problem + format: uint32 detail: type: string - description: A human-readable explanation specific to this occurrence of the problem + description: A human-readable explanation specific to this occurrence of + the problem instance: type: string + description: A URI reference that identifies the specific occurrence of + the problem format: uri - description: A URI reference that identifies the specific occurrence of the problem GrantType: - description: OAuth 2.0 grant type type: string + description: OAuth 2.0 grant type + example: OAUTH2_CLIENT_CREDENTIALS enum: - - OAUTH2_AUTHORIZATION_CODE - - OAUTH2_IMPLICIT_GRANT - - OAUTH2_RESOURCE_OWNER - - OAUTH2_CLIENT_CREDENTIALS - example: 'OAUTH2_CLIENT_CREDENTIALS' + - OAUTH2_AUTHORIZATION_CODE + - OAUTH2_IMPLICIT_GRANT + - OAUTH2_RESOURCE_OWNER + - OAUTH2_CLIENT_CREDENTIALS OAuth2Info: - description: Parameters related to use of OAuth 2.0 - type: object required: - - grantTypes - - tokenEndpoint + - grantTypes + - tokenEndpoint + type: object properties: grantTypes: - description: >- - List of supported OAuth 2.0 grant types. - type: array - minItems: 1 maxItems: 4 + minItems: 1 + type: array + description: List of supported OAuth 2.0 grant types. items: $ref: '#/components/schemas/GrantType' tokenEndpoint: - description: The token endpoint type: string + description: The token endpoint format: uri + description: Parameters related to use of OAuth 2.0 + example: + tokenEndpoint: http://example.com/aeiou + grantTypes: + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS SecurityInfo: - description: This type represents security information related to a transport type: object properties: oAuth2Info: $ref: '#/components/schemas/OAuth2Info' + description: This type represents security information related to a transport + example: + oAuth2Info: + tokenEndpoint: http://example.com/aeiou + grantTypes: + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS Self: - description: Self-referring URI. - type: object required: - - self + - self + type: object properties: self: $ref: '#/components/schemas/LinkType' + description: Self-referring URI. readOnly: true + example: + self: + href: /mecSerMgmtApi/example SerAvailabilityNotificationSubscription: - description: >- - This type represents a subscription to the notifications from the - MEC platform regarding the availability of a MEC service or a - list of MEC services. - type: object required: - - subscriptionType - - callbackReference + - callbackReference + - subscriptionType + type: object properties: subscriptionType: - description: Shall be set to SerAvailabilityNotificationSubscription. type: string + description: Shall be set to SerAvailabilityNotificationSubscription. callbackReference: - description: >- - URI selected by the MEC application instance to receive - notifications on the subscribed MEC service availability - information. This shall be included in both the request and the - response. type: string + description: URI selected by the MEC application instance to receive notifications + on the subscribed MEC service availability information. This shall be + included in both the request and the response. format: uri _links: $ref: '#/components/schemas/Self' filteringCriteria: - description: >- - Filtering criteria to match services for which events are requested to be reported. - If absent, matches all services. All child attributes are combined with the logical - "AND" operation. - type: object - not: - required: [serInstanceIds, serNames, serCategories] - properties: - serInstanceIds: - $ref: '#/components/schemas/SerInstanceIds' - serNames: - $ref: '#/components/schemas/SerNames' - serCategories: - $ref: '#/components/schemas/CategoryRefs' - states: - $ref: '#/components/schemas/ServiceStates' - isLocal: - description: >- - Indicate whether the service is located in the same locality (as defined - by scopeOfLocality) as the consuming MEC application. - type: boolean + $ref: '#/components/schemas/SerAvailabilityNotificationSubscription_filteringCriteria' + description: This type represents a subscription to the notifications from the + MEC platform regarding the availability of a MEC service or a list of MEC + services. + example: + filteringCriteria: + serNames: + - serNames + - serNames + serInstanceIds: + - serInstanceIds + - serInstanceIds + serCategories: + - name: name + href: http://example.com/aeiou + id: id + version: version + - name: name + href: http://example.com/aeiou + id: id + version: version + states: + - ACTIVE + - ACTIVE + isLocal: true + subscriptionType: subscriptionType + _links: + self: + href: /mecSerMgmtApi/example + callbackReference: http://example.com/aeiou ServiceAvailabilityNotification: - description: >- - This type represents the service availability information. - type: object required: - - notificationType - - serviceReferences - - _links + - _links + - notificationType + - serviceReferences + type: object properties: notificationType: - description: Shall be set to SerAvailabilityNotification. type: string + description: Shall be set to SerAvailabilityNotification. serviceReferences: type: array - items: - description: List of links to services whose availability has changed. - type: object - required: - - serName - - serInstanceId - - state - - changeType - properties: - link: - $ref: '#/components/schemas/LinkType' - serName: - $ref: '#/components/schemas/SerName' - serInstanceId: - $ref: '#/components/schemas/SerInstanceId' - state: - $ref: '#/components/schemas/ServiceState' - changeType: - description: >- - Type of the change. Valid values: - ADDED: The service was newly added. - REMOVED: The service was removed. - STATE_CHANGED: Only the state of the service was changed. - ATTRIBUTES_CHANGED: At least one attribute of the service other than state was changed. The change may or may not include changing the state. - type: string - enum: - - ADDED - - REMOVED - - STATE_CHANGED - - ATTRIBUTES_CHANGED + items: + $ref: '#/components/schemas/ServiceAvailabilityNotification_serviceReferences' _links: $ref: '#/components/schemas/Subscription' + description: This type represents the service availability information. + ServiceAvailabilityNotificationChangeType: + type: string + description: "Type of the change. Valid values:\n ADDED: The service was newly\ + \ added.\n REMOVED: The service was removed.\n STATE_CHANGED: Only the state\ + \ of the service was changed.\n ATTRIBUTES_CHANGED: At least one attribute\ + \ of the service other than state was changed. The change may or may not include\ + \ changing the state." + enum: + - ADDED + - REMOVED + - STATE_CHANGED + - ATTRIBUTES_CHANGED SerializerType: - description: The enumeration represents types of serializers type: string + description: The enumeration represents types of serializers enum: - - JSON - - XML - - PROTOBUF3 + - JSON + - XML + - PROTOBUF3 LocalityType: - description: The scope of locality as expressed by "consumedLocalOnly" and "isLocal". If absent, defaults to MEC_HOST type: string + description: "The scope of locality as expressed by \"consumedLocalOnly\" and\ + \ \"isLocal\". If absent, defaults to MEC_HOST" enum: - - MEC_SYSTEM - - MEC_HOST - - NFVI_POP - - ZONE - - ZONE_GROUP - - NFVI_NODE + - MEC_SYSTEM + - MEC_HOST + - NFVI_POP + - ZONE + - ZONE_GROUP + - NFVI_NODE ServiceState: - description: This enumeration defines the possible states of a service. type: string + description: This enumeration defines the possible states of a service. enum: - - ACTIVE - - INACTIVE - - SUSPENDED + - ACTIVE + - INACTIVE + - SUSPENDED ServiceStates: - description: >- - States of the services about which to report events. If the event is - a state change, this filter represents the state after the change. - type: array minItems: 0 + type: array + description: "States of the services about which to report events. If the event\ + \ is a state change, this filter represents the state after the change." items: $ref: '#/components/schemas/ServiceState' + x-schema-name: ServiceStates SerInstanceId: - description: >- - Identifier of the service instance assigned by the MEC platform. type: string + description: Identifier of the service instance assigned by the MEC platform. readOnly: true SerInstanceIds: - description: Identifiers of service instances about which to report events. - type: array minItems: 0 + type: array + description: Identifiers of service instances about which to report events. items: $ref: '#/components/schemas/SerInstanceId' + x-schema-name: SerInstanceIds SerName: - description: >- - The name of the service. This is how the service producing MEC - application identifies the service instance it produces. type: string + description: The name of the service. This is how the service producing MEC + application identifies the service instance it produces. SerNames: - description: Names of services about which to report events. - type: array minItems: 0 + type: array + description: Names of services about which to report events. items: $ref: '#/components/schemas/SerName' + x-schema-name: SerNames ServiceInfoPost: - description: This type represents the general information of a MEC service. - type: object required: - - serName - - version - - state - - serializer - oneOf: - - required: [transportId] - - required: [transportInfo] + - serName + - serializer + - state + - version + type: object properties: serInstanceId: $ref: '#/components/schemas/SerInstanceId' @@ -620,18 +1129,17 @@ components: serCategory: $ref: '#/components/schemas/CategoryRef' version: - description: Service version type: string + description: Service version state: $ref: '#/components/schemas/ServiceState' transportId: - description: >- - Identifier of the platform-provided transport to be used by the service. - Valid identifiers may be obtained using the "Transport information - query" procedure. May be present in POST requests to signal the use of a - platform-provided transport for the service, and shall be absent - otherwise. type: string + description: "Identifier of the platform-provided transport to be used by\ + \ the service. Valid identifiers may be obtained using the \"Transport\ + \ information query\" procedure. May be present in POST requests to signal\ + \ the use of a platform-provided transport for the service, and shall\ + \ be absent otherwise." writeOnly: true transportInfo: $ref: '#/components/schemas/TransportInfo' @@ -640,26 +1148,29 @@ components: scopeOfLocality: $ref: '#/components/schemas/LocalityType' consumedLocalOnly: - description: >- - Indicate whether the service can only be consumed by the MEC applications - located in the same locality (as defined by scopeOfLocality) as this - service instance. type: boolean + description: Indicate whether the service can only be consumed by the MEC + applications located in the same locality (as defined by scopeOfLocality) + as this service instance. isLocal: - description: >- - Indicate whether the service is located in the same locality (as defined - by scopeOfLocality) as the consuming MEC application. type: boolean - ServiceInfo: + description: Indicate whether the service is located in the same locality + (as defined by scopeOfLocality) as the consuming MEC application. description: This type represents the general information of a MEC service. - type: object - required: - - serName - - version - - state + oneOf: + - required: + - transportId + - required: - transportInfo - - serializer - - _links + ServiceInfo: + required: + - _links + - serName + - serializer + - state + - transportInfo + - version + type: object properties: serInstanceId: $ref: '#/components/schemas/SerInstanceId' @@ -668,19 +1179,17 @@ components: serCategory: $ref: '#/components/schemas/CategoryRef' version: - description: Service version type: string + description: Service version state: $ref: '#/components/schemas/ServiceState' transportId: type: string - description: > - Identifier of the platform-provided transport to be used by - the service. Valid identifiers may be obtained using the - "Transport information query" procedure. May be present - in POST requests to signal the use of a platform-provided - transport for the service, and shall be absent otherwise. - See note 2. + description: "Identifier of the platform-provided transport to be used by\ + \ the service. Valid identifiers may be obtained using the \"Transport\ + \ information query\" procedure. May be present in POST requests to signal\ + \ the use of a platform-provided transport for the service, and shall\ + \ be absent otherwise. See note 2.\n" transportInfo: $ref: '#/components/schemas/TransportInfo' serializer: @@ -688,240 +1197,294 @@ components: scopeOfLocality: $ref: '#/components/schemas/LocalityType' consumedLocalOnly: - description: >- - Indicate whether the service can only be consumed by the MEC applications - located in the same locality (as defined by scopeOfLocality) as this - service instance. type: boolean - isLocal: - description: >- - Indicate whether the service is located in the same locality (as defined - by scopeOfLocality) as the consuming MEC application. + description: Indicate whether the service can only be consumed by the MEC + applications located in the same locality (as defined by scopeOfLocality) + as this service instance. + isLocal: type: boolean + description: Indicate whether the service is located in the same locality + (as defined by scopeOfLocality) as the consuming MEC application. livenessInterval: type: integer - description: Interval (in seconds) between two consecutive "heartbeat" messages (see clause 8.2.10.3.3). - If the service-producing application supports sending "heartbeat" messages, it shall include this attribute in the registration request. In this case, the application shall either set the value of this attribute to zero or shall use this attribute to propose a non-zero positive value for the liveness interval. - If the application has provided this attribute in the request and the MEC platform requires "heartbeat" messages, the MEC platform shall return this attribute value in the HTTP responses. The MEC platform may use the value proposed in the request or may choose a different value. - If the MEC platform does not require "heartbeat" messages for this service instance it shall omit the attribute in responses. + description: "Interval (in seconds) between two consecutive \"heartbeat\"\ + \ messages (see clause 8.2.10.3.3). If the service-producing application\ + \ supports sending \"heartbeat\" messages, it shall include this attribute\ + \ in the registration request. In this case, the application shall either\ + \ set the value of this attribute to zero or shall use this attribute\ + \ to propose a non-zero positive value for the liveness interval. If the\ + \ application has provided this attribute in the request and the MEC platform\ + \ requires \"heartbeat\" messages, the MEC platform shall return this\ + \ attribute value in the HTTP responses. The MEC platform may use the\ + \ value proposed in the request or may choose a different value. If the\ + \ MEC platform does not require \"heartbeat\" messages for this service\ + \ instance it shall omit the attribute in responses." _links: - type: object - required: - - self - properties: - self: - $ref: '#/components/schemas/LinkType' - liveness: - $ref: '#/components/schemas/LinkType' + $ref: '#/components/schemas/ServiceInfo__links' + description: This type represents the general information of a MEC service. example: - serInstanceId: 'rnisInstance1' - serName: 'myRnis' + serInstanceId: rnisInstance1 + serName: myRnis serCategory: - href: 'catItem1' - id: 'id12345' - name: 'RNI' - version: 'v2' - version: '2.2.1' - state: 'ACTIVE' + href: catItem1 + id: id12345 + name: RNI + version: v2 + version: 2.2.1 + state: ACTIVE transportInfo: - id: 'TransId12345' - name: 'REST' - description: 'REST API' - type: 'REST_HTTP' - protocol: 'HTTP' - version: '2.0' + id: TransId12345 + name: REST + description: REST API + type: REST_HTTP + protocol: HTTP + version: "2.0" endpoint: uris: - - 'https://my.callback.com/sandboxname/rni/v2/' - serializer: 'JSON' - scopeOfLocality: 'MEC_SYSTEM' + - https://my.callback.com/sandboxname/rni/v2/ + serializer: JSON + scopeOfLocality: MEC_SYSTEM ServiceLivenessInfo: - type: object required: - - state - - timeStamp - - interval + - interval + - state + - timeStamp + type: object properties: state: $ref: '#/components/schemas/ServiceState' timeStamp: - type: object - description: The time when the last "heartbeat" message was received by MEC platform - required: - - seconds - - nanoSeconds - properties: - seconds: - type: integer - nanoSeconds: - type: integer + $ref: '#/components/schemas/ServiceLivenessInfo_timeStamp' interval: type: integer - description: The interval (in seconds) between two consecutive "heartbeat" messages (see clause 8.2.10.3.3) that MEC platform has determined. + description: The interval (in seconds) between two consecutive "heartbeat" + messages (see clause 8.2.10.3.3) that MEC platform has determined. ServiceLivenessUpdate: - type: object required: - - state + - state + type: object properties: state: $ref: '#/components/schemas/ServiceState' Subscription: - description: A link to the related subscription - type: object required: - - subscription + - subscription + type: object properties: subscription: $ref: '#/components/schemas/LinkType' + description: A link to the related subscription TransportInfo: - description: This type represents the general information of a MEC service. - type: object required: - - id - - name - - type - - protocol - - version - - endpoint - - security + - endpoint + - id + - name + - protocol + - security + - type + - version + type: object properties: id: - description: The identifier of this transport type: string + description: The identifier of this transport name: - description: The name of this transport type: string + description: The name of this transport description: - description: Human-readable description of this transport type: string + description: Human-readable description of this transport type: $ref: '#/components/schemas/TransportType' protocol: - description: The name of the protocol used. Shall be set to HTTP for a REST API. type: string + description: The name of the protocol used. Shall be set to HTTP for a REST + API. version: - description: The version of the protocol used type: string + description: The version of the protocol used endpoint: - description: This type represents information about a transport endpoint type: object + description: This type represents information about a transport endpoint oneOf: - - $ref: '#/components/schemas/EndPointInfoUris' - - $ref: '#/components/schemas/EndPointInfoAddresses' - - $ref: '#/components/schemas/EndPointInfoAlternative' + - $ref: '#/components/schemas/EndPointInfoUris' + - $ref: '#/components/schemas/EndPointInfoAddresses' + - $ref: '#/components/schemas/EndPointInfoAlternative' security: $ref: '#/components/schemas/SecurityInfo' implSpecificInfo: - description: Additional implementation specific details of the transport type: object + description: Additional implementation specific details of the transport + description: This type represents the general information of a MEC service. + example: + implSpecificInfo: {} + protocol: protocol + endpoint: "" + security: + oAuth2Info: + tokenEndpoint: http://example.com/aeiou + grantTypes: + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + - OAUTH2_CLIENT_CREDENTIALS + name: name + description: description + id: id + type: REST_HTTP + version: version TransportType: - description: The enumeration TransportType represents types of transports type: string + description: The enumeration TransportType represents types of transports enum: - - REST_HTTP - - MB_TOPIC_BASED - - MB_ROUTING - - MB_PUBSUB - - RPC - - RPC_STREAMING - - WEBSOCKET - parameters: - Path.AppInstanceId: - name: appInstanceId - description: >- - Represents a MEC application instance. Note that the - appInstanceId is allocated by the MEC platform manager. - in: path - required: true - schema: - type: string - Path.SubscriptionId: - name: subscriptionId - description: >- - Represents a subscription to the notifications from the MEC - platform. - in: path - required: true - schema: - type: string - Path.ServiceId: - name: serviceId - description: Represents a MEC service instance. - in: path - required: true - schema: - type: string - Query.SerCategoryId: - name: ser_category_id - description: >- - A MEC application instance may use ser_category_id as an input - parameter to query the availability of a list of MEC service - instances in a serCategory. Either "ser_instance_id" or "ser_name" or - "ser_category_id" or none of them shall be present. - in: query - required: false - schema: - type: string - Query.SerInstanceId: - name: ser_instance_id - description: >- - A MEC application instance may use multiple ser_instance_ids as - an input parameter to query the availability of a list of MEC - service instances. Either "ser_instance_id" or "ser_name" or - "ser_category_id" or none of them shall be present. - in: query - required: false - schema: - type: array - items: + - REST_HTTP + - MB_TOPIC_BASED + - MB_ROUTING + - MB_PUBSUB + - RPC + - RPC_STREAMING + - WEBSOCKET + EndPointInfoAddresses_addresses: + required: + - host + - port + type: object + properties: + host: type: string - Query.SerName: - name: ser_name - description: >- - A MEC application instance may use multiple ser_names as an - input parameter to query the availability of a list of MEC - service instances. Either "ser_instance_id" or "ser_name" or - "ser_category_id" or none of them shall be present. - in: query - required: false - schema: - type: array - items: + description: Host portion of the address + port: + type: integer + description: Port portion of the address + format: uint32 + description: A IP address and port pair + SubscriptionLinkList__links_subscriptions: + required: + - href + - subscriptionType + type: object + properties: + href: type: string - Query.LocalityType: - name: scope_of_locality - description: >- - A MEC application instance may use scope_of_locality as an input - parameter to query the availability of a list of MEC service instances - with a certain scope of locality. - in: query - required: false - schema: - type: string - Query.IsLocal: - name: is_local - description: >- - Indicate whether the service is located in the same locality (as - defined by scopeOfLocality) as the consuming MEC application. - in: query - required: false - schema: - type: boolean - Query.ConsumedLocalOnly: - name: consumed_local_only - description: >- - Indicate whether the service can only be consumed by the MEC - applications located in the same locality (as defined by - scopeOfLocality) as this service instance. - in: query - required: false - schema: - type: boolean + description: URI referring to a resource + format: uri + subscriptionType: + type: string + description: Type of the subscription. The values are as defined in the + "subscriptionType" attribute for each different Mp1 event subscription + data type. + description: A link to a subscription. + example: + subscriptionType: subscriptionType + href: http://example.com/aeiou + SubscriptionLinkList__links: + required: + - self + type: object + properties: + self: + $ref: '#/components/schemas/LinkType' + subscriptions: + type: array + description: The MEC application instance's subscriptions + items: + $ref: '#/components/schemas/SubscriptionLinkList__links_subscriptions' + description: Self-referring URI. + example: + subscriptions: + - subscriptionType: subscriptionType + href: http://example.com/aeiou + - subscriptionType: subscriptionType + href: http://example.com/aeiou + self: + href: /mecSerMgmtApi/example + SerAvailabilityNotificationSubscription_filteringCriteria: + type: object + not: + required: + - serCategories + - serInstanceIds + - serNames + properties: + serInstanceIds: + $ref: '#/components/schemas/SerInstanceIds' + serNames: + $ref: '#/components/schemas/SerNames' + serCategories: + $ref: '#/components/schemas/CategoryRefs' + states: + $ref: '#/components/schemas/ServiceStates' + isLocal: + type: boolean + description: Indicate whether the service is located in the same locality + (as defined by scopeOfLocality) as the consuming MEC application. + description: "Filtering criteria to match services for which events are requested\ + \ to be reported. If absent, matches all services. All child attributes are\ + \ combined with the logical \"AND\" operation." + example: + serNames: + - serNames + - serNames + serInstanceIds: + - serInstanceIds + - serInstanceIds + serCategories: + - name: name + href: http://example.com/aeiou + id: id + version: version + - name: name + href: http://example.com/aeiou + id: id + version: version + states: + - ACTIVE + - ACTIVE + isLocal: true + ServiceAvailabilityNotification_serviceReferences: + required: + - changeType + - serInstanceId + - serName + - state + type: object + properties: + link: + $ref: '#/components/schemas/LinkType' + serName: + $ref: '#/components/schemas/SerName' + serInstanceId: + $ref: '#/components/schemas/SerInstanceId' + state: + $ref: '#/components/schemas/ServiceState' + changeType: + $ref: '#/components/schemas/ServiceAvailabilityNotificationChangeType' + description: List of links to services whose availability has changed. + ServiceInfo__links: + required: + - self + type: object + properties: + self: + $ref: '#/components/schemas/LinkType' + liveness: + $ref: '#/components/schemas/LinkType' + ServiceLivenessInfo_timeStamp: + required: + - nanoSeconds + - seconds + type: object + properties: + seconds: + type: integer + nanoSeconds: + type: integer + description: The time when the last "heartbeat" message was received by MEC + platform responses: ApplicationsSubscriptions200: - description: >- - Upon success, a response body containing the list of links to the - requested subscriptions is returned. + description: "Upon success, a response body containing the list of links to\ + \ the requested subscriptions is returned." content: application/json: schema: @@ -932,12 +1495,13 @@ components: delIndividualmecSerMgmtApiSubscriptionLinkList: $ref: '#/components/links/DelIndividualmecSerMgmtApiSubscriptionLinkList' ApplicationsSubscriptions201: - description: >- - Entity body in the request contains a subscription to the MEC - service availability notifications that is to be created. + description: Entity body in the request contains a subscription to the MEC service + availability notifications that is to be created. headers: location: description: The resource URI of the created resource + style: simple + explode: false schema: type: string format: uri @@ -951,36 +1515,36 @@ components: delIndividualmecSerMgmtApiSubscription: $ref: '#/components/links/DelIndividualmecSerMgmtApiSubscription' ApplicationsSubscription200: - description: >- - Upon success, a response body containing the requested subscription - is returned. + description: "Upon success, a response body containing the requested subscription\ + \ is returned." content: application/json: schema: $ref: '#/components/schemas/SerAvailabilityNotificationSubscription' Services200: - description: >- - It is used to indicate nonspecific success. The response body - contains a representation of the resource. + description: It is used to indicate nonspecific success. The response body contains + a representation of the resource. content: application/json: schema: - type: array minItems: 0 + type: array items: $ref: '#/components/schemas/ServiceInfo' + x-content-type: application/json links: getIndividualmecService: $ref: '#/components/links/GetIndividualmecService' putIndividualmecService: $ref: '#/components/links/PutIndividualmecService' Services201: - description: >- - Upon success, the HTTP response shall include a Location HTTP header - that contains the resource URI of the created resource. + description: "Upon success, the HTTP response shall include a Location HTTP\ + \ header that contains the resource URI of the created resource." headers: location: description: The resource URI of the created resource + style: simple + explode: false schema: type: string format: uri @@ -994,161 +1558,271 @@ components: putIndividualmecService: $ref: '#/components/links/PutIndividualmecService' ServicesServiceId200: - description: >- - It is used to indicate nonspecific success. The response body - contains a representation of the resource. + description: It is used to indicate nonspecific success. The response body contains + a representation of the resource. content: application/json: schema: $ref: '#/components/schemas/ServiceInfo' Transports200: - description: >- - It is used to indicate nonspecific success. The response body - contains a representation of the resource. + description: It is used to indicate nonspecific success. The response body contains + a representation of the resource. content: application/json: schema: - type: array minItems: 0 + type: array items: $ref: '#/components/schemas/TransportInfo' + x-content-type: application/json links: getTransportInfo: $ref: '#/components/links/GetTransportInfo' - 400: - description: >- - Bad Request. - It is used to indicate that incorrect parameters were passed to the request. + "400": + description: Bad Request. It is used to indicate that incorrect parameters were + passed to the request. content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 401: - description: >- - Unauthorized. - It is used when the client did not submit the appropriate credentials. + "401": + description: Unauthorized. It is used when the client did not submit the appropriate + credentials. content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 403: - description: >- - Forbidden. - The operation is not allowed given the current status of the resource. + "403": + description: Forbidden. The operation is not allowed given the current status + of the resource. content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 404: - description: >- - Not Found. - It is used when a client provided a URI that cannot be mapped - to a valid resource URI. + "404": + description: Not Found. It is used when a client provided a URI that cannot + be mapped to a valid resource URI. content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 409: - description: >- - Conflict. - The operation cannot be executed currently, due to a conflict with - the state of the resource. Typically, this is because the application - instance resource is in NOT_INSTANTIATED state. + "409": + description: "Conflict. The operation cannot be executed currently, due to a\ + \ conflict with the state of the resource. Typically, this is because the\ + \ application instance resource is in NOT_INSTANTIATED state." content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 412: - description: >- - Precondition Failed. - It is used when a condition has failed during conditional requests, - e.g. when using ETags to avoid write conflicts. + "412": + description: "Precondition Failed. It is used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts." content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 414: - description: >- - It is used to indicate that the server is refusing to process the request because the request URI is longer than the server is willing or able to process. + "414": + description: It is used to indicate that the server is refusing to process the + request because the request URI is longer than the server is willing or able + to process. content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - 429: - description: >- - Too Many Requests. - It is used when a rate limiter has triggered. + "429": + description: Too Many Requests. It is used when a rate limiter has triggered. content: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' + parameters: + Path.AppInstanceId: + name: appInstanceId + in: path + description: Represents a MEC application instance. Note that the appInstanceId + is allocated by the MEC platform manager. + required: true + style: simple + explode: false + schema: + type: string + Path.SubscriptionId: + name: subscriptionId + in: path + description: Represents a subscription to the notifications from the MEC platform. + required: true + style: simple + explode: false + schema: + type: string + Path.ServiceId: + name: serviceId + in: path + description: Represents a MEC service instance. + required: true + style: simple + explode: false + schema: + type: string + Query.SerCategoryId: + name: ser_category_id + in: query + description: A MEC application instance may use ser_category_id as an input + parameter to query the availability of a list of MEC service instances in + a serCategory. Either "ser_instance_id" or "ser_name" or "ser_category_id" + or none of them shall be present. + required: false + style: form + explode: true + schema: + type: string + Query.SerInstanceId: + name: ser_instance_id + in: query + description: A MEC application instance may use multiple ser_instance_ids as + an input parameter to query the availability of a list of MEC service instances. + Either "ser_instance_id" or "ser_name" or "ser_category_id" or none of them + shall be present. + required: false + style: form + explode: true + schema: + type: array + items: + type: string + Query.SerName: + name: ser_name + in: query + description: A MEC application instance may use multiple ser_names as an input + parameter to query the availability of a list of MEC service instances. Either + "ser_instance_id" or "ser_name" or "ser_category_id" or none of them shall + be present. + required: false + style: form + explode: true + schema: + type: array + items: + type: string + Query.LocalityType: + name: scope_of_locality + in: query + description: A MEC application instance may use scope_of_locality as an input + parameter to query the availability of a list of MEC service instances with + a certain scope of locality. + required: false + style: form + explode: true + schema: + type: string + Query.IsLocal: + name: is_local + in: query + description: Indicate whether the service is located in the same locality (as + defined by scopeOfLocality) as the consuming MEC application. + required: false + style: form + explode: true + schema: + type: boolean + Query.ConsumedLocalOnly: + name: consumed_local_only + in: query + description: Indicate whether the service can only be consumed by the MEC applications + located in the same locality (as defined by scopeOfLocality) as this service + instance. + required: false + style: form + explode: true + schema: + type: boolean + examples: + ServiceInfo: + value: + serInstanceId: rnisInstance1 + serName: myRnis + serCategory: + href: catItem1 + id: id12345 + name: RNI + version: v2 + version: 2.2.1 + state: ACTIVE + transportInfo: + id: TransId12345 + name: REST + description: REST API + type: REST_HTTP + protocol: HTTP + version: "2.0" + endpoint: + uris: + - https://my.callback.com/sandboxname/rni/v2/ + serializer: JSON + scopeOfLocality: MEC_SYSTEM requestBodies: ApplicationsSubscriptions: + description: Entity body in the request contains a subscription to the MEC application + termination notifications that is to be created. content: application/json: schema: $ref: '#/components/schemas/SerAvailabilityNotificationSubscription' example: - subscriptionType: 'SerAvailabilityNotificationSubscription' - callbackReference: "http://my.callback.com/mec_service_mgmt_ser_availabilities/some-id" + subscriptionType: SerAvailabilityNotificationSubscription + callbackReference: http://my.callback.com/mec_service_mgmt_ser_availabilities/some-id filteringCriteria: serNames: - - 'myRnis' + - myRnis states: - - 'ACTIVE' - - 'INACTIVE' + - ACTIVE + - INACTIVE isLocal: true - description: >- - Entity body in the request contains a subscription to the MEC - application termination notifications that is to be created. required: true Services: + description: New ServiceInfo with updated "state" is included as entity body + of the request content: application/json: schema: $ref: '#/components/schemas/ServiceInfo' - description: >- - New ServiceInfo with updated "state" is included as entity body of the - request required: true ServicesPost: + description: New ServiceInfo with updated "state" is included as entity body + of the request content: application/json: schema: $ref: '#/components/schemas/ServiceInfoPost' example: - serName: 'myRnis' + serName: myRnis serCategory: - href: 'catItem1' - id: 'id12345' - name: 'RNI' - version: 'v2' - version: '2.2.1' - state: 'ACTIVE' + href: catItem1 + id: id12345 + name: RNI + version: v2 + version: 2.2.1 + state: ACTIVE transportInfo: - id: 'TransId12345' - name: 'REST' - description: 'REST API' - type: 'REST_HTTP' - protocol: 'HTTP' - version: '2.0' + id: TransId12345 + name: REST + description: REST API + type: REST_HTTP + protocol: HTTP + version: "2.0" endpoint: uris: - - 'https://my.callback.com/sandboxname/rni/v2/' - serializer: 'JSON' - scopeOfLocality: 'MEC_SYSTEM' - description: >- - New ServiceInfo with updated "state" is included as entity body of the - request + - https://my.callback.com/sandboxname/rni/v2/ + serializer: JSON + scopeOfLocality: MEC_SYSTEM required: true ServicesServiceId: + description: New ServiceInfo with updated "state" is included as entity body + of the request content: application/json: schema: $ref: '#/components/schemas/ServiceInfo' - description: >- - New ServiceInfo with updated "state" is included as entity body of the - request required: true ServiceAvailabilityNotification: content: @@ -1156,90 +1830,79 @@ components: schema: $ref: '#/components/schemas/ServiceAvailabilityNotification' required: true - callbacks: - ServiceAvailabilityNotification: - '{$request.body#/callbackReference}': - post: - description: >- - 'Represents the service availability information that - is used in the following cases - - when the MEC platform announces the newly available - services to the authorized relevant MEC applications (e.g. - the applications that indicate the services as "optional" - or "required") that are subscribed to the corresponding - service availability notifications - - when the MEC platform notifies the authorized relevant - applications that are subscribed to the corresponding - service availability notifications about the service availability changes.' - operationId: Sm_ServiceAvailabilityNotification_POST - tags: - - callbacks - requestBody: - $ref: '#/components/requestBodies/ServiceAvailabilityNotification' - responses: - '200': - description: Expected responses from callback consumer, if it accepts the callback links: GetIndividualmecService: operationId: Sm_ServicesServiceId_GET - description: The `serviceId` value returned in the response can be used as the `serviceId` parameter in `GET /services/{serviceId}` parameters: - serviceId: '$response.body#/serviceId' + serviceId: $response.body#/serviceId + description: "The `serviceId` value returned in the response can be used as\ + \ the `serviceId` parameter in `GET /services/{serviceId}`" PutIndividualmecService: operationId: Sm_ServicesServiceId_PUT - description: The `serviceId` value returned in the response can be used as the `serviceId` parameter in `PUT /services/{serviceId}` parameters: - serviceId: '$response.body#/serviceId' + serviceId: $response.body#/serviceId + description: "The `serviceId` value returned in the response can be used as\ + \ the `serviceId` parameter in `PUT /services/{serviceId}`" GetTransportInfo: operationId: Sm_AppServices_POST - description: The `id` value returned in the response can be used as the `transportId` parameter in `POST /applications/{appInstanceId}/services`. The first transport is provided as the link as wildcards are not supported parameters: - transportId: '$response.body#/0/id' + transportId: $response.body#/0/id + description: "The `id` value returned in the response can be used as the `transportId`\ + \ parameter in `POST /applications/{appInstanceId}/services`. The first transport\ + \ is provided as the link as wildcards are not supported" GetIndividualmecSerMgmtApiSubscription: operationId: Sm_ApplicationsSubscription_GET - description: The `subscriptionId` value returned in the response can be used as the `subscriptionId` parameter in `GET /applications/{appInstanceId}/subscriptions/{subscriptionId}` parameters: - description: regex = \/mec_service_mgmt\/v1\/applications\/.*\/subscriptions\/.*\/(.*);subscriptionId = href.match(regex)[1];// where "href" is an attribute within the subscription attribute within the _links attribute - subscriptionId: 'TBC' + description: "regex = \\/mec_service_mgmt\\/v1\\/applications\\/.*\\/subscriptions\\\ + /.*\\/(.*);subscriptionId = href.match(regex)[1];// where \"href\" is an\ + \ attribute within the subscription attribute within the _links attribute" + subscriptionId: TBC + description: "The `subscriptionId` value returned in the response can be used\ + \ as the `subscriptionId` parameter in `GET /applications/{appInstanceId}/subscriptions/{subscriptionId}`" DelIndividualmecSerMgmtApiSubscription: operationId: Sm_ApplicationsSubscription_DELETE - description: The `subscriptionId` value returned in the response can be used as the `subscriptionId` parameter in `DELETE /applications/{appInstanceId}/subscriptions/{subscriptionId}` parameters: - description: regex = \/mec_service_mgmt\/v1\/applications\/.*\/subscriptions\/(.*);subscriptionId = href.match(regex)[1];// where "href" is an attribute within the subscription attribute within the _links attribute - subscriptionId: 'TBC' + description: "regex = \\/mec_service_mgmt\\/v1\\/applications\\/.*\\/subscriptions\\\ + /(.*);subscriptionId = href.match(regex)[1];// where \"href\" is an attribute\ + \ within the subscription attribute within the _links attribute" + subscriptionId: TBC + description: "The `subscriptionId` value returned in the response can be used\ + \ as the `subscriptionId` parameter in `DELETE /applications/{appInstanceId}/subscriptions/{subscriptionId}`" GetIndividualmecSerMgmtApiSubscriptionLinkList: operationId: Sm_ApplicationsSubscription_GET - description: The `subscriptionId` value returned in the response can be used as the `subscriptionId` parameter in `GET /applications/{appInstanceId}/subscriptions/{subscriptionId}` parameters: - description: regex = \/mec_service_mgmt\/v1\/applications\/.*\/subscriptions\/(.*);subscriptionId = href.match(regex)[1];// where "href" is an attribute within the subscription attribute within the _links attribute - subscriptionId: 'TBC' + description: "regex = \\/mec_service_mgmt\\/v1\\/applications\\/.*\\/subscriptions\\\ + /(.*);subscriptionId = href.match(regex)[1];// where \"href\" is an attribute\ + \ within the subscription attribute within the _links attribute" + subscriptionId: TBC + description: "The `subscriptionId` value returned in the response can be used\ + \ as the `subscriptionId` parameter in `GET /applications/{appInstanceId}/subscriptions/{subscriptionId}`" DelIndividualmecSerMgmtApiSubscriptionLinkList: operationId: Sm_ApplicationsSubscription_DELETE - description: The `subscriptionId` value returned in the response can be used as the `subscriptionId` parameter in `DELETE /applications/{appInstanceId}/subscriptions/{subscriptionId}` parameters: - description: regex = \/mec_service_mgmt\/v1\/applications\/.*\/subscriptions\/(.*);subscriptionId = href.match(regex)[1];// where "href" is an attribute within the subscription attribute within the _links attribute - subscriptionId: 'TBC' - examples: - ServiceInfo: - value: - serInstanceId: 'rnisInstance1' - serName: 'myRnis' - serCategory: - href: 'catItem1' - id: 'id12345' - name: 'RNI' - version: 'v2' - version: '2.2.1' - state: 'ACTIVE' - transportInfo: - id: 'TransId12345' - name: 'REST' - description: 'REST API' - type: 'REST_HTTP' - protocol: 'HTTP' - version: '2.0' - endpoint: - uris: - - 'https://my.callback.com/sandboxname/rni/v2/' - serializer: 'JSON' - scopeOfLocality: 'MEC_SYSTEM' + description: "regex = \\/mec_service_mgmt\\/v1\\/applications\\/.*\\/subscriptions\\\ + /(.*);subscriptionId = href.match(regex)[1];// where \"href\" is an attribute\ + \ within the subscription attribute within the _links attribute" + subscriptionId: TBC + description: "The `subscriptionId` value returned in the response can be used\ + \ as the `subscriptionId` parameter in `DELETE /applications/{appInstanceId}/subscriptions/{subscriptionId}`" + callbacks: + ServiceAvailabilityNotification: + '{$request.body#/callbackReference}': + post: + tags: + - callbacks + description: |- + 'Represents the service availability information that is used in the following cases - when the MEC platform announces the newly available + services to the authorized relevant MEC applications (e.g. + the applications that indicate the services as "optional" + or "required") that are subscribed to the corresponding + service availability notifications + - when the MEC platform notifies the authorized relevant applications that are subscribed to the corresponding service availability notifications about the service availability changes.' + operationId: Sm_ServiceAvailabilityNotification_POST + requestBody: + $ref: '#/components/requestBodies/ServiceAvailabilityNotification' + responses: + "200": + description: "Expected responses from callback consumer, if it accepts\ + \ the callback" diff --git a/go-packages/meep-service-mgmt-client/api_mec_service_mgmt.go b/go-packages/meep-service-mgmt-client/api_mec_service_mgmt.go index f643a67ae..e2be3473e 100644 --- a/go-packages/meep-service-mgmt-client/api_mec_service_mgmt.go +++ b/go-packages/meep-service-mgmt-client/api_mec_service_mgmt.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -51,9 +51,9 @@ This method retrieves information about a list of mecService resources. This met * @param "SerInstanceId" (optional.Interface of []string) - A MEC application instance may use multiple ser_instance_ids as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. * @param "SerName" (optional.Interface of []string) - A MEC application instance may use multiple ser_names as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. * @param "SerCategoryId" (optional.String) - A MEC application instance may use ser_category_id as an input parameter to query the availability of a list of MEC service instances in a serCategory. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. - * @param "ConsumedLocalOnly" (optional.Bool) - Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. - * @param "IsLocal" (optional.Bool) - Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. - * @param "ScopeOfLocality" (optional.String) - A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. + * @param "ConsumedLocalOnly" (optional.Bool) - Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. + * @param "IsLocal" (optional.Bool) - Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. + * @param "ScopeOfLocality" (optional.String) - A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. @return []ServiceInfo */ @@ -1162,9 +1162,9 @@ This method retrieves information about a list of mecService resources. This met * @param "SerInstanceId" (optional.Interface of []string) - A MEC application instance may use multiple ser_instance_ids as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. * @param "SerName" (optional.Interface of []string) - A MEC application instance may use multiple ser_names as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. * @param "SerCategoryId" (optional.String) - A MEC application instance may use ser_category_id as an input parameter to query the availability of a list of MEC service instances in a serCategory. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. - * @param "ConsumedLocalOnly" (optional.Bool) - Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. - * @param "IsLocal" (optional.Bool) - Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. - * @param "ScopeOfLocality" (optional.String) - A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. + * @param "ConsumedLocalOnly" (optional.Bool) - Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. + * @param "IsLocal" (optional.Bool) - Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. + * @param "ScopeOfLocality" (optional.String) - A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. @return []ServiceInfo */ diff --git a/go-packages/meep-service-mgmt-client/client.go b/go-packages/meep-service-mgmt-client/client.go index 28935abc9..b8902d566 100644 --- a/go-packages/meep-service-mgmt-client/client.go +++ b/go-packages/meep-service-mgmt-client/client.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -52,7 +52,7 @@ var ( xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)") ) -// APIClient manages communication with the AdvantEDGE MEC Service Management API API v2.2.1 +// APIClient manages communication with the AdvantEDGE Service Management API API v2.2.1 // In most cases there should be only one, shared, APIClient. type APIClient struct { cfg *Configuration diff --git a/go-packages/meep-service-mgmt-client/configuration.go b/go-packages/meep-service-mgmt-client/configuration.go index 61f532df0..2ffce674d 100644 --- a/go-packages/meep-service-mgmt-client/configuration.go +++ b/go-packages/meep-service-mgmt-client/configuration.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/docs/MecServiceMgmtApi.md b/go-packages/meep-service-mgmt-client/docs/MecServiceMgmtApi.md index 76a2b35ec..8309d6d76 100644 --- a/go-packages/meep-service-mgmt-client/docs/MecServiceMgmtApi.md +++ b/go-packages/meep-service-mgmt-client/docs/MecServiceMgmtApi.md @@ -1,4 +1,4 @@ -# {{classname}} +# \MecServiceMgmtApi All URIs are relative to *https://localhost/sandboxname/mec_service_mgmt/v1* @@ -30,19 +30,20 @@ Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. **appInstanceId** | **string**| Represents a MEC application instance. Note that the appInstanceId is allocated by the MEC platform manager. | - **optional** | ***MecServiceMgmtApiAppServicesGETOpts** | optional parameters | nil if no parameters + **optional** | ***AppServicesGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a MecServiceMgmtApiAppServicesGETOpts struct +Optional parameters are passed through a pointer to a AppServicesGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **serInstanceId** | [**optional.Interface of []string**](string.md)| A MEC application instance may use multiple ser_instance_ids as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. | **serName** | [**optional.Interface of []string**](string.md)| A MEC application instance may use multiple ser_names as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. | **serCategoryId** | **optional.String**| A MEC application instance may use ser_category_id as an input parameter to query the availability of a list of MEC service instances in a serCategory. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. | - **consumedLocalOnly** | **optional.Bool**| Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. | - **isLocal** | **optional.Bool**| Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. | - **scopeOfLocality** | **optional.String**| A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. | + **consumedLocalOnly** | **optional.Bool**| Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. | + **isLocal** | **optional.Bool**| Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. | + **scopeOfLocality** | **optional.String**| A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. | ### Return type @@ -92,7 +93,7 @@ No authorization required > AppServicesServiceIdDELETE(ctx, appInstanceId, serviceId) -This method deletes a mecService resource. This method is typically used in the service deregistration procedure. +This method deletes a mecService resource. This method is typically used in the service deregistration procedure. ### Required Parameters @@ -302,18 +303,19 @@ This method retrieves information about a list of mecService resources. This met Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***MecServiceMgmtApiServicesGETOpts** | optional parameters | nil if no parameters + **optional** | ***ServicesGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a MecServiceMgmtApiServicesGETOpts struct +Optional parameters are passed through a pointer to a ServicesGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **serInstanceId** | [**optional.Interface of []string**](string.md)| A MEC application instance may use multiple ser_instance_ids as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. | **serName** | [**optional.Interface of []string**](string.md)| A MEC application instance may use multiple ser_names as an input parameter to query the availability of a list of MEC service instances. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. | **serCategoryId** | **optional.String**| A MEC application instance may use ser_category_id as an input parameter to query the availability of a list of MEC service instances in a serCategory. Either \"ser_instance_id\" or \"ser_name\" or \"ser_category_id\" or none of them shall be present. | - **consumedLocalOnly** | **optional.Bool**| Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. | - **isLocal** | **optional.Bool**| Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. | - **scopeOfLocality** | **optional.String**| A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. | + **consumedLocalOnly** | **optional.Bool**| Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. | + **isLocal** | **optional.Bool**| Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. | + **scopeOfLocality** | **optional.String**| A MEC application instance may use scope_of_locality as an input parameter to query the availability of a list of MEC service instances with a certain scope of locality. | ### Return type diff --git a/go-packages/meep-service-mgmt-client/docs/ProblemDetails.md b/go-packages/meep-service-mgmt-client/docs/ProblemDetails.md index 465caf4ff..f59a7ac9a 100644 --- a/go-packages/meep-service-mgmt-client/docs/ProblemDetails.md +++ b/go-packages/meep-service-mgmt-client/docs/ProblemDetails.md @@ -5,8 +5,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Type_** | **string** | A URI reference according to IETF RFC 3986 that identifies the problem type | [optional] [default to null] **Title** | **string** | A short, human-readable summary of the problem type | [optional] [default to null] -**Status** | **int32** | The HTTP status code for this occurrence of the problem | [optional] [default to null] -**Detail** | **string** | A human-readable explanation specific to this occurrence of the problem | [optional] [default to null] +**Status** | **int32** | The HTTP status code for this occurrence of the problem | [default to null] +**Detail** | **string** | A human-readable explanation specific to this occurrence of the problem | [default to null] **Instance** | **string** | A URI reference that identifies the specific occurrence of the problem | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationChangeType.md b/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationChangeType.md new file mode 100644 index 000000000..0b54ccfb4 --- /dev/null +++ b/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationChangeType.md @@ -0,0 +1,9 @@ +# ServiceAvailabilityNotificationChangeType + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationServiceReferences.md b/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationServiceReferences.md index 42aa1388f..e62707c55 100644 --- a/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationServiceReferences.md +++ b/go-packages/meep-service-mgmt-client/docs/ServiceAvailabilityNotificationServiceReferences.md @@ -7,7 +7,7 @@ Name | Type | Description | Notes **SerName** | **string** | | [default to null] **SerInstanceId** | **string** | | [default to null] **State** | [***ServiceState**](ServiceState.md) | | [default to null] -**ChangeType** | **string** | Type of the change. Valid values: ADDED: The service was newly added. REMOVED: The service was removed. STATE_CHANGED: Only the state of the service was changed. ATTRIBUTES_CHANGED: At least one attribute of the service other than state was changed. The change may or may not include changing the state. | [default to null] +**ChangeType** | [***ServiceAvailabilityNotificationChangeType**](ServiceAvailabilityNotificationChangeType.md) | | [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-service-mgmt-client/docs/ServiceInfo.md b/go-packages/meep-service-mgmt-client/docs/ServiceInfo.md index 81b164ae0..194cc3381 100644 --- a/go-packages/meep-service-mgmt-client/docs/ServiceInfo.md +++ b/go-packages/meep-service-mgmt-client/docs/ServiceInfo.md @@ -8,10 +8,11 @@ Name | Type | Description | Notes **SerCategory** | [***CategoryRef**](CategoryRef.md) | | [optional] [default to null] **Version** | **string** | Service version | [default to null] **State** | [***ServiceState**](ServiceState.md) | | [default to null] +**TransportId** | **string** | Identifier of the platform-provided transport to be used by the service. Valid identifiers may be obtained using the \"Transport information query\" procedure. May be present in POST requests to signal the use of a platform-provided transport for the service, and shall be absent otherwise. See note 2. | [optional] [default to null] **TransportInfo** | [***TransportInfo**](TransportInfo.md) | | [default to null] **Serializer** | [***SerializerType**](SerializerType.md) | | [default to null] **ScopeOfLocality** | [***LocalityType**](LocalityType.md) | | [optional] [default to null] -**ConsumedLocalOnly** | **bool** | Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. | [optional] [default to null] +**ConsumedLocalOnly** | **bool** | Indicate whether the service can only be consumed by the MEC applications located in the same locality (as defined by scopeOfLocality) as this service instance. | [optional] [default to null] **IsLocal** | **bool** | Indicate whether the service is located in the same locality (as defined by scopeOfLocality) as the consuming MEC application. | [optional] [default to null] **LivenessInterval** | **int32** | Interval (in seconds) between two consecutive \"heartbeat\" messages (see clause 8.2.10.3.3). If the service-producing application supports sending \"heartbeat\" messages, it shall include this attribute in the registration request. In this case, the application shall either set the value of this attribute to zero or shall use this attribute to propose a non-zero positive value for the liveness interval. If the application has provided this attribute in the request and the MEC platform requires \"heartbeat\" messages, the MEC platform shall return this attribute value in the HTTP responses. The MEC platform may use the value proposed in the request or may choose a different value. If the MEC platform does not require \"heartbeat\" messages for this service instance it shall omit the attribute in responses. | [optional] [default to null] **Links** | [***ServiceInfoLinks**](ServiceInfo__links.md) | | [default to null] diff --git a/go-packages/meep-service-mgmt-client/docs/SubscriptionLinkListLinks.md b/go-packages/meep-service-mgmt-client/docs/SubscriptionLinkListLinks.md index fab16509d..3759ba13d 100644 --- a/go-packages/meep-service-mgmt-client/docs/SubscriptionLinkListLinks.md +++ b/go-packages/meep-service-mgmt-client/docs/SubscriptionLinkListLinks.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Self** | [***LinkType**](LinkType.md) | | [default to null] -**Subscriptions** | [**[]SubscriptionLinkListLinksSubscriptions**](SubscriptionLinkList__links_subscriptions.md) | The MEC application instance's subscriptions | [optional] [default to null] +**Subscriptions** | [**[]SubscriptionLinkListLinksSubscriptions**](SubscriptionLinkList__links_subscriptions.md) | The MEC application instance's subscriptions | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/go-packages/meep-service-mgmt-client/model_category_ref.go b/go-packages/meep-service-mgmt-client/model_category_ref.go index a3a187239..106b664ce 100644 --- a/go-packages/meep-service-mgmt-client/model_category_ref.go +++ b/go-packages/meep-service-mgmt-client/model_category_ref.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_end_point_info_addresses.go b/go-packages/meep-service-mgmt-client/model_end_point_info_addresses.go index ff85a2d64..85bdbdc3b 100644 --- a/go-packages/meep-service-mgmt-client/model_end_point_info_addresses.go +++ b/go-packages/meep-service-mgmt-client/model_end_point_info_addresses.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_end_point_info_addresses_addresses.go b/go-packages/meep-service-mgmt-client/model_end_point_info_addresses_addresses.go index 655b806e0..b7ff8b345 100644 --- a/go-packages/meep-service-mgmt-client/model_end_point_info_addresses_addresses.go +++ b/go-packages/meep-service-mgmt-client/model_end_point_info_addresses_addresses.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_end_point_info_alternative.go b/go-packages/meep-service-mgmt-client/model_end_point_info_alternative.go index 988fd4d25..8cfc33564 100644 --- a/go-packages/meep-service-mgmt-client/model_end_point_info_alternative.go +++ b/go-packages/meep-service-mgmt-client/model_end_point_info_alternative.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_end_point_info_uris.go b/go-packages/meep-service-mgmt-client/model_end_point_info_uris.go index 8a268e883..9128eea67 100644 --- a/go-packages/meep-service-mgmt-client/model_end_point_info_uris.go +++ b/go-packages/meep-service-mgmt-client/model_end_point_info_uris.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_grant_type.go b/go-packages/meep-service-mgmt-client/model_grant_type.go index 12f50d6cc..14881e81a 100644 --- a/go-packages/meep-service-mgmt-client/model_grant_type.go +++ b/go-packages/meep-service-mgmt-client/model_grant_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_link_type.go b/go-packages/meep-service-mgmt-client/model_link_type.go index 08c7c8146..f35e0225d 100644 --- a/go-packages/meep-service-mgmt-client/model_link_type.go +++ b/go-packages/meep-service-mgmt-client/model_link_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_locality_type.go b/go-packages/meep-service-mgmt-client/model_locality_type.go index e3ab4355e..65277d968 100644 --- a/go-packages/meep-service-mgmt-client/model_locality_type.go +++ b/go-packages/meep-service-mgmt-client/model_locality_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_o_auth2_info.go b/go-packages/meep-service-mgmt-client/model_o_auth2_info.go index db0c9383d..e9261a588 100644 --- a/go-packages/meep-service-mgmt-client/model_o_auth2_info.go +++ b/go-packages/meep-service-mgmt-client/model_o_auth2_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_one_of_service_info_post.go b/go-packages/meep-service-mgmt-client/model_one_of_service_info_post.go index 2251437e7..50e336e40 100644 --- a/go-packages/meep-service-mgmt-client/model_one_of_service_info_post.go +++ b/go-packages/meep-service-mgmt-client/model_one_of_service_info_post.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_one_of_transport_info_endpoint.go b/go-packages/meep-service-mgmt-client/model_one_of_transport_info_endpoint.go index 4827c21ad..6e21a5ef6 100644 --- a/go-packages/meep-service-mgmt-client/model_one_of_transport_info_endpoint.go +++ b/go-packages/meep-service-mgmt-client/model_one_of_transport_info_endpoint.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_problem_details.go b/go-packages/meep-service-mgmt-client/model_problem_details.go index 9f1293001..ff82e256c 100644 --- a/go-packages/meep-service-mgmt-client/model_problem_details.go +++ b/go-packages/meep-service-mgmt-client/model_problem_details.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -30,9 +30,9 @@ type ProblemDetails struct { // A short, human-readable summary of the problem type Title string `json:"title,omitempty"` // The HTTP status code for this occurrence of the problem - Status int32 `json:"status,omitempty"` + Status int32 `json:"status"` // A human-readable explanation specific to this occurrence of the problem - Detail string `json:"detail,omitempty"` + Detail string `json:"detail"` // A URI reference that identifies the specific occurrence of the problem Instance string `json:"instance,omitempty"` } diff --git a/go-packages/meep-service-mgmt-client/model_security_info.go b/go-packages/meep-service-mgmt-client/model_security_info.go index 308ab5f93..98cbc5aa3 100644 --- a/go-packages/meep-service-mgmt-client/model_security_info.go +++ b/go-packages/meep-service-mgmt-client/model_security_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_self.go b/go-packages/meep-service-mgmt-client/model_self.go index 215eed593..56614466f 100644 --- a/go-packages/meep-service-mgmt-client/model_self.go +++ b/go-packages/meep-service-mgmt-client/model_self.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription.go b/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription.go index fac3b6d59..a07db8cbd 100644 --- a/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription.go +++ b/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -24,7 +24,7 @@ package client -// This type represents a subscription to the notifications from the MEC platform regarding the availability of a MEC service or a list of MEC services. +// This type represents a subscription to the notifications from the MEC platform regarding the availability of a MEC service or a list of MEC services. type SerAvailabilityNotificationSubscription struct { // Shall be set to SerAvailabilityNotificationSubscription. SubscriptionType string `json:"subscriptionType"` diff --git a/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription_filtering_criteria.go b/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription_filtering_criteria.go index 99e8790c3..672cb4d01 100644 --- a/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription_filtering_criteria.go +++ b/go-packages/meep-service-mgmt-client/model_ser_availability_notification_subscription_filtering_criteria.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -24,7 +24,7 @@ package client -// Filtering criteria to match services for which events are requested to be reported. If absent, matches all services. All child attributes are combined with the logical \"AND\" operation. +// Filtering criteria to match services for which events are requested to be reported. If absent, matches all services. All child attributes are combined with the logical \"AND\" operation. type SerAvailabilityNotificationSubscriptionFilteringCriteria struct { SerInstanceIds *[]string `json:"serInstanceIds,omitempty"` SerNames *[]string `json:"serNames,omitempty"` diff --git a/go-packages/meep-service-mgmt-client/model_serializer_type.go b/go-packages/meep-service-mgmt-client/model_serializer_type.go index 5851a683c..da5cdd21a 100644 --- a/go-packages/meep-service-mgmt-client/model_serializer_type.go +++ b/go-packages/meep-service-mgmt-client/model_serializer_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_service_availability_notification.go b/go-packages/meep-service-mgmt-client/model_service_availability_notification.go index 06a3a56ae..7609df0df 100644 --- a/go-packages/meep-service-mgmt-client/model_service_availability_notification.go +++ b/go-packages/meep-service-mgmt-client/model_service_availability_notification.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_service_availability_notification_change_type.go b/go-packages/meep-service-mgmt-client/model_service_availability_notification_change_type.go index 5cec2fbdb..de5c41469 100644 --- a/go-packages/meep-service-mgmt-client/model_service_availability_notification_change_type.go +++ b/go-packages/meep-service-mgmt-client/model_service_availability_notification_change_type.go @@ -1,33 +1,33 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * - * The ETSI MEC ISG MEC011 MEC Service Management API described using OpenAPI + * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * * API version: 2.2.1 - * Contact: cti_support@etsi.org + * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package client -// ServiceAvailabilityNotificationChangeType : Type of the change. Valid values: ADDED: The service was newly added. REMOVED: The service was removed. STATE_CHANGED: Only the state of the service was changed. ATTRIBUTES_CHANGED: At least one attribute of the service other than state was changed. The change may or may not include changing the state. +// ServiceAvailabilityNotificationChangeType : Type of the change. Valid values: ADDED: The service was newly added. REMOVED: The service was removed. STATE_CHANGED: Only the state of the service was changed. ATTRIBUTES_CHANGED: At least one attribute of the service other than state was changed. The change may or may not include changing the state. type ServiceAvailabilityNotificationChangeType string -// List of ServiceAvailabilityNotification.ChangeType +// List of ServiceAvailabilityNotificationChangeType const ( ADDED_ServiceAvailabilityNotificationChangeType ServiceAvailabilityNotificationChangeType = "ADDED" REMOVED_ServiceAvailabilityNotificationChangeType ServiceAvailabilityNotificationChangeType = "REMOVED" diff --git a/go-packages/meep-service-mgmt-client/model_service_availability_notification_service_references.go b/go-packages/meep-service-mgmt-client/model_service_availability_notification_service_references.go index 8bfaf007d..fda14e88b 100644 --- a/go-packages/meep-service-mgmt-client/model_service_availability_notification_service_references.go +++ b/go-packages/meep-service-mgmt-client/model_service_availability_notification_service_references.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -26,10 +26,9 @@ package client // List of links to services whose availability has changed. type ServiceAvailabilityNotificationServiceReferences struct { - Link *LinkType `json:"link,omitempty"` - SerName string `json:"serName"` - SerInstanceId string `json:"serInstanceId"` - State *ServiceState `json:"state"` - // Type of the change. Valid values: ADDED: The service was newly added. REMOVED: The service was removed. STATE_CHANGED: Only the state of the service was changed. ATTRIBUTES_CHANGED: At least one attribute of the service other than state was changed. The change may or may not include changing the state. - ChangeType string `json:"changeType"` + Link *LinkType `json:"link,omitempty"` + SerName string `json:"serName"` + SerInstanceId string `json:"serInstanceId"` + State *ServiceState `json:"state"` + ChangeType *ServiceAvailabilityNotificationChangeType `json:"changeType"` } diff --git a/go-packages/meep-service-mgmt-client/model_service_info.go b/go-packages/meep-service-mgmt-client/model_service_info.go index 12764a3b7..8e57c6eb3 100644 --- a/go-packages/meep-service-mgmt-client/model_service_info.go +++ b/go-packages/meep-service-mgmt-client/model_service_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_service_info_links.go b/go-packages/meep-service-mgmt-client/model_service_info__links.go similarity index 80% rename from go-packages/meep-service-mgmt-client/model_service_info_links.go rename to go-packages/meep-service-mgmt-client/model_service_info__links.go index 50d085ee0..8f5718585 100644 --- a/go-packages/meep-service-mgmt-client/model_service_info_links.go +++ b/go-packages/meep-service-mgmt-client/model_service_info__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ServiceInfoLinks struct { - Self *LinkType `json:"self"` - + Self *LinkType `json:"self"` Liveness *LinkType `json:"liveness,omitempty"` } diff --git a/go-packages/meep-service-mgmt-client/model_service_info_post.go b/go-packages/meep-service-mgmt-client/model_service_info_post.go index c017b8c93..ee4788300 100644 --- a/go-packages/meep-service-mgmt-client/model_service_info_post.go +++ b/go-packages/meep-service-mgmt-client/model_service_info_post.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_service_liveness_info.go b/go-packages/meep-service-mgmt-client/model_service_liveness_info.go index 66862a21b..ea08fbf2c 100644 --- a/go-packages/meep-service-mgmt-client/model_service_liveness_info.go +++ b/go-packages/meep-service-mgmt-client/model_service_liveness_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -21,11 +21,11 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ServiceLivenessInfo struct { - State *ServiceState `json:"state"` - + State *ServiceState `json:"state"` TimeStamp *ServiceLivenessInfoTimeStamp `json:"timeStamp"` // The interval (in seconds) between two consecutive \"heartbeat\" messages (see clause 8.2.10.3.3) that MEC platform has determined. Interval int32 `json:"interval"` diff --git a/go-packages/meep-service-mgmt-client/model_service_liveness_info_time_stamp.go b/go-packages/meep-service-mgmt-client/model_service_liveness_info_time_stamp.go index 5e704c83e..a34cdceea 100644 --- a/go-packages/meep-service-mgmt-client/model_service_liveness_info_time_stamp.go +++ b/go-packages/meep-service-mgmt-client/model_service_liveness_info_time_stamp.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -21,11 +21,11 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // The time when the last \"heartbeat\" message was received by MEC platform type ServiceLivenessInfoTimeStamp struct { - Seconds int32 `json:"seconds"` - + Seconds int32 `json:"seconds"` NanoSeconds int32 `json:"nanoSeconds"` } diff --git a/go-packages/meep-service-mgmt-client/model_service_liveness_update.go b/go-packages/meep-service-mgmt-client/model_service_liveness_update.go index 6d2dc1979..a61576451 100644 --- a/go-packages/meep-service-mgmt-client/model_service_liveness_update.go +++ b/go-packages/meep-service-mgmt-client/model_service_liveness_update.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ServiceLivenessUpdate struct { diff --git a/go-packages/meep-service-mgmt-client/model_service_state.go b/go-packages/meep-service-mgmt-client/model_service_state.go index b37554f1d..de5d9decb 100644 --- a/go-packages/meep-service-mgmt-client/model_service_state.go +++ b/go-packages/meep-service-mgmt-client/model_service_state.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_subscription.go b/go-packages/meep-service-mgmt-client/model_subscription.go index e5911f338..920068df6 100644 --- a/go-packages/meep-service-mgmt-client/model_subscription.go +++ b/go-packages/meep-service-mgmt-client/model_subscription.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_subscription_link_list.go b/go-packages/meep-service-mgmt-client/model_subscription_link_list.go index 0d7b0aeb0..c69aab221 100644 --- a/go-packages/meep-service-mgmt-client/model_subscription_link_list.go +++ b/go-packages/meep-service-mgmt-client/model_subscription_link_list.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_subscription_link_list__links.go b/go-packages/meep-service-mgmt-client/model_subscription_link_list__links.go index 65ff1d305..e0f79dcb9 100644 --- a/go-packages/meep-service-mgmt-client/model_subscription_link_list__links.go +++ b/go-packages/meep-service-mgmt-client/model_subscription_link_list__links.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_subscription_link_list__links_subscriptions.go b/go-packages/meep-service-mgmt-client/model_subscription_link_list__links_subscriptions.go index ba4029d9e..c3fd59c32 100644 --- a/go-packages/meep-service-mgmt-client/model_subscription_link_list__links_subscriptions.go +++ b/go-packages/meep-service-mgmt-client/model_subscription_link_list__links_subscriptions.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_transport_info.go b/go-packages/meep-service-mgmt-client/model_transport_info.go index 4eab0700b..8dcf3eff4 100644 --- a/go-packages/meep-service-mgmt-client/model_transport_info.go +++ b/go-packages/meep-service-mgmt-client/model_transport_info.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/model_transport_type.go b/go-packages/meep-service-mgmt-client/model_transport_type.go index 61ad622e0..30fdd37d3 100644 --- a/go-packages/meep-service-mgmt-client/model_transport_type.go +++ b/go-packages/meep-service-mgmt-client/model_transport_type.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-service-mgmt-client/response.go b/go-packages/meep-service-mgmt-client/response.go index ca7bc5c39..a38680f01 100644 --- a/go-packages/meep-service-mgmt-client/response.go +++ b/go-packages/meep-service-mgmt-client/response.go @@ -1,19 +1,19 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * - * AdvantEDGE MEC Service Management API + * AdvantEDGE Service Management API * * MEC Service Management Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC011 Application Enablement API](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/02.02.01_60/gs_MEC011v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-app-enablement](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-app-enablement/server/service-mgmt)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about services in the network

    **Note**
    AdvantEDGE supports all of Service Management API endpoints (see below). * diff --git a/go-packages/meep-sessions/permission-store.go b/go-packages/meep-sessions/permission-store.go index 95c2890d4..eac1a1b9a 100644 --- a/go-packages/meep-sessions/permission-store.go +++ b/go-packages/meep-sessions/permission-store.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-sessions/session-mgr.go b/go-packages/meep-sessions/session-mgr.go index 9ec86f2aa..c6da5167b 100644 --- a/go-packages/meep-sessions/session-mgr.go +++ b/go-packages/meep-sessions/session-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-sessions/session-store.go b/go-packages/meep-sessions/session-store.go index 2a167e042..4f060a6cb 100644 --- a/go-packages/meep-sessions/session-store.go +++ b/go-packages/meep-sessions/session-store.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-subscriptions/go.sum b/go-packages/meep-subscriptions/go.sum index c1a0ae314..f778de387 100644 --- a/go-packages/meep-subscriptions/go.sum +++ b/go-packages/meep-subscriptions/go.sum @@ -105,6 +105,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= diff --git a/go-packages/meep-subscriptions/subscription-mgr.go b/go-packages/meep-subscriptions/subscription-mgr.go index c77658f44..e5e0952ab 100644 --- a/go-packages/meep-subscriptions/subscription-mgr.go +++ b/go-packages/meep-subscriptions/subscription-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-subscriptions/subscription-mgr_test.go b/go-packages/meep-subscriptions/subscription-mgr_test.go index 96e451c77..30b77fc9b 100644 --- a/go-packages/meep-subscriptions/subscription-mgr_test.go +++ b/go-packages/meep-subscriptions/subscription-mgr_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-subscriptions/subscription.go b/go-packages/meep-subscriptions/subscription.go index 53d4410bb..a679912af 100644 --- a/go-packages/meep-subscriptions/subscription.go +++ b/go-packages/meep-subscriptions/subscription.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -231,7 +231,7 @@ func (sub *Subscription) sendNotification(notif []byte, sandbox string, service // Log metrics if necessary if metricsEnabled { duration := float64(time.Since(startTime).Microseconds()) / 1000.0 - _ = httpLog.LogTx(notifUrl, notifMethod, string(notif), notifResp, startTime) + _ = httpLog.LogNotification(notifUrl, notifMethod, "", "", string(notif), notifResp, startTime) if notifErr != nil { log.Error(notifErr) met.ObserveNotification(sandbox, service, sub.Cfg.NotifType, notifUrl, nil, duration) diff --git a/go-packages/meep-subscriptions/util.go b/go-packages/meep-subscriptions/util.go index 015b47cea..8b6bc7ca3 100644 --- a/go-packages/meep-subscriptions/util.go +++ b/go-packages/meep-subscriptions/util.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-swagger-api-mgr/swagger-api-mgr.go b/go-packages/meep-swagger-api-mgr/swagger-api-mgr.go index 6190eb133..37b915965 100644 --- a/go-packages/meep-swagger-api-mgr/swagger-api-mgr.go +++ b/go-packages/meep-swagger-api-mgr/swagger-api-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -99,40 +99,6 @@ func NewSwaggerApiMgr(moduleName string, sandboxName string, mepName string, msg return sam, nil } -// NewSwaggerApiMgr - Creates and initialize a Swagger API Manager instance for UE application and/or MEC application -func NewSwaggerApiMgr_1(moduleName string, mepName string, msgQueue *mq.MsgQueue, appHostUrl string, appSvcPath string) (sam *SwaggerApiMgr, err error) { - // Create new Swagger API Manager instance - sam = new(SwaggerApiMgr) - sam.moduleName = moduleName - sam.sandboxName = "" - sam.mepName = mepName - sam.msgQueue = msgQueue - sam.handlerId = -1 - sam.apiMap = make(map[string]*SwaggerApiList) - - // Get Host Url - hostUrl, err := url.Parse(appHostUrl) - if err != nil { - hostUrl = new(url.URL) - } - log.Info("MEEP_HOST_URL: ", hostUrl) - - // Get Service Path - svcPath := appSvcPath - log.Info("MEEP_SVC_PATH: ", svcPath) - - // Create full service url - sam.svcUrl = hostUrl.String() - if mepName != "" { - sam.svcUrl += "/" + mepName - } - sam.svcUrl += svcPath - log.Info("Service URL: ", sam.svcUrl) - - log.Info("Created Swagger API Manager") - return sam, nil -} - // Start - Start Swagger API message Handler func (sam *SwaggerApiMgr) Start(isProvider bool, isAggregator bool) error { var err error diff --git a/go-packages/meep-users/db.go b/go-packages/meep-users/db.go index 791c560bc..cce456cbb 100644 --- a/go-packages/meep-users/db.go +++ b/go-packages/meep-users/db.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-users/db_test.go b/go-packages/meep-users/db_test.go index 405131246..287aad699 100644 --- a/go-packages/meep-users/db_test.go +++ b/go-packages/meep-users/db_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-vis-client/.swagger-codegen/VERSION b/go-packages/meep-vis-client/.swagger-codegen/VERSION index 812aaafe6..92eba66b0 100644 --- a/go-packages/meep-vis-client/.swagger-codegen/VERSION +++ b/go-packages/meep-vis-client/.swagger-codegen/VERSION @@ -1 +1 @@ -3.0.22 \ No newline at end of file +3.0.29 diff --git a/go-packages/meep-vis-client/README.md b/go-packages/meep-vis-client/README.md index 68e0ebcfb..c36261472 100644 --- a/go-packages/meep-vis-client/README.md +++ b/go-packages/meep-vis-client/README.md @@ -1,4 +1,4 @@ -# Go API client for swagger +# Go API client for client V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. @@ -12,7 +12,7 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge ## Installation Put the package under your project folder and add the following in import: ```golang -import "./swagger" +import "./client" ``` ## Documentation for API Endpoints @@ -33,12 +33,11 @@ Class | Method | HTTP request | Description *V2xiApi* | [**Mec011AppTerminationPOST**](docs/V2xiApi.md#mec011appterminationpost) | **Post** /notifications/mec011/appTermination | MEC011 Application Termination notification for self termination *V2xiApi* | [**PredictedQosPOST**](docs/V2xiApi.md#predictedqospost) | **Post** /provide_predicted_qos | Request the predicted QoS correspondent to potential routes of a vehicular UE. + ## Documentation For Models - [AppTerminationNotification](docs/AppTerminationNotification.md) - [AppTerminationNotificationLinks](docs/AppTerminationNotificationLinks.md) - - [Body](docs/Body.md) - - [Body1](docs/Body1.md) - [CellId](docs/CellId.md) - [Earfcn](docs/Earfcn.md) - [Ecgi](docs/Ecgi.md) @@ -48,8 +47,8 @@ Class | Method | HTTP request | Description - [LocationInfo](docs/LocationInfo.md) - [LocationInfoGeoArea](docs/LocationInfoGeoArea.md) - [MsgType](docs/MsgType.md) - - [OneOfbody](docs/OneOfbody.md) - - [OneOfbody1](docs/OneOfbody1.md) + - [OneOfsubscriptionsBody](docs/OneOfsubscriptionsBody.md) + - [OneOfsubscriptionsSubscriptionIdBody](docs/OneOfsubscriptionsSubscriptionIdBody.md) - [OperationActionType](docs/OperationActionType.md) - [Pc5NeighbourCellInfo](docs/Pc5NeighbourCellInfo.md) - [Pc5ProvisioningInfo](docs/Pc5ProvisioningInfo.md) @@ -71,6 +70,8 @@ Class | Method | HTTP request | Description - [SubscriptionLinkList](docs/SubscriptionLinkList.md) - [SubscriptionLinkListLinks](docs/SubscriptionLinkListLinks.md) - [SubscriptionLinkListLinksSubscriptions](docs/SubscriptionLinkListLinksSubscriptions.md) + - [SubscriptionsBody](docs/SubscriptionsBody.md) + - [SubscriptionsSubscriptionIdBody](docs/SubscriptionsSubscriptionIdBody.md) - [SystemInformationBlockType21](docs/SystemInformationBlockType21.md) - [TddInfo](docs/TddInfo.md) - [TestNotification](docs/TestNotification.md) @@ -95,6 +96,7 @@ Class | Method | HTTP request | Description - [V2xServerUsdTmgi](docs/V2xServerUsdTmgi.md) - [WebsockNotifConfig](docs/WebsockNotifConfig.md) + ## Documentation For Authorization Endpoints do not require authorization. @@ -102,3 +104,4 @@ Class | Method | HTTP request | Description ## Author AdvantEDGE@InterDigital.com + diff --git a/go-packages/meep-vis-client/api/swagger.yaml b/go-packages/meep-vis-client/api/swagger.yaml index 4aa0a30a8..5351261a3 100644 --- a/go-packages/meep-vis-client/api/swagger.yaml +++ b/go-packages/meep-vis-client/api/swagger.yaml @@ -1,14 +1,14 @@ openapi: 3.0.0 info: title: AdvantEDGE V2X Information Service REST API - description: V2X Information Service is AdvantEDGE's implementation of [ETSI MEC - ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf) -

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt) -

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis) -

    **Type & Usage**
    Edge Service used by edge applications that want to get - information about radio conditions in the network

    **Note**
    AdvantEDGE supports - a selected subset of RNI API endpoints (see below) and a subset of subscription - types. + description: "V2X Information Service is AdvantEDGE's implementation of [ETSI MEC\ + \ ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)\ + \

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)\ + \

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)\ + \

    **Type & Usage**
    Edge Service used by edge applications that want to get\ + \ information about radio conditions in the network

    **Note**
    AdvantEDGE\ + \ supports a selected subset of RNI API endpoints (see below) and a subset of\ + \ subscription types." contact: name: InterDigital AdvantEDGE Support email: AdvantEDGE@InterDigital.com @@ -17,7 +17,7 @@ info: url: https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE version: 2.2.1 externalDocs: - description: ETSI GS MEC 030 V2X Information Service API, v2.2.1 + description: "ETSI GS MEC 030 V2X Information Service API, v2.2.1" url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_mec030v020201p.pdf servers: - url: https://localhost/sandboxname/vis/v2 @@ -52,41 +52,41 @@ paths: schema: $ref: '#/components/schemas/UuUnicastProvisioningInfo' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -116,41 +116,41 @@ paths: schema: $ref: '#/components/schemas/UuMbmsProvisioningInfo' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -181,41 +181,41 @@ paths: schema: $ref: '#/components/schemas/Pc5ProvisioningInfo' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -244,28 +244,28 @@ paths: schema: $ref: '#/components/schemas/PredictedQos' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: @@ -287,41 +287,41 @@ paths: "204": description: No Content "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -336,11 +336,11 @@ paths: parameters: - name: subscription_type in: query - description: 'Query parameter to filter on a specific subscription type. Permitted - values: prov_chg_uu_uni: provisioning information change for V2X communication - over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X - communication over Uu MBMS prov_chg_uu_pc5: provisioning information change - for V2X communication over PC5. v2x_msg: V2X interoperability message' + description: "Query parameter to filter on a specific subscription type. Permitted\ + \ values: prov_chg_uu_uni: provisioning information change for V2X communication\ + \ over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X\ + \ communication over Uu MBMS prov_chg_uu_pc5: provisioning information change\ + \ for V2X communication over PC5. v2x_msg: V2X interoperability message" required: false style: form explode: true @@ -355,41 +355,41 @@ paths: schema: $ref: '#/components/schemas/SubscriptionLinkList' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -404,71 +404,72 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body' + $ref: '#/components/schemas/subscriptions_body' required: true responses: "201": - description: In the returned NotificationSubscription structure, the created - subscription is described using the appropriate data type. + description: "In the returned NotificationSubscription structure, the created\ + \ subscription is described using the appropriate data type." content: application/json: schema: - $ref: '#/components/schemas/body' + $ref: '#/components/schemas/subscriptions_body' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "415": - description: 'Unsupported Media Type : used to indicate that the server - or the client does not support the content type of the entity body.' + description: "Unsupported Media Type : used to indicate that the server\ + \ or the client does not support the content type of the entity body." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -504,8 +505,8 @@ paths: parameters: - name: subscriptionId in: path - description: Refers to created subscription, where the VIS API allocates a - unique resource name for this subscription + description: "Refers to created subscription, where the VIS API allocates\ + \ a unique resource name for this subscription" required: true style: simple explode: false @@ -518,43 +519,43 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body' + $ref: '#/components/schemas/subscriptions_body' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -568,8 +569,8 @@ paths: parameters: - name: subscriptionId in: path - description: Refers to created subscription, where the VIS API allocates a - unique resource name for this subscription + description: "Refers to created subscription, where the VIS API allocates\ + \ a unique resource name for this subscription" required: true style: simple explode: false @@ -579,7 +580,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body_1' + $ref: '#/components/schemas/subscriptions_subscriptionId_body' required: true responses: "200": @@ -588,63 +589,64 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/body_1' + $ref: '#/components/schemas/subscriptions_subscriptionId_body' "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "412": - description: 'Precondition failed : used when a condition has failed during - conditional requests, e.g. when using ETags to avoid write conflicts when - using PUT' + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts\ + \ when using PUT" content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained - instructions. This error condition can occur if an JSON request body is - syntactically correct but semantically incorrect, for example if the target - area for the request is considered too large. This error condition can - also occur if the capabilities required by the request are not supported.' + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body\ + \ is syntactically correct but semantically incorrect, for example if\ + \ the target area for the request is considered too large. This error\ + \ condition can also occur if the capabilities required by the request\ + \ are not supported." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -658,8 +660,8 @@ paths: parameters: - name: subscriptionId in: path - description: Refers to created subscription, where the VIS API allocates a - unique resource name for this subscription + description: "Refers to created subscription, where the VIS API allocates\ + \ a unique resource name for this subscription" required: true style: simple explode: false @@ -669,27 +671,27 @@ paths: "204": description: No Content "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot - be mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot\ + \ be mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: @@ -743,8 +745,8 @@ components: properties: earfcn: type: integer - description: E-UTRA Absolute Radio Frequency Channel Number, range (0... - 65535) + description: "E-UTRA Absolute Radio Frequency Channel Number, range (0...\ + \ 65535)" x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Integer example: @@ -976,9 +978,10 @@ components: properties: dstLayer2Id: type: string - description: |- - For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - PLMN operators coordinate to make sure Destination Layer2 ID(s) for different V2X services are configured in a consistent manner. + description: "For sidelink communication, the Destination Layer-2 ID is\ + \ set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS\_136\_\ + 321 [i.12].\nPLMN operators coordinate to make sure Destination Layer2\ + \ ID(s) for different V2X services are configured in a consistent manner." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String locationInfo: @@ -1197,17 +1200,15 @@ components: $ref: '#/components/schemas/LocationInfo' rsrp: type: integer - description: |- - Reference Signal Received Power as defined in ETSI TS 136 214 [i.13]. - Shall only be included in the response. + description: "Reference Signal Received Power as defined in ETSI TS 136\ + \ 214 [i.13].\nShall only be included in the response." format: uint8 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 rsrq: type: integer - description: |- - Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. - Shall only be included in the response. + description: "Reference Signal Received Quality as defined in ETSI TS 136\ + \ 214 [i.13].\nShall only be included in the response." format: uint8 x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Uint8 @@ -1253,7 +1254,7 @@ components: x-etsi-mec-origin-type: Uint32 title: type: string - description: A short, human-readable summary of the problem type + description: "A short, human-readable summary of the problem type" x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String type: @@ -1271,8 +1272,9 @@ components: properties: dstLayer2Id: type: string - description: For sidelink communication, the Destination Layer-2 ID is set - to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. + description: "For sidelink communication, the Destination Layer-2 ID is\ + \ set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321\ + \ [i.12]." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: String locationInfo: @@ -1315,9 +1317,9 @@ components: $ref: '#/components/schemas/ProvChgPc5Subscription.filterCriteria' requestTestNotification: type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, as described\ + \ in ETSI GS\_MEC\_009 [i.1], clause 6.12a.\nDefault: FALSE." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: @@ -1327,10 +1329,10 @@ components: x-etsi-mec-origin-type: String websockNotifConfig: $ref: '#/components/schemas/WebsockNotifConfig' - x-etsi-notes: 'NOTE: At least one of callbackReference and websockNotifConfig - shall be provided by the service consumer. If both are provided, it is up - to VIS to choose an alternative and return only that alternative in the response, - as described in ETSI GS MEC 009 [i.1], clause 6.12a.' + x-etsi-notes: "NOTE: At least one of callbackReference and websockNotifConfig\ + \ shall be provided by the service consumer. If both are provided, it is up\ + \ to VIS to choose an alternative and return only that alternative in the\ + \ response, as described in ETSI GS MEC 009 [i.1], clause 6.12a." x-etsi-ref: 6.3.4 ProvChgPc5Subscription.filterCriteria: required: @@ -1340,8 +1342,9 @@ components: properties: dstLayer2Id: type: string - description: For sidelink communication, the Destination Layer-2 ID is set - to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. + description: "For sidelink communication, the Destination Layer-2 ID is\ + \ set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321\ + \ [i.12]." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String locationInfo: @@ -1355,9 +1358,9 @@ components: $ref: '#/components/schemas/Pc5NeighbourCellInfo' x-etsi-mec-cardinality: 0..N x-etsi-mec-origin-type: Pc5NeighbourCellInfo - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Structure (inlined) ProvChgUuMbmsNotification: @@ -1408,9 +1411,9 @@ components: $ref: '#/components/schemas/ProvChgUuMbmsSubscription.filterCriteria' requestTestNotification: type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, as described\ + \ in ETSI GS\_MEC\_009 [i.1], clause 6.12a.\nDefault: FALSE." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: @@ -1444,9 +1447,9 @@ components: x-etsi-mec-origin-type: UuMbmsNeighbourCellInfo v2xServerUsd: $ref: '#/components/schemas/V2xServerUsd' - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Structure (inlined) ProvChgUuUniNotification: @@ -1497,9 +1500,9 @@ components: $ref: '#/components/schemas/ProvChgUuUniSubscription.filterCriteria' requestTestNotification: type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, as described\ + \ in ETSI GS\_MEC\_009 [i.1], clause 6.12a.\nDefault: FALSE." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: @@ -1533,9 +1536,9 @@ components: x-etsi-mec-origin-type: UuUniNeighbourCellInfo v2xApplicationServer: $ref: '#/components/schemas/V2xApplicationServer' - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Structure (inlined) SubscriptionLinkList: @@ -1648,15 +1651,15 @@ components: properties: nanoSeconds: type: integer - description: The nanoseconds part of the time. Time is defined as Unix-time - since January 1, 1970, 00:00:00 UTC. + description: "The nanoseconds part of the time. Time is defined as Unix-time\ + \ since January 1, 1970, 00:00:00 UTC." format: uint32 x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 seconds: type: integer - description: The seconds part of the time. Time is defined as Unixtime since - January 1, 1970, 00:00:00 UTC. + description: "The seconds part of the time. Time is defined as Unixtime\ + \ since January 1, 1970, 00:00:00 UTC." format: uint32 x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Uint32 @@ -2252,7 +2255,7 @@ components: x-etsi-mec-origin-type: String msgEncodeFormat: type: string - description: The encode format of the V2X message, for example base64. + description: "The encode format of the V2X message, for example base64." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String msgType: @@ -2303,7 +2306,7 @@ components: x-etsi-mec-origin-type: String msgEncodeFormat: type: string - description: The encode format of the V2X message, for example base64. + description: "The encode format of the V2X message, for example base64." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String msgType: @@ -2323,21 +2326,25 @@ components: x-etsi-ref: 6.2.6 msgType: type: integer - description: | - Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. - − denm(1): Decentralized Environmental Notification Message (DENM) as specified in ETSI EN 302 637-3, - − cam(2): Cooperative Awareness Message (CAM) as specified in ETSI EN 302 637-2, - − poi(3): Point of Interest message as specified in ETSI TS 101 556-1, - − spatem(4): Signal Phase And Timing (SPAT) message as specified in SAE J2735 and in ETSI TS 103 301, - − mapem(5): MAP message as specified in SAE J2735 and in ETSI TS 103 301, - − ivim(6): In Vehicle Information (IVI) message as defined in ISO TS 19321, - − ev-rsr(7): Electric vehicle recharging spot reservation message, as defined in ETSI TS 101 556-3, - − tistpgtransaction(8): messages for Tyre Information System (TIS) and Tyre Pressure Gauge (TPG) interoperability, as specified in ETSI TS 101 556-2, - − srem(9): Traffic light Signal Request Message as specified in ETSI TS 103 301, - − ssem(10): Traffic Light Signal Request Status Message as specified in ETSI TS 103 301. - − evcsn(11): Electrical Vehicle Charging Spot Notification message as specified in ETSI TS 101 556-1, - − saem(12): Services Announcement Extended Message as specified in ETSI TS 102 890-1, - − rtcmem(13): Radio Technical Commission for Maritime Services (RTCM) Message as specified in ETSI TS 103 301, + description: "Published V2X message type. Its value is defined by the standardization\ + \ organization indicated by the attribute stdOrganization. See note 2.\n−\ + \ denm(1): Decentralized Environmental Notification Message (DENM) as specified\ + \ in ETSI EN 302 637-3,\n− cam(2): Cooperative Awareness Message (CAM) as\ + \ specified in ETSI EN 302 637-2,\n− poi(3): Point of Interest message as\ + \ specified in ETSI TS 101 556-1,\n− spatem(4): Signal Phase And Timing (SPAT)\ + \ message as specified in SAE J2735 and in ETSI TS 103 301,\n− mapem(5): MAP\ + \ message as specified in SAE J2735 and in ETSI TS 103 301,\n− ivim(6): In\ + \ Vehicle Information (IVI) message as defined in ISO TS 19321,\n− ev-rsr(7):\ + \ Electric vehicle recharging spot reservation message, as defined in ETSI\ + \ TS 101 556-3,\n− tistpgtransaction(8): messages for Tyre Information System\ + \ (TIS) and Tyre Pressure Gauge (TPG) interoperability, as specified in ETSI\ + \ TS 101 556-2,\n− srem(9): Traffic light Signal Request Message as specified\ + \ in ETSI TS 103 301,\n− ssem(10): Traffic Light Signal Request Status Message\ + \ as specified in ETSI TS 103 301.\n− evcsn(11): Electrical Vehicle Charging\ + \ Spot Notification message as specified in ETSI TS 101 556-1,\n− saem(12):\ + \ Services Announcement Extended Message as specified in ETSI TS 102 890-1,\n\ + − rtcmem(13): Radio Technical Commission for Maritime Services (RTCM) Message\ + \ as specified in ETSI TS 103 301,\n" enum: - 1 - 2 @@ -2375,9 +2382,9 @@ components: $ref: '#/components/schemas/V2xMsgSubscription.filterCriteria' requestTestNotification: type: boolean - description: |- - Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. - Default: FALSE. + description: "Shall be set to TRUE by the service consumer to request a\ + \ test notification via HTTP on the callbackReference URI, as described\ + \ in ETSI GS\_MEC 009 [i.1], clause 6.12a.\nDefault: FALSE." x-etsi-mec-cardinality: 0..1 x-etsi-mec-origin-type: Boolean subscriptionType: @@ -2418,9 +2425,9 @@ components: - ETSI x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Enum - description: List of filtering criteria for the subscription. Any filtering - criteria from below, which is included in the request, shall also be included - in the response. + description: "List of filtering criteria for the subscription. Any filtering\ + \ criteria from below, which is included in the request, shall also be included\ + \ in the response." x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: Structure (inlined) V2xServerUsd: @@ -2498,8 +2505,8 @@ components: description: The Mobile Network Code part of PLMN Identity. x-etsi-mec-cardinality: "1" x-etsi-mec-origin-type: String - description: Temporary Mobile Group Identity (TMGI), which is used within MBMS - to uniquely identify Multicast and Broadcast bearer services. + description: "Temporary Mobile Group Identity (TMGI), which is used within MBMS\ + \ to uniquely identify Multicast and Broadcast bearer services." example: mnc: mnc mcc: mcc @@ -2552,13 +2559,13 @@ components: enum: - STOPPING - TERMINATING - body: + subscriptions_body: oneOf: - $ref: '#/components/schemas/ProvChgUuUniSubscription' - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' - $ref: '#/components/schemas/ProvChgPc5Subscription' - $ref: '#/components/schemas/V2xMsgSubscription' - body_1: + subscriptions_subscriptionId_body: oneOf: - $ref: '#/components/schemas/ProvChgUuUniSubscription' - $ref: '#/components/schemas/ProvChgUuMbmsSubscription' @@ -2588,75 +2595,75 @@ components: "206": description: Partial content "400": - description: 'Bad Request : used to indicate that incorrect parameters were - passed to the request.' + description: "Bad Request : used to indicate that incorrect parameters were\ + \ passed to the request." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "401": - description: 'Unauthorized : used when the client did not submit credentials.' + description: "Unauthorized : used when the client did not submit credentials." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "403": - description: 'Forbidden : operation is not allowed given the current status - of the resource.' + description: "Forbidden : operation is not allowed given the current status\ + \ of the resource." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "404": - description: 'Not Found : used when a client provided a URI that cannot be - mapped to a valid resource URI.' + description: "Not Found : used when a client provided a URI that cannot be\ + \ mapped to a valid resource URI." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "406": - description: 'Not Acceptable : used to indicate that the server cannot provide - the any of the content formats supported by the client.' + description: "Not Acceptable : used to indicate that the server cannot provide\ + \ the any of the content formats supported by the client." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "409": - description: 'Conflict : The operation cannot be executed currently, due to - a conflict with the state of the resource' + description: "Conflict : The operation cannot be executed currently, due to\ + \ a conflict with the state of the resource" content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "412": - description: 'Precondition failed : used when a condition has failed during - conditional requests, e.g. when using ETags to avoid write conflicts when - using PUT' + description: "Precondition failed : used when a condition has failed during\ + \ conditional requests, e.g. when using ETags to avoid write conflicts when\ + \ using PUT" content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "415": - description: 'Unsupported Media Type : used to indicate that the server or - the client does not support the content type of the entity body.' + description: "Unsupported Media Type : used to indicate that the server or\ + \ the client does not support the content type of the entity body." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "422": - description: 'Unprocessable Entity : used to indicate that the server understands - the content type of the request entity and that the syntax of the request - entity is correct but that the server is unable to process the contained instructions. - This error condition can occur if an JSON request body is syntactically correct - but semantically incorrect, for example if the target area for the request - is considered too large. This error condition can also occur if the capabilities - required by the request are not supported.' + description: "Unprocessable Entity : used to indicate that the server understands\ + \ the content type of the request entity and that the syntax of the request\ + \ entity is correct but that the server is unable to process the contained\ + \ instructions. This error condition can occur if an JSON request body is\ + \ syntactically correct but semantically incorrect, for example if the target\ + \ area for the request is considered too large. This error condition can also\ + \ occur if the capabilities required by the request are not supported." content: application/json: schema: $ref: '#/components/schemas/ProblemDetails' "429": - description: 'Too Many Requests : used when a rate limiter has triggered.' + description: "Too Many Requests : used when a rate limiter has triggered." content: application/json: schema: diff --git a/go-packages/meep-vis-client/api_unsupported.go b/go-packages/meep-vis-client/api_unsupported.go index 41935deef..f748f8f98 100644 --- a/go-packages/meep-vis-client/api_unsupported.go +++ b/go-packages/meep-vis-client/api_unsupported.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client import ( @@ -47,6 +48,7 @@ Used to cancel the existing subscription. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param subscriptionId Refers to created subscription, where the VIS API allocates a unique resource name for this subscription + */ func (a *UnsupportedApiService) IndividualSubscriptionDELETE(ctx context.Context, subscriptionId string) (*http.Response, error) { var ( @@ -102,6 +104,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionDELETE(ctx context.Context body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -112,6 +115,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionDELETE(ctx context.Context newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -122,6 +126,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionDELETE(ctx context.Context newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -132,6 +137,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionDELETE(ctx context.Context newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -142,6 +148,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionDELETE(ctx context.Context newErr.model = v return localVarHttpResponse, newErr } + return localVarHttpResponse, newErr } @@ -153,15 +160,16 @@ UnsupportedApiService Retrieve information about this subscription. Retrieve information about this subscription. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param subscriptionId Refers to created subscription, where the VIS API allocates a unique resource name for this subscription -@return Body + +@return SubscriptionsBody */ -func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, subscriptionId string) (Body, *http.Response, error) { +func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, subscriptionId string) (SubscriptionsBody, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Get") localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - localVarReturnValue Body + localVarReturnValue SubscriptionsBody ) // create path and map variables @@ -218,8 +226,9 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { - var v Body + var v SubscriptionsBody err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() @@ -228,6 +237,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -238,6 +248,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -248,6 +259,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -258,6 +270,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -268,6 +281,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -278,6 +292,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -288,6 +303,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionGET(ctx context.Context, s newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -300,15 +316,16 @@ Used to update the existing subscription. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param body * @param subscriptionId Refers to created subscription, where the VIS API allocates a unique resource name for this subscription -@return Body1 + +@return SubscriptionsSubscriptionIdBody */ -func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, body Body1, subscriptionId string) (Body1, *http.Response, error) { +func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, body SubscriptionsSubscriptionIdBody, subscriptionId string) (SubscriptionsSubscriptionIdBody, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Put") localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - localVarReturnValue Body1 + localVarReturnValue SubscriptionsSubscriptionIdBody ) // create path and map variables @@ -367,8 +384,9 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { - var v Body1 + var v SubscriptionsSubscriptionIdBody err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() @@ -377,6 +395,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -387,6 +406,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -397,6 +417,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -407,6 +428,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -417,6 +439,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -427,6 +450,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 412 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -437,6 +461,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 422 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -447,6 +472,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -457,6 +483,7 @@ func (a *UnsupportedApiService) IndividualSubscriptionPUT(ctx context.Context, b newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -468,6 +495,7 @@ UnsupportedApiService Query provisioning information for V2X communication over Query provisioning information for V2X communication over PC5. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param locationInfo Comma separated list of locations to identify a cell of a base station or a particular geographical area + @return Pc5ProvisioningInfo */ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo string) (Pc5ProvisioningInfo, *http.Response, error) { @@ -533,6 +561,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { var v Pc5ProvisioningInfo err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -543,6 +572,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -553,6 +583,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -563,6 +594,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -573,6 +605,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -583,6 +616,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -593,6 +627,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -603,6 +638,7 @@ func (a *UnsupportedApiService) ProvInfoGET(ctx context.Context, locationInfo st newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -614,6 +650,7 @@ UnsupportedApiService retrieve information required for V2X communication over U retrieve information required for V2X communication over Uu MBMS. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param locationInfo omma separated list of locations to identify a cell of a base station or a particular geographical area + @return UuMbmsProvisioningInfo */ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationInfo string) (UuMbmsProvisioningInfo, *http.Response, error) { @@ -679,6 +716,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { var v UuMbmsProvisioningInfo err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -689,6 +727,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -699,6 +738,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -709,6 +749,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -719,6 +760,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -729,6 +771,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -739,6 +782,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -749,6 +793,7 @@ func (a *UnsupportedApiService) ProvInfoUuMbmsGET(ctx context.Context, locationI newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -760,6 +805,7 @@ UnsupportedApiService Used to query provisioning information for V2X communicati Used to query provisioning information for V2X communication over Uu unicast. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param locationInfo Comma separated list of locations to identify a cell of a base station or a particular geographical area + @return UuUnicastProvisioningInfo */ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locationInfo string) (UuUnicastProvisioningInfo, *http.Response, error) { @@ -825,6 +871,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { var v UuUnicastProvisioningInfo err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -835,6 +882,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -845,6 +893,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -855,6 +904,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -865,6 +915,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -875,6 +926,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -885,6 +937,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -895,6 +948,7 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -905,16 +959,17 @@ func (a *UnsupportedApiService) ProvInfoUuUnicastGET(ctx context.Context, locati UnsupportedApiService Request information about the subscriptions for this requestor. Request information about the subscriptions for this requestor. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param optional nil or *UnsupportedApiSubGETOpts - Optional Parameters: + * @param optional nil or *SubGETOpts - Optional Parameters: * @param "SubscriptionType" (optional.String) - Query parameter to filter on a specific subscription type. Permitted values: prov_chg_uu_uni: provisioning information change for V2X communication over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X communication over Uu MBMS prov_chg_uu_pc5: provisioning information change for V2X communication over PC5. v2x_msg: V2X interoperability message + @return SubscriptionLinkList */ -type UnsupportedApiSubGETOpts struct { +type SubGETOpts struct { SubscriptionType optional.String } -func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *UnsupportedApiSubGETOpts) (SubscriptionLinkList, *http.Response, error) { +func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *SubGETOpts) (SubscriptionLinkList, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Get") localVarPostBody interface{} @@ -979,6 +1034,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { var v SubscriptionLinkList err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -989,6 +1045,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -999,6 +1056,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1009,6 +1067,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1019,6 +1078,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1029,6 +1089,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1039,6 +1100,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1049,6 +1111,7 @@ func (a *UnsupportedApiService) SubGET(ctx context.Context, localVarOptionals *U newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -1060,15 +1123,16 @@ UnsupportedApiService create a new subscription to VIS notifications. create a new subscription to VIS notifications. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param body -@return Body + +@return SubscriptionsBody */ -func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, *http.Response, error) { +func (a *UnsupportedApiService) SubPOST(ctx context.Context, body SubscriptionsBody) (SubscriptionsBody, *http.Response, error) { var ( localVarHttpMethod = strings.ToUpper("Post") localVarPostBody interface{} localVarFileName string localVarFileBytes []byte - localVarReturnValue Body + localVarReturnValue SubscriptionsBody ) // create path and map variables @@ -1126,8 +1190,9 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 201 { - var v Body + var v SubscriptionsBody err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() @@ -1136,6 +1201,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1146,6 +1212,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1156,6 +1223,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1166,6 +1234,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1176,6 +1245,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1186,6 +1256,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 415 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1196,6 +1267,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 422 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1206,6 +1278,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1216,6 +1289,7 @@ func (a *UnsupportedApiService) SubPOST(ctx context.Context, body Body) (Body, * newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } @@ -1228,6 +1302,7 @@ Used to publish a V2X message. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param body + */ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgPublication) (*http.Response, error) { var ( @@ -1284,6 +1359,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1294,6 +1370,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1304,6 +1381,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1314,6 +1392,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1324,6 +1403,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 406 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1334,6 +1414,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP newErr.model = v return localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 429 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -1344,6 +1425,7 @@ func (a *UnsupportedApiService) V2xMessagePOST(ctx context.Context, body V2xMsgP newErr.model = v return localVarHttpResponse, newErr } + return localVarHttpResponse, newErr } diff --git a/go-packages/meep-vis-client/api_v2xi.go b/go-packages/meep-vis-client/api_v2xi.go index bf26a15e8..a69d93b09 100644 --- a/go-packages/meep-vis-client/api_v2xi.go +++ b/go-packages/meep-vis-client/api_v2xi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client import ( @@ -44,6 +45,7 @@ Terminates itself. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param body Termination notification details + */ func (a *V2xiApiService) Mec011AppTerminationPOST(ctx context.Context, body AppTerminationNotification) (*http.Response, error) { var ( @@ -100,6 +102,7 @@ func (a *V2xiApiService) Mec011AppTerminationPOST(ctx context.Context, body AppT body: localVarBody, error: localVarHttpResponse.Status, } + return localVarHttpResponse, newErr } @@ -111,6 +114,7 @@ V2xiApiService Request the predicted QoS correspondent to potential routes of a Request the predicted QoS correspondent to potential routes of a vehicular UE. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param body + @return PredictedQos */ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos) (PredictedQos, *http.Response, error) { @@ -177,6 +181,7 @@ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos body: localVarBody, error: localVarHttpResponse.Status, } + if localVarHttpResponse.StatusCode == 200 { var v PredictedQos err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -187,6 +192,7 @@ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 400 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -197,6 +203,7 @@ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 401 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -207,6 +214,7 @@ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 403 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -217,6 +225,7 @@ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + if localVarHttpResponse.StatusCode == 404 { var v ProblemDetails err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) @@ -227,6 +236,7 @@ func (a *V2xiApiService) PredictedQosPOST(ctx context.Context, body PredictedQos newErr.model = v return localVarReturnValue, localVarHttpResponse, newErr } + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/go-packages/meep-vis-client/client.go b/go-packages/meep-vis-client/client.go index e88f8fe70..18f77696b 100644 --- a/go-packages/meep-vis-client/client.go +++ b/go-packages/meep-vis-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client import ( @@ -198,7 +199,7 @@ func (c *APIClient) prepareRequest( } // add form parameters and file if available. - if strings.HasPrefix(headerParams["Content-Type"], "multipart/form-data") && len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") { + if len(formParams) > 0 || (len(fileBytes) > 0 && fileName != "") { if body != nil { return nil, errors.New("Cannot specify postBody and multipart form at the same time.") } @@ -237,16 +238,6 @@ func (c *APIClient) prepareRequest( w.Close() } - if strings.HasPrefix(headerParams["Content-Type"], "application/x-www-form-urlencoded") && len(formParams) > 0 { - if body != nil { - return nil, errors.New("Cannot specify postBody and x-www-form-urlencoded form at the same time.") - } - body = &bytes.Buffer{} - body.WriteString(formParams.Encode()) - // Set Content-Length - headerParams["Content-Length"] = fmt.Sprintf("%d", body.Len()) - } - // Setup path and query parameters url, err := url.Parse(path) if err != nil { diff --git a/go-packages/meep-vis-client/configuration.go b/go-packages/meep-vis-client/configuration.go index c2e76b4de..64ff2d1a3 100644 --- a/go-packages/meep-vis-client/configuration.go +++ b/go-packages/meep-vis-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client import ( diff --git a/go-packages/meep-vis-client/docs/Body.md b/go-packages/meep-vis-client/docs/Body.md deleted file mode 100644 index 6ab902617..000000000 --- a/go-packages/meep-vis-client/docs/Body.md +++ /dev/null @@ -1,8 +0,0 @@ -# Body - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-vis-client/docs/Body1.md b/go-packages/meep-vis-client/docs/Body1.md deleted file mode 100644 index 8a9eb3d41..000000000 --- a/go-packages/meep-vis-client/docs/Body1.md +++ /dev/null @@ -1,8 +0,0 @@ -# Body1 - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-vis-client/docs/OneOfbody.md b/go-packages/meep-vis-client/docs/OneOfbody.md deleted file mode 100644 index 60b34231e..000000000 --- a/go-packages/meep-vis-client/docs/OneOfbody.md +++ /dev/null @@ -1,8 +0,0 @@ -# OneOfbody - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-vis-client/docs/OneOfbody1.md b/go-packages/meep-vis-client/docs/OneOfbody1.md deleted file mode 100644 index add66742c..000000000 --- a/go-packages/meep-vis-client/docs/OneOfbody1.md +++ /dev/null @@ -1,8 +0,0 @@ -# OneOfbody1 - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - diff --git a/go-packages/meep-vis-client/docs/OneOfsubscriptionsBody.md b/go-packages/meep-vis-client/docs/OneOfsubscriptionsBody.md new file mode 100644 index 000000000..c142be36d --- /dev/null +++ b/go-packages/meep-vis-client/docs/OneOfsubscriptionsBody.md @@ -0,0 +1,9 @@ +# OneOfsubscriptionsBody + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-vis-client/docs/OneOfsubscriptionsSubscriptionIdBody.md b/go-packages/meep-vis-client/docs/OneOfsubscriptionsSubscriptionIdBody.md new file mode 100644 index 000000000..438438608 --- /dev/null +++ b/go-packages/meep-vis-client/docs/OneOfsubscriptionsSubscriptionIdBody.md @@ -0,0 +1,9 @@ +# OneOfsubscriptionsSubscriptionIdBody + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-vis-client/docs/SubscriptionsBody.md b/go-packages/meep-vis-client/docs/SubscriptionsBody.md new file mode 100644 index 000000000..76cfc5af9 --- /dev/null +++ b/go-packages/meep-vis-client/docs/SubscriptionsBody.md @@ -0,0 +1,9 @@ +# SubscriptionsBody + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-vis-client/docs/SubscriptionsSubscriptionIdBody.md b/go-packages/meep-vis-client/docs/SubscriptionsSubscriptionIdBody.md new file mode 100644 index 000000000..9bfad31c3 --- /dev/null +++ b/go-packages/meep-vis-client/docs/SubscriptionsSubscriptionIdBody.md @@ -0,0 +1,9 @@ +# SubscriptionsSubscriptionIdBody + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/go-packages/meep-vis-client/docs/UnsupportedApi.md b/go-packages/meep-vis-client/docs/UnsupportedApi.md index 7e11a2845..006dd3c1b 100644 --- a/go-packages/meep-vis-client/docs/UnsupportedApi.md +++ b/go-packages/meep-vis-client/docs/UnsupportedApi.md @@ -1,4 +1,4 @@ -# {{classname}} +# \UnsupportedApi All URIs are relative to *https://localhost/sandboxname/vis/v2* @@ -14,6 +14,7 @@ Method | HTTP request | Description [**SubPOST**](UnsupportedApi.md#SubPOST) | **Post** /subscriptions | create a new subscription to VIS notifications. [**V2xMessagePOST**](UnsupportedApi.md#V2xMessagePOST) | **Post** /publish_v2x_message | Used to publish a V2X message. + # **IndividualSubscriptionDELETE** > IndividualSubscriptionDELETE(ctx, subscriptionId) Used to cancel the existing subscription. @@ -43,7 +44,7 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **IndividualSubscriptionGET** -> Body IndividualSubscriptionGET(ctx, subscriptionId) +> SubscriptionsBody IndividualSubscriptionGET(ctx, subscriptionId) Retrieve information about this subscription. Retrieve information about this subscription. @@ -57,7 +58,7 @@ Name | Type | Description | Notes ### Return type -[**Body**](body.md) +[**SubscriptionsBody**](subscriptions_body.md) ### Authorization @@ -71,7 +72,7 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **IndividualSubscriptionPUT** -> Body1 IndividualSubscriptionPUT(ctx, body, subscriptionId) +> SubscriptionsSubscriptionIdBody IndividualSubscriptionPUT(ctx, body, subscriptionId) Used to update the existing subscription. Used to update the existing subscription. @@ -81,12 +82,12 @@ Used to update the existing subscription. Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**Body1**](Body1.md)| | + **body** | [**SubscriptionsSubscriptionIdBody**](SubscriptionsSubscriptionIdBody.md)| | **subscriptionId** | **string**| Refers to created subscription, where the VIS API allocates a unique resource name for this subscription | ### Return type -[**Body1**](body_1.md) +[**SubscriptionsSubscriptionIdBody**](subscriptions_subscriptionId_body.md) ### Authorization @@ -194,10 +195,11 @@ Request information about the subscriptions for this requestor. Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **optional** | ***UnsupportedApiSubGETOpts** | optional parameters | nil if no parameters + **optional** | ***SubGETOpts** | optional parameters | nil if no parameters ### Optional Parameters -Optional parameters are passed through a pointer to a UnsupportedApiSubGETOpts struct +Optional parameters are passed through a pointer to a SubGETOpts struct + Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **subscriptionType** | **optional.String**| Query parameter to filter on a specific subscription type. Permitted values: prov_chg_uu_uni: provisioning information change for V2X communication over Uuunicast prov_chg_uu_mbms: provisioning information change for V2X communication over Uu MBMS prov_chg_uu_pc5: provisioning information change for V2X communication over PC5. v2x_msg: V2X interoperability message | @@ -218,7 +220,7 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **SubPOST** -> Body SubPOST(ctx, body) +> SubscriptionsBody SubPOST(ctx, body) create a new subscription to VIS notifications. create a new subscription to VIS notifications. @@ -228,11 +230,11 @@ No authorization required Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **ctx** | **context.Context** | context for authentication, logging, cancellation, deadlines, tracing, etc. - **body** | [**Body**](Body.md)| | + **body** | [**SubscriptionsBody**](SubscriptionsBody.md)| | ### Return type -[**Body**](body.md) +[**SubscriptionsBody**](subscriptions_body.md) ### Authorization diff --git a/go-packages/meep-vis-client/docs/V2xiApi.md b/go-packages/meep-vis-client/docs/V2xiApi.md index c8e1b88e3..d2a228f70 100644 --- a/go-packages/meep-vis-client/docs/V2xiApi.md +++ b/go-packages/meep-vis-client/docs/V2xiApi.md @@ -1,4 +1,4 @@ -# {{classname}} +# \V2xiApi All URIs are relative to *https://localhost/sandboxname/vis/v2* @@ -7,6 +7,7 @@ Method | HTTP request | Description [**Mec011AppTerminationPOST**](V2xiApi.md#Mec011AppTerminationPOST) | **Post** /notifications/mec011/appTermination | MEC011 Application Termination notification for self termination [**PredictedQosPOST**](V2xiApi.md#PredictedQosPOST) | **Post** /provide_predicted_qos | Request the predicted QoS correspondent to potential routes of a vehicular UE. + # **Mec011AppTerminationPOST** > Mec011AppTerminationPOST(ctx, body) MEC011 Application Termination notification for self termination diff --git a/go-packages/meep-vis-client/model_app_termination_notification.go b/go-packages/meep-vis-client/model_app_termination_notification.go index ce65926d9..a177e9340 100644 --- a/go-packages/meep-vis-client/model_app_termination_notification.go +++ b/go-packages/meep-vis-client/model_app_termination_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,16 +21,15 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // This type represents the information that the MEC platform notifies the subscribed application instance about the corresponding application instance termination/stop. type AppTerminationNotification struct { // Shall be set to AppTerminationNotification. - NotificationType string `json:"notificationType"` - - OperationAction *OperationActionType `json:"operationAction"` + NotificationType string `json:"notificationType"` + OperationAction *OperationActionType `json:"operationAction"` // Maximum timeout value in seconds for graceful termination or graceful stop of an application instance. - MaxGracefulTimeout int32 `json:"maxGracefulTimeout"` - - Links *AppTerminationNotificationLinks `json:"_links"` + MaxGracefulTimeout int32 `json:"maxGracefulTimeout"` + Links *AppTerminationNotificationLinks `json:"_links"` } diff --git a/go-packages/meep-vis-client/model_app_termination_notification__links.go b/go-packages/meep-vis-client/model_app_termination_notification__links.go index f37941b64..12a8dbc5b 100644 --- a/go-packages/meep-vis-client/model_app_termination_notification__links.go +++ b/go-packages/meep-vis-client/model_app_termination_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,11 +21,11 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // Object containing hyperlinks related to the resource. type AppTerminationNotificationLinks struct { - Subscription *LinkType `json:"subscription"` - + Subscription *LinkType `json:"subscription"` ConfirmTermination *LinkType `json:"confirmTermination,omitempty"` } diff --git a/go-packages/meep-vis-client/model_cell_id.go b/go-packages/meep-vis-client/model_cell_id.go index fe9e363b1..348228e68 100644 --- a/go-packages/meep-vis-client/model_cell_id.go +++ b/go-packages/meep-vis-client/model_cell_id.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type CellId struct { diff --git a/go-packages/meep-vis-client/model_earfcn.go b/go-packages/meep-vis-client/model_earfcn.go index 826839ca4..7ad68f6e5 100644 --- a/go-packages/meep-vis-client/model_earfcn.go +++ b/go-packages/meep-vis-client/model_earfcn.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type Earfcn struct { diff --git a/go-packages/meep-vis-client/model_ecgi.go b/go-packages/meep-vis-client/model_ecgi.go index c90aaf1e8..fd0cea6cf 100644 --- a/go-packages/meep-vis-client/model_ecgi.go +++ b/go-packages/meep-vis-client/model_ecgi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type Ecgi struct { CellId *CellId `json:"cellId"` - - Plmn *Plmn `json:"plmn"` + Plmn *Plmn `json:"plmn"` } diff --git a/go-packages/meep-vis-client/model_fdd_info.go b/go-packages/meep-vis-client/model_fdd_info.go index 4acb96549..ba13c3fd5 100644 --- a/go-packages/meep-vis-client/model_fdd_info.go +++ b/go-packages/meep-vis-client/model_fdd_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,14 +21,12 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type FddInfo struct { - DlEarfcn *Earfcn `json:"dlEarfcn"` - + DlEarfcn *Earfcn `json:"dlEarfcn"` DlTransmissionBandwidth *TransmissionBandwidth `json:"dlTransmissionBandwidth"` - - UlEarfcn *Earfcn `json:"ulEarfcn"` - + UlEarfcn *Earfcn `json:"ulEarfcn"` UlTransmissionBandwidth *TransmissionBandwidth `json:"ulTransmissionBandwidth"` } diff --git a/go-packages/meep-vis-client/model_link_type.go b/go-packages/meep-vis-client/model_link_type.go index 459708a66..c765cd7f5 100644 --- a/go-packages/meep-vis-client/model_link_type.go +++ b/go-packages/meep-vis-client/model_link_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type LinkType struct { diff --git a/go-packages/meep-vis-client/model_links.go b/go-packages/meep-vis-client/model_links.go index 302ef3713..833f0b4ed 100644 --- a/go-packages/meep-vis-client/model_links.go +++ b/go-packages/meep-vis-client/model_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // Hyperlink related to the resource. This shall be only included in the HTTP responses and in HTTP PUT requests. diff --git a/go-packages/meep-vis-client/model_location_info.go b/go-packages/meep-vis-client/model_location_info.go index 248658419..e3a1dae40 100644 --- a/go-packages/meep-vis-client/model_location_info.go +++ b/go-packages/meep-vis-client/model_location_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type LocationInfo struct { - Ecgi *Ecgi `json:"ecgi,omitempty"` - + Ecgi *Ecgi `json:"ecgi,omitempty"` GeoArea *LocationInfoGeoArea `json:"geoArea,omitempty"` } diff --git a/go-packages/meep-vis-client/model_location_info_geo_area.go b/go-packages/meep-vis-client/model_location_info_geo_area.go index 8142e22e3..bc652c356 100644 --- a/go-packages/meep-vis-client/model_location_info_geo_area.go +++ b/go-packages/meep-vis-client/model_location_info_geo_area.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // Information of a geographical area. diff --git a/go-packages/meep-vis-client/model_msg_type.go b/go-packages/meep-vis-client/model_msg_type.go index a148f534b..5cc494130 100644 --- a/go-packages/meep-vis-client/model_msg_type.go +++ b/go-packages/meep-vis-client/model_msg_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // MsgType : Published V2X message type. Its value is defined by the standardization organization indicated by the attribute stdOrganization. See note 2. − denm(1): Decentralized Environmental Notification Message (DENM) as specified in ETSI EN 302 637-3, − cam(2): Cooperative Awareness Message (CAM) as specified in ETSI EN 302 637-2, − poi(3): Point of Interest message as specified in ETSI TS 101 556-1, − spatem(4): Signal Phase And Timing (SPAT) message as specified in SAE J2735 and in ETSI TS 103 301, − mapem(5): MAP message as specified in SAE J2735 and in ETSI TS 103 301, − ivim(6): In Vehicle Information (IVI) message as defined in ISO TS 19321, − ev-rsr(7): Electric vehicle recharging spot reservation message, as defined in ETSI TS 101 556-3, − tistpgtransaction(8): messages for Tyre Information System (TIS) and Tyre Pressure Gauge (TPG) interoperability, as specified in ETSI TS 101 556-2, − srem(9): Traffic light Signal Request Message as specified in ETSI TS 103 301, − ssem(10): Traffic Light Signal Request Status Message as specified in ETSI TS 103 301. − evcsn(11): Electrical Vehicle Charging Spot Notification message as specified in ETSI TS 101 556-1, − saem(12): Services Announcement Extended Message as specified in ETSI TS 102 890-1, − rtcmem(13): Radio Technical Commission for Maritime Services (RTCM) Message as specified in ETSI TS 103 301, diff --git a/go-packages/meep-vis-client/model_body_1.go b/go-packages/meep-vis-client/model_one_ofsubscriptions_body.go similarity index 82% rename from go-packages/meep-vis-client/model_body_1.go rename to go-packages/meep-vis-client/model_one_ofsubscriptions_body.go index c58f75ecc..88e1524a4 100644 --- a/go-packages/meep-vis-client/model_body_1.go +++ b/go-packages/meep-vis-client/model_one_ofsubscriptions_body.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,8 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client -type Body1 struct { +type OneOfsubscriptionsBody struct { } diff --git a/go-packages/meep-vis-client/model_one_ofsubscriptions_subscription_id_body.go b/go-packages/meep-vis-client/model_one_ofsubscriptions_subscription_id_body.go new file mode 100644 index 000000000..779b595c5 --- /dev/null +++ b/go-packages/meep-vis-client/model_one_ofsubscriptions_subscription_id_body.go @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +type OneOfsubscriptionsSubscriptionIdBody struct { +} diff --git a/go-packages/meep-vis-client/model_operation_action_type.go b/go-packages/meep-vis-client/model_operation_action_type.go index 095b30a27..744c12749 100644 --- a/go-packages/meep-vis-client/model_operation_action_type.go +++ b/go-packages/meep-vis-client/model_operation_action_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // OperationActionType : Operation that is being performed on the MEC application instance. @@ -28,6 +29,6 @@ type OperationActionType string // List of OperationActionType const ( - STOPPING OperationActionType = "STOPPING" - TERMINATING OperationActionType = "TERMINATING" + STOPPING_OperationActionType OperationActionType = "STOPPING" + TERMINATING_OperationActionType OperationActionType = "TERMINATING" ) diff --git a/go-packages/meep-vis-client/model_pc5_neighbour_cell_info.go b/go-packages/meep-vis-client/model_pc5_neighbour_cell_info.go index a87d14433..1744528fa 100644 --- a/go-packages/meep-vis-client/model_pc5_neighbour_cell_info.go +++ b/go-packages/meep-vis-client/model_pc5_neighbour_cell_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,12 +21,11 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type Pc5NeighbourCellInfo struct { - Ecgi *Ecgi `json:"ecgi"` - - Plmn *Plmn `json:"plmn"` - + Ecgi *Ecgi `json:"ecgi"` + Plmn *Plmn `json:"plmn"` SiV2xConfig *SystemInformationBlockType21 `json:"siV2xConfig"` } diff --git a/go-packages/meep-vis-client/model_pc5_provisioning_info.go b/go-packages/meep-vis-client/model_pc5_provisioning_info.go index 8c9f240f9..baf007eaf 100644 --- a/go-packages/meep-vis-client/model_pc5_provisioning_info.go +++ b/go-packages/meep-vis-client/model_pc5_provisioning_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type Pc5ProvisioningInfo struct { - ProInfoPc5 *[]interface{} `json:"proInfoPc5"` - - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + ProInfoPc5 []Pc5ProvisioningInfoProInfoPc5 `json:"proInfoPc5"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-packages/meep-vis-client/model_pc5_provisioning_info_pro_info_pc5.go b/go-packages/meep-vis-client/model_pc5_provisioning_info_pro_info_pc5.go new file mode 100644 index 000000000..69eb20701 --- /dev/null +++ b/go-packages/meep-vis-client/model_pc5_provisioning_info_pro_info_pc5.go @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// The provisioning information per location as defined below. +type Pc5ProvisioningInfoProInfoPc5 struct { + // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. PLMN operators coordinate to make sure Destination Layer2 ID(s) for different V2X services are configured in a consistent manner. + DstLayer2Id string `json:"dstLayer2Id"` + LocationInfo *LocationInfo `json:"locationInfo"` + // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. + NeighbourCellInfo []Pc5NeighbourCellInfo `json:"neighbourCellInfo,omitempty"` +} diff --git a/go-packages/meep-vis-client/model_plmn.go b/go-packages/meep-vis-client/model_plmn.go index 3f53ac8a6..38e2f928d 100644 --- a/go-packages/meep-vis-client/model_plmn.go +++ b/go-packages/meep-vis-client/model_plmn.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type Plmn struct { diff --git a/go-packages/meep-vis-client/model_predicted_qos.go b/go-packages/meep-vis-client/model_predicted_qos.go index cf3675639..7093544c7 100644 --- a/go-packages/meep-vis-client/model_predicted_qos.go +++ b/go-packages/meep-vis-client/model_predicted_qos.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,13 +21,13 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type PredictedQos struct { // Granularity of visited location. Measured in meters. LocationGranularity string `json:"locationGranularity"` // Information relating to the potential routes of a vehicular UE. - Routes []PredictedQosRoutes `json:"routes"` - - TimeGranularity *TimeStamp `json:"timeGranularity,omitempty"` + Routes []PredictedQosRoutes `json:"routes"` + TimeGranularity *TimeStamp `json:"timeGranularity,omitempty"` } diff --git a/go-packages/meep-vis-client/model_predicted_qos_routes.go b/go-packages/meep-vis-client/model_predicted_qos_routes.go index 8ff6e6ba8..8f28d228a 100644 --- a/go-packages/meep-vis-client/model_predicted_qos_routes.go +++ b/go-packages/meep-vis-client/model_predicted_qos_routes.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,9 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type PredictedQosRoutes struct { // Information relating to a specific route. The first structure shall relate to the route origin and the last to the route destination. Intermediate waypoint locations may also be provided. - RouteInfo []PredictedQosRoutesRouteInfo `json:"routeInfo"` + RouteInfo []PredictedQosRoutesRouteInfo `json:"routeInfo,omitempty"` } diff --git a/go-packages/meep-vis-client/model_predicted_qos_routes_route_info.go b/go-packages/meep-vis-client/model_predicted_qos_routes_route_info.go index 97dbc1bc9..f1b39cfa6 100644 --- a/go-packages/meep-vis-client/model_predicted_qos_routes_route_info.go +++ b/go-packages/meep-vis-client/model_predicted_qos_routes_route_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,14 +21,14 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type PredictedQosRoutesRouteInfo struct { - Location *LocationInfo `json:"location"` + Location *LocationInfo `json:"location,omitempty"` // Reference Signal Received Power as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response. Rsrp int32 `json:"rsrp,omitempty"` // Reference Signal Received Quality as defined in ETSI TS 136 214 [i.13]. Shall only be included in the response. - Rsrq int32 `json:"rsrq,omitempty"` - + Rsrq int32 `json:"rsrq,omitempty"` Time *TimeStamp `json:"time,omitempty"` } diff --git a/go-packages/meep-vis-client/model_problem_details.go b/go-packages/meep-vis-client/model_problem_details.go index 06249d0d3..ecb9b9a9c 100644 --- a/go-packages/meep-vis-client/model_problem_details.go +++ b/go-packages/meep-vis-client/model_problem_details.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProblemDetails struct { diff --git a/go-packages/meep-vis-client/model_prov_chg_pc5_notification.go b/go-packages/meep-vis-client/model_prov_chg_pc5_notification.go index d3bd4d1bb..8c525e898 100644 --- a/go-packages/meep-vis-client/model_prov_chg_pc5_notification.go +++ b/go-packages/meep-vis-client/model_prov_chg_pc5_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,17 +21,16 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProvChgPc5Notification struct { // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - DstLayer2Id string `json:"dstLayer2Id,omitempty"` - + DstLayer2Id string `json:"dstLayer2Id,omitempty"` LocationInfo *LocationInfo `json:"locationInfo"` // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. NeighbourCellInfo []Pc5NeighbourCellInfo `json:"neighbourCellInfo,omitempty"` // Shall be set to \"ProvChgPc5Notification\". - NotificationType string `json:"notificationType"` - - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + NotificationType string `json:"notificationType"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_pc5_subscription.go b/go-packages/meep-vis-client/model_prov_chg_pc5_subscription.go index 956e785c3..1a9b53423 100644 --- a/go-packages/meep-vis-client/model_prov_chg_pc5_subscription.go +++ b/go-packages/meep-vis-client/model_prov_chg_pc5_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,20 +21,18 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProvChgPc5Subscription struct { Links *Links `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` - - ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` - - FilterCriteria *ProvChgPc5SubscriptionFilterCriteria `json:"filterCriteria"` + CallbackReference string `json:"callbackReference,omitempty"` + ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` + FilterCriteria *ProvChgPc5SubscriptionFilterCriteria `json:"filterCriteria"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. Default: FALSE. RequestTestNotification bool `json:"requestTestNotification,omitempty"` // Shall be set to \"ProvChgPc5Subscription\". - SubscriptionType string `json:"subscriptionType"` - + SubscriptionType string `json:"subscriptionType"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_pc5_subscription_filter_criteria.go b/go-packages/meep-vis-client/model_prov_chg_pc5_subscription_filter_criteria.go index 8240549cd..34aaad686 100644 --- a/go-packages/meep-vis-client/model_prov_chg_pc5_subscription_filter_criteria.go +++ b/go-packages/meep-vis-client/model_prov_chg_pc5_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,13 +21,13 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. type ProvChgPc5SubscriptionFilterCriteria struct { // For sidelink communication, the Destination Layer-2 ID is set to the ProSe Layer-2 Group ID or Prose UE ID, see ETSI TS 136 321 [i.12]. - DstLayer2Id string `json:"dstLayer2Id"` - + DstLayer2Id string `json:"dstLayer2Id"` LocationInfo *LocationInfo `json:"locationInfo"` // The information of the neighbour cells in a visiting PLMN that support V2X communication over PC5. NeighbourCellInfo []Pc5NeighbourCellInfo `json:"neighbourCellInfo,omitempty"` diff --git a/go-packages/meep-vis-client/model_prov_chg_uu_mbms_notification.go b/go-packages/meep-vis-client/model_prov_chg_uu_mbms_notification.go index 3e9019d71..57d29f733 100644 --- a/go-packages/meep-vis-client/model_prov_chg_uu_mbms_notification.go +++ b/go-packages/meep-vis-client/model_prov_chg_uu_mbms_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProvChgUuMbmsNotification struct { @@ -28,9 +29,7 @@ type ProvChgUuMbmsNotification struct { // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. NeighbourCellInfo []UuMbmsNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` // Shall be set to \"ProvChgUuMbmsNotification\". - NotificationType string `json:"notificationType"` - - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` - - V2xServerUsd *V2xServerUsd `json:"v2xServerUsd,omitempty"` + NotificationType string `json:"notificationType"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + V2xServerUsd *V2xServerUsd `json:"v2xServerUsd,omitempty"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription.go b/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription.go index 1fd817a4f..b03e6e657 100644 --- a/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription.go +++ b/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,20 +21,18 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProvChgUuMbmsSubscription struct { Links *Links `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` - - ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` - - FilterCriteria *ProvChgUuMbmsSubscriptionFilterCriteria `json:"filterCriteria"` + CallbackReference string `json:"callbackReference,omitempty"` + ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` + FilterCriteria *ProvChgUuMbmsSubscriptionFilterCriteria `json:"filterCriteria"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. Default: FALSE. RequestTestNotification bool `json:"requestTestNotification,omitempty"` // Shall be set to \"ProvChgUuMbmsSubscription\". - SubscriptionType string `json:"subscriptionType"` - + SubscriptionType string `json:"subscriptionType"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription_filter_criteria.go b/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription_filter_criteria.go index cafe333f6..c05e29ec8 100644 --- a/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription_filter_criteria.go +++ b/go-packages/meep-vis-client/model_prov_chg_uu_mbms_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. @@ -28,6 +29,5 @@ type ProvChgUuMbmsSubscriptionFilterCriteria struct { LocationInfo *LocationInfo `json:"locationInfo"` // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. NeighbourCellInfo []UuMbmsNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` - - V2xServerUsd *V2xServerUsd `json:"v2xServerUsd"` + V2xServerUsd *V2xServerUsd `json:"v2xServerUsd"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_uu_uni_notification.go b/go-packages/meep-vis-client/model_prov_chg_uu_uni_notification.go index 240dd37f4..960baa8d7 100644 --- a/go-packages/meep-vis-client/model_prov_chg_uu_uni_notification.go +++ b/go-packages/meep-vis-client/model_prov_chg_uu_uni_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProvChgUuUniNotification struct { @@ -28,9 +29,7 @@ type ProvChgUuUniNotification struct { // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. NeighbourCellInfo []UuUniNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` // Shall be set to \"ProvChgUuUniNotification\". - NotificationType string `json:"notificationType"` - - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` - + NotificationType string `json:"notificationType"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` V2xApplicationServer *V2xApplicationServer `json:"v2xApplicationServer,omitempty"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription.go b/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription.go index 04501a658..e386eede1 100644 --- a/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription.go +++ b/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,20 +21,18 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type ProvChgUuUniSubscription struct { Links *Links `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note. - CallbackReference string `json:"callbackReference,omitempty"` - - ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` - - FilterCriteria *ProvChgUuUniSubscriptionFilterCriteria `json:"filterCriteria"` + CallbackReference string `json:"callbackReference,omitempty"` + ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` + FilterCriteria *ProvChgUuUniSubscriptionFilterCriteria `json:"filterCriteria"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. Default: FALSE. RequestTestNotification bool `json:"requestTestNotification,omitempty"` // Shall be set to \"ProvChgUuUniSubscription\". - SubscriptionType string `json:"subscriptionType"` - + SubscriptionType string `json:"subscriptionType"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` } diff --git a/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription_filter_criteria.go b/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription_filter_criteria.go index c819346e0..0934083ab 100644 --- a/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription_filter_criteria.go +++ b/go-packages/meep-vis-client/model_prov_chg_uu_uni_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,13 +21,13 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. type ProvChgUuUniSubscriptionFilterCriteria struct { LocationInfo *LocationInfo `json:"locationInfo"` // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. - NeighbourCellInfo []UuUniNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` - - V2xApplicationServer *V2xApplicationServer `json:"v2xApplicationServer"` + NeighbourCellInfo []UuUniNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` + V2xApplicationServer *V2xApplicationServer `json:"v2xApplicationServer"` } diff --git a/go-packages/meep-vis-client/model_subscription_link_list.go b/go-packages/meep-vis-client/model_subscription_link_list.go index 2c2b2e12c..3208727f0 100644 --- a/go-packages/meep-vis-client/model_subscription_link_list.go +++ b/go-packages/meep-vis-client/model_subscription_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type SubscriptionLinkList struct { diff --git a/go-packages/meep-vis-client/model_subscription_link_list_links.go b/go-packages/meep-vis-client/model_subscription_link_list_links.go index 5fa5b4e79..0594db26a 100644 --- a/go-packages/meep-vis-client/model_subscription_link_list_links.go +++ b/go-packages/meep-vis-client/model_subscription_link_list_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,11 +21,11 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of hyperlinks related to the resource. type SubscriptionLinkListLinks struct { - Self *LinkType `json:"self"` - - Subscriptions *[]interface{} `json:"subscriptions,omitempty"` + Self *LinkType `json:"self"` + Subscriptions []SubscriptionLinkListLinksSubscriptions `json:"subscriptions,omitempty"` } diff --git a/go-packages/meep-vis-client/model_one_ofbody.go b/go-packages/meep-vis-client/model_subscription_link_list_links_subscriptions.go similarity index 66% rename from go-packages/meep-vis-client/model_one_ofbody.go rename to go-packages/meep-vis-client/model_subscription_link_list_links_subscriptions.go index 2e1301355..53fa80f05 100644 --- a/go-packages/meep-vis-client/model_one_ofbody.go +++ b/go-packages/meep-vis-client/model_subscription_link_list_links_subscriptions.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,11 +21,13 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client -type OneOfbody struct { - // ProvChgUuUniSubscription - // ProvChgUuMbmsSubscription - // ProvChgPc5Subscription - // V2xMsgSubscription +// The service consumer's subscriptions. +type SubscriptionLinkListLinksSubscriptions struct { + // The URI referring to the subscription. + Href string `json:"href"` + // Type of the subscription. The values are as defined in the \"subscriptionType\" attribute for each different V2X information event subscription data type. + SubscriptionType string `json:"subscriptionType"` } diff --git a/go-packages/meep-vis-client/model_body.go b/go-packages/meep-vis-client/model_subscriptions_body.go similarity index 82% rename from go-packages/meep-vis-client/model_body.go rename to go-packages/meep-vis-client/model_subscriptions_body.go index 8f56c6640..024738339 100644 --- a/go-packages/meep-vis-client/model_body.go +++ b/go-packages/meep-vis-client/model_subscriptions_body.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,8 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client -type Body struct { +type SubscriptionsBody struct { } diff --git a/go-packages/meep-vis-client/model_subscriptions_subscription_id_body.go b/go-packages/meep-vis-client/model_subscriptions_subscription_id_body.go new file mode 100644 index 000000000..a2c8cd636 --- /dev/null +++ b/go-packages/meep-vis-client/model_subscriptions_subscription_id_body.go @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +type SubscriptionsSubscriptionIdBody struct { +} diff --git a/go-packages/meep-vis-client/model_system_information_block_type21.go b/go-packages/meep-vis-client/model_system_information_block_type21.go index a92c9a960..2a90b13e9 100644 --- a/go-packages/meep-vis-client/model_system_information_block_type21.go +++ b/go-packages/meep-vis-client/model_system_information_block_type21.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type SystemInformationBlockType21 struct { diff --git a/go-packages/meep-vis-client/model_tdd_info.go b/go-packages/meep-vis-client/model_tdd_info.go index db0f2e2aa..2a5a828a2 100644 --- a/go-packages/meep-vis-client/model_tdd_info.go +++ b/go-packages/meep-vis-client/model_tdd_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,12 +21,12 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type TddInfo struct { Earfcn *Earfcn `json:"earfcn"` // Uplink-downlink subframe configuration information. - SubframeAssignment string `json:"subframeAssignment"` - + SubframeAssignment string `json:"subframeAssignment"` TransmissionBandwidth *TransmissionBandwidth `json:"transmissionBandwidth"` } diff --git a/go-packages/meep-vis-client/model_test_notification.go b/go-packages/meep-vis-client/model_test_notification.go index 0c523a09a..7afc63521 100644 --- a/go-packages/meep-vis-client/model_test_notification.go +++ b/go-packages/meep-vis-client/model_test_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type TestNotification struct { diff --git a/go-packages/meep-vis-client/model_test_notification__links.go b/go-packages/meep-vis-client/model_test_notification__links.go index ac215cf3e..17d668cee 100644 --- a/go-packages/meep-vis-client/model_test_notification__links.go +++ b/go-packages/meep-vis-client/model_test_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // Hyperlink related to the resource. diff --git a/go-packages/meep-vis-client/model_time_stamp.go b/go-packages/meep-vis-client/model_time_stamp.go index 5ca6cc320..d047301cc 100644 --- a/go-packages/meep-vis-client/model_time_stamp.go +++ b/go-packages/meep-vis-client/model_time_stamp.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type TimeStamp struct { diff --git a/go-packages/meep-vis-client/model_transmission_bandwidth.go b/go-packages/meep-vis-client/model_transmission_bandwidth.go index 39c7ed5e3..ece1305a5 100644 --- a/go-packages/meep-vis-client/model_transmission_bandwidth.go +++ b/go-packages/meep-vis-client/model_transmission_bandwidth.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type TransmissionBandwidth struct { diff --git a/go-packages/meep-vis-client/model_transmission_bandwidth_transmission_bandwidth.go b/go-packages/meep-vis-client/model_transmission_bandwidth_transmission_bandwidth.go index b2aef6717..ea2a43dcb 100644 --- a/go-packages/meep-vis-client/model_transmission_bandwidth_transmission_bandwidth.go +++ b/go-packages/meep-vis-client/model_transmission_bandwidth_transmission_bandwidth.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // TransmissionBandwidthTransmissionBandwidth : 'Numeric value corresponding to the transmission bandwidth expressed in units of resource blocks as follows: 1 = bw6 (6 resource blocks) 2 = bw15 (15 resource blocks) 3 = bw25 (25 resource blocks) 4 = bw50 (50 resource blocks) 5 = bw75 (75 resource blocks) 6 = bw100 (100 resource blocks)' diff --git a/go-packages/meep-vis-client/model_uu_mbms_neighbour_cell_info.go b/go-packages/meep-vis-client/model_uu_mbms_neighbour_cell_info.go index b650f17da..989cd5ae7 100644 --- a/go-packages/meep-vis-client/model_uu_mbms_neighbour_cell_info.go +++ b/go-packages/meep-vis-client/model_uu_mbms_neighbour_cell_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,18 +21,16 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type UuMbmsNeighbourCellInfo struct { - Ecgi *Ecgi `json:"ecgi"` - + Ecgi *Ecgi `json:"ecgi"` FddInfo *FddInfo `json:"fddInfo"` // Supported MBMS Service Area Identities in the cell. MbmsServiceAreaIdentity []string `json:"mbmsServiceAreaIdentity"` // Physical Cell Identifier. - Pci int32 `json:"pci"` - - Plmn *Plmn `json:"plmn"` - + Pci int32 `json:"pci"` + Plmn *Plmn `json:"plmn"` TddInfo *TddInfo `json:"tddInfo"` } diff --git a/go-packages/meep-vis-client/model_uu_mbms_provisioning_info.go b/go-packages/meep-vis-client/model_uu_mbms_provisioning_info.go index ad796d67c..cea70d792 100644 --- a/go-packages/meep-vis-client/model_uu_mbms_provisioning_info.go +++ b/go-packages/meep-vis-client/model_uu_mbms_provisioning_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type UuMbmsProvisioningInfo struct { - ProInfoUuMbms *[]interface{} `json:"proInfoUuMbms"` - - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + ProInfoUuMbms []UuMbmsProvisioningInfoProInfoUuMbms `json:"proInfoUuMbms"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-packages/meep-vis-client/model_one_ofbody_1.go b/go-packages/meep-vis-client/model_uu_mbms_provisioning_info_pro_info_uu_mbms.go similarity index 65% rename from go-packages/meep-vis-client/model_one_ofbody_1.go rename to go-packages/meep-vis-client/model_uu_mbms_provisioning_info_pro_info_uu_mbms.go index 3c92938a1..8e2809206 100644 --- a/go-packages/meep-vis-client/model_one_ofbody_1.go +++ b/go-packages/meep-vis-client/model_uu_mbms_provisioning_info_pro_info_uu_mbms.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,11 +21,13 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client -type OneOfbody1 struct { - // ProvChgUuUniSubscription - // ProvChgUuMbmsSubscription - // ProvChgPc5Subscription - // V2xMsgSubscription +// The provisioning information per location as defined below. +type UuMbmsProvisioningInfoProInfoUuMbms struct { + LocationInfo *LocationInfo `json:"locationInfo"` + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu MBMS. + NeighbourCellInfo []UuMbmsNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` + V2xServerUsd *V2xServerUsd `json:"v2xServerUsd"` } diff --git a/go-packages/meep-vis-client/model_uu_uni_neighbour_cell_info.go b/go-packages/meep-vis-client/model_uu_uni_neighbour_cell_info.go index ea203e201..a4289cbd8 100644 --- a/go-packages/meep-vis-client/model_uu_uni_neighbour_cell_info.go +++ b/go-packages/meep-vis-client/model_uu_uni_neighbour_cell_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,16 +21,14 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type UuUniNeighbourCellInfo struct { - Ecgi *Ecgi `json:"ecgi"` - + Ecgi *Ecgi `json:"ecgi"` FddInfo *FddInfo `json:"fddInfo"` // Physical Cell Identifier. - Pci int32 `json:"pci"` - - Plmn *Plmn `json:"plmn"` - + Pci int32 `json:"pci"` + Plmn *Plmn `json:"plmn"` TddInfo *TddInfo `json:"tddInfo"` } diff --git a/go-packages/meep-vis-client/model_uu_unicast_provisioning_info.go b/go-packages/meep-vis-client/model_uu_unicast_provisioning_info.go index b224e0f9d..e8de05a43 100644 --- a/go-packages/meep-vis-client/model_uu_unicast_provisioning_info.go +++ b/go-packages/meep-vis-client/model_uu_unicast_provisioning_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type UuUnicastProvisioningInfo struct { - ProInfoUuUnicast *[]interface{} `json:"proInfoUuUnicast"` - - TimeStamp *TimeStamp `json:"timeStamp,omitempty"` + ProInfoUuUnicast []UuUnicastProvisioningInfoProInfoUuUnicast `json:"proInfoUuUnicast"` + TimeStamp *TimeStamp `json:"timeStamp,omitempty"` } diff --git a/go-packages/meep-vis-client/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go b/go-packages/meep-vis-client/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go new file mode 100644 index 000000000..ca1a5c9e0 --- /dev/null +++ b/go-packages/meep-vis-client/model_uu_unicast_provisioning_info_pro_info_uu_unicast.go @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE V2X Information Service REST API + * + * V2X Information Service is AdvantEDGE's implementation of [ETSI MEC ISG MEC030 V2XI API](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/02.02.01_60/gs_MEC030v020201p.pdf)

    [Copyright (c) ETSI 2017](https://forge.etsi.org/etsi-forge-copyright-notice.txt)

    **Micro-service**
    [meep-vis](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-vis)

    **Type & Usage**
    Edge Service used by edge applications that want to get information about radio conditions in the network

    **Note**
    AdvantEDGE supports a selected subset of RNI API endpoints (see below) and a subset of subscription types. + * + * API version: 2.2.1 + * Contact: AdvantEDGE@InterDigital.com + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package client + +// The provisioning information per location as defined below. +type UuUnicastProvisioningInfoProInfoUuUnicast struct { + LocationInfo *LocationInfo `json:"locationInfo"` + // The information of the neighbour cells in a visiting PLMN that support V2X communication over Uu unicast. + NeighbourCellInfo []UuUniNeighbourCellInfo `json:"neighbourCellInfo,omitempty"` + V2xApplicationServer *V2xApplicationServer `json:"v2xApplicationServer"` +} diff --git a/go-packages/meep-vis-client/model_v2x_application_server.go b/go-packages/meep-vis-client/model_v2x_application_server.go index 74eead688..a1c1bcfc5 100644 --- a/go-packages/meep-vis-client/model_v2x_application_server.go +++ b/go-packages/meep-vis-client/model_v2x_application_server.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,10 +21,10 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type V2xApplicationServer struct { IpAddress string `json:"ipAddress"` - - UdpPort string `json:"udpPort"` + UdpPort string `json:"udpPort"` } diff --git a/go-packages/meep-vis-client/model_v2x_msg_notification.go b/go-packages/meep-vis-client/model_v2x_msg_notification.go index 7a4a67ac7..87697f2a6 100644 --- a/go-packages/meep-vis-client/model_v2x_msg_notification.go +++ b/go-packages/meep-vis-client/model_v2x_msg_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type V2xMsgNotification struct { @@ -28,13 +29,11 @@ type V2xMsgNotification struct { // Published V2X message content. The format of the string is defined by the standardization organization indicated by the attribute stdOrganization. MsgContent string `json:"msgContent"` // The encode format of the V2X message, for example base64. - MsgEncodeFormat string `json:"msgEncodeFormat"` - - MsgType *MsgType `json:"msgType"` + MsgEncodeFormat string `json:"msgEncodeFormat"` + MsgType *MsgType `json:"msgType"` // Shall be set to \"V2xMsgNotification\". NotificationType string `json:"notificationType"` // Standardization organization which defines the published V2X message type: ETSI: European Telecommunications Standards Institute. See note 1. - StdOrganization string `json:"stdOrganization"` - - TimeStamp *TimeStamp `json:"timeStamp"` + StdOrganization string `json:"stdOrganization"` + TimeStamp *TimeStamp `json:"timeStamp"` } diff --git a/go-packages/meep-vis-client/model_v2x_msg_notification_links.go b/go-packages/meep-vis-client/model_v2x_msg_notification_links.go index 4d884d078..d351e6550 100644 --- a/go-packages/meep-vis-client/model_v2x_msg_notification_links.go +++ b/go-packages/meep-vis-client/model_v2x_msg_notification_links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // links to resources related to this notification. diff --git a/go-packages/meep-vis-client/model_v2x_msg_publication.go b/go-packages/meep-vis-client/model_v2x_msg_publication.go index a175de60d..f44ca8c9c 100644 --- a/go-packages/meep-vis-client/model_v2x_msg_publication.go +++ b/go-packages/meep-vis-client/model_v2x_msg_publication.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,15 +21,15 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type V2xMsgPublication struct { // Published V2X message content. Its format is defined by the standardization organization indicated by the attribute stdOrganization. MsgContent string `json:"msgContent"` // The encode format of the V2X message, for example base64. - MsgEncodeFormat string `json:"msgEncodeFormat"` - - MsgType *MsgType `json:"msgType"` + MsgEncodeFormat string `json:"msgEncodeFormat"` + MsgType *MsgType `json:"msgType"` // Standardization organization which defines the published V2X message type: ETSI: European Telecommunications Standards Institute. See note 1. StdOrganization string `json:"stdOrganization"` } diff --git a/go-packages/meep-vis-client/model_v2x_msg_subscription.go b/go-packages/meep-vis-client/model_v2x_msg_subscription.go index 141accf9d..c13a83bb9 100644 --- a/go-packages/meep-vis-client/model_v2x_msg_subscription.go +++ b/go-packages/meep-vis-client/model_v2x_msg_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,20 +21,18 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type V2xMsgSubscription struct { Links *Links `json:"_links,omitempty"` // URI exposed by the client on which to receive notifications via HTTP. See note 1. - CallbackReference string `json:"callbackReference,omitempty"` - - ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` - - FilterCriteria *V2xMsgSubscriptionFilterCriteria `json:"filterCriteria"` + CallbackReference string `json:"callbackReference,omitempty"` + ExpiryDeadline *TimeStamp `json:"expiryDeadline,omitempty"` + FilterCriteria *V2xMsgSubscriptionFilterCriteria `json:"filterCriteria"` // Shall be set to TRUE by the service consumer to request a test notification via HTTP on the callbackReference URI, as described in ETSI GS MEC 009 [i.1], clause 6.12a. Default: FALSE. RequestTestNotification bool `json:"requestTestNotification,omitempty"` // Shall be set to \"V2xMsgSubscription\". - SubscriptionType string `json:"subscriptionType"` - + SubscriptionType string `json:"subscriptionType"` WebsockNotifConfig *WebsockNotifConfig `json:"websockNotifConfig,omitempty"` } diff --git a/go-packages/meep-vis-client/model_v2x_msg_subscription_filter_criteria.go b/go-packages/meep-vis-client/model_v2x_msg_subscription_filter_criteria.go index 6585a6c47..e5baf15c8 100644 --- a/go-packages/meep-vis-client/model_v2x_msg_subscription_filter_criteria.go +++ b/go-packages/meep-vis-client/model_v2x_msg_subscription_filter_criteria.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response. diff --git a/go-packages/meep-vis-client/model_v2x_server_usd.go b/go-packages/meep-vis-client/model_v2x_server_usd.go index 1f918a049..3740fe6ca 100644 --- a/go-packages/meep-vis-client/model_v2x_server_usd.go +++ b/go-packages/meep-vis-client/model_v2x_server_usd.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,12 +21,12 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type V2xServerUsd struct { SdpInfo *V2xServerUsdSdpInfo `json:"sdpInfo"` // A list of service area identifier for the applicable MBMS broadcast area. - ServiceAreaIdentifier []string `json:"serviceAreaIdentifier"` - - Tmgi *V2xServerUsdTmgi `json:"tmgi"` + ServiceAreaIdentifier []string `json:"serviceAreaIdentifier"` + Tmgi *V2xServerUsdTmgi `json:"tmgi"` } diff --git a/go-packages/meep-vis-client/model_v2x_server_usd_sdp_info.go b/go-packages/meep-vis-client/model_v2x_server_usd_sdp_info.go index 2eee61d3c..716abb523 100644 --- a/go-packages/meep-vis-client/model_v2x_server_usd_sdp_info.go +++ b/go-packages/meep-vis-client/model_v2x_server_usd_sdp_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,11 +21,11 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // SDP with IP multicast address and port number used for V2X communication via MBMS. type V2xServerUsdSdpInfo struct { IpMulticastAddress string `json:"ipMulticastAddress"` - - PortNumber string `json:"portNumber"` + PortNumber string `json:"portNumber"` } diff --git a/go-packages/meep-vis-client/model_v2x_server_usd_tmgi.go b/go-packages/meep-vis-client/model_v2x_server_usd_tmgi.go index 9106acfba..3b1eb2975 100644 --- a/go-packages/meep-vis-client/model_v2x_server_usd_tmgi.go +++ b/go-packages/meep-vis-client/model_v2x_server_usd_tmgi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client // Temporary Mobile Group Identity (TMGI), which is used within MBMS to uniquely identify Multicast and Broadcast bearer services. diff --git a/go-packages/meep-vis-client/model_websock_notif_config.go b/go-packages/meep-vis-client/model_websock_notif_config.go index 01e23ad42..7c4759cdb 100644 --- a/go-packages/meep-vis-client/model_websock_notif_config.go +++ b/go-packages/meep-vis-client/model_websock_notif_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client type WebsockNotifConfig struct { diff --git a/go-packages/meep-vis-client/response.go b/go-packages/meep-vis-client/response.go index ee0726532..8b1bd1ede 100644 --- a/go-packages/meep-vis-client/response.go +++ b/go-packages/meep-vis-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ * Contact: AdvantEDGE@InterDigital.com * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ + package client import ( diff --git a/go-packages/meep-vis-traffic-mgr/go.mod b/go-packages/meep-vis-traffic-mgr/go.mod index 8b8220ca4..be384b25b 100644 --- a/go-packages/meep-vis-traffic-mgr/go.mod +++ b/go-packages/meep-vis-traffic-mgr/go.mod @@ -3,10 +3,10 @@ module github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-traffic-mgr go 1.16 require ( - github.com/BurntSushi/toml v1.1.0 // indirect + github.com/BurntSushi/toml v1.2.0 // indirect github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0 - github.com/lib/pq v1.5.2 - github.com/spf13/viper v1.3.2 + github.com/lib/pq v1.10.7 + github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3 ) replace github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger diff --git a/go-packages/meep-vis-traffic-mgr/go.sum b/go-packages/meep-vis-traffic-mgr/go.sum index f13aaf753..645332803 100644 --- a/go-packages/meep-vis-traffic-mgr/go.sum +++ b/go-packages/meep-vis-traffic-mgr/go.sum @@ -1,5 +1,5 @@ -github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= -github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= +github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= @@ -8,12 +8,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw= -github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= @@ -22,6 +20,8 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3 h1:lBNvYUFo7d4fHs8BXUmoTzbdUo4usq6PlP5qn894sGA= +github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3/go.mod h1:jo59Sv6xirZtbxbaZbCtrQd1CSufmcxJZIC8hm2tepw= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= @@ -32,8 +32,6 @@ github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= diff --git a/go-packages/meep-vis-traffic-mgr/traffic-mgr.go b/go-packages/meep-vis-traffic-mgr/traffic-mgr.go index 9a34425c1..7d3f5798d 100644 --- a/go-packages/meep-vis-traffic-mgr/traffic-mgr.go +++ b/go-packages/meep-vis-traffic-mgr/traffic-mgr.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -22,26 +22,59 @@ import ( "math" "strconv" "strings" + "sync" "time" log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger" _ "github.com/lib/pq" - "github.com/spf13/viper" + "github.com/roymx/viper" ) +// VIS Traffic Manager +type TrafficMgr struct { + name string + namespace string + user string + pwd string + host string + port string + dbName string + db *sql.DB + connected bool + GridFileExists bool + mutex sync.Mutex + poaLoadMap map[string]*PoaLoads + // updateCb func(string, string) +} + +type PoaLoads struct { + PoaName string + Category string + Loads map[string]int32 + AverageLoad int32 +} + +type CategoryLoads struct { + Category string + Loads map[string]int32 +} + +type GridMapTable struct { + area string + category string + grid string +} + // DB Config const ( - DbHost = "meep-postgis.default.svc.cluster.local" - DbPort = "5432" - DbUser = "" - DbPassword = "" - DbDefault = "postgres" - + DbHost = "meep-postgis.default.svc.cluster.local" + DbPort = "5432" + DbUser = "" + DbPassword = "" + DbDefault = "postgres" DbMaxRetryCount int = 2 ) -var gridMapFilePath string = "/grid_map.yaml" - // Enable profiling const profiling = false @@ -60,94 +93,88 @@ const ( FieldTwentyOneToTwentyFour = "2100-2400" ) +const ( + CategoryCommercial = "commercial" + CategoryResidential = "residential" + CategoryCoastal = "coastal" +) + // DB Table Names const ( - GridTable = "grid_map" - CategoryTable = "categories" - TrafficTable = "traffic_patterns" + GridTable = "grid_map" ) // Grid Map data var gridMapData map[string]map[string][]string // Category-wise Traffic Loads -var categoriesLoads = map[string]map[string]int32{ - "commercial": { - "0000-0300": 50, - "0300-0600": 50, - "0600-0900": 75, - "0900-1200": 100, - "1200-1500": 125, - "1500-1800": 100, - "1800-2100": 75, - "2100-2400": 50, +var categoryLoads = map[string]*CategoryLoads{ + CategoryCommercial: &CategoryLoads{ + Category: CategoryCommercial, + Loads: map[string]int32{ + FieldZeroToThree: 50, + FieldThreeToSix: 50, + FieldSixToNine: 75, + FieldNineToTwelve: 100, + FieldTwelveToFifteen: 125, + FieldFifteenToEighteen: 100, + FieldEighteenToTwentyOne: 75, + FieldTwentyOneToTwentyFour: 50, + }, }, - "residential": { - "0000-0300": 125, - "0300-0600": 125, - "0600-0900": 100, - "0900-1200": 75, - "1200-1500": 50, - "1500-1800": 50, - "1800-2100": 125, - "2100-2400": 125, + CategoryResidential: &CategoryLoads{ + Category: CategoryResidential, + Loads: map[string]int32{ + FieldZeroToThree: 125, + FieldThreeToSix: 125, + FieldSixToNine: 100, + FieldNineToTwelve: 75, + FieldTwelveToFifteen: 50, + FieldFifteenToEighteen: 50, + FieldEighteenToTwentyOne: 125, + FieldTwentyOneToTwentyFour: 125, + }, }, - "coastal": { - "0000-0300": 25, - "0300-0600": 25, - "0600-0900": 50, - "0900-1200": 25, - "1200-1500": 50, - "1500-1800": 75, - "1800-2100": 50, - "2100-2400": 25, + CategoryCoastal: &CategoryLoads{ + Category: CategoryCoastal, + Loads: map[string]int32{ + FieldZeroToThree: 25, + FieldThreeToSix: 25, + FieldSixToNine: 50, + FieldNineToTwelve: 25, + FieldTwelveToFifteen: 50, + FieldFifteenToEighteen: 75, + FieldEighteenToTwentyOne: 50, + FieldTwentyOneToTwentyFour: 25, + }, }, } -// VIS Traffic Manager -type TrafficMgr struct { - name string - namespace string - user string - pwd string - host string - port string - dbName string - db *sql.DB - connected bool - GridFileExists bool - // updateCb func(string, string) -} - -type PoaLoads struct { - PoaName string - Category string - ZeroToThree int32 - ThreeToSix int32 - SixToNine int32 - NineToTwelve int32 - TwelveToFifteen int32 - FifteenToEighteen int32 - EighteenToTwentyOne int32 - TwentyOneToTwentyFour int32 -} - -type CategoryLoads struct { - Category string - ZeroToThree int32 - ThreeToSix int32 - SixToNine int32 - NineToTwelve int32 - TwelveToFifteen int32 - FifteenToEighteen int32 - EighteenToTwentyOne int32 - TwentyOneToTwentyFour int32 -} - -type GridMapTable struct { - area string - category string - grid string +var timeWindows = map[int32]string{ + 0: FieldZeroToThree, + 1: FieldZeroToThree, + 2: FieldZeroToThree, + 3: FieldThreeToSix, + 4: FieldThreeToSix, + 5: FieldThreeToSix, + 6: FieldSixToNine, + 7: FieldSixToNine, + 8: FieldSixToNine, + 9: FieldNineToTwelve, + 10: FieldNineToTwelve, + 11: FieldNineToTwelve, + 12: FieldTwelveToFifteen, + 13: FieldTwelveToFifteen, + 14: FieldTwelveToFifteen, + 15: FieldFifteenToEighteen, + 16: FieldFifteenToEighteen, + 17: FieldFifteenToEighteen, + 18: FieldEighteenToTwentyOne, + 19: FieldEighteenToTwentyOne, + 20: FieldEighteenToTwentyOne, + 21: FieldTwentyOneToTwentyFour, + 22: FieldTwentyOneToTwentyFour, + 23: FieldTwentyOneToTwentyFour, } // Profiling init @@ -176,6 +203,7 @@ func NewTrafficMgr(name, namespace, user, pwd, host, port string) (tm *TrafficMg tm.pwd = pwd tm.host = host tm.port = port + tm.poaLoadMap = map[string]*PoaLoads{} // Connect to Postgis DB for retry := 0; retry <= DbMaxRetryCount; retry++ { @@ -316,7 +344,7 @@ func (tm *TrafficMgr) DestroyDb(name string) (err error) { func getGridMapConfig() (gridData map[string]map[string][]string, gridFile bool, err error) { // Read grid map from grid map file - gridMapFile := gridMapFilePath + gridMapFile := "/grid_map.yaml" gridMap := viper.New() gridMap.SetConfigFile(gridMapFile) err = gridMap.ReadInConfig() @@ -340,7 +368,7 @@ func (tm *TrafficMgr) CreateTables() (err error) { } // Grid Table - _, err = tm.db.Exec(`CREATE TABLE ` + GridTable + ` ( + _, err = tm.db.Exec(`CREATE TABLE IF NOT EXISTS ` + GridTable + ` ( area varchar(100) NOT NULL, category varchar(100) NOT NULL, grid geometry(POLYGON,4326), @@ -352,53 +380,12 @@ func (tm *TrafficMgr) CreateTables() (err error) { } log.Info("Created Grids table: ", GridTable) - // Categories Table - _, err = tm.db.Exec(`CREATE TABLE ` + CategoryTable + ` ( - category varchar(100) NOT NULL UNIQUE, - "0000-0300" integer NOT NULL DEFAULT '0', - "0300-0600" integer NOT NULL DEFAULT '0', - "0600-0900" integer NOT NULL DEFAULT '0', - "0900-1200" integer NOT NULL DEFAULT '0', - "1200-1500" integer NOT NULL DEFAULT '0', - "1500-1800" integer NOT NULL DEFAULT '0', - "1800-2100" integer NOT NULL DEFAULT '0', - "2100-2400" integer NOT NULL DEFAULT '0', - PRIMARY KEY (category) - )`) - if err != nil { - log.Error(err.Error()) - return err - } - log.Info("Created Categories table: ", CategoryTable) - - // Traffic Load Table - _, err = tm.db.Exec(`CREATE TABLE ` + TrafficTable + ` ( - poa_name varchar(100) NOT NULL UNIQUE, - category varchar(100) NOT NULL, - "0000-0300" integer NOT NULL DEFAULT '0', - "0300-0600" integer NOT NULL DEFAULT '0', - "0600-0900" integer NOT NULL DEFAULT '0', - "0900-1200" integer NOT NULL DEFAULT '0', - "1200-1500" integer NOT NULL DEFAULT '0', - "1500-1800" integer NOT NULL DEFAULT '0', - "1800-2100" integer NOT NULL DEFAULT '0', - "2100-2400" integer NOT NULL DEFAULT '0', - PRIMARY KEY (poa_name) - )`) - if err != nil { - log.Error(err.Error()) - return err - } - log.Info("Created Traffic Loads table: ", TrafficTable) - return nil } // DeleteTables - Delete all postgis traffic tables func (tm *TrafficMgr) DeleteTables() (err error) { _ = tm.DeleteTable(GridTable) - _ = tm.DeleteTable(CategoryTable) - _ = tm.DeleteTable(TrafficTable) return nil } @@ -450,193 +437,10 @@ func (tm *TrafficMgr) CreateGridMap(area string, category string, grid string) ( return nil } -// CreateCategoryLoad - Create new Category Load -func (tm *TrafficMgr) CreateCategoryLoad(category string, data map[string]int32) (err error) { - if profiling { - profilingTimers["CreateCategoryLoad"] = time.Now() - } - - var loadTime []int32 - - // Validate input - if category == "" { - return errors.New("Missing category name") - } - - fields := []string{ - FieldZeroToThree, - FieldThreeToSix, - FieldSixToNine, - FieldNineToTwelve, - FieldTwelveToFifteen, - FieldFifteenToEighteen, - FieldEighteenToTwentyOne, - FieldTwentyOneToTwentyFour, - } - for _, field := range fields { - if _, found := data[field]; !found { - return errors.New("Missing time field " + field) - } - loadTime = append(loadTime, data[field]) - } - - // Create Traffic Load entry - query := `INSERT INTO ` + CategoryTable + - ` (category, "0000-0300", "0300-0600", "0600-0900", "0900-1200", "1200-1500", "1500-1800", "1800-2100", "2100-2400") - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)` - _, err = tm.db.Exec(query, category, loadTime[0], loadTime[1], loadTime[2], loadTime[3], loadTime[4], loadTime[5], loadTime[6], loadTime[7]) - if err != nil { - log.Error(err.Error()) - return err - } - - // Notify listener - // tm.notifyListener(TypePoa, name) - - if profiling { - now := time.Now() - log.Debug("CreateCategoryLoad: ", now.Sub(profilingTimers["CreateCategoryLoad"])) - } - return nil -} - -// GetCategoryLoad - Get POA Load information -func (tm *TrafficMgr) GetCategoryLoad(category string) (categoryLoads *CategoryLoads, err error) { - if profiling { - profilingTimers["GetCategoryLoad"] = time.Now() - } - - // Validate input - if category == "" { - err = errors.New("Missing category name") - return nil, err - } - - // Get Category Load entry - var rows *sql.Rows - rows, err = tm.db.Query(` - SELECT category, "0000-0300", "0300-0600", "0600-0900", "0900-1200", "1200-1500", "1500-1800", "1800-2100", "2100-2400" - FROM `+CategoryTable+` - WHERE category = ($1)`, category) - if err != nil { - log.Error(err.Error()) - return nil, err - } - defer rows.Close() - - // Scan result - for rows.Next() { - categoryLoads = new(CategoryLoads) - err = rows.Scan( - &categoryLoads.Category, - &categoryLoads.ZeroToThree, - &categoryLoads.ThreeToSix, - &categoryLoads.SixToNine, - &categoryLoads.NineToTwelve, - &categoryLoads.TwelveToFifteen, - &categoryLoads.FifteenToEighteen, - &categoryLoads.EighteenToTwentyOne, - &categoryLoads.TwentyOneToTwentyFour, - ) - if err != nil { - log.Error(err.Error()) - return nil, err - } - } - err = rows.Err() - if err != nil { - log.Error(err) - } - - // Return error if not found - if categoryLoads == nil { - err = errors.New("Category Load not found: " + category) - return nil, err - } - - if profiling { - now := time.Now() - log.Debug("GetCategoryLoad: ", now.Sub(profilingTimers["GetCategoryLoad"])) - } - return categoryLoads, nil -} - -// GetAllCategoryLoad - Get POA Load information -func (tm *TrafficMgr) GetAllCategoryLoad() (categoryLoads map[string]*CategoryLoads, err error) { - if profiling { - profilingTimers["GetAllCategoryLoad"] = time.Now() - } - - // Create Category map - categoryLoadsMap := make(map[string]*CategoryLoads) - - // Get Category Load entry - var rows *sql.Rows - rows, err = tm.db.Query(` - SELECT category, "0000-0300", "0300-0600", "0600-0900", "0900-1200", "1200-1500", "1500-1800", "1800-2100", "2100-2400" - FROM ` + CategoryTable) - if err != nil { - log.Error(err.Error()) - return nil, err - } - defer rows.Close() - - // Scan results - for rows.Next() { - - categoryLoads := new(CategoryLoads) - err = rows.Scan( - &categoryLoads.Category, - &categoryLoads.ZeroToThree, - &categoryLoads.ThreeToSix, - &categoryLoads.SixToNine, - &categoryLoads.NineToTwelve, - &categoryLoads.TwelveToFifteen, - &categoryLoads.FifteenToEighteen, - &categoryLoads.EighteenToTwentyOne, - &categoryLoads.TwentyOneToTwentyFour, - ) - - // Add POA to map - categoryLoadsMap[categoryLoads.Category] = categoryLoads - } - err = rows.Err() - if err != nil { - log.Error(err) - } - - if profiling { - now := time.Now() - log.Debug("GetAllCategoryLoad: ", now.Sub(profilingTimers["GetAllCategoryLoad"])) - } - - return categoryLoadsMap, nil -} - -// DeleteAllCategory - Delete all Category entries -func (tm *TrafficMgr) DeleteAllCategory() (err error) { - if profiling { - profilingTimers["DeleteAllCategory"] = time.Now() - } - - _, err = tm.db.Exec(`DELETE FROM ` + CategoryTable) - if err != nil { - log.Error(err.Error()) - return err - } - - if profiling { - now := time.Now() - log.Debug("DeleteAllCategory: ", now.Sub(profilingTimers["DeleteAllCategory"])) - } - return nil -} - // CreatePoaLoad - Create new POA Load func (tm *TrafficMgr) CreatePoaLoad(poaName string, category string) (err error) { - if profiling { - profilingTimers["CreatePoaLoad"] = time.Now() - } + tm.mutex.Lock() + defer tm.mutex.Unlock() // Validate input if poaName == "" { @@ -647,45 +451,37 @@ func (tm *TrafficMgr) CreatePoaLoad(poaName string, category string) (err error) } // Get Load entry from Categories Table - categoryLoads, err := tm.GetCategoryLoad(category) - if err != nil { - log.Error(err.Error()) - return err - } - - loadTime := []int32{ - categoryLoads.ZeroToThree, - categoryLoads.ThreeToSix, - categoryLoads.SixToNine, - categoryLoads.NineToTwelve, - categoryLoads.TwelveToFifteen, - categoryLoads.FifteenToEighteen, - categoryLoads.EighteenToTwentyOne, - categoryLoads.TwentyOneToTwentyFour, - } - - // Create Traffic Load entry - query := `INSERT INTO ` + TrafficTable + - ` (poa_name, category, "0000-0300", "0300-0600", "0600-0900", "0900-1200", "1200-1500", "1500-1800", "1800-2100", "2100-2400") - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)` - _, err = tm.db.Exec(query, poaName, category, loadTime[0], loadTime[1], loadTime[2], loadTime[3], loadTime[4], loadTime[5], loadTime[6], loadTime[7]) - if err != nil { - log.Error(err.Error()) - return err + categoryLoads, found := categoryLoads[category] + if !found { + return errors.New("Invalid category name: " + category) + } + + // Create POA loads entry + poaLoads := &PoaLoads{ + PoaName: poaName, + Category: category, + Loads: map[string]int32{}, + } + // Copy category loads & calculate average load + if len(categoryLoads.Loads) > 0 { + var loadSum int32 = 0 + for k, v := range categoryLoads.Loads { + poaLoads.Loads[k] = v + loadSum += v + } + poaLoads.AverageLoad = loadSum / int32(len(poaLoads.Loads)) } + log.Info("Created loads table for ", poaName, " (", category, "): ", poaLoads.Loads, ", Average: ", poaLoads.AverageLoad) - if profiling { - now := time.Now() - log.Debug("CreatePoaLoad: ", now.Sub(profilingTimers["CreatePoaLoad"])) - } + // Add POA loads to map + tm.poaLoadMap[poaName] = poaLoads return nil } // GetPoaLoad - Get POA Load information func (tm *TrafficMgr) GetPoaLoad(poaName string) (poaLoads *PoaLoads, err error) { - if profiling { - profilingTimers["GetPoaLoad"] = time.Now() - } + tm.mutex.Lock() + defer tm.mutex.Unlock() // Validate input if poaName == "" { @@ -693,129 +489,27 @@ func (tm *TrafficMgr) GetPoaLoad(poaName string) (poaLoads *PoaLoads, err error) return nil, err } - // Get Poa entry - var rows *sql.Rows - rows, err = tm.db.Query(` - SELECT poa_name, category, "0000-0300", "0300-0600", "0600-0900", "0900-1200", "1200-1500", "1500-1800", "1800-2100", "2100-2400" - FROM `+TrafficTable+` - WHERE poa_name = ($1)`, poaName) - if err != nil { - log.Error(err.Error()) - return nil, err - } - defer rows.Close() - - // Scan result - for rows.Next() { - poaLoads = new(PoaLoads) - err = rows.Scan( - &poaLoads.PoaName, - &poaLoads.Category, - &poaLoads.ZeroToThree, - &poaLoads.ThreeToSix, - &poaLoads.SixToNine, - &poaLoads.NineToTwelve, - &poaLoads.TwelveToFifteen, - &poaLoads.FifteenToEighteen, - &poaLoads.EighteenToTwentyOne, - &poaLoads.TwentyOneToTwentyFour, - ) - if err != nil { - log.Error(err.Error()) - return nil, err - } - } - err = rows.Err() - if err != nil { - log.Error(err) - } - - // Return error if not found + // Get POA loads + poaLoads = tm.poaLoadMap[poaName] if poaLoads == nil { - err = errors.New("POA Load not found: " + poaName) + err = errors.New("POA loads not found: " + poaName) return nil, err } - - if profiling { - now := time.Now() - log.Debug("GetPoaLoad: ", now.Sub(profilingTimers["GetPoaLoad"])) - } return poaLoads, nil } // GetAllPoaLoad - Get all POA information func (tm *TrafficMgr) GetAllPoaLoad() (poaLoadMap map[string]*PoaLoads, err error) { - if profiling { - profilingTimers["GetAllPoaLoad"] = time.Now() - } - - // Create PoaLoad map - poaLoadMap = make(map[string]*PoaLoads) - - // Get POA entries - var rows *sql.Rows - rows, err = tm.db.Query(` - SELECT poa_name, category, "0000-0300", "0300-0600", "0600-0900", "0900-1200", "1200-1500", "1500-1800", "1800-2100", "2100-2400" - FROM ` + TrafficTable) - if err != nil { - log.Error(err.Error()) - return poaLoadMap, err - } - defer rows.Close() - - // Scan results - for rows.Next() { - poaLoads := new(PoaLoads) - - // Fill POA - err = rows.Scan( - &poaLoads.PoaName, - &poaLoads.Category, - &poaLoads.ZeroToThree, - &poaLoads.ThreeToSix, - &poaLoads.SixToNine, - &poaLoads.NineToTwelve, - &poaLoads.TwelveToFifteen, - &poaLoads.FifteenToEighteen, - &poaLoads.EighteenToTwentyOne, - &poaLoads.TwentyOneToTwentyFour, - ) - if err != nil { - log.Error(err.Error()) - return poaLoadMap, err - } - - // Add POA to map - poaLoadMap[poaLoads.PoaName] = poaLoads - } - err = rows.Err() - if err != nil { - log.Error(err) - } - - if profiling { - now := time.Now() - log.Debug("GetAllPoaLoad: ", now.Sub(profilingTimers["GetAllPoaLoad"])) - } - return poaLoadMap, nil + return tm.poaLoadMap, nil } // DeleteAllPoaLoads - Delete all POA entries func (tm *TrafficMgr) DeleteAllPoaLoad() (err error) { - if profiling { - profilingTimers["DeleteAllPoa"] = time.Now() - } - - _, err = tm.db.Exec(`DELETE FROM ` + TrafficTable) - if err != nil { - log.Error(err.Error()) - return err - } + tm.mutex.Lock() + defer tm.mutex.Unlock() - if profiling { - now := time.Now() - log.Debug("DeleteAllPoa: ", now.Sub(profilingTimers["DeleteAllPoa"])) - } + // Reset poa loads + tm.poaLoadMap = map[string]*PoaLoads{} return nil } @@ -969,27 +663,6 @@ func (tm *TrafficMgr) PopulateGridMapTable() (err error) { return nil } -// PopulateCategoryTable - Populate the categories table -func (tm *TrafficMgr) PopulateCategoryTable() (err error) { - if profiling { - profilingTimers["PopulateCategoryTable"] = time.Now() - } - - for category, loads := range categoriesLoads { - err = tm.CreateCategoryLoad(category, loads) - if err != nil { - log.Error(err.Error()) - return err - } - } - - if profiling { - now := time.Now() - log.Debug("PopulateCategoryTable: ", now.Sub(profilingTimers["PopulateCategoryTable"])) - } - return nil -} - // GetPoaCategory - Get the category for a PoA func (tm *TrafficMgr) GetPoaCategory(longitude float32, latitude float32) (category string, err error) { if profiling { @@ -1032,13 +705,14 @@ func (tm *TrafficMgr) PopulatePoaLoad(poaNameList []string, gpsCoordinates [][]f err = errors.New("Missing POA Name List") return err } - if gpsCoordinates == nil { err = errors.New("Missing GPS coordinates") return err } + // Get POA loads for each POA for i, poaName := range poaNameList { + // Get POA category from locaion & grid map poaLongitude := gpsCoordinates[i][0] poaLatitude := gpsCoordinates[i][1] category, err := tm.GetPoaCategory(poaLongitude, poaLatitude) @@ -1047,19 +721,13 @@ func (tm *TrafficMgr) PopulatePoaLoad(poaNameList []string, gpsCoordinates [][]f return err } - if _, ok := categoriesLoads[category]; !ok { - err = errors.New("Category " + category + " not present in the categories table") - log.Error(err.Error()) - return err - } - + // Set POA load err = tm.CreatePoaLoad(poaName, category) if err != nil { log.Error(err.Error()) return err } } - return nil } @@ -1076,66 +744,30 @@ func (tm *TrafficMgr) PredictQosPerTrafficLoad(hour int32, inRsrp int32, inRsrq } // Get time range for DB query - timeRange := inTimeRange(hour) - - // Get predicted load for a given PoA in a desired time slot from the traffic patterns table - - var predictedUserTraffic int - - var row *sql.Row - log.Debug("Collecting traffic load pattern of POA " + poaName + " for the time range: " + timeRange) - row = tm.db.QueryRow(`SELECT "`+timeRange+`" FROM `+TrafficTable+` WHERE poa_name = ($1)`, poaName) - - err = row.Scan(&predictedUserTraffic) - - if err == sql.ErrNoRows { - log.Error(err) - log.Error("Could not find estimated user load in the " + TrafficTable + " table") + timeRange, found := timeWindows[hour] + if !found { + err = errors.New("Invalid hour value") return 0, 0, err } - // Get average PoA load throughout the day - poaLoad, err := tm.GetPoaLoad(poaName) + // Get predicted load for a given PoA in a desired time slot from the traffic patterns table + log.Debug("Obtaining traffic load pattern of POA " + poaName + " for the time range: " + timeRange) + poaLoads, err := tm.GetPoaLoad(poaName) if err != nil { - log.Error(err) - log.Error("Could not find PoA load in the " + TrafficTable + " table") - // returning the same values for Rsrp and Rsrq received in request - return inRsrp, inRsrq, err + return 0, 0, err + } + var predictedUserTraffic int32 + predictedUserTraffic, found = poaLoads.Loads[timeRange] + if !found { + err = errors.New("Could not find estimated user load") + return 0, 0, err } - - averageLoad := (poaLoad.ZeroToThree + poaLoad.ThreeToSix + poaLoad.SixToNine + poaLoad.NineToTwelve + poaLoad.TwelveToFifteen + poaLoad.FifteenToEighteen + poaLoad.EighteenToTwentyOne + poaLoad.TwentyOneToTwentyFour) / 8 // Find reduced signal strength as a function of number of users in the area - outRsrp, outRsrq, err = findReducedSignalStrength(inRsrp, inRsrq, int32(predictedUserTraffic), averageLoad) - + outRsrp, outRsrq, err = findReducedSignalStrength(inRsrp, inRsrq, predictedUserTraffic, poaLoads.AverageLoad) return outRsrp, outRsrq, err } -// Returns the time range as key in the traffic load map against vehicle ETA -func inTimeRange(hour int32) (key string) { - - var TimeWindows = map[string][]int32{ - FieldZeroToThree: {0, 1, 2}, - FieldThreeToSix: {3, 4, 5}, - FieldSixToNine: {6, 7, 8}, - FieldNineToTwelve: {9, 10, 11}, - FieldTwelveToFifteen: {12, 13, 14}, - FieldFifteenToEighteen: {15, 16, 17}, - FieldEighteenToTwentyOne: {18, 19, 20}, - FieldTwentyOneToTwentyFour: {21, 22, 23}, - } - - for key, hours := range TimeWindows { - for i := range hours { - if hours[i] == hour { - return key - } - } - } - - return "" -} - // Returns reduced signal strength based on the deviation in predicted user traffic from average user load in that area // The RSRP/RSRP values are reduced proportional to the difference between estimated users and average user traffic in a given POA // Assumption: the RSRP/RSRP values remain unchanged for average POA traffic diff --git a/go-packages/meep-vis-traffic-mgr/traffic-mgr_test.go b/go-packages/meep-vis-traffic-mgr/traffic-mgr_test.go index ad28fb25f..437cb230c 100644 --- a/go-packages/meep-vis-traffic-mgr/traffic-mgr_test.go +++ b/go-packages/meep-vis-traffic-mgr/traffic-mgr_test.go @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on ance "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package vistrafficmgr import ( @@ -8,13 +24,12 @@ import ( ) const ( // FIXME To be update with correct values at the end - tmName = "pc" - tmNamespace = "postgis-ns" - tmDBUser = "postgres" - tmDBPwd = "pwd" - tmDBHost = "localhost" - tmDBPort = "30432" - tmGridMapFile = "../../test/grid_map.yaml" + tmName = "pc" + tmNamespace = "postgis-ns" + tmDBUser = "postgres" + tmDBPwd = "pwd" + tmDBHost = "localhost" + tmDBPort = "30432" category1 = "poa1-category" poaName1 = "poa1-name" @@ -59,7 +74,6 @@ func TestNewTrafficMgr(t *testing.T) { // Valid Connector fmt.Println("Create valid VIS Asset Manager") - gridMapFilePath = tmGridMapFile tm, err = NewTrafficMgr(tmName, tmNamespace, tmDBUser, tmDBPwd, tmDBHost, tmDBPort) if err != nil || tm == nil { t.Fatalf("Failed to create VIS Asset Manager") @@ -84,101 +98,12 @@ func TestNewTrafficMgr(t *testing.T) { // t.Fatalf("DONE") } -func TestTrafficMgrCreateCategoryTable(t *testing.T) { - fmt.Println("--- ", t.Name()) - log.MeepTextLogInit(t.Name()) - - // Create Connector - fmt.Println("Create valid VIS Asset Manager") - gridMapFilePath = tmGridMapFile - tm, err := NewTrafficMgr(tmName, tmNamespace, tmDBUser, tmDBPwd, tmDBHost, tmDBPort) - if err != nil || tm == nil { - t.Fatalf("Failed to create VIS Asset Manager") - } - - // Cleanup - _ = tm.DeleteTables() - - // Create tables - fmt.Println("Create Tables") - err = tm.CreateTables() - if err != nil { - t.Fatalf("Failed to create tables") - } - - // Make sure Category don't exist - fmt.Println("Verify no Category present") - catMap, err := tm.GetAllCategoryLoad() - if err != nil { - t.Fatalf("Failed to get all Category") - } - if len(catMap) != 0 { - t.Fatalf("No Category should be present") - } - - // Add Invalid Category - fmt.Println("Create Invalid Category") - catData := map[string]int32{ - FieldZeroToThree: zeroToThree1, - FieldThreeToSix: threeToSix1, - FieldSixToNine: sixToNine1, - FieldNineToTwelve: nineToTwelve1, - FieldTwelveToFifteen: twelveToFifteen1, - FieldFifteenToEighteen: fifteenToEighteen1, - FieldEighteenToTwentyOne: eighteenToTwentyOne1, - FieldTwentyOneToTwentyFour: twentyOneToTwentyFour1, - } - err = tm.CreateCategoryLoad("", catData) // Invalid category field value - if err == nil { - t.Fatalf("Category creation should have failed") - } - - // Add Category & Validate successfully added - catData = map[string]int32{ - FieldZeroToThree: zeroToThree1, - FieldThreeToSix: threeToSix1, - FieldSixToNine: sixToNine1, - FieldNineToTwelve: nineToTwelve1, - FieldTwelveToFifteen: twelveToFifteen1, - FieldFifteenToEighteen: fifteenToEighteen1, - FieldEighteenToTwentyOne: eighteenToTwentyOne1, - FieldTwentyOneToTwentyFour: twentyOneToTwentyFour1, - } - err = tm.CreateCategoryLoad(category1, catData) - if err != nil { - t.Fatalf("Failed to create asset: " + err.Error()) - } - catLoad, err := tm.GetCategoryLoad(category1) - if err != nil || catLoad == nil { - t.Fatalf("Failed to get Category") - } - // Validate - if !validateCategory(catLoad, category1, zeroToThree1, threeToSix1, sixToNine1, nineToTwelve1, twelveToFifteen1, fifteenToEighteen1, eighteenToTwentyOne1, twentyOneToTwentyFour1) { - t.Fatalf("Category validation failed") - } - // Delete all & validate updatespoaMap - - fmt.Println("Delete all & validate updates") - // TODO - err = tm.DeleteAllCategory() - if err != nil { - t.Fatalf("Failed to delete all Category") - } - catMap, err = tm.GetAllCategoryLoad() - if err != nil || len(catMap) != 0 { - t.Fatalf("Category should no longer exist") - } - - // t.Fatalf("DONE") -} - func TestTrafficMgrCreateTrafficTable(t *testing.T) { fmt.Println("--- ", t.Name()) log.MeepTextLogInit(t.Name()) // Create Connector fmt.Println("Create valid VIS Asset Manager") - gridMapFilePath = tmGridMapFile tm, err := NewTrafficMgr(tmName, tmNamespace, tmDBUser, tmDBPwd, tmDBHost, tmDBPort) if err != nil || tm == nil { t.Fatalf("Failed to create VIS Asset Manager") @@ -231,9 +156,9 @@ func TestTrafficMgrCreateTrafficTable(t *testing.T) { FieldEighteenToTwentyOne: eighteenToTwentyOne1, FieldTwentyOneToTwentyFour: twentyOneToTwentyFour1, } - err = tm.CreateCategoryLoad(category1, catData) - if err != nil { - t.Fatalf("Failed to create asset: " + err.Error()) + categoryLoads[category1] = &CategoryLoads{ + Category: category1, + Loads: catData, } // 2. Add Traffic err = tm.CreatePoaLoad(poaName1, category1) @@ -246,7 +171,17 @@ func TestTrafficMgrCreateTrafficTable(t *testing.T) { t.Fatalf("Failed to get Traffic") } // Validate - if !validatePoaLoads(trafficMap, poaName1, category1, zeroToThree1, threeToSix1, sixToNine1, nineToTwelve1, twelveToFifteen1, fifteenToEighteen1, eighteenToTwentyOne1, twentyOneToTwentyFour1) { + loads := map[string]int32{ + FieldZeroToThree: zeroToThree1, + FieldThreeToSix: threeToSix1, + FieldSixToNine: sixToNine1, + FieldNineToTwelve: nineToTwelve1, + FieldTwelveToFifteen: twelveToFifteen1, + FieldFifteenToEighteen: fifteenToEighteen1, + FieldEighteenToTwentyOne: eighteenToTwentyOne1, + FieldTwentyOneToTwentyFour: twentyOneToTwentyFour1, + } + if !validatePoaLoads(trafficMap, poaName1, category1, loads) { t.Fatalf("Category validation failed") } @@ -270,7 +205,6 @@ func TestTrafficMgrCreateCreateGridMap(t *testing.T) { // Create Connector fmt.Println("Create valid VIS Asset Manager") - gridMapFilePath = tmGridMapFile tm, err := NewTrafficMgr(tmName, tmNamespace, tmDBUser, tmDBPwd, tmDBHost, tmDBPort) if err != nil || tm == nil { t.Fatalf("Failed to create VIS Asset Manager") @@ -350,7 +284,6 @@ func TestPredictQosPerTrafficLoad(t *testing.T) { // Create Connector fmt.Println("Create valid VIS Asset Manager") - gridMapFilePath = tmGridMapFile tm, _ := NewTrafficMgr(tmName, tmNamespace, tmDBUser, tmDBPwd, tmDBHost, tmDBPort) // Cleanup @@ -361,6 +294,7 @@ func TestPredictQosPerTrafficLoad(t *testing.T) { _ = tm.CreateTables() // Add Traffic & Validate successfully added + // Create category load catData := map[string]int32{ FieldZeroToThree: zeroToThree1, FieldThreeToSix: threeToSix1, @@ -371,7 +305,10 @@ func TestPredictQosPerTrafficLoad(t *testing.T) { FieldEighteenToTwentyOne: eighteenToTwentyOne1, FieldTwentyOneToTwentyFour: twentyOneToTwentyFour1, } - _ = tm.CreateCategoryLoad(category1, catData) + categoryLoads[category1] = &CategoryLoads{ + Category: category1, + Loads: catData, + } _ = tm.CreatePoaLoad(poaName1, category1) fmt.Println("Tables initialized") @@ -415,52 +352,7 @@ func TestPredictQosPerTrafficLoad(t *testing.T) { // t.Fatalf("DONE") } -func validateCategory(categoryLoads *CategoryLoads, category string, zeroToThree int32, threeToSix int32, sixToNine int32, nineToTwelve int32, twelveToFifteen int32, fifteenToEighteen int32, eighteenToTwentyOne int32, twentyOneToTwentyFour int32) bool { - if categoryLoads == nil { - fmt.Println("categoryLoads == nil") - return false - } - if categoryLoads.Category != category { - fmt.Println("CategoryLoads.Category != category") - return false - } - if categoryLoads.ZeroToThree != zeroToThree { - fmt.Println("CategoryLoads.ZeroToThree != zeroToThree") - return false - } - if categoryLoads.ThreeToSix != threeToSix { - fmt.Println("CategoryLoads.ThreeToSix != threeToSix") - return false - } - if categoryLoads.SixToNine != sixToNine { - fmt.Println("CategoryLoads.SixToNine != sixToNine") - return false - } - if categoryLoads.NineToTwelve != nineToTwelve { - fmt.Println("CategoryLoads.NineToTwelve != nineToTwelve") - return false - } - if categoryLoads.EighteenToTwentyOne != eighteenToTwentyOne { - fmt.Println("CategoryLoads.EighteenToTwentyOne != eighteenToTwentyOne") - return false - } - if categoryLoads.FifteenToEighteen != fifteenToEighteen { - fmt.Println("CategoryLoads.FifteenToEighteen != fifteenToEighteen") - return false - } - if categoryLoads.FifteenToEighteen != fifteenToEighteen { - fmt.Println("CategoryLoads.FifteenToEighteen != fifteenToEighteen") - return false - } - if categoryLoads.TwentyOneToTwentyFour != twentyOneToTwentyFour { - fmt.Println("CategoryLoads.TwentyOneToTwentyFour != twentyOneToTwentyFour") - return false - } - - return true -} - -func validatePoaLoads(poaLoads *PoaLoads, poaName string, category string, zeroToThree int32, threeToSix int32, sixToNine int32, nineToTwelve int32, twelveToFifteen int32, fifteenToEighteen int32, eighteenToTwentyOne int32, twentyOneToTwentyFour int32) bool { +func validatePoaLoads(poaLoads *PoaLoads, poaName string, category string, loads map[string]int32) bool { if poaLoads == nil { fmt.Println("poaLoads == nil") return false @@ -473,39 +365,13 @@ func validatePoaLoads(poaLoads *PoaLoads, poaName string, category string, zeroT fmt.Println("PoaLoads.Category != category") return false } - if poaLoads.ZeroToThree != zeroToThree { - fmt.Println("PoaLoads.ZeroToThree != zeroToThree") - return false + for key, load := range loads { + curLoad, found := poaLoads.Loads[key] + if !found || load != curLoad { + fmt.Println("poaLoads.Loads[" + key + "] not valid") + return false + } } - if poaLoads.ThreeToSix != threeToSix { - fmt.Println("PoaLoads.ThreeToSix != threeToSix") - return false - } - if poaLoads.SixToNine != sixToNine { - fmt.Println("PoaLoads.SixToNine != sixToNine") - return false - } - if poaLoads.NineToTwelve != nineToTwelve { - fmt.Println("PoaLoads.NineToTwelve != nineToTwelve") - return false - } - if poaLoads.EighteenToTwentyOne != eighteenToTwentyOne { - fmt.Println("PoaLoads.EighteenToTwentyOne != eighteenToTwentyOne") - return false - } - if poaLoads.FifteenToEighteen != fifteenToEighteen { - fmt.Println("PoaLoads.FifteenToEighteen != fifteenToEighteen") - return false - } - if poaLoads.FifteenToEighteen != fifteenToEighteen { - fmt.Println("PoaLoads.FifteenToEighteen != fifteenToEighteen") - return false - } - if poaLoads.TwentyOneToTwentyFour != twentyOneToTwentyFour { - fmt.Println("PoaLoads.TwentyOneToTwentyFour != twentyOneToTwentyFour") - return false - } - return true } diff --git a/go-packages/meep-wais-client/model_all_of_notification_event.go b/go-packages/meep-wais-client/all_of_notification_event.go similarity index 93% rename from go-packages/meep-wais-client/model_all_of_notification_event.go rename to go-packages/meep-wais-client/all_of_notification_event.go index aa7cbffe3..850fa75fa 100644 --- a/go-packages/meep-wais-client/model_all_of_notification_event.go +++ b/go-packages/meep-wais-client/all_of_notification_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/api_unsupported.go b/go-packages/meep-wais-client/api_unsupported.go index c874a063d..f656ee7ae 100644 --- a/go-packages/meep-wais-client/api_unsupported.go +++ b/go-packages/meep-wais-client/api_unsupported.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/api_wai.go b/go-packages/meep-wais-client/api_wai.go index 675860d55..db4c8a3d6 100644 --- a/go-packages/meep-wais-client/api_wai.go +++ b/go-packages/meep-wais-client/api_wai.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/client.go b/go-packages/meep-wais-client/client.go index 9e385d8ef..5fbcda8bb 100644 --- a/go-packages/meep-wais-client/client.go +++ b/go-packages/meep-wais-client/client.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/configuration.go b/go-packages/meep-wais-client/configuration.go index a0298344b..504cd548a 100644 --- a/go-packages/meep-wais-client/configuration.go +++ b/go-packages/meep-wais-client/configuration.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_ap_associated.go b/go-packages/meep-wais-client/model_ap_associated.go index 74dee7e2b..b8908d91c 100644 --- a/go-packages/meep-wais-client/model_ap_associated.go +++ b/go-packages/meep-wais-client/model_ap_associated.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_ap_identity.go b/go-packages/meep-wais-client/model_ap_identity.go index e07460b05..0799229f9 100644 --- a/go-packages/meep-wais-client/model_ap_identity.go +++ b/go-packages/meep-wais-client/model_ap_identity.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_ap_info.go b/go-packages/meep-wais-client/model_ap_info.go index 03efb7083..e6afed03b 100644 --- a/go-packages/meep-wais-client/model_ap_info.go +++ b/go-packages/meep-wais-client/model_ap_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_ap_location.go b/go-packages/meep-wais-client/model_ap_location.go index 087e4ea52..8ce8a936f 100644 --- a/go-packages/meep-wais-client/model_ap_location.go +++ b/go-packages/meep-wais-client/model_ap_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_app_termination_notification.go b/go-packages/meep-wais-client/model_app_termination_notification.go index a56470a0c..0c6c00e36 100644 --- a/go-packages/meep-wais-client/model_app_termination_notification.go +++ b/go-packages/meep-wais-client/model_app_termination_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_app_termination_notification__links.go b/go-packages/meep-wais-client/model_app_termination_notification__links.go index 570335866..8b3c26b98 100644 --- a/go-packages/meep-wais-client/model_app_termination_notification__links.go +++ b/go-packages/meep-wais-client/model_app_termination_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_assoc_sta_notification.go b/go-packages/meep-wais-client/model_assoc_sta_notification.go index f101211b7..461086992 100644 --- a/go-packages/meep-wais-client/model_assoc_sta_notification.go +++ b/go-packages/meep-wais-client/model_assoc_sta_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_assoc_sta_subscription.go b/go-packages/meep-wais-client/model_assoc_sta_subscription.go index 66d85cd2a..2d51e8033 100644 --- a/go-packages/meep-wais-client/model_assoc_sta_subscription.go +++ b/go-packages/meep-wais-client/model_assoc_sta_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_assoc_sta_subscription__links.go b/go-packages/meep-wais-client/model_assoc_sta_subscription__links.go index 0dd6d6a46..778c620d8 100644 --- a/go-packages/meep-wais-client/model_assoc_sta_subscription__links.go +++ b/go-packages/meep-wais-client/model_assoc_sta_subscription__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_assoc_sta_subscription_notification_event.go b/go-packages/meep-wais-client/model_assoc_sta_subscription_notification_event.go index 78ec2f855..a3bda3814 100644 --- a/go-packages/meep-wais-client/model_assoc_sta_subscription_notification_event.go +++ b/go-packages/meep-wais-client/model_assoc_sta_subscription_notification_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_beacon_report.go b/go-packages/meep-wais-client/model_beacon_report.go index 34f47eba4..dbcd9b618 100644 --- a/go-packages/meep-wais-client/model_beacon_report.go +++ b/go-packages/meep-wais-client/model_beacon_report.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_beacon_reporting_config.go b/go-packages/meep-wais-client/model_beacon_reporting_config.go index 11358fa48..1bbc364b4 100644 --- a/go-packages/meep-wais-client/model_beacon_reporting_config.go +++ b/go-packages/meep-wais-client/model_beacon_reporting_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_beacon_request_config.go b/go-packages/meep-wais-client/model_beacon_request_config.go index 880d13536..7d0d12cc6 100644 --- a/go-packages/meep-wais-client/model_beacon_request_config.go +++ b/go-packages/meep-wais-client/model_beacon_request_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_bss_capabilities.go b/go-packages/meep-wais-client/model_bss_capabilities.go index 1f97e8698..76c7c2047 100644 --- a/go-packages/meep-wais-client/model_bss_capabilities.go +++ b/go-packages/meep-wais-client/model_bss_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_bss_load.go b/go-packages/meep-wais-client/model_bss_load.go index f5ebf9086..3b6d4dd8a 100644 --- a/go-packages/meep-wais-client/model_bss_load.go +++ b/go-packages/meep-wais-client/model_bss_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_bssid_info.go b/go-packages/meep-wais-client/model_bssid_info.go index b4d70ceed..c02add22c 100644 --- a/go-packages/meep-wais-client/model_bssid_info.go +++ b/go-packages/meep-wais-client/model_bssid_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_channel_load.go b/go-packages/meep-wais-client/model_channel_load.go index 64f3f35e3..4655ddd36 100644 --- a/go-packages/meep-wais-client/model_channel_load.go +++ b/go-packages/meep-wais-client/model_channel_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_channel_load_config.go b/go-packages/meep-wais-client/model_channel_load_config.go index 7582b5c2e..e791065f9 100644 --- a/go-packages/meep-wais-client/model_channel_load_config.go +++ b/go-packages/meep-wais-client/model_channel_load_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_civic_location.go b/go-packages/meep-wais-client/model_civic_location.go index b88d70472..09f6696d3 100644 --- a/go-packages/meep-wais-client/model_civic_location.go +++ b/go-packages/meep-wais-client/model_civic_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_dmg_capabilities.go b/go-packages/meep-wais-client/model_dmg_capabilities.go index b9f606eda..105726a04 100644 --- a/go-packages/meep-wais-client/model_dmg_capabilities.go +++ b/go-packages/meep-wais-client/model_dmg_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_edmg_capabilities.go b/go-packages/meep-wais-client/model_edmg_capabilities.go index 52f44e8e6..20fde35d5 100644 --- a/go-packages/meep-wais-client/model_edmg_capabilities.go +++ b/go-packages/meep-wais-client/model_edmg_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_expiry_notification.go b/go-packages/meep-wais-client/model_expiry_notification.go index 7d826febc..43395f8e3 100644 --- a/go-packages/meep-wais-client/model_expiry_notification.go +++ b/go-packages/meep-wais-client/model_expiry_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_expiry_notification__links.go b/go-packages/meep-wais-client/model_expiry_notification__links.go index c958f9f92..021755f08 100644 --- a/go-packages/meep-wais-client/model_expiry_notification__links.go +++ b/go-packages/meep-wais-client/model_expiry_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_ext_bss_load.go b/go-packages/meep-wais-client/model_ext_bss_load.go index efd166d28..b3cc5d6b8 100644 --- a/go-packages/meep-wais-client/model_ext_bss_load.go +++ b/go-packages/meep-wais-client/model_ext_bss_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_geo_location.go b/go-packages/meep-wais-client/model_geo_location.go index 58439cbd7..ecba849f0 100644 --- a/go-packages/meep-wais-client/model_geo_location.go +++ b/go-packages/meep-wais-client/model_geo_location.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_he_capabilities.go b/go-packages/meep-wais-client/model_he_capabilities.go index fc0c0a806..05450c857 100644 --- a/go-packages/meep-wais-client/model_he_capabilities.go +++ b/go-packages/meep-wais-client/model_he_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_ht_capabilities.go b/go-packages/meep-wais-client/model_ht_capabilities.go index 7437abe74..56c59d873 100644 --- a/go-packages/meep-wais-client/model_ht_capabilities.go +++ b/go-packages/meep-wais-client/model_ht_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_inline_notification.go b/go-packages/meep-wais-client/model_inline_notification.go index be3ccd19c..a3ce75344 100644 --- a/go-packages/meep-wais-client/model_inline_notification.go +++ b/go-packages/meep-wais-client/model_inline_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_inline_subscription.go b/go-packages/meep-wais-client/model_inline_subscription.go index 079a29faa..c75b30b21 100644 --- a/go-packages/meep-wais-client/model_inline_subscription.go +++ b/go-packages/meep-wais-client/model_inline_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_link_type.go b/go-packages/meep-wais-client/model_link_type.go index e2d27f73b..03210fd0c 100644 --- a/go-packages/meep-wais-client/model_link_type.go +++ b/go-packages/meep-wais-client/model_link_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_config.go b/go-packages/meep-wais-client/model_measurement_config.go index b4b4cb9dc..c408e43b3 100644 --- a/go-packages/meep-wais-client/model_measurement_config.go +++ b/go-packages/meep-wais-client/model_measurement_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_config__links.go b/go-packages/meep-wais-client/model_measurement_config__links.go index cb046e9d6..6b8f59e2b 100644 --- a/go-packages/meep-wais-client/model_measurement_config__links.go +++ b/go-packages/meep-wais-client/model_measurement_config__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_config_link_list.go b/go-packages/meep-wais-client/model_measurement_config_link_list.go index 6c555891d..90ba19f28 100644 --- a/go-packages/meep-wais-client/model_measurement_config_link_list.go +++ b/go-packages/meep-wais-client/model_measurement_config_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_config_link_list_measurement_config.go b/go-packages/meep-wais-client/model_measurement_config_link_list_measurement_config.go index c9ce43739..91c4ee04b 100644 --- a/go-packages/meep-wais-client/model_measurement_config_link_list_measurement_config.go +++ b/go-packages/meep-wais-client/model_measurement_config_link_list_measurement_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_info.go b/go-packages/meep-wais-client/model_measurement_info.go index d5fa05917..3e1c9dee9 100644 --- a/go-packages/meep-wais-client/model_measurement_info.go +++ b/go-packages/meep-wais-client/model_measurement_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_report_notification.go b/go-packages/meep-wais-client/model_measurement_report_notification.go index 7ac2e1d37..992f67372 100644 --- a/go-packages/meep-wais-client/model_measurement_report_notification.go +++ b/go-packages/meep-wais-client/model_measurement_report_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_measurement_report_subscription.go b/go-packages/meep-wais-client/model_measurement_report_subscription.go index 13d732176..4332a626a 100644 --- a/go-packages/meep-wais-client/model_measurement_report_subscription.go +++ b/go-packages/meep-wais-client/model_measurement_report_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_neighbor_report.go b/go-packages/meep-wais-client/model_neighbor_report.go index 3b6e9f79f..6505f5a16 100644 --- a/go-packages/meep-wais-client/model_neighbor_report.go +++ b/go-packages/meep-wais-client/model_neighbor_report.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_neighbor_report_config.go b/go-packages/meep-wais-client/model_neighbor_report_config.go index a9f77b4ba..d89e50524 100644 --- a/go-packages/meep-wais-client/model_neighbor_report_config.go +++ b/go-packages/meep-wais-client/model_neighbor_report_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_o_bss_load.go b/go-packages/meep-wais-client/model_o_bss_load.go index 793c37af7..30443fa54 100644 --- a/go-packages/meep-wais-client/model_o_bss_load.go +++ b/go-packages/meep-wais-client/model_o_bss_load.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_one_of_inline_notification.go b/go-packages/meep-wais-client/model_one_of_inline_notification.go index 0fde2773f..523fea82b 100644 --- a/go-packages/meep-wais-client/model_one_of_inline_notification.go +++ b/go-packages/meep-wais-client/model_one_of_inline_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_one_of_inline_subscription.go b/go-packages/meep-wais-client/model_one_of_inline_subscription.go index 8835dc995..6f5958025 100644 --- a/go-packages/meep-wais-client/model_one_of_inline_subscription.go +++ b/go-packages/meep-wais-client/model_one_of_inline_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_operation_action_type.go b/go-packages/meep-wais-client/model_operation_action_type.go index 0c1b050ab..cc7bff409 100644 --- a/go-packages/meep-wais-client/model_operation_action_type.go +++ b/go-packages/meep-wais-client/model_operation_action_type.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_problem_details.go b/go-packages/meep-wais-client/model_problem_details.go index ce867f364..f9e00a7f4 100644 --- a/go-packages/meep-wais-client/model_problem_details.go +++ b/go-packages/meep-wais-client/model_problem_details.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_reported_beacon_frame_info.go b/go-packages/meep-wais-client/model_reported_beacon_frame_info.go index a09151601..7655325e0 100644 --- a/go-packages/meep-wais-client/model_reported_beacon_frame_info.go +++ b/go-packages/meep-wais-client/model_reported_beacon_frame_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_reporting_reason_qo_s_counters.go b/go-packages/meep-wais-client/model_reporting_reason_qo_s_counters.go index 995464f15..27183826c 100644 --- a/go-packages/meep-wais-client/model_reporting_reason_qo_s_counters.go +++ b/go-packages/meep-wais-client/model_reporting_reason_qo_s_counters.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_reporting_reason_sta_counters.go b/go-packages/meep-wais-client/model_reporting_reason_sta_counters.go index aba8416d3..ab2fd0d6c 100644 --- a/go-packages/meep-wais-client/model_reporting_reason_sta_counters.go +++ b/go-packages/meep-wais-client/model_reporting_reason_sta_counters.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_rssi.go b/go-packages/meep-wais-client/model_rssi.go index c622366cd..eff68f9b5 100644 --- a/go-packages/meep-wais-client/model_rssi.go +++ b/go-packages/meep-wais-client/model_rssi.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_counter_trigger_condition.go b/go-packages/meep-wais-client/model_sta_counter_trigger_condition.go index a37decc80..b42cccf6a 100644 --- a/go-packages/meep-wais-client/model_sta_counter_trigger_condition.go +++ b/go-packages/meep-wais-client/model_sta_counter_trigger_condition.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_data_rate.go b/go-packages/meep-wais-client/model_sta_data_rate.go index b0fb1a3fa..757026231 100644 --- a/go-packages/meep-wais-client/model_sta_data_rate.go +++ b/go-packages/meep-wais-client/model_sta_data_rate.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_data_rate_notification.go b/go-packages/meep-wais-client/model_sta_data_rate_notification.go index bc0b4335b..546aa6ff6 100644 --- a/go-packages/meep-wais-client/model_sta_data_rate_notification.go +++ b/go-packages/meep-wais-client/model_sta_data_rate_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_data_rate_subscription.go b/go-packages/meep-wais-client/model_sta_data_rate_subscription.go index 3ab130d3e..f14a74837 100644 --- a/go-packages/meep-wais-client/model_sta_data_rate_subscription.go +++ b/go-packages/meep-wais-client/model_sta_data_rate_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_data_rate_subscription_notification_event.go b/go-packages/meep-wais-client/model_sta_data_rate_subscription_notification_event.go index 0c64b082b..70334b75b 100644 --- a/go-packages/meep-wais-client/model_sta_data_rate_subscription_notification_event.go +++ b/go-packages/meep-wais-client/model_sta_data_rate_subscription_notification_event.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_identity.go b/go-packages/meep-wais-client/model_sta_identity.go index d91acf1b2..069b08662 100644 --- a/go-packages/meep-wais-client/model_sta_identity.go +++ b/go-packages/meep-wais-client/model_sta_identity.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_info.go b/go-packages/meep-wais-client/model_sta_info.go index 3c1abaf70..2c796f52e 100644 --- a/go-packages/meep-wais-client/model_sta_info.go +++ b/go-packages/meep-wais-client/model_sta_info.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_statistics.go b/go-packages/meep-wais-client/model_sta_statistics.go index 31a93b772..503c23a56 100644 --- a/go-packages/meep-wais-client/model_sta_statistics.go +++ b/go-packages/meep-wais-client/model_sta_statistics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_statistics_config.go b/go-packages/meep-wais-client/model_sta_statistics_config.go index 03c65499c..1b61f1635 100644 --- a/go-packages/meep-wais-client/model_sta_statistics_config.go +++ b/go-packages/meep-wais-client/model_sta_statistics_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_statistics_group2to9_data.go b/go-packages/meep-wais-client/model_sta_statistics_group2to9_data.go index 6799c819e..b0d224f34 100644 --- a/go-packages/meep-wais-client/model_sta_statistics_group2to9_data.go +++ b/go-packages/meep-wais-client/model_sta_statistics_group2to9_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_statistics_group_one_data.go b/go-packages/meep-wais-client/model_sta_statistics_group_one_data.go index 57650be9a..e633468bd 100644 --- a/go-packages/meep-wais-client/model_sta_statistics_group_one_data.go +++ b/go-packages/meep-wais-client/model_sta_statistics_group_one_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_sta_statistics_group_zero_data.go b/go-packages/meep-wais-client/model_sta_statistics_group_zero_data.go index 244ff19ca..7f8e14724 100644 --- a/go-packages/meep-wais-client/model_sta_statistics_group_zero_data.go +++ b/go-packages/meep-wais-client/model_sta_statistics_group_zero_data.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_subscription_link_list.go b/go-packages/meep-wais-client/model_subscription_link_list.go index 4045bd7af..ec46c4749 100644 --- a/go-packages/meep-wais-client/model_subscription_link_list.go +++ b/go-packages/meep-wais-client/model_subscription_link_list.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_subscription_link_list__links.go b/go-packages/meep-wais-client/model_subscription_link_list__links.go index f36153b13..1e0a93b22 100644 --- a/go-packages/meep-wais-client/model_subscription_link_list__links.go +++ b/go-packages/meep-wais-client/model_subscription_link_list__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_subscription_link_list_subscription.go b/go-packages/meep-wais-client/model_subscription_link_list_subscription.go index d9fb1d83f..28402bfbd 100644 --- a/go-packages/meep-wais-client/model_subscription_link_list_subscription.go +++ b/go-packages/meep-wais-client/model_subscription_link_list_subscription.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_test_notification.go b/go-packages/meep-wais-client/model_test_notification.go index ce81ab45d..0baf6e913 100644 --- a/go-packages/meep-wais-client/model_test_notification.go +++ b/go-packages/meep-wais-client/model_test_notification.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_test_notification__links.go b/go-packages/meep-wais-client/model_test_notification__links.go index c62ae3888..649d4682f 100644 --- a/go-packages/meep-wais-client/model_test_notification__links.go +++ b/go-packages/meep-wais-client/model_test_notification__links.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_time_stamp.go b/go-packages/meep-wais-client/model_time_stamp.go index b3afd0050..66592f96b 100644 --- a/go-packages/meep-wais-client/model_time_stamp.go +++ b/go-packages/meep-wais-client/model_time_stamp.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_vht_capabilities.go b/go-packages/meep-wais-client/model_vht_capabilities.go index 45eb9c6de..7d29536c1 100644 --- a/go-packages/meep-wais-client/model_vht_capabilities.go +++ b/go-packages/meep-wais-client/model_vht_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_wan_metrics.go b/go-packages/meep-wais-client/model_wan_metrics.go index f97421420..7c8af30ac 100644 --- a/go-packages/meep-wais-client/model_wan_metrics.go +++ b/go-packages/meep-wais-client/model_wan_metrics.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_websock_notif_config.go b/go-packages/meep-wais-client/model_websock_notif_config.go index acb4c5afd..1a33204d3 100644 --- a/go-packages/meep-wais-client/model_websock_notif_config.go +++ b/go-packages/meep-wais-client/model_websock_notif_config.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/model_wlan_capabilities.go b/go-packages/meep-wais-client/model_wlan_capabilities.go index 49b9b70b7..73f7a6d07 100644 --- a/go-packages/meep-wais-client/model_wlan_capabilities.go +++ b/go-packages/meep-wais-client/model_wlan_capabilities.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-wais-client/response.go b/go-packages/meep-wais-client/response.go index f3640028c..f91dee274 100644 --- a/go-packages/meep-wais-client/response.go +++ b/go-packages/meep-wais-client/response.go @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/go-packages/meep-watchdog/const.go b/go-packages/meep-watchdog/const.go index e46f5e20c..be74638c9 100644 --- a/go-packages/meep-watchdog/const.go +++ b/go-packages/meep-watchdog/const.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-watchdog/pinger.go b/go-packages/meep-watchdog/pinger.go index 0ebe64c4f..f4e73afcd 100644 --- a/go-packages/meep-watchdog/pinger.go +++ b/go-packages/meep-watchdog/pinger.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-watchdog/pinger_test.go b/go-packages/meep-watchdog/pinger_test.go index 63fcba62e..eba49a34b 100644 --- a/go-packages/meep-watchdog/pinger_test.go +++ b/go-packages/meep-watchdog/pinger_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-watchdog/watchdog.go b/go-packages/meep-watchdog/watchdog.go index 01fb1ae73..03245ef18 100644 --- a/go-packages/meep-watchdog/watchdog.go +++ b/go-packages/meep-watchdog/watchdog.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-watchdog/watchdog_test.go b/go-packages/meep-watchdog/watchdog_test.go index dbbd0b59e..6782c6283 100644 --- a/go-packages/meep-watchdog/watchdog_test.go +++ b/go-packages/meep-watchdog/watchdog_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-websocket/3gpp-ws-notif-encoder.go b/go-packages/meep-websocket/3gpp-ws-notif-encoder.go index e28c37ba7..ada4e4891 100644 --- a/go-packages/meep-websocket/3gpp-ws-notif-encoder.go +++ b/go-packages/meep-websocket/3gpp-ws-notif-encoder.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-websocket/3gpp-ws-notif-transport.go b/go-packages/meep-websocket/3gpp-ws-notif-transport.go index 81439e066..0e83182d9 100644 --- a/go-packages/meep-websocket/3gpp-ws-notif-transport.go +++ b/go-packages/meep-websocket/3gpp-ws-notif-transport.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-websocket/util.go b/go-packages/meep-websocket/util.go index c5b850800..bcff90dad 100644 --- a/go-packages/meep-websocket/util.go +++ b/go-packages/meep-websocket/util.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/go-packages/meep-websocket/websocket.go b/go-packages/meep-websocket/websocket.go index 05a27a8e0..4d1f14587 100644 --- a/go-packages/meep-websocket/websocket.go +++ b/go-packages/meep-websocket/websocket.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/js-apps/meep-frontend/package-lock.json b/js-apps/meep-frontend/package-lock.json index 4a00192a6..6fe5ede4c 100644 --- a/js-apps/meep-frontend/package-lock.json +++ b/js-apps/meep-frontend/package-lock.json @@ -917,6 +917,11 @@ "to-fast-properties": "^2.0.0" } }, + "@braintree/sanitize-url": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz", + "integrity": "sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==" + }, "@cnakazawa/watch": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz", @@ -6234,6 +6239,14 @@ "d3-array": "^1.1.1" } }, + "d3-delaunay": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz", + "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==", + "requires": { + "delaunator": "5" + } + }, "d3-dispatch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.5.tgz", @@ -6410,6 +6423,77 @@ "d3-transition": "1" } }, + "dagre": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz", + "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==", + "requires": { + "graphlib": "^2.1.8", + "lodash": "^4.17.15" + } + }, + "dagre-d3": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz", + "integrity": "sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==", + "requires": { + "d3": "^5.14", + "dagre": "^0.8.5", + "graphlib": "^2.1.8", + "lodash": "^4.17.15" + }, + "dependencies": { + "d3": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz", + "integrity": "sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==", + "requires": { + "d3-array": "1", + "d3-axis": "1", + "d3-brush": "1", + "d3-chord": "1", + "d3-collection": "1", + "d3-color": "1", + "d3-contour": "1", + "d3-dispatch": "1", + "d3-drag": "1", + "d3-dsv": "1", + "d3-ease": "1", + "d3-fetch": "1", + "d3-force": "1", + "d3-format": "1", + "d3-geo": "1", + "d3-hierarchy": "1", + "d3-interpolate": "1", + "d3-path": "1", + "d3-polygon": "1", + "d3-quadtree": "1", + "d3-random": "1", + "d3-scale": "2", + "d3-scale-chromatic": "1", + "d3-selection": "1", + "d3-shape": "1", + "d3-time": "1", + "d3-time-format": "2", + "d3-timer": "1", + "d3-transition": "1", + "d3-voronoi": "1", + "d3-zoom": "1" + } + }, + "d3-force": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz", + "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==", + "requires": { + "d3-collection": "1", + "d3-dispatch": "1", + "d3-quadtree": "1", + "d3-timer": "1" + } + } + } + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -6665,6 +6749,14 @@ } } }, + "delaunator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz", + "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==", + "requires": { + "robust-predicates": "^3.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -6832,6 +6924,11 @@ "domelementtype": "1" } }, + "dompurify": { + "version": "2.3.10", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.10.tgz", + "integrity": "sha512-o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g==" + }, "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", @@ -8778,6 +8875,14 @@ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", "dev": true }, + "graphlib": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz", + "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==", + "requires": { + "lodash": "^4.17.15" + } + }, "grid-index": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", @@ -9322,6 +9427,11 @@ "ipaddr.js": "^1.9.0" } }, + "internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==" + }, "interpret": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", @@ -10578,6 +10688,11 @@ "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=" }, + "khroma": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/khroma/-/khroma-2.0.0.tgz", + "integrity": "sha512-2J8rDNlQWbtiNYThZRvmMv5yt44ZakX+Tz5ZIp/mN1pt4snn+m030Va5Z4v8xA0cQFDXBwO/8i42xL4QPsVk3g==" + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -11146,6 +11261,292 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "mermaid": { + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-9.1.6.tgz", + "integrity": "sha512-oBuQk7s55wQgEgH/AK0GYY8U0kBqOIGK9QlJL+VYxh+1kZQtU9tNwoy0gWCfBJDaFIRdfpc/fm9PagaIXg6XFQ==", + "requires": { + "@braintree/sanitize-url": "^6.0.0", + "d3": "^7.0.0", + "dagre": "^0.8.5", + "dagre-d3": "^0.6.4", + "dompurify": "2.3.10", + "graphlib": "^2.1.8", + "khroma": "^2.0.0", + "moment-mini": "2.24.0", + "stylis": "^4.0.10" + }, + "dependencies": { + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + }, + "d3": { + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/d3/-/d3-7.6.1.tgz", + "integrity": "sha512-txMTdIHFbcpLx+8a0IFhZsbp+PfBBPt8yfbmukZTQFroKuFqIwqswF0qE5JXWefylaAVpSXFoKm3yP+jpNLFLw==", + "requires": { + "d3-array": "3", + "d3-axis": "3", + "d3-brush": "3", + "d3-chord": "3", + "d3-color": "3", + "d3-contour": "4", + "d3-delaunay": "6", + "d3-dispatch": "3", + "d3-drag": "3", + "d3-dsv": "3", + "d3-ease": "3", + "d3-fetch": "3", + "d3-force": "3", + "d3-format": "3", + "d3-geo": "3", + "d3-hierarchy": "3", + "d3-interpolate": "3", + "d3-path": "3", + "d3-polygon": "3", + "d3-quadtree": "3", + "d3-random": "3", + "d3-scale": "4", + "d3-scale-chromatic": "3", + "d3-selection": "3", + "d3-shape": "3", + "d3-time": "3", + "d3-time-format": "4", + "d3-timer": "3", + "d3-transition": "3", + "d3-zoom": "3" + } + }, + "d3-array": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.0.tgz", + "integrity": "sha512-3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g==", + "requires": { + "internmap": "1 - 2" + } + }, + "d3-axis": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz", + "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==" + }, + "d3-brush": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz", + "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==", + "requires": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "3", + "d3-transition": "3" + } + }, + "d3-chord": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz", + "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==", + "requires": { + "d3-path": "1 - 3" + } + }, + "d3-color": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==" + }, + "d3-contour": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.0.tgz", + "integrity": "sha512-7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw==", + "requires": { + "d3-array": "^3.2.0" + } + }, + "d3-dispatch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", + "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==" + }, + "d3-drag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz", + "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", + "requires": { + "d3-dispatch": "1 - 3", + "d3-selection": "3" + } + }, + "d3-dsv": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", + "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", + "requires": { + "commander": "7", + "iconv-lite": "0.6", + "rw": "1" + } + }, + "d3-ease": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==" + }, + "d3-fetch": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz", + "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==", + "requires": { + "d3-dsv": "1 - 3" + } + }, + "d3-force": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz", + "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==", + "requires": { + "d3-dispatch": "1 - 3", + "d3-quadtree": "1 - 3", + "d3-timer": "1 - 3" + } + }, + "d3-format": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", + "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==" + }, + "d3-geo": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz", + "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==", + "requires": { + "d3-array": "2.5.0 - 3" + } + }, + "d3-hierarchy": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz", + "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==" + }, + "d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "requires": { + "d3-color": "1 - 3" + } + }, + "d3-path": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz", + "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==" + }, + "d3-polygon": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz", + "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==" + }, + "d3-quadtree": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz", + "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==" + }, + "d3-random": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz", + "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==" + }, + "d3-scale": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", + "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", + "requires": { + "d3-array": "2.10.0 - 3", + "d3-format": "1 - 3", + "d3-interpolate": "1.2.0 - 3", + "d3-time": "2.1.1 - 3", + "d3-time-format": "2 - 4" + } + }, + "d3-scale-chromatic": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz", + "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==", + "requires": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + } + }, + "d3-selection": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz", + "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==" + }, + "d3-shape": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz", + "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==", + "requires": { + "d3-path": "1 - 3" + } + }, + "d3-time": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz", + "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==", + "requires": { + "d3-array": "2 - 3" + } + }, + "d3-time-format": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "requires": { + "d3-time": "1 - 3" + } + }, + "d3-timer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==" + }, + "d3-transition": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz", + "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", + "requires": { + "d3-color": "1 - 3", + "d3-dispatch": "1 - 3", + "d3-ease": "1 - 3", + "d3-interpolate": "1 - 3", + "d3-timer": "1 - 3" + } + }, + "d3-zoom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz", + "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", + "requires": { + "d3-dispatch": "1 - 3", + "d3-drag": "2 - 3", + "d3-interpolate": "1 - 3", + "d3-selection": "2 - 3", + "d3-transition": "2 - 3" + } + }, + "iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } + } + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -11310,6 +11711,11 @@ } } }, + "moment-mini": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.24.0.tgz", + "integrity": "sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==" + }, "moo": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz", @@ -13356,6 +13762,11 @@ } } }, + "react-zoom-pan-pinch": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/react-zoom-pan-pinch/-/react-zoom-pan-pinch-2.1.3.tgz", + "integrity": "sha512-a5AChOWhjo0RmxsNZXGQIlNh3e3nLU6m4V6M+6dlbPNk5d+MtMxgKWyA5zpR06Lp3OZkZVF9nR8JeWSvKwck9g==" + }, "reactcss": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz", @@ -14479,6 +14890,11 @@ } } }, + "robust-predicates": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz", + "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==" + }, "rst-selector-parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz", @@ -15947,6 +16363,11 @@ "schema-utils": "^0.4.5" } }, + "stylis": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.1.tgz", + "integrity": "sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ==" + }, "supercluster": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.0.tgz", diff --git a/js-apps/meep-frontend/package.json b/js-apps/meep-frontend/package.json index 63ce7573e..2c0bf11e4 100644 --- a/js-apps/meep-frontend/package.json +++ b/js-apps/meep-frontend/package.json @@ -8,7 +8,7 @@ "test:verbose": "jest --verbose true", "test:coverage": "jest --verbose true --coverage --colors", "build": "webpack", - "build:dev": "webpack-dev-server --https true --port 8092 --host 10.190.114.150 --env.MEEP_HOST=10.190.114.150" + "build:dev": "webpack-dev-server --https true --port 8092 --host 10.3.16.69 --env.MEEP_HOST=10.3.16.69" }, "author": "", "license": "ISC", @@ -55,6 +55,7 @@ "mapbox-gl-leaflet": "0.0.12", "material-components-web": "0.41.1", "material-design-icons": "3.0.1", + "mermaid": "^9.1.6", "prop-types": "15.6.2", "react": "^16.8.6", "react-autobind": "^1.0.6", @@ -67,6 +68,7 @@ "react-split-pane": "^0.1.87", "react-tooltip": "^3.10.0", "react-virtualized": "^9.21.2", + "react-zoom-pan-pinch": "^2.1.3", "redux": "^4.0.1", "redux-thunk": "^2.3.0", "reselect": "^4.0.0", diff --git a/js-apps/meep-frontend/src/css/meep-controller.scss b/js-apps/meep-frontend/src/css/meep-controller.scss index be59ec52d..ed5ae3994 100755 --- a/js-apps/meep-frontend/src/css/meep-controller.scss +++ b/js-apps/meep-frontend/src/css/meep-controller.scss @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -288,3 +288,8 @@ div.vis-tooltip { .user-icon .material-icons { font-size: 36px; } + +// Mermaid styles +.seq-mermaid svg { + height: auto; +} diff --git a/js-apps/meep-frontend/src/index.html b/js-apps/meep-frontend/src/index.html index b1ecdfb7c..c0b3a40fc 100755 --- a/js-apps/meep-frontend/src/index.html +++ b/js-apps/meep-frontend/src/index.html @@ -1,5 +1,5 @@ Bob"); + } + } + expect(data.dataflowMetricString).to.be.a('string'); + expect(data.dataflowMetricString).to.be(""); + + done(); + }); + */ + // TODO: uncomment and complete method invocation above, then delete this line and the next: + done(); + }); + }); describe('postEventQuery', function() { it('should call postEventQuery successfully', function(done) { // TODO: uncomment, update parameter values for postEventQuery call and complete the assertions @@ -235,6 +292,65 @@ done(); }); }); + describe('postSeqQuery', function() { + it('should call postSeqQuery successfully', function(done) { + // TODO: uncomment, update parameter values for postSeqQuery call and complete the assertions + /* + var params = new AdvantEdgeMetricsServiceRestApi.SeqQueryParams(); + params.tags = [new AdvantEdgeMetricsServiceRestApi.Tag()]; + params.tags[0].name = "src"; + params.tags[0].value = "ue1-iperf"; + params.fields = ["mermaid"]"mermaid"; + params.responseType = "listonly"; + params.scope = new AdvantEdgeMetricsServiceRestApi.Scope(); + params.scope.limit = 60; + params.scope.duration = "10s"; + + instance.postSeqQuery(params, function(error, data, response) { + if (error) { + done(error); + return; + } + // TODO: update response assertions + expect(data).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqMetrics); + expect(data.seqMetricList).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqMetricList); + expect(data.seqMetricList.name).to.be.a('string'); + expect(data.seqMetricList.name).to.be("seq metrics"); + { + let dataCtr = data.seqMetricList.columns; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.seqMetricList.values; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqMetric); + expect(data.time).to.be.a('string'); + expect(data.time).to.be("2019-11-24T12:45:00-5:00"); + expect(data.mermaid).to.be.a('string'); + expect(data.mermaid).to.be("Alice ->> Bob: Hello!"); + expect(data.sdorg).to.be.a('string'); + expect(data.sdorg).to.be("Alice -> Bob: Hello!"); + } + } + expect(data.seqMetricString).to.be.a('string'); + expect(data.seqMetricString).to.be(""); + + done(); + }); + */ + // TODO: uncomment and complete method invocation above, then delete this line and the next: + done(); + }); + }); }); }); diff --git a/js-packages/meep-metrics-engine-client/test/api/SubscriptionsApi.spec.js b/js-packages/meep-metrics-engine-client/test/api/SubscriptionsApi.spec.js index 848034071..0756e4391 100644 --- a/js-packages/meep-metrics-engine-client/test/api/SubscriptionsApi.spec.js +++ b/js-packages/meep-metrics-engine-client/test/api/SubscriptionsApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/DataflowMetric.spec.js b/js-packages/meep-metrics-engine-client/test/model/DataflowMetric.spec.js new file mode 100644 index 000000000..ae2f91f2d --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/DataflowMetric.spec.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('DataflowMetric', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.DataflowMetric(); + }); + + it('should create an instance of DataflowMetric', function() { + // TODO: update the code to test DataflowMetric + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.DataflowMetric); + }); + + it('should have the property time (base name: "time")', function() { + // TODO: update the code to test the property time + expect(instance).to.have.property('time'); + // expect(instance.time).to.be(expectedValueLiteral); + }); + + it('should have the property mermaid (base name: "mermaid")', function() { + // TODO: update the code to test the property mermaid + expect(instance).to.have.property('mermaid'); + // expect(instance.mermaid).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/DataflowMetricList.spec.js b/js-packages/meep-metrics-engine-client/test/model/DataflowMetricList.spec.js new file mode 100644 index 000000000..faf1ad78d --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/DataflowMetricList.spec.js @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('DataflowMetricList', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.DataflowMetricList(); + }); + + it('should create an instance of DataflowMetricList', function() { + // TODO: update the code to test DataflowMetricList + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.DataflowMetricList); + }); + + it('should have the property name (base name: "name")', function() { + // TODO: update the code to test the property name + expect(instance).to.have.property('name'); + // expect(instance.name).to.be(expectedValueLiteral); + }); + + it('should have the property columns (base name: "columns")', function() { + // TODO: update the code to test the property columns + expect(instance).to.have.property('columns'); + // expect(instance.columns).to.be(expectedValueLiteral); + }); + + it('should have the property values (base name: "values")', function() { + // TODO: update the code to test the property values + expect(instance).to.have.property('values'); + // expect(instance.values).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/DataflowMetrics.spec.js b/js-packages/meep-metrics-engine-client/test/model/DataflowMetrics.spec.js new file mode 100644 index 000000000..43faaa089 --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/DataflowMetrics.spec.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('DataflowMetrics', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.DataflowMetrics(); + }); + + it('should create an instance of DataflowMetrics', function() { + // TODO: update the code to test DataflowMetrics + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.DataflowMetrics); + }); + + it('should have the property dataflowMetricList (base name: "dataflowMetricList")', function() { + // TODO: update the code to test the property dataflowMetricList + expect(instance).to.have.property('dataflowMetricList'); + // expect(instance.dataflowMetricList).to.be(expectedValueLiteral); + }); + + it('should have the property dataflowMetricString (base name: "dataflowMetricString")', function() { + // TODO: update the code to test the property dataflowMetricString + expect(instance).to.have.property('dataflowMetricString'); + // expect(instance.dataflowMetricString).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/DataflowQueryParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/DataflowQueryParams.spec.js new file mode 100644 index 000000000..eada99625 --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/DataflowQueryParams.spec.js @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('DataflowQueryParams', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.DataflowQueryParams(); + }); + + it('should create an instance of DataflowQueryParams', function() { + // TODO: update the code to test DataflowQueryParams + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.DataflowQueryParams); + }); + + it('should have the property tags (base name: "tags")', function() { + // TODO: update the code to test the property tags + expect(instance).to.have.property('tags'); + // expect(instance.tags).to.be(expectedValueLiteral); + }); + + it('should have the property scope (base name: "scope")', function() { + // TODO: update the code to test the property scope + expect(instance).to.have.property('scope'); + // expect(instance.scope).to.be(expectedValueLiteral); + }); + + it('should have the property fields (base name: "fields")', function() { + // TODO: update the code to test the property fields + expect(instance).to.have.property('fields'); + // expect(instance.fields).to.be(expectedValueLiteral); + }); + + it('should have the property responseType (base name: "responseType")', function() { + // TODO: update the code to test the property responseType + expect(instance).to.have.property('responseType'); + // expect(instance.responseType).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/EventMetric.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventMetric.spec.js index 4017d6429..8a50d00ce 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventMetric.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventMetric.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/EventMetricList.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventMetricList.spec.js index ad87c03f5..6e54ce596 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventMetricList.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventMetricList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/EventQueryParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventQueryParams.spec.js index ce71b2684..b6108a394 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventQueryParams.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventQueryParams.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/EventSubscription.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventSubscription.spec.js index dfe56ea4e..5e97b99d1 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventSubscription.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventSubscription.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionList.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionList.spec.js index b2bee0afd..0ca905cab 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionList.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionParams.spec.js index 4d931117f..18317b4c9 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionParams.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventSubscriptionParams.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/EventsCallbackReference.spec.js b/js-packages/meep-metrics-engine-client/test/model/EventsCallbackReference.spec.js index e42500584..0c4e9a4e6 100644 --- a/js-packages/meep-metrics-engine-client/test/model/EventsCallbackReference.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/EventsCallbackReference.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/HttpMetric.spec.js b/js-packages/meep-metrics-engine-client/test/model/HttpMetric.spec.js index ed14f2de4..2bfb5f1c8 100644 --- a/js-packages/meep-metrics-engine-client/test/model/HttpMetric.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/HttpMetric.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/HttpMetricList.spec.js b/js-packages/meep-metrics-engine-client/test/model/HttpMetricList.spec.js index 4b788bf68..efd1addba 100644 --- a/js-packages/meep-metrics-engine-client/test/model/HttpMetricList.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/HttpMetricList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/HttpQueryParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/HttpQueryParams.spec.js index 59f1b6c3e..3b5159f5b 100644 --- a/js-packages/meep-metrics-engine-client/test/model/HttpQueryParams.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/HttpQueryParams.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkCallbackReference.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkCallbackReference.spec.js index 6c07f7a53..15d3e7ea1 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkCallbackReference.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkCallbackReference.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkMetric.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkMetric.spec.js index 1a695a48e..47f565a5d 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkMetric.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkMetric.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkMetricList.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkMetricList.spec.js index 2e2757f5e..3904ac770 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkMetricList.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkMetricList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkQueryParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkQueryParams.spec.js index e19febb13..52a4a39d2 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkQueryParams.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkQueryParams.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkSubscription.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkSubscription.spec.js index 9df96d9bf..ccb7a461c 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkSubscription.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkSubscription.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionList.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionList.spec.js index cf69f3900..c9f59a13e 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionList.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionParams.spec.js index 88e24d1bf..70a4191b1 100644 --- a/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionParams.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/NetworkSubscriptionParams.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/Scope.spec.js b/js-packages/meep-metrics-engine-client/test/model/Scope.spec.js index e2c9c0ca5..0645b5c1d 100644 --- a/js-packages/meep-metrics-engine-client/test/model/Scope.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/Scope.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-metrics-engine-client/test/model/SeqMetric.spec.js b/js-packages/meep-metrics-engine-client/test/model/SeqMetric.spec.js new file mode 100644 index 000000000..8731627d3 --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/SeqMetric.spec.js @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('SeqMetric', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.SeqMetric(); + }); + + it('should create an instance of SeqMetric', function() { + // TODO: update the code to test SeqMetric + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqMetric); + }); + + it('should have the property time (base name: "time")', function() { + // TODO: update the code to test the property time + expect(instance).to.have.property('time'); + // expect(instance.time).to.be(expectedValueLiteral); + }); + + it('should have the property mermaid (base name: "mermaid")', function() { + // TODO: update the code to test the property mermaid + expect(instance).to.have.property('mermaid'); + // expect(instance.mermaid).to.be(expectedValueLiteral); + }); + + it('should have the property sdorg (base name: "sdorg")', function() { + // TODO: update the code to test the property sdorg + expect(instance).to.have.property('sdorg'); + // expect(instance.sdorg).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/SeqMetricList.spec.js b/js-packages/meep-metrics-engine-client/test/model/SeqMetricList.spec.js new file mode 100644 index 000000000..fdd2fa5bf --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/SeqMetricList.spec.js @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('SeqMetricList', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.SeqMetricList(); + }); + + it('should create an instance of SeqMetricList', function() { + // TODO: update the code to test SeqMetricList + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqMetricList); + }); + + it('should have the property name (base name: "name")', function() { + // TODO: update the code to test the property name + expect(instance).to.have.property('name'); + // expect(instance.name).to.be(expectedValueLiteral); + }); + + it('should have the property columns (base name: "columns")', function() { + // TODO: update the code to test the property columns + expect(instance).to.have.property('columns'); + // expect(instance.columns).to.be(expectedValueLiteral); + }); + + it('should have the property values (base name: "values")', function() { + // TODO: update the code to test the property values + expect(instance).to.have.property('values'); + // expect(instance.values).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/SeqMetrics.spec.js b/js-packages/meep-metrics-engine-client/test/model/SeqMetrics.spec.js new file mode 100644 index 000000000..cdbbb600b --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/SeqMetrics.spec.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('SeqMetrics', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.SeqMetrics(); + }); + + it('should create an instance of SeqMetrics', function() { + // TODO: update the code to test SeqMetrics + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqMetrics); + }); + + it('should have the property seqMetricList (base name: "seqMetricList")', function() { + // TODO: update the code to test the property seqMetricList + expect(instance).to.have.property('seqMetricList'); + // expect(instance.seqMetricList).to.be(expectedValueLiteral); + }); + + it('should have the property seqMetricString (base name: "seqMetricString")', function() { + // TODO: update the code to test the property seqMetricString + expect(instance).to.have.property('seqMetricString'); + // expect(instance.seqMetricString).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/SeqQueryParams.spec.js b/js-packages/meep-metrics-engine-client/test/model/SeqQueryParams.spec.js new file mode 100644 index 000000000..42f5c00b3 --- /dev/null +++ b/js-packages/meep-metrics-engine-client/test/model/SeqQueryParams.spec.js @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Metrics Service REST API + * Metrics Service provides metrics about the active scenario

    **Micro-service**
    [meep-metrics-engine](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-metrics-engine)

    **Type & Usage**
    Platform Service used by control/monitoring software and possibly by edge applications that require metrics

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeMetricsServiceRestApi); + } +}(this, function(expect, AdvantEdgeMetricsServiceRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('SeqQueryParams', function() { + beforeEach(function() { + instance = new AdvantEdgeMetricsServiceRestApi.SeqQueryParams(); + }); + + it('should create an instance of SeqQueryParams', function() { + // TODO: update the code to test SeqQueryParams + expect(instance).to.be.a(AdvantEdgeMetricsServiceRestApi.SeqQueryParams); + }); + + it('should have the property tags (base name: "tags")', function() { + // TODO: update the code to test the property tags + expect(instance).to.have.property('tags'); + // expect(instance.tags).to.be(expectedValueLiteral); + }); + + it('should have the property fields (base name: "fields")', function() { + // TODO: update the code to test the property fields + expect(instance).to.have.property('fields'); + // expect(instance.fields).to.be(expectedValueLiteral); + }); + + it('should have the property responseType (base name: "responseType")', function() { + // TODO: update the code to test the property responseType + expect(instance).to.have.property('responseType'); + // expect(instance.responseType).to.be(expectedValueLiteral); + }); + + it('should have the property scope (base name: "scope")', function() { + // TODO: update the code to test the property scope + expect(instance).to.have.property('scope'); + // expect(instance.scope).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-metrics-engine-client/test/model/Tag.spec.js b/js-packages/meep-metrics-engine-client/test/model/Tag.spec.js index bad8f76d6..3823bb90b 100644 --- a/js-packages/meep-metrics-engine-client/test/model/Tag.spec.js +++ b/js-packages/meep-metrics-engine-client/test/model/Tag.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/src/ApiClient.js b/js-packages/meep-mon-engine-client/src/ApiClient.js index 15b73e89c..9c3ebffec 100644 --- a/js-packages/meep-mon-engine-client/src/ApiClient.js +++ b/js-packages/meep-mon-engine-client/src/ApiClient.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/src/api/PodStatesApi.js b/js-packages/meep-mon-engine-client/src/api/PodStatesApi.js index 1df312a7e..56168fe22 100644 --- a/js-packages/meep-mon-engine-client/src/api/PodStatesApi.js +++ b/js-packages/meep-mon-engine-client/src/api/PodStatesApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/src/index.js b/js-packages/meep-mon-engine-client/src/index.js index d72d71809..22b629092 100644 --- a/js-packages/meep-mon-engine-client/src/index.js +++ b/js-packages/meep-mon-engine-client/src/index.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/src/model/PodStatus.js b/js-packages/meep-mon-engine-client/src/model/PodStatus.js index fb84aaa56..cb1f3952a 100644 --- a/js-packages/meep-mon-engine-client/src/model/PodStatus.js +++ b/js-packages/meep-mon-engine-client/src/model/PodStatus.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/src/model/PodsStatus.js b/js-packages/meep-mon-engine-client/src/model/PodsStatus.js index b1818424a..a7fb0bb0b 100644 --- a/js-packages/meep-mon-engine-client/src/model/PodsStatus.js +++ b/js-packages/meep-mon-engine-client/src/model/PodsStatus.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/test/api/PodStatesApi.spec.js b/js-packages/meep-mon-engine-client/test/api/PodStatesApi.spec.js index 3b1272370..9ce7efefc 100644 --- a/js-packages/meep-mon-engine-client/test/api/PodStatesApi.spec.js +++ b/js-packages/meep-mon-engine-client/test/api/PodStatesApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/test/model/PodStatus.spec.js b/js-packages/meep-mon-engine-client/test/model/PodStatus.spec.js index 9ba807a67..eb18f2ddd 100644 --- a/js-packages/meep-mon-engine-client/test/model/PodStatus.spec.js +++ b/js-packages/meep-mon-engine-client/test/model/PodStatus.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-mon-engine-client/test/model/PodsStatus.spec.js b/js-packages/meep-mon-engine-client/test/model/PodsStatus.spec.js index 62e13be71..efe3d8bd7 100644 --- a/js-packages/meep-mon-engine-client/test/model/PodsStatus.spec.js +++ b/js-packages/meep-mon-engine-client/test/model/PodsStatus.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/README.md b/js-packages/meep-platform-ctrl-client/README.md index 47202bcf1..18bff5a21 100644 --- a/js-packages/meep-platform-ctrl-client/README.md +++ b/js-packages/meep-platform-ctrl-client/README.md @@ -137,6 +137,7 @@ Class | Method | HTTP request | Description - [AdvantEdgePlatformControllerRestApi.CellularPoaConfig](docs/CellularPoaConfig.md) - [AdvantEdgePlatformControllerRestApi.ConnectivityConfig](docs/ConnectivityConfig.md) - [AdvantEdgePlatformControllerRestApi.CpuConfig](docs/CpuConfig.md) + - [AdvantEdgePlatformControllerRestApi.D2dConfig](docs/D2dConfig.md) - [AdvantEdgePlatformControllerRestApi.DNConfig](docs/DNConfig.md) - [AdvantEdgePlatformControllerRestApi.Deployment](docs/Deployment.md) - [AdvantEdgePlatformControllerRestApi.Domain](docs/Domain.md) diff --git a/js-packages/meep-platform-ctrl-client/docs/D2dConfig.md b/js-packages/meep-platform-ctrl-client/docs/D2dConfig.md new file mode 100644 index 000000000..5c11f3aa0 --- /dev/null +++ b/js-packages/meep-platform-ctrl-client/docs/D2dConfig.md @@ -0,0 +1,9 @@ +# AdvantEdgePlatformControllerRestApi.D2dConfig + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**d2dMaxDistance** | **Number** | Maximum distance for D2D. Default distance is 100m | [optional] +**disableD2dViaNetwork** | **Boolean** | Enable-Disable D2D via network. Default value is false | [optional] + + diff --git a/js-packages/meep-platform-ctrl-client/docs/Deployment.md b/js-packages/meep-platform-ctrl-client/docs/Deployment.md index aa449dc69..66e90eb02 100644 --- a/js-packages/meep-platform-ctrl-client/docs/Deployment.md +++ b/js-packages/meep-platform-ctrl-client/docs/Deployment.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **netChar** | [**NetworkCharacteristics**](NetworkCharacteristics.md) | | [optional] **connectivity** | [**ConnectivityConfig**](ConnectivityConfig.md) | | [optional] +**d2d** | [**D2dConfig**](D2dConfig.md) | | [optional] **interDomainLatency** | **Number** | **DEPRECATED** As of release 1.5.0, replaced by netChar latency | [optional] **interDomainLatencyVariation** | **Number** | **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation | [optional] **interDomainThroughput** | **Number** | **DEPRECATED** As of release 1.5.0, replaced by netChar throughputUl and throughputDl | [optional] diff --git a/js-packages/meep-platform-ctrl-client/docs/GeoData.md b/js-packages/meep-platform-ctrl-client/docs/GeoData.md index a43cc1691..b84f9284c 100644 --- a/js-packages/meep-platform-ctrl-client/docs/GeoData.md +++ b/js-packages/meep-platform-ctrl-client/docs/GeoData.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **path** | [**LineString**](LineString.md) | | [optional] **eopMode** | **String** | End-of-Path mode:

  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path | [optional] **velocity** | **Number** | Speed of movement along path in m/s | [optional] +**d2dInRange** | **[String]** | | [optional] +**poaInRange** | **[String]** | | [optional] diff --git a/js-packages/meep-platform-ctrl-client/src/ApiClient.js b/js-packages/meep-platform-ctrl-client/src/ApiClient.js index 12ac4fc33..1dca7ae94 100644 --- a/js-packages/meep-platform-ctrl-client/src/ApiClient.js +++ b/js-packages/meep-platform-ctrl-client/src/ApiClient.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/api/SandboxControlApi.js b/js-packages/meep-platform-ctrl-client/src/api/SandboxControlApi.js index cfc25ccb6..4cd3606e9 100644 --- a/js-packages/meep-platform-ctrl-client/src/api/SandboxControlApi.js +++ b/js-packages/meep-platform-ctrl-client/src/api/SandboxControlApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/api/ScenarioConfigurationApi.js b/js-packages/meep-platform-ctrl-client/src/api/ScenarioConfigurationApi.js index e004f6c7a..d30a1fc8b 100644 --- a/js-packages/meep-platform-ctrl-client/src/api/ScenarioConfigurationApi.js +++ b/js-packages/meep-platform-ctrl-client/src/api/ScenarioConfigurationApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/index.js b/js-packages/meep-platform-ctrl-client/src/index.js index 1aedf4485..4b6d40c53 100644 --- a/js-packages/meep-platform-ctrl-client/src/index.js +++ b/js-packages/meep-platform-ctrl-client/src/index.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,12 +31,12 @@ (function(factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient', 'model/CellularDomainConfig', 'model/CellularPoaConfig', 'model/ConnectivityConfig', 'model/CpuConfig', 'model/DNConfig', 'model/Deployment', 'model/Domain', 'model/EgressService', 'model/ExternalConfig', 'model/GeoData', 'model/GpuConfig', 'model/IngressService', 'model/LineString', 'model/MemoryConfig', 'model/NetworkCharacteristics', 'model/NetworkLocation', 'model/PhysicalLocation', 'model/Poa4GConfig', 'model/Poa5GConfig', 'model/PoaWifiConfig', 'model/Point', 'model/Process', 'model/Sandbox', 'model/SandboxConfig', 'model/SandboxList', 'model/Scenario', 'model/ScenarioConfig', 'model/ScenarioList', 'model/ServiceConfig', 'model/ServicePort', 'model/Zone', 'api/SandboxControlApi', 'api/ScenarioConfigurationApi'], factory); + define(['ApiClient', 'model/CellularDomainConfig', 'model/CellularPoaConfig', 'model/ConnectivityConfig', 'model/CpuConfig', 'model/D2dConfig', 'model/DNConfig', 'model/Deployment', 'model/Domain', 'model/EgressService', 'model/ExternalConfig', 'model/GeoData', 'model/GpuConfig', 'model/IngressService', 'model/LineString', 'model/MemoryConfig', 'model/NetworkCharacteristics', 'model/NetworkLocation', 'model/PhysicalLocation', 'model/Poa4GConfig', 'model/Poa5GConfig', 'model/PoaWifiConfig', 'model/Point', 'model/Process', 'model/Sandbox', 'model/SandboxConfig', 'model/SandboxList', 'model/Scenario', 'model/ScenarioConfig', 'model/ScenarioList', 'model/ServiceConfig', 'model/ServicePort', 'model/Zone', 'api/SandboxControlApi', 'api/ScenarioConfigurationApi'], factory); } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('./ApiClient'), require('./model/CellularDomainConfig'), require('./model/CellularPoaConfig'), require('./model/ConnectivityConfig'), require('./model/CpuConfig'), require('./model/DNConfig'), require('./model/Deployment'), require('./model/Domain'), require('./model/EgressService'), require('./model/ExternalConfig'), require('./model/GeoData'), require('./model/GpuConfig'), require('./model/IngressService'), require('./model/LineString'), require('./model/MemoryConfig'), require('./model/NetworkCharacteristics'), require('./model/NetworkLocation'), require('./model/PhysicalLocation'), require('./model/Poa4GConfig'), require('./model/Poa5GConfig'), require('./model/PoaWifiConfig'), require('./model/Point'), require('./model/Process'), require('./model/Sandbox'), require('./model/SandboxConfig'), require('./model/SandboxList'), require('./model/Scenario'), require('./model/ScenarioConfig'), require('./model/ScenarioList'), require('./model/ServiceConfig'), require('./model/ServicePort'), require('./model/Zone'), require('./api/SandboxControlApi'), require('./api/ScenarioConfigurationApi')); + module.exports = factory(require('./ApiClient'), require('./model/CellularDomainConfig'), require('./model/CellularPoaConfig'), require('./model/ConnectivityConfig'), require('./model/CpuConfig'), require('./model/D2dConfig'), require('./model/DNConfig'), require('./model/Deployment'), require('./model/Domain'), require('./model/EgressService'), require('./model/ExternalConfig'), require('./model/GeoData'), require('./model/GpuConfig'), require('./model/IngressService'), require('./model/LineString'), require('./model/MemoryConfig'), require('./model/NetworkCharacteristics'), require('./model/NetworkLocation'), require('./model/PhysicalLocation'), require('./model/Poa4GConfig'), require('./model/Poa5GConfig'), require('./model/PoaWifiConfig'), require('./model/Point'), require('./model/Process'), require('./model/Sandbox'), require('./model/SandboxConfig'), require('./model/SandboxList'), require('./model/Scenario'), require('./model/ScenarioConfig'), require('./model/ScenarioList'), require('./model/ServiceConfig'), require('./model/ServicePort'), require('./model/Zone'), require('./api/SandboxControlApi'), require('./api/ScenarioConfigurationApi')); } -}(function(ApiClient, CellularDomainConfig, CellularPoaConfig, ConnectivityConfig, CpuConfig, DNConfig, Deployment, Domain, EgressService, ExternalConfig, GeoData, GpuConfig, IngressService, LineString, MemoryConfig, NetworkCharacteristics, NetworkLocation, PhysicalLocation, Poa4GConfig, Poa5GConfig, PoaWifiConfig, Point, Process, Sandbox, SandboxConfig, SandboxList, Scenario, ScenarioConfig, ScenarioList, ServiceConfig, ServicePort, Zone, SandboxControlApi, ScenarioConfigurationApi) { +}(function(ApiClient, CellularDomainConfig, CellularPoaConfig, ConnectivityConfig, CpuConfig, D2dConfig, DNConfig, Deployment, Domain, EgressService, ExternalConfig, GeoData, GpuConfig, IngressService, LineString, MemoryConfig, NetworkCharacteristics, NetworkLocation, PhysicalLocation, Poa4GConfig, Poa5GConfig, PoaWifiConfig, Point, Process, Sandbox, SandboxConfig, SandboxList, Scenario, ScenarioConfig, ScenarioList, ServiceConfig, ServicePort, Zone, SandboxControlApi, ScenarioConfigurationApi) { 'use strict'; /** @@ -96,6 +96,11 @@ * @property {module:model/CpuConfig} */ CpuConfig: CpuConfig, + /** + * The D2dConfig model constructor. + * @property {module:model/D2dConfig} + */ + D2dConfig: D2dConfig, /** * The DNConfig model constructor. * @property {module:model/DNConfig} diff --git a/js-packages/meep-platform-ctrl-client/src/model/CellularDomainConfig.js b/js-packages/meep-platform-ctrl-client/src/model/CellularDomainConfig.js index 34b8222f4..147750ce9 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/CellularDomainConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/CellularDomainConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/CellularPoaConfig.js b/js-packages/meep-platform-ctrl-client/src/model/CellularPoaConfig.js index 158cc26a3..d2bff145b 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/CellularPoaConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/CellularPoaConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/ConnectivityConfig.js b/js-packages/meep-platform-ctrl-client/src/model/ConnectivityConfig.js index 9b9844df7..53362b8a4 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/ConnectivityConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/ConnectivityConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/CpuConfig.js b/js-packages/meep-platform-ctrl-client/src/model/CpuConfig.js index 3b552904c..621d53a25 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/CpuConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/CpuConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/D2dConfig.js b/js-packages/meep-platform-ctrl-client/src/model/D2dConfig.js new file mode 100644 index 000000000..96d770743 --- /dev/null +++ b/js-packages/meep-platform-ctrl-client/src/model/D2dConfig.js @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Platform Controller REST API + * This API is the main Platform Controller API for scenario configuration & sandbox management

    **Micro-service**
    [meep-pfm-ctrl](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-platform-ctrl)

    **Type & Usage**
    Platform main interface used by controller software to configure scenarios and manage sandboxes in the AdvantEDGE platform

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['ApiClient'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + module.exports = factory(require('../ApiClient')); + } else { + // Browser globals (root is window) + if (!root.AdvantEdgePlatformControllerRestApi) { + root.AdvantEdgePlatformControllerRestApi = {}; + } + root.AdvantEdgePlatformControllerRestApi.D2dConfig = factory(root.AdvantEdgePlatformControllerRestApi.ApiClient); + } +}(this, function(ApiClient) { + 'use strict'; + + /** + * The D2dConfig model module. + * @module model/D2dConfig + * @version 1.0.0 + */ + + /** + * Constructs a new D2dConfig. + * D2D config + * @alias module:model/D2dConfig + * @class + */ + var exports = function() { + }; + + /** + * Constructs a D2dConfig from a plain JavaScript object, optionally creating a new instance. + * Copies all relevant properties from data to obj if supplied or a new instance if not. + * @param {Object} data The plain JavaScript object bearing properties of interest. + * @param {module:model/D2dConfig} obj Optional instance to populate. + * @return {module:model/D2dConfig} The populated D2dConfig instance. + */ + exports.constructFromObject = function(data, obj) { + if (data) { + obj = obj || new exports(); + if (data.hasOwnProperty('d2dMaxDistance')) + obj.d2dMaxDistance = ApiClient.convertToType(data['d2dMaxDistance'], 'Number'); + if (data.hasOwnProperty('disableD2dViaNetwork')) + obj.disableD2dViaNetwork = ApiClient.convertToType(data['disableD2dViaNetwork'], 'Boolean'); + } + return obj; + } + + /** + * Maximum distance for D2D. Default distance is 100m + * @member {Number} d2dMaxDistance + */ + exports.prototype.d2dMaxDistance = undefined; + + /** + * Enable-Disable D2D via network. Default value is false + * @member {Boolean} disableD2dViaNetwork + */ + exports.prototype.disableD2dViaNetwork = undefined; + + return exports; + +})); diff --git a/js-packages/meep-platform-ctrl-client/src/model/DNConfig.js b/js-packages/meep-platform-ctrl-client/src/model/DNConfig.js index 35eded160..d77fe3582 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/DNConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/DNConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Deployment.js b/js-packages/meep-platform-ctrl-client/src/model/Deployment.js index 290a3f566..b95c9dc86 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Deployment.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Deployment.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,18 +31,18 @@ (function(root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient', 'model/ConnectivityConfig', 'model/Domain', 'model/NetworkCharacteristics'], factory); + define(['ApiClient', 'model/ConnectivityConfig', 'model/D2dConfig', 'model/Domain', 'model/NetworkCharacteristics'], factory); } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient'), require('./ConnectivityConfig'), require('./Domain'), require('./NetworkCharacteristics')); + module.exports = factory(require('../ApiClient'), require('./ConnectivityConfig'), require('./D2dConfig'), require('./Domain'), require('./NetworkCharacteristics')); } else { // Browser globals (root is window) if (!root.AdvantEdgePlatformControllerRestApi) { root.AdvantEdgePlatformControllerRestApi = {}; } - root.AdvantEdgePlatformControllerRestApi.Deployment = factory(root.AdvantEdgePlatformControllerRestApi.ApiClient, root.AdvantEdgePlatformControllerRestApi.ConnectivityConfig, root.AdvantEdgePlatformControllerRestApi.Domain, root.AdvantEdgePlatformControllerRestApi.NetworkCharacteristics); + root.AdvantEdgePlatformControllerRestApi.Deployment = factory(root.AdvantEdgePlatformControllerRestApi.ApiClient, root.AdvantEdgePlatformControllerRestApi.ConnectivityConfig, root.AdvantEdgePlatformControllerRestApi.D2dConfig, root.AdvantEdgePlatformControllerRestApi.Domain, root.AdvantEdgePlatformControllerRestApi.NetworkCharacteristics); } -}(this, function(ApiClient, ConnectivityConfig, Domain, NetworkCharacteristics) { +}(this, function(ApiClient, ConnectivityConfig, D2dConfig, Domain, NetworkCharacteristics) { 'use strict'; /** @@ -74,6 +74,8 @@ obj.netChar = NetworkCharacteristics.constructFromObject(data['netChar']); if (data.hasOwnProperty('connectivity')) obj.connectivity = ConnectivityConfig.constructFromObject(data['connectivity']); + if (data.hasOwnProperty('d2d')) + obj.d2d = D2dConfig.constructFromObject(data['d2d']); if (data.hasOwnProperty('interDomainLatency')) obj.interDomainLatency = ApiClient.convertToType(data['interDomainLatency'], 'Number'); if (data.hasOwnProperty('interDomainLatencyVariation')) @@ -102,6 +104,11 @@ */ exports.prototype.connectivity = undefined; + /** + * @member {module:model/D2dConfig} d2d + */ + exports.prototype.d2d = undefined; + /** * **DEPRECATED** As of release 1.5.0, replaced by netChar latency * @member {Number} interDomainLatency diff --git a/js-packages/meep-platform-ctrl-client/src/model/Domain.js b/js-packages/meep-platform-ctrl-client/src/model/Domain.js index a0b15a196..b55fc565a 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Domain.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Domain.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/EgressService.js b/js-packages/meep-platform-ctrl-client/src/model/EgressService.js index 580702882..53d8549ec 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/EgressService.js +++ b/js-packages/meep-platform-ctrl-client/src/model/EgressService.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/ExternalConfig.js b/js-packages/meep-platform-ctrl-client/src/model/ExternalConfig.js index 95e7caa55..910517a62 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/ExternalConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/ExternalConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/GeoData.js b/js-packages/meep-platform-ctrl-client/src/model/GeoData.js index 95c70876d..dd4c122bc 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/GeoData.js +++ b/js-packages/meep-platform-ctrl-client/src/model/GeoData.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -80,6 +80,10 @@ obj.eopMode = ApiClient.convertToType(data['eopMode'], 'String'); if (data.hasOwnProperty('velocity')) obj.velocity = ApiClient.convertToType(data['velocity'], 'Number'); + if (data.hasOwnProperty('d2dInRange')) + obj.d2dInRange = ApiClient.convertToType(data['d2dInRange'], ['String']); + if (data.hasOwnProperty('poaInRange')) + obj.poaInRange = ApiClient.convertToType(data['poaInRange'], ['String']); } return obj; } @@ -112,6 +116,16 @@ */ exports.prototype.velocity = undefined; + /** + * @member {Array.} d2dInRange + */ + exports.prototype.d2dInRange = undefined; + + /** + * @member {Array.} poaInRange + */ + exports.prototype.poaInRange = undefined; + /** * Allowed values for the eopMode property. diff --git a/js-packages/meep-platform-ctrl-client/src/model/GpuConfig.js b/js-packages/meep-platform-ctrl-client/src/model/GpuConfig.js index aec53d2ec..b2d5dafc6 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/GpuConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/GpuConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/IngressService.js b/js-packages/meep-platform-ctrl-client/src/model/IngressService.js index ed8fb47a0..1d8a187eb 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/IngressService.js +++ b/js-packages/meep-platform-ctrl-client/src/model/IngressService.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/LineString.js b/js-packages/meep-platform-ctrl-client/src/model/LineString.js index 89933de00..5ec2c1e1f 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/LineString.js +++ b/js-packages/meep-platform-ctrl-client/src/model/LineString.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/MemoryConfig.js b/js-packages/meep-platform-ctrl-client/src/model/MemoryConfig.js index d48f455af..d53204a6a 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/MemoryConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/MemoryConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/NetworkCharacteristics.js b/js-packages/meep-platform-ctrl-client/src/model/NetworkCharacteristics.js index edf05db60..1c8c09420 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/NetworkCharacteristics.js +++ b/js-packages/meep-platform-ctrl-client/src/model/NetworkCharacteristics.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/NetworkLocation.js b/js-packages/meep-platform-ctrl-client/src/model/NetworkLocation.js index 5a1a28b01..80813471b 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/NetworkLocation.js +++ b/js-packages/meep-platform-ctrl-client/src/model/NetworkLocation.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/PhysicalLocation.js b/js-packages/meep-platform-ctrl-client/src/model/PhysicalLocation.js index 1b4e2b909..94ff65fc5 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/PhysicalLocation.js +++ b/js-packages/meep-platform-ctrl-client/src/model/PhysicalLocation.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Poa4GConfig.js b/js-packages/meep-platform-ctrl-client/src/model/Poa4GConfig.js index a5ed2a0ef..e5fc012c7 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Poa4GConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Poa4GConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Poa5GConfig.js b/js-packages/meep-platform-ctrl-client/src/model/Poa5GConfig.js index c735d91f3..36dc07152 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Poa5GConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Poa5GConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/PoaWifiConfig.js b/js-packages/meep-platform-ctrl-client/src/model/PoaWifiConfig.js index e63551488..57f1f783b 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/PoaWifiConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/PoaWifiConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Point.js b/js-packages/meep-platform-ctrl-client/src/model/Point.js index 57feffeb9..8dc591883 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Point.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Point.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Process.js b/js-packages/meep-platform-ctrl-client/src/model/Process.js index 88655e274..7780fb447 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Process.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Process.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Sandbox.js b/js-packages/meep-platform-ctrl-client/src/model/Sandbox.js index 5c2923823..e23191261 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Sandbox.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Sandbox.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/SandboxConfig.js b/js-packages/meep-platform-ctrl-client/src/model/SandboxConfig.js index 40d0043fe..2d730dc90 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/SandboxConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/SandboxConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/SandboxList.js b/js-packages/meep-platform-ctrl-client/src/model/SandboxList.js index ae79dae14..d2e433def 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/SandboxList.js +++ b/js-packages/meep-platform-ctrl-client/src/model/SandboxList.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Scenario.js b/js-packages/meep-platform-ctrl-client/src/model/Scenario.js index e825b973c..5f37de19b 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Scenario.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Scenario.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/ScenarioConfig.js b/js-packages/meep-platform-ctrl-client/src/model/ScenarioConfig.js index 291b69217..8f84dc230 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/ScenarioConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/ScenarioConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/ScenarioList.js b/js-packages/meep-platform-ctrl-client/src/model/ScenarioList.js index f61a063bb..b35cbdf7c 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/ScenarioList.js +++ b/js-packages/meep-platform-ctrl-client/src/model/ScenarioList.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/ServiceConfig.js b/js-packages/meep-platform-ctrl-client/src/model/ServiceConfig.js index 26f3f2ecd..3a3f0501c 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/ServiceConfig.js +++ b/js-packages/meep-platform-ctrl-client/src/model/ServiceConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/ServicePort.js b/js-packages/meep-platform-ctrl-client/src/model/ServicePort.js index 1d93ab2df..d5da3daf1 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/ServicePort.js +++ b/js-packages/meep-platform-ctrl-client/src/model/ServicePort.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/src/model/Zone.js b/js-packages/meep-platform-ctrl-client/src/model/Zone.js index 88ff10af3..926085832 100644 --- a/js-packages/meep-platform-ctrl-client/src/model/Zone.js +++ b/js-packages/meep-platform-ctrl-client/src/model/Zone.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/api/SandboxControlApi.spec.js b/js-packages/meep-platform-ctrl-client/test/api/SandboxControlApi.spec.js index f19741a08..eb9b17f8f 100644 --- a/js-packages/meep-platform-ctrl-client/test/api/SandboxControlApi.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/api/SandboxControlApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/api/ScenarioConfigurationApi.spec.js b/js-packages/meep-platform-ctrl-client/test/api/ScenarioConfigurationApi.spec.js index a31840b0d..5eb72b2de 100644 --- a/js-packages/meep-platform-ctrl-client/test/api/ScenarioConfigurationApi.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/api/ScenarioConfigurationApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -74,6 +74,9 @@ scenario.deployment.netChar.packetLoss = 0.0; scenario.deployment.connectivity = new AdvantEdgePlatformControllerRestApi.ConnectivityConfig(); scenario.deployment.connectivity.model = "OPEN"; + scenario.deployment.d2d = new AdvantEdgePlatformControllerRestApi.D2dConfig(); + scenario.deployment.d2d.d2dMaxDistance = ; + scenario.deployment.d2d.disableD2dViaNetwork = false; scenario.deployment.interDomainLatency = 0; scenario.deployment.interDomainLatencyVariation = 0; scenario.deployment.interDomainThroughput = 0; @@ -164,6 +167,8 @@ scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.path.coordinates = [[]]; scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.eopMode = "LOOP"; scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.velocity = ; + scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.d2dInRange = [""]; + scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.poaInRange = [""]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations = [new AdvantEdgePlatformControllerRestApi.PhysicalLocation()]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].id = ""; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].name = ""; @@ -179,6 +184,8 @@ scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.path.coordinates = [[]]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.eopMode = "LOOP"; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.velocity = ; + scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.d2dInRange = [""]; + scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.poaInRange = [""]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].networkLocationsInRange = [""]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].connected = false; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].wireless = false; @@ -354,6 +361,11 @@ expect(data.deployment.connectivity).to.be.a(AdvantEdgePlatformControllerRestApi.ConnectivityConfig); expect(data.deployment.connectivity.model).to.be.a('string'); expect(data.deployment.connectivity.model).to.be("OPEN"); + expect(data.deployment.d2d).to.be.a(AdvantEdgePlatformControllerRestApi.D2dConfig); + expect(data.deployment.d2d.d2dMaxDistance).to.be.a('number'); + expect(data.deployment.d2d.d2dMaxDistance).to.be(); + expect(data.deployment.d2d.disableD2dViaNetwork).to.be.a('boolean'); + expect(data.deployment.d2d.disableD2dViaNetwork).to.be(false); expect(data.deployment.interDomainLatency).to.be.a('number'); expect(data.deployment.interDomainLatency).to.be(0); expect(data.deployment.interDomainLatencyVariation).to.be.a('number'); @@ -618,6 +630,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.physicalLocations; expect(dataCtr).to.be.an(Array); @@ -666,6 +698,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); @@ -951,6 +1003,11 @@ expect(data.deployment.connectivity).to.be.a(AdvantEdgePlatformControllerRestApi.ConnectivityConfig); expect(data.deployment.connectivity.model).to.be.a('string'); expect(data.deployment.connectivity.model).to.be("OPEN"); + expect(data.deployment.d2d).to.be.a(AdvantEdgePlatformControllerRestApi.D2dConfig); + expect(data.deployment.d2d.d2dMaxDistance).to.be.a('number'); + expect(data.deployment.d2d.d2dMaxDistance).to.be(); + expect(data.deployment.d2d.disableD2dViaNetwork).to.be.a('boolean'); + expect(data.deployment.d2d.disableD2dViaNetwork).to.be(false); expect(data.deployment.interDomainLatency).to.be.a('number'); expect(data.deployment.interDomainLatency).to.be(0); expect(data.deployment.interDomainLatencyVariation).to.be.a('number'); @@ -1215,6 +1272,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.physicalLocations; expect(dataCtr).to.be.an(Array); @@ -1263,6 +1340,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); @@ -1523,6 +1620,9 @@ scenario.deployment.netChar.packetLoss = 0.0; scenario.deployment.connectivity = new AdvantEdgePlatformControllerRestApi.ConnectivityConfig(); scenario.deployment.connectivity.model = "OPEN"; + scenario.deployment.d2d = new AdvantEdgePlatformControllerRestApi.D2dConfig(); + scenario.deployment.d2d.d2dMaxDistance = ; + scenario.deployment.d2d.disableD2dViaNetwork = false; scenario.deployment.interDomainLatency = 0; scenario.deployment.interDomainLatencyVariation = 0; scenario.deployment.interDomainThroughput = 0; @@ -1613,6 +1713,8 @@ scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.path.coordinates = [[]]; scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.eopMode = "LOOP"; scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.velocity = ; + scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.d2dInRange = [""]; + scenario.deployment.domains[0].zones[0].networkLocations[0].geoData.poaInRange = [""]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations = [new AdvantEdgePlatformControllerRestApi.PhysicalLocation()]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].id = ""; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].name = ""; @@ -1628,6 +1730,8 @@ scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.path.coordinates = [[]]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.eopMode = "LOOP"; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.velocity = ; + scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.d2dInRange = [""]; + scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].geoData.poaInRange = [""]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].networkLocationsInRange = [""]; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].connected = false; scenario.deployment.domains[0].zones[0].networkLocations[0].physicalLocations[0].wireless = false; diff --git a/js-packages/meep-platform-ctrl-client/test/model/CellularDomainConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/CellularDomainConfig.spec.js index a764f3f00..6baca8d39 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/CellularDomainConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/CellularDomainConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/CellularPoaConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/CellularPoaConfig.spec.js index 187ccf603..da9e1173e 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/CellularPoaConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/CellularPoaConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/ConnectivityConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/ConnectivityConfig.spec.js index 210f6dfc9..5013a53eb 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/ConnectivityConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/ConnectivityConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/CpuConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/CpuConfig.spec.js index 4b7142939..d2720f30d 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/CpuConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/CpuConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/D2dConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/D2dConfig.spec.js new file mode 100644 index 000000000..5db990155 --- /dev/null +++ b/js-packages/meep-platform-ctrl-client/test/model/D2dConfig.spec.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Platform Controller REST API + * This API is the main Platform Controller API for scenario configuration & sandbox management

    **Micro-service**
    [meep-pfm-ctrl](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-platform-ctrl)

    **Type & Usage**
    Platform main interface used by controller software to configure scenarios and manage sandboxes in the AdvantEDGE platform

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgePlatformControllerRestApi); + } +}(this, function(expect, AdvantEdgePlatformControllerRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('D2dConfig', function() { + beforeEach(function() { + instance = new AdvantEdgePlatformControllerRestApi.D2dConfig(); + }); + + it('should create an instance of D2dConfig', function() { + // TODO: update the code to test D2dConfig + expect(instance).to.be.a(AdvantEdgePlatformControllerRestApi.D2dConfig); + }); + + it('should have the property d2dMaxDistance (base name: "d2dMaxDistance")', function() { + // TODO: update the code to test the property d2dMaxDistance + expect(instance).to.have.property('d2dMaxDistance'); + // expect(instance.d2dMaxDistance).to.be(expectedValueLiteral); + }); + + it('should have the property disableD2dViaNetwork (base name: "disableD2dViaNetwork")', function() { + // TODO: update the code to test the property disableD2dViaNetwork + expect(instance).to.have.property('disableD2dViaNetwork'); + // expect(instance.disableD2dViaNetwork).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-platform-ctrl-client/test/model/DNConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/DNConfig.spec.js index 238a00ce9..d92cf26f3 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/DNConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/DNConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Deployment.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Deployment.spec.js index ebf422616..da8aadee0 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Deployment.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Deployment.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -67,6 +67,12 @@ // expect(instance.connectivity).to.be(expectedValueLiteral); }); + it('should have the property d2d (base name: "d2d")', function() { + // TODO: update the code to test the property d2d + expect(instance).to.have.property('d2d'); + // expect(instance.d2d).to.be(expectedValueLiteral); + }); + it('should have the property interDomainLatency (base name: "interDomainLatency")', function() { // TODO: update the code to test the property interDomainLatency expect(instance).to.have.property('interDomainLatency'); diff --git a/js-packages/meep-platform-ctrl-client/test/model/Domain.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Domain.spec.js index 5a936f357..9aafc04d6 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Domain.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Domain.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/EgressService.spec.js b/js-packages/meep-platform-ctrl-client/test/model/EgressService.spec.js index 685529043..4ba9fe218 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/EgressService.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/EgressService.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/ExternalConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/ExternalConfig.spec.js index 22bc38a3b..a3286c071 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/ExternalConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/ExternalConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/GeoData.spec.js b/js-packages/meep-platform-ctrl-client/test/model/GeoData.spec.js index 6e10a1def..a71bcf55c 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/GeoData.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/GeoData.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -85,6 +85,18 @@ // expect(instance.velocity).to.be(expectedValueLiteral); }); + it('should have the property d2dInRange (base name: "d2dInRange")', function() { + // TODO: update the code to test the property d2dInRange + expect(instance).to.have.property('d2dInRange'); + // expect(instance.d2dInRange).to.be(expectedValueLiteral); + }); + + it('should have the property poaInRange (base name: "poaInRange")', function() { + // TODO: update the code to test the property poaInRange + expect(instance).to.have.property('poaInRange'); + // expect(instance.poaInRange).to.be(expectedValueLiteral); + }); + }); }); diff --git a/js-packages/meep-platform-ctrl-client/test/model/GpuConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/GpuConfig.spec.js index 86b36aa0e..bf0a900e9 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/GpuConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/GpuConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/IngressService.spec.js b/js-packages/meep-platform-ctrl-client/test/model/IngressService.spec.js index 406cbdd11..1a59c8c2c 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/IngressService.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/IngressService.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/LineString.spec.js b/js-packages/meep-platform-ctrl-client/test/model/LineString.spec.js index 97abeb8da..6b39aea7e 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/LineString.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/LineString.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/MemoryConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/MemoryConfig.spec.js index cae728891..b6832f782 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/MemoryConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/MemoryConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/NetworkCharacteristics.spec.js b/js-packages/meep-platform-ctrl-client/test/model/NetworkCharacteristics.spec.js index a08d72f97..c6ea193cb 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/NetworkCharacteristics.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/NetworkCharacteristics.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/NetworkLocation.spec.js b/js-packages/meep-platform-ctrl-client/test/model/NetworkLocation.spec.js index e611f9e53..bca2fba3d 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/NetworkLocation.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/NetworkLocation.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/PhysicalLocation.spec.js b/js-packages/meep-platform-ctrl-client/test/model/PhysicalLocation.spec.js index 48a6daaf6..79fc142ba 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/PhysicalLocation.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/PhysicalLocation.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Poa4GConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Poa4GConfig.spec.js index 448001013..b267acbea 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Poa4GConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Poa4GConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Poa5GConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Poa5GConfig.spec.js index 5d199e96e..bd7dda69c 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Poa5GConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Poa5GConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/PoaWifiConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/PoaWifiConfig.spec.js index 087988e86..5923e2d2f 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/PoaWifiConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/PoaWifiConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Point.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Point.spec.js index 66e54c23c..89cdb8086 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Point.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Point.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Process.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Process.spec.js index 1c23f8b79..26b84aa81 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Process.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Process.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Sandbox.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Sandbox.spec.js index 370c8e177..86ee85f50 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Sandbox.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Sandbox.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/SandboxConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/SandboxConfig.spec.js index b5e912e70..db06c59e7 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/SandboxConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/SandboxConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/SandboxList.spec.js b/js-packages/meep-platform-ctrl-client/test/model/SandboxList.spec.js index 0722e7087..504d68971 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/SandboxList.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/SandboxList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Scenario.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Scenario.spec.js index b6283a64d..1cf250f6e 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Scenario.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Scenario.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/ScenarioConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/ScenarioConfig.spec.js index 7ede2e9a9..6239a622b 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/ScenarioConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/ScenarioConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/ScenarioList.spec.js b/js-packages/meep-platform-ctrl-client/test/model/ScenarioList.spec.js index 1818a1628..441e36bce 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/ScenarioList.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/ScenarioList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/ServiceConfig.spec.js b/js-packages/meep-platform-ctrl-client/test/model/ServiceConfig.spec.js index dba5267d1..01f9b02f8 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/ServiceConfig.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/ServiceConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/ServicePort.spec.js b/js-packages/meep-platform-ctrl-client/test/model/ServicePort.spec.js index 28cf6513b..a710e0322 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/ServicePort.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/ServicePort.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-platform-ctrl-client/test/model/Zone.spec.js b/js-packages/meep-platform-ctrl-client/test/model/Zone.spec.js index ce83967dd..e171d26ac 100644 --- a/js-packages/meep-platform-ctrl-client/test/model/Zone.spec.js +++ b/js-packages/meep-platform-ctrl-client/test/model/Zone.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/README.md b/js-packages/meep-sandbox-ctrl-client/README.md index f22e8581f..8b6b0a218 100644 --- a/js-packages/meep-sandbox-ctrl-client/README.md +++ b/js-packages/meep-sandbox-ctrl-client/README.md @@ -159,6 +159,7 @@ Class | Method | HTTP request | Description - [AdvantEdgeSandboxControllerRestApi.CellularPoaConfig](docs/CellularPoaConfig.md) - [AdvantEdgeSandboxControllerRestApi.ConnectivityConfig](docs/ConnectivityConfig.md) - [AdvantEdgeSandboxControllerRestApi.CpuConfig](docs/CpuConfig.md) + - [AdvantEdgeSandboxControllerRestApi.D2dConfig](docs/D2dConfig.md) - [AdvantEdgeSandboxControllerRestApi.DNConfig](docs/DNConfig.md) - [AdvantEdgeSandboxControllerRestApi.Deployment](docs/Deployment.md) - [AdvantEdgeSandboxControllerRestApi.Domain](docs/Domain.md) diff --git a/js-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md b/js-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md new file mode 100644 index 000000000..e3959d961 --- /dev/null +++ b/js-packages/meep-sandbox-ctrl-client/docs/D2dConfig.md @@ -0,0 +1,9 @@ +# AdvantEdgeSandboxControllerRestApi.D2dConfig + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**d2dMaxDistance** | **Number** | Maximum distance for D2D. Default distance is 100m | [optional] +**disableD2dViaNetwork** | **Boolean** | Enable-Disable D2D via network. Default value is false | [optional] + + diff --git a/js-packages/meep-sandbox-ctrl-client/docs/Deployment.md b/js-packages/meep-sandbox-ctrl-client/docs/Deployment.md index bf9f6ad17..e819aa1c5 100644 --- a/js-packages/meep-sandbox-ctrl-client/docs/Deployment.md +++ b/js-packages/meep-sandbox-ctrl-client/docs/Deployment.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **netChar** | [**NetworkCharacteristics**](NetworkCharacteristics.md) | | [optional] **connectivity** | [**ConnectivityConfig**](ConnectivityConfig.md) | | [optional] +**d2d** | [**D2dConfig**](D2dConfig.md) | | [optional] **interDomainLatency** | **Number** | **DEPRECATED** As of release 1.5.0, replaced by netChar latency | [optional] **interDomainLatencyVariation** | **Number** | **DEPRECATED** As of release 1.5.0, replaced by netChar latencyVariation | [optional] **interDomainThroughput** | **Number** | **DEPRECATED** As of release 1.5.0, replaced by netChar throughputUl and throughputDl | [optional] diff --git a/js-packages/meep-sandbox-ctrl-client/docs/GeoData.md b/js-packages/meep-sandbox-ctrl-client/docs/GeoData.md index 99641540a..114d1e3b4 100644 --- a/js-packages/meep-sandbox-ctrl-client/docs/GeoData.md +++ b/js-packages/meep-sandbox-ctrl-client/docs/GeoData.md @@ -8,6 +8,8 @@ Name | Type | Description | Notes **path** | [**LineString**](LineString.md) | | [optional] **eopMode** | **String** | End-of-Path mode:

  • LOOP: When path endpoint is reached, start over from the beginning
  • REVERSE: When path endpoint is reached, return on the reverse path | [optional] **velocity** | **Number** | Speed of movement along path in m/s | [optional] +**d2dInRange** | **[String]** | | [optional] +**poaInRange** | **[String]** | | [optional] diff --git a/js-packages/meep-sandbox-ctrl-client/src/ApiClient.js b/js-packages/meep-sandbox-ctrl-client/src/ApiClient.js index 08d9c86f8..bbbafe233 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/ApiClient.js +++ b/js-packages/meep-sandbox-ctrl-client/src/ApiClient.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/api/ActiveScenarioApi.js b/js-packages/meep-sandbox-ctrl-client/src/api/ActiveScenarioApi.js index a994d664a..89832afa1 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/api/ActiveScenarioApi.js +++ b/js-packages/meep-sandbox-ctrl-client/src/api/ActiveScenarioApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/api/ApplicationsApi.js b/js-packages/meep-sandbox-ctrl-client/src/api/ApplicationsApi.js index 02fd2b010..6cb546490 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/api/ApplicationsApi.js +++ b/js-packages/meep-sandbox-ctrl-client/src/api/ApplicationsApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/api/ConnectivityApi.js b/js-packages/meep-sandbox-ctrl-client/src/api/ConnectivityApi.js index 561750bb3..de59a1265 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/api/ConnectivityApi.js +++ b/js-packages/meep-sandbox-ctrl-client/src/api/ConnectivityApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/api/EventReplayApi.js b/js-packages/meep-sandbox-ctrl-client/src/api/EventReplayApi.js index 93efa6f55..938e3c01f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/api/EventReplayApi.js +++ b/js-packages/meep-sandbox-ctrl-client/src/api/EventReplayApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/api/EventsApi.js b/js-packages/meep-sandbox-ctrl-client/src/api/EventsApi.js index fc4ecd304..1adcdd94f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/api/EventsApi.js +++ b/js-packages/meep-sandbox-ctrl-client/src/api/EventsApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/api/ServicesApi.js b/js-packages/meep-sandbox-ctrl-client/src/api/ServicesApi.js index 794eac71b..c177e24ba 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/api/ServicesApi.js +++ b/js-packages/meep-sandbox-ctrl-client/src/api/ServicesApi.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/index.js b/js-packages/meep-sandbox-ctrl-client/src/index.js index 7ffd7cbc9..c855f360f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/index.js +++ b/js-packages/meep-sandbox-ctrl-client/src/index.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,12 +31,12 @@ (function(factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient', 'model/ActivationInfo', 'model/ApplicationInfo', 'model/CellularDomainConfig', 'model/CellularPoaConfig', 'model/ConnectivityConfig', 'model/CpuConfig', 'model/DNConfig', 'model/Deployment', 'model/Domain', 'model/Domains', 'model/EgressService', 'model/Event', 'model/EventMobility', 'model/EventNetworkCharacteristicsUpdate', 'model/EventPduSession', 'model/EventPoasInRange', 'model/EventScenarioUpdate', 'model/ExternalConfig', 'model/GeoData', 'model/GpuConfig', 'model/IngressService', 'model/LineString', 'model/MemoryConfig', 'model/NetworkCharacteristics', 'model/NetworkLocation', 'model/NetworkLocations', 'model/NodeDataUnion', 'model/NodeServiceMaps', 'model/PDUSession', 'model/PDUSessionInfo', 'model/PDUSessionList', 'model/PhysicalLocation', 'model/PhysicalLocations', 'model/Poa4GConfig', 'model/Poa5GConfig', 'model/PoaWifiConfig', 'model/Point', 'model/Process', 'model/Processes', 'model/Replay', 'model/ReplayEvent', 'model/ReplayFileList', 'model/ReplayInfo', 'model/ReplayStatus', 'model/Scenario', 'model/ScenarioConfig', 'model/ScenarioNode', 'model/ServiceConfig', 'model/ServiceInfo', 'model/ServicePort', 'model/Zone', 'model/Zones', 'api/ActiveScenarioApi', 'api/ApplicationsApi', 'api/ConnectivityApi', 'api/EventReplayApi', 'api/EventsApi', 'api/ServicesApi'], factory); + define(['ApiClient', 'model/ActivationInfo', 'model/ApplicationInfo', 'model/CellularDomainConfig', 'model/CellularPoaConfig', 'model/ConnectivityConfig', 'model/CpuConfig', 'model/D2dConfig', 'model/DNConfig', 'model/Deployment', 'model/Domain', 'model/Domains', 'model/EgressService', 'model/Event', 'model/EventMobility', 'model/EventNetworkCharacteristicsUpdate', 'model/EventPduSession', 'model/EventPoasInRange', 'model/EventScenarioUpdate', 'model/ExternalConfig', 'model/GeoData', 'model/GpuConfig', 'model/IngressService', 'model/LineString', 'model/MemoryConfig', 'model/NetworkCharacteristics', 'model/NetworkLocation', 'model/NetworkLocations', 'model/NodeDataUnion', 'model/NodeServiceMaps', 'model/PDUSession', 'model/PDUSessionInfo', 'model/PDUSessionList', 'model/PhysicalLocation', 'model/PhysicalLocations', 'model/Poa4GConfig', 'model/Poa5GConfig', 'model/PoaWifiConfig', 'model/Point', 'model/Process', 'model/Processes', 'model/Replay', 'model/ReplayEvent', 'model/ReplayFileList', 'model/ReplayInfo', 'model/ReplayStatus', 'model/Scenario', 'model/ScenarioConfig', 'model/ScenarioNode', 'model/ServiceConfig', 'model/ServiceInfo', 'model/ServicePort', 'model/Zone', 'model/Zones', 'api/ActiveScenarioApi', 'api/ApplicationsApi', 'api/ConnectivityApi', 'api/EventReplayApi', 'api/EventsApi', 'api/ServicesApi'], factory); } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('./ApiClient'), require('./model/ActivationInfo'), require('./model/ApplicationInfo'), require('./model/CellularDomainConfig'), require('./model/CellularPoaConfig'), require('./model/ConnectivityConfig'), require('./model/CpuConfig'), require('./model/DNConfig'), require('./model/Deployment'), require('./model/Domain'), require('./model/Domains'), require('./model/EgressService'), require('./model/Event'), require('./model/EventMobility'), require('./model/EventNetworkCharacteristicsUpdate'), require('./model/EventPduSession'), require('./model/EventPoasInRange'), require('./model/EventScenarioUpdate'), require('./model/ExternalConfig'), require('./model/GeoData'), require('./model/GpuConfig'), require('./model/IngressService'), require('./model/LineString'), require('./model/MemoryConfig'), require('./model/NetworkCharacteristics'), require('./model/NetworkLocation'), require('./model/NetworkLocations'), require('./model/NodeDataUnion'), require('./model/NodeServiceMaps'), require('./model/PDUSession'), require('./model/PDUSessionInfo'), require('./model/PDUSessionList'), require('./model/PhysicalLocation'), require('./model/PhysicalLocations'), require('./model/Poa4GConfig'), require('./model/Poa5GConfig'), require('./model/PoaWifiConfig'), require('./model/Point'), require('./model/Process'), require('./model/Processes'), require('./model/Replay'), require('./model/ReplayEvent'), require('./model/ReplayFileList'), require('./model/ReplayInfo'), require('./model/ReplayStatus'), require('./model/Scenario'), require('./model/ScenarioConfig'), require('./model/ScenarioNode'), require('./model/ServiceConfig'), require('./model/ServiceInfo'), require('./model/ServicePort'), require('./model/Zone'), require('./model/Zones'), require('./api/ActiveScenarioApi'), require('./api/ApplicationsApi'), require('./api/ConnectivityApi'), require('./api/EventReplayApi'), require('./api/EventsApi'), require('./api/ServicesApi')); + module.exports = factory(require('./ApiClient'), require('./model/ActivationInfo'), require('./model/ApplicationInfo'), require('./model/CellularDomainConfig'), require('./model/CellularPoaConfig'), require('./model/ConnectivityConfig'), require('./model/CpuConfig'), require('./model/D2dConfig'), require('./model/DNConfig'), require('./model/Deployment'), require('./model/Domain'), require('./model/Domains'), require('./model/EgressService'), require('./model/Event'), require('./model/EventMobility'), require('./model/EventNetworkCharacteristicsUpdate'), require('./model/EventPduSession'), require('./model/EventPoasInRange'), require('./model/EventScenarioUpdate'), require('./model/ExternalConfig'), require('./model/GeoData'), require('./model/GpuConfig'), require('./model/IngressService'), require('./model/LineString'), require('./model/MemoryConfig'), require('./model/NetworkCharacteristics'), require('./model/NetworkLocation'), require('./model/NetworkLocations'), require('./model/NodeDataUnion'), require('./model/NodeServiceMaps'), require('./model/PDUSession'), require('./model/PDUSessionInfo'), require('./model/PDUSessionList'), require('./model/PhysicalLocation'), require('./model/PhysicalLocations'), require('./model/Poa4GConfig'), require('./model/Poa5GConfig'), require('./model/PoaWifiConfig'), require('./model/Point'), require('./model/Process'), require('./model/Processes'), require('./model/Replay'), require('./model/ReplayEvent'), require('./model/ReplayFileList'), require('./model/ReplayInfo'), require('./model/ReplayStatus'), require('./model/Scenario'), require('./model/ScenarioConfig'), require('./model/ScenarioNode'), require('./model/ServiceConfig'), require('./model/ServiceInfo'), require('./model/ServicePort'), require('./model/Zone'), require('./model/Zones'), require('./api/ActiveScenarioApi'), require('./api/ApplicationsApi'), require('./api/ConnectivityApi'), require('./api/EventReplayApi'), require('./api/EventsApi'), require('./api/ServicesApi')); } -}(function(ApiClient, ActivationInfo, ApplicationInfo, CellularDomainConfig, CellularPoaConfig, ConnectivityConfig, CpuConfig, DNConfig, Deployment, Domain, Domains, EgressService, Event, EventMobility, EventNetworkCharacteristicsUpdate, EventPduSession, EventPoasInRange, EventScenarioUpdate, ExternalConfig, GeoData, GpuConfig, IngressService, LineString, MemoryConfig, NetworkCharacteristics, NetworkLocation, NetworkLocations, NodeDataUnion, NodeServiceMaps, PDUSession, PDUSessionInfo, PDUSessionList, PhysicalLocation, PhysicalLocations, Poa4GConfig, Poa5GConfig, PoaWifiConfig, Point, Process, Processes, Replay, ReplayEvent, ReplayFileList, ReplayInfo, ReplayStatus, Scenario, ScenarioConfig, ScenarioNode, ServiceConfig, ServiceInfo, ServicePort, Zone, Zones, ActiveScenarioApi, ApplicationsApi, ConnectivityApi, EventReplayApi, EventsApi, ServicesApi) { +}(function(ApiClient, ActivationInfo, ApplicationInfo, CellularDomainConfig, CellularPoaConfig, ConnectivityConfig, CpuConfig, D2dConfig, DNConfig, Deployment, Domain, Domains, EgressService, Event, EventMobility, EventNetworkCharacteristicsUpdate, EventPduSession, EventPoasInRange, EventScenarioUpdate, ExternalConfig, GeoData, GpuConfig, IngressService, LineString, MemoryConfig, NetworkCharacteristics, NetworkLocation, NetworkLocations, NodeDataUnion, NodeServiceMaps, PDUSession, PDUSessionInfo, PDUSessionList, PhysicalLocation, PhysicalLocations, Poa4GConfig, Poa5GConfig, PoaWifiConfig, Point, Process, Processes, Replay, ReplayEvent, ReplayFileList, ReplayInfo, ReplayStatus, Scenario, ScenarioConfig, ScenarioNode, ServiceConfig, ServiceInfo, ServicePort, Zone, Zones, ActiveScenarioApi, ApplicationsApi, ConnectivityApi, EventReplayApi, EventsApi, ServicesApi) { 'use strict'; /** @@ -106,6 +106,11 @@ * @property {module:model/CpuConfig} */ CpuConfig: CpuConfig, + /** + * The D2dConfig model constructor. + * @property {module:model/D2dConfig} + */ + D2dConfig: D2dConfig, /** * The DNConfig model constructor. * @property {module:model/DNConfig} diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ActivationInfo.js b/js-packages/meep-sandbox-ctrl-client/src/model/ActivationInfo.js index db7f49d51..b31172b95 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ActivationInfo.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ActivationInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ApplicationInfo.js b/js-packages/meep-sandbox-ctrl-client/src/model/ApplicationInfo.js index b853e6bc5..18f78854b 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ApplicationInfo.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ApplicationInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/CellularDomainConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/CellularDomainConfig.js index 82184fe2a..d2ba29566 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/CellularDomainConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/CellularDomainConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/CellularPoaConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/CellularPoaConfig.js index 6ea03522f..9999c50af 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/CellularPoaConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/CellularPoaConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ConnectivityConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/ConnectivityConfig.js index 5fbd5ca0c..797b221c6 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ConnectivityConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ConnectivityConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/CpuConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/CpuConfig.js index 9a725a372..237ef1a83 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/CpuConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/CpuConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/D2dConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/D2dConfig.js new file mode 100644 index 000000000..38f8309d3 --- /dev/null +++ b/js-packages/meep-sandbox-ctrl-client/src/model/D2dConfig.js @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Sandbox Controller REST API + * This API is the main Sandbox Controller API for scenario deployment & event injection

    **Micro-service**
    [meep-sandbox-ctrl](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-sandbox-ctrl)

    **Type & Usage**
    Platform runtime interface to manage active scenarios and inject events in AdvantEDGE platform

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['ApiClient'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + module.exports = factory(require('../ApiClient')); + } else { + // Browser globals (root is window) + if (!root.AdvantEdgeSandboxControllerRestApi) { + root.AdvantEdgeSandboxControllerRestApi = {}; + } + root.AdvantEdgeSandboxControllerRestApi.D2dConfig = factory(root.AdvantEdgeSandboxControllerRestApi.ApiClient); + } +}(this, function(ApiClient) { + 'use strict'; + + /** + * The D2dConfig model module. + * @module model/D2dConfig + * @version 1.0.0 + */ + + /** + * Constructs a new D2dConfig. + * D2D config + * @alias module:model/D2dConfig + * @class + */ + var exports = function() { + }; + + /** + * Constructs a D2dConfig from a plain JavaScript object, optionally creating a new instance. + * Copies all relevant properties from data to obj if supplied or a new instance if not. + * @param {Object} data The plain JavaScript object bearing properties of interest. + * @param {module:model/D2dConfig} obj Optional instance to populate. + * @return {module:model/D2dConfig} The populated D2dConfig instance. + */ + exports.constructFromObject = function(data, obj) { + if (data) { + obj = obj || new exports(); + if (data.hasOwnProperty('d2dMaxDistance')) + obj.d2dMaxDistance = ApiClient.convertToType(data['d2dMaxDistance'], 'Number'); + if (data.hasOwnProperty('disableD2dViaNetwork')) + obj.disableD2dViaNetwork = ApiClient.convertToType(data['disableD2dViaNetwork'], 'Boolean'); + } + return obj; + } + + /** + * Maximum distance for D2D. Default distance is 100m + * @member {Number} d2dMaxDistance + */ + exports.prototype.d2dMaxDistance = undefined; + + /** + * Enable-Disable D2D via network. Default value is false + * @member {Boolean} disableD2dViaNetwork + */ + exports.prototype.disableD2dViaNetwork = undefined; + + return exports; + +})); diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/DNConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/DNConfig.js index 5ae1cd29e..cc05fdd7d 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/DNConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/DNConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Deployment.js b/js-packages/meep-sandbox-ctrl-client/src/model/Deployment.js index 6e12a0642..17db3b213 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Deployment.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Deployment.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,18 +31,18 @@ (function(root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define(['ApiClient', 'model/ConnectivityConfig', 'model/Domain', 'model/NetworkCharacteristics'], factory); + define(['ApiClient', 'model/ConnectivityConfig', 'model/D2dConfig', 'model/Domain', 'model/NetworkCharacteristics'], factory); } else if (typeof module === 'object' && module.exports) { // CommonJS-like environments that support module.exports, like Node. - module.exports = factory(require('../ApiClient'), require('./ConnectivityConfig'), require('./Domain'), require('./NetworkCharacteristics')); + module.exports = factory(require('../ApiClient'), require('./ConnectivityConfig'), require('./D2dConfig'), require('./Domain'), require('./NetworkCharacteristics')); } else { // Browser globals (root is window) if (!root.AdvantEdgeSandboxControllerRestApi) { root.AdvantEdgeSandboxControllerRestApi = {}; } - root.AdvantEdgeSandboxControllerRestApi.Deployment = factory(root.AdvantEdgeSandboxControllerRestApi.ApiClient, root.AdvantEdgeSandboxControllerRestApi.ConnectivityConfig, root.AdvantEdgeSandboxControllerRestApi.Domain, root.AdvantEdgeSandboxControllerRestApi.NetworkCharacteristics); + root.AdvantEdgeSandboxControllerRestApi.Deployment = factory(root.AdvantEdgeSandboxControllerRestApi.ApiClient, root.AdvantEdgeSandboxControllerRestApi.ConnectivityConfig, root.AdvantEdgeSandboxControllerRestApi.D2dConfig, root.AdvantEdgeSandboxControllerRestApi.Domain, root.AdvantEdgeSandboxControllerRestApi.NetworkCharacteristics); } -}(this, function(ApiClient, ConnectivityConfig, Domain, NetworkCharacteristics) { +}(this, function(ApiClient, ConnectivityConfig, D2dConfig, Domain, NetworkCharacteristics) { 'use strict'; /** @@ -74,6 +74,8 @@ obj.netChar = NetworkCharacteristics.constructFromObject(data['netChar']); if (data.hasOwnProperty('connectivity')) obj.connectivity = ConnectivityConfig.constructFromObject(data['connectivity']); + if (data.hasOwnProperty('d2d')) + obj.d2d = D2dConfig.constructFromObject(data['d2d']); if (data.hasOwnProperty('interDomainLatency')) obj.interDomainLatency = ApiClient.convertToType(data['interDomainLatency'], 'Number'); if (data.hasOwnProperty('interDomainLatencyVariation')) @@ -102,6 +104,11 @@ */ exports.prototype.connectivity = undefined; + /** + * @member {module:model/D2dConfig} d2d + */ + exports.prototype.d2d = undefined; + /** * **DEPRECATED** As of release 1.5.0, replaced by netChar latency * @member {Number} interDomainLatency diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Domain.js b/js-packages/meep-sandbox-ctrl-client/src/model/Domain.js index 939c38ddd..cb6fb237b 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Domain.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Domain.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Domains.js b/js-packages/meep-sandbox-ctrl-client/src/model/Domains.js index 418b5ccea..c711154c2 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Domains.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Domains.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/EgressService.js b/js-packages/meep-sandbox-ctrl-client/src/model/EgressService.js index 8a38a54b5..cdb94f411 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/EgressService.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/EgressService.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Event.js b/js-packages/meep-sandbox-ctrl-client/src/model/Event.js index 911224414..a71d38a2f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Event.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Event.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/EventMobility.js b/js-packages/meep-sandbox-ctrl-client/src/model/EventMobility.js index e311143bd..e5a8a1801 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/EventMobility.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/EventMobility.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/EventNetworkCharacteristicsUpdate.js b/js-packages/meep-sandbox-ctrl-client/src/model/EventNetworkCharacteristicsUpdate.js index 9a72589e2..5c3a3a8b0 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/EventNetworkCharacteristicsUpdate.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/EventNetworkCharacteristicsUpdate.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/EventPduSession.js b/js-packages/meep-sandbox-ctrl-client/src/model/EventPduSession.js index 8b7f40b01..88a24a4f1 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/EventPduSession.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/EventPduSession.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/EventPoasInRange.js b/js-packages/meep-sandbox-ctrl-client/src/model/EventPoasInRange.js index 5e743b9e3..2ca03af01 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/EventPoasInRange.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/EventPoasInRange.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/EventScenarioUpdate.js b/js-packages/meep-sandbox-ctrl-client/src/model/EventScenarioUpdate.js index c31ae9704..c7447515b 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/EventScenarioUpdate.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/EventScenarioUpdate.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ExternalConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/ExternalConfig.js index 89fa9ec2d..f5a239db3 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ExternalConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ExternalConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/GeoData.js b/js-packages/meep-sandbox-ctrl-client/src/model/GeoData.js index 10ebb60fe..78e242f70 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/GeoData.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/GeoData.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -80,6 +80,10 @@ obj.eopMode = ApiClient.convertToType(data['eopMode'], 'String'); if (data.hasOwnProperty('velocity')) obj.velocity = ApiClient.convertToType(data['velocity'], 'Number'); + if (data.hasOwnProperty('d2dInRange')) + obj.d2dInRange = ApiClient.convertToType(data['d2dInRange'], ['String']); + if (data.hasOwnProperty('poaInRange')) + obj.poaInRange = ApiClient.convertToType(data['poaInRange'], ['String']); } return obj; } @@ -112,6 +116,16 @@ */ exports.prototype.velocity = undefined; + /** + * @member {Array.} d2dInRange + */ + exports.prototype.d2dInRange = undefined; + + /** + * @member {Array.} poaInRange + */ + exports.prototype.poaInRange = undefined; + /** * Allowed values for the eopMode property. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/GpuConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/GpuConfig.js index 9efdd67cb..2e45f52bb 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/GpuConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/GpuConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/IngressService.js b/js-packages/meep-sandbox-ctrl-client/src/model/IngressService.js index 436270eca..b49d7905b 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/IngressService.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/IngressService.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/LineString.js b/js-packages/meep-sandbox-ctrl-client/src/model/LineString.js index f84ed1a75..65c615cbe 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/LineString.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/LineString.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/MemoryConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/MemoryConfig.js index 98307fafb..371d14f25 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/MemoryConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/MemoryConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/NetworkCharacteristics.js b/js-packages/meep-sandbox-ctrl-client/src/model/NetworkCharacteristics.js index 4877a4b7c..14f1bbe4f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/NetworkCharacteristics.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/NetworkCharacteristics.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocation.js b/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocation.js index 37172e196..ebdf745a9 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocation.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocation.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocations.js b/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocations.js index 1386e5923..4fece94e0 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocations.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/NetworkLocations.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/NodeDataUnion.js b/js-packages/meep-sandbox-ctrl-client/src/model/NodeDataUnion.js index 9639c2529..1bad9e4b4 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/NodeDataUnion.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/NodeDataUnion.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/NodeServiceMaps.js b/js-packages/meep-sandbox-ctrl-client/src/model/NodeServiceMaps.js index 0bd136083..744393630 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/NodeServiceMaps.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/NodeServiceMaps.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/PDUSession.js b/js-packages/meep-sandbox-ctrl-client/src/model/PDUSession.js index 565ec5c55..5eff0879e 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/PDUSession.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/PDUSession.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionInfo.js b/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionInfo.js index 166c9e0b5..f60fa366d 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionInfo.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionList.js b/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionList.js index 11a53d9b8..b592f8856 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionList.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/PDUSessionList.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocation.js b/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocation.js index fe4b68c58..7d51adfaa 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocation.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocation.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocations.js b/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocations.js index 4b64fd3cf..37b7f0a96 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocations.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/PhysicalLocations.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Poa4GConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/Poa4GConfig.js index 9e6cf38d1..fe016e639 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Poa4GConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Poa4GConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Poa5GConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/Poa5GConfig.js index bff21c261..e91bcb662 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Poa5GConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Poa5GConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/PoaWifiConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/PoaWifiConfig.js index b92c660b4..091bf68a3 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/PoaWifiConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/PoaWifiConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Point.js b/js-packages/meep-sandbox-ctrl-client/src/model/Point.js index 4d8fe64e1..0e2dbccf4 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Point.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Point.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Process.js b/js-packages/meep-sandbox-ctrl-client/src/model/Process.js index f8d325b0d..597226367 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Process.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Process.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Processes.js b/js-packages/meep-sandbox-ctrl-client/src/model/Processes.js index bd6b4e91d..3a78fa56f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Processes.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Processes.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Replay.js b/js-packages/meep-sandbox-ctrl-client/src/model/Replay.js index 1557026f8..4ba7bcf17 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Replay.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Replay.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayEvent.js b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayEvent.js index 33dbfe722..c663568bd 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayEvent.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayEvent.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayFileList.js b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayFileList.js index ff0da77c8..e63b4f7b5 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayFileList.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayFileList.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayInfo.js b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayInfo.js index 73117781a..706b0546a 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayInfo.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayStatus.js b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayStatus.js index ac7fd3b03..4ed84b656 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ReplayStatus.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ReplayStatus.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Scenario.js b/js-packages/meep-sandbox-ctrl-client/src/model/Scenario.js index ad9f40ecc..b3a990219 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Scenario.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Scenario.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioConfig.js index 18fd12468..4b7b8f00f 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioNode.js b/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioNode.js index d12516ed1..297e5a2e3 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioNode.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ScenarioNode.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ServiceConfig.js b/js-packages/meep-sandbox-ctrl-client/src/model/ServiceConfig.js index c0058b0b2..9f777d329 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ServiceConfig.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ServiceConfig.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ServiceInfo.js b/js-packages/meep-sandbox-ctrl-client/src/model/ServiceInfo.js index a4974217f..0d41ce60b 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ServiceInfo.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ServiceInfo.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/ServicePort.js b/js-packages/meep-sandbox-ctrl-client/src/model/ServicePort.js index cd111ba55..7cbcb3b1b 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/ServicePort.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/ServicePort.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Zone.js b/js-packages/meep-sandbox-ctrl-client/src/model/Zone.js index e4d25e95f..97bdb5166 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Zone.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Zone.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/src/model/Zones.js b/js-packages/meep-sandbox-ctrl-client/src/model/Zones.js index 6e6841627..daf871fbb 100644 --- a/js-packages/meep-sandbox-ctrl-client/src/model/Zones.js +++ b/js-packages/meep-sandbox-ctrl-client/src/model/Zones.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/api/ActiveScenarioApi.spec.js b/js-packages/meep-sandbox-ctrl-client/test/api/ActiveScenarioApi.spec.js index 41316a2b4..073f5b124 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/api/ActiveScenarioApi.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/api/ActiveScenarioApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -186,6 +186,11 @@ expect(data.deployment.connectivity).to.be.a(AdvantEdgeSandboxControllerRestApi.ConnectivityConfig); expect(data.deployment.connectivity.model).to.be.a('string'); expect(data.deployment.connectivity.model).to.be("OPEN"); + expect(data.deployment.d2d).to.be.a(AdvantEdgeSandboxControllerRestApi.D2dConfig); + expect(data.deployment.d2d.d2dMaxDistance).to.be.a('number'); + expect(data.deployment.d2d.d2dMaxDistance).to.be(); + expect(data.deployment.d2d.disableD2dViaNetwork).to.be.a('boolean'); + expect(data.deployment.d2d.disableD2dViaNetwork).to.be(false); expect(data.deployment.interDomainLatency).to.be.a('number'); expect(data.deployment.interDomainLatency).to.be(0); expect(data.deployment.interDomainLatencyVariation).to.be.a('number'); @@ -450,6 +455,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.physicalLocations; expect(dataCtr).to.be.an(Array); @@ -498,6 +523,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); @@ -992,6 +1037,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.physicalLocations; expect(dataCtr).to.be.an(Array); @@ -1040,6 +1105,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); @@ -1399,6 +1484,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.physicalLocations; expect(dataCtr).to.be.an(Array); @@ -1447,6 +1552,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); @@ -1749,6 +1874,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); @@ -2356,6 +2501,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.physicalLocations; expect(dataCtr).to.be.an(Array); @@ -2404,6 +2569,26 @@ expect(data.geoData.eopMode).to.be("LOOP"); expect(data.geoData.velocity).to.be.a('number'); expect(data.geoData.velocity).to.be(); + { + let dataCtr = data.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.networkLocationsInRange; expect(dataCtr).to.be.an(Array); diff --git a/js-packages/meep-sandbox-ctrl-client/test/api/ApplicationsApi.spec.js b/js-packages/meep-sandbox-ctrl-client/test/api/ApplicationsApi.spec.js index 506dd1d75..c7a27d98f 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/api/ApplicationsApi.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/api/ApplicationsApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/api/ConnectivityApi.spec.js b/js-packages/meep-sandbox-ctrl-client/test/api/ConnectivityApi.spec.js index db24a046d..8ce42dd6d 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/api/ConnectivityApi.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/api/ConnectivityApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/api/EventReplayApi.spec.js b/js-packages/meep-sandbox-ctrl-client/test/api/EventReplayApi.spec.js index 504513476..ba3c7ab7f 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/api/EventReplayApi.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/api/EventReplayApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -99,6 +99,8 @@ replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.path.coordinates = [[]]; replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.eopMode = "LOOP"; replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.velocity = ; + replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.d2dInRange = [""]; + replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.poaInRange = [""]; replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.networkLocationsInRange = [""]; replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.connected = false; replayFile.events[0].event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.wireless = false; @@ -435,6 +437,26 @@ expect(data.event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.eopMode).to.be("LOOP"); expect(data.event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.velocity).to.be.a('number'); expect(data.event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.velocity).to.be(); + { + let dataCtr = data.event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.d2dInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } + { + let dataCtr = data.event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.poaInRange; + expect(dataCtr).to.be.an(Array); + expect(dataCtr).to.not.be.empty(); + for (let p in dataCtr) { + let data = dataCtr[p]; + expect(data).to.be.a('string'); + expect(data).to.be(""); + } + } { let dataCtr = data.event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.networkLocationsInRange; expect(dataCtr).to.be.an(Array); diff --git a/js-packages/meep-sandbox-ctrl-client/test/api/EventsApi.spec.js b/js-packages/meep-sandbox-ctrl-client/test/api/EventsApi.spec.js index a3d2e01a0..3b017e729 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/api/EventsApi.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/api/EventsApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -95,6 +95,8 @@ event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.path.coordinates = [[]]; event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.eopMode = "LOOP"; event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.velocity = ; + event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.d2dInRange = [""]; + event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.geoData.poaInRange = [""]; event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.networkLocationsInRange = [""]; event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.connected = false; event.eventScenarioUpdate.node.nodeDataUnion.physicalLocation.wireless = false; diff --git a/js-packages/meep-sandbox-ctrl-client/test/api/ServicesApi.spec.js b/js-packages/meep-sandbox-ctrl-client/test/api/ServicesApi.spec.js index d630e0abd..740014fcc 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/api/ServicesApi.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/api/ServicesApi.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ActivationInfo.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ActivationInfo.spec.js index 6da7f8a2c..505e4380a 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ActivationInfo.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ActivationInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ApplicationInfo.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ApplicationInfo.spec.js index 71a273c10..84d371e44 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ApplicationInfo.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ApplicationInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/CellularDomainConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/CellularDomainConfig.spec.js index 28e8f454e..a9f45d74a 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/CellularDomainConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/CellularDomainConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/CellularPoaConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/CellularPoaConfig.spec.js index 096a44310..c92cbd0d4 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/CellularPoaConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/CellularPoaConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ConnectivityConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ConnectivityConfig.spec.js index cf312d3fb..92a49478f 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ConnectivityConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ConnectivityConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/CpuConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/CpuConfig.spec.js index 8389f7751..0129cbb43 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/CpuConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/CpuConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/D2dConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/D2dConfig.spec.js new file mode 100644 index 000000000..7ec17d3c4 --- /dev/null +++ b/js-packages/meep-sandbox-ctrl-client/test/model/D2dConfig.spec.js @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2022 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * AdvantEDGE Sandbox Controller REST API + * This API is the main Sandbox Controller API for scenario deployment & event injection

    **Micro-service**
    [meep-sandbox-ctrl](https://github.com/InterDigitalInc/AdvantEDGE/tree/master/go-apps/meep-sandbox-ctrl)

    **Type & Usage**
    Platform runtime interface to manage active scenarios and inject events in AdvantEDGE platform

    **Details**
    API details available at _your-AdvantEDGE-ip-address/api_ + * + * OpenAPI spec version: 1.0.0 + * Contact: AdvantEDGE@InterDigital.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * + * Swagger Codegen version: 2.4.9 + * + * Do not edit the class manually. + * + */ + +(function(root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. + define(['expect.js', '../../src/index'], factory); + } else if (typeof module === 'object' && module.exports) { + // CommonJS-like environments that support module.exports, like Node. + factory(require('expect.js'), require('../../src/index')); + } else { + // Browser globals (root is window) + factory(root.expect, root.AdvantEdgeSandboxControllerRestApi); + } +}(this, function(expect, AdvantEdgeSandboxControllerRestApi) { + 'use strict'; + + var instance; + + describe('(package)', function() { + describe('D2dConfig', function() { + beforeEach(function() { + instance = new AdvantEdgeSandboxControllerRestApi.D2dConfig(); + }); + + it('should create an instance of D2dConfig', function() { + // TODO: update the code to test D2dConfig + expect(instance).to.be.a(AdvantEdgeSandboxControllerRestApi.D2dConfig); + }); + + it('should have the property d2dMaxDistance (base name: "d2dMaxDistance")', function() { + // TODO: update the code to test the property d2dMaxDistance + expect(instance).to.have.property('d2dMaxDistance'); + // expect(instance.d2dMaxDistance).to.be(expectedValueLiteral); + }); + + it('should have the property disableD2dViaNetwork (base name: "disableD2dViaNetwork")', function() { + // TODO: update the code to test the property disableD2dViaNetwork + expect(instance).to.have.property('disableD2dViaNetwork'); + // expect(instance.disableD2dViaNetwork).to.be(expectedValueLiteral); + }); + + }); + }); + +})); diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/DNConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/DNConfig.spec.js index 8aaebf66d..122a5861e 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/DNConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/DNConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Deployment.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Deployment.spec.js index 079f0520e..d6cfd70f4 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Deployment.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Deployment.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -67,6 +67,12 @@ // expect(instance.connectivity).to.be(expectedValueLiteral); }); + it('should have the property d2d (base name: "d2d")', function() { + // TODO: update the code to test the property d2d + expect(instance).to.have.property('d2d'); + // expect(instance.d2d).to.be(expectedValueLiteral); + }); + it('should have the property interDomainLatency (base name: "interDomainLatency")', function() { // TODO: update the code to test the property interDomainLatency expect(instance).to.have.property('interDomainLatency'); diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Domain.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Domain.spec.js index b85378dc1..29d812510 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Domain.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Domain.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Domains.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Domains.spec.js index c26a10b7b..1d517571b 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Domains.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Domains.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/EgressService.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/EgressService.spec.js index 79e0199b6..43ebb318a 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/EgressService.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/EgressService.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Event.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Event.spec.js index 70c5bf930..0c78bbb53 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Event.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Event.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/EventMobility.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/EventMobility.spec.js index fafdac303..51899749a 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/EventMobility.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/EventMobility.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/EventNetworkCharacteristicsUpdate.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/EventNetworkCharacteristicsUpdate.spec.js index 6eedff8d2..f61d37000 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/EventNetworkCharacteristicsUpdate.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/EventNetworkCharacteristicsUpdate.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/EventPduSession.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/EventPduSession.spec.js index 47cbcc51d..b8fb8a6f5 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/EventPduSession.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/EventPduSession.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/EventPoasInRange.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/EventPoasInRange.spec.js index 51f036598..7460a5655 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/EventPoasInRange.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/EventPoasInRange.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/EventScenarioUpdate.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/EventScenarioUpdate.spec.js index ae4aeb726..f9b6062f2 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/EventScenarioUpdate.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/EventScenarioUpdate.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ExternalConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ExternalConfig.spec.js index 377111e89..83fe7a562 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ExternalConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ExternalConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/GeoData.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/GeoData.spec.js index 51e8d3b5a..0a3c1a007 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/GeoData.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/GeoData.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -85,6 +85,18 @@ // expect(instance.velocity).to.be(expectedValueLiteral); }); + it('should have the property d2dInRange (base name: "d2dInRange")', function() { + // TODO: update the code to test the property d2dInRange + expect(instance).to.have.property('d2dInRange'); + // expect(instance.d2dInRange).to.be(expectedValueLiteral); + }); + + it('should have the property poaInRange (base name: "poaInRange")', function() { + // TODO: update the code to test the property poaInRange + expect(instance).to.have.property('poaInRange'); + // expect(instance.poaInRange).to.be(expectedValueLiteral); + }); + }); }); diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/GpuConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/GpuConfig.spec.js index d447bf886..bbc627d02 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/GpuConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/GpuConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/IngressService.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/IngressService.spec.js index 5bbfd2b8c..9c9b33a2c 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/IngressService.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/IngressService.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/LineString.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/LineString.spec.js index db01b5d71..82cc07de5 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/LineString.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/LineString.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/MemoryConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/MemoryConfig.spec.js index a1c65ca9f..9df019fe8 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/MemoryConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/MemoryConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/NetworkCharacteristics.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/NetworkCharacteristics.spec.js index 70d06a3df..bff9d79cb 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/NetworkCharacteristics.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/NetworkCharacteristics.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocation.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocation.spec.js index 2cbaef5b2..b9d362bb3 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocation.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocation.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocations.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocations.spec.js index 48893bdbf..c8e4e1187 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocations.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/NetworkLocations.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/NodeDataUnion.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/NodeDataUnion.spec.js index fda9d2291..b78e5ee58 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/NodeDataUnion.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/NodeDataUnion.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/NodeServiceMaps.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/NodeServiceMaps.spec.js index 217b100a1..bd8968a05 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/NodeServiceMaps.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/NodeServiceMaps.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/PDUSession.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/PDUSession.spec.js index b15fc7a1a..285e220ce 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/PDUSession.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/PDUSession.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionInfo.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionInfo.spec.js index 8abc8eed5..a842b3eb4 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionInfo.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionList.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionList.spec.js index a45bc534f..3da2974f4 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionList.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/PDUSessionList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocation.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocation.spec.js index df3aca412..bcfd4797d 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocation.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocation.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocations.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocations.spec.js index f6a504f90..b3c29847e 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocations.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/PhysicalLocations.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Poa4GConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Poa4GConfig.spec.js index c8d6a8ab8..b503d14fc 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Poa4GConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Poa4GConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Poa5GConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Poa5GConfig.spec.js index d24ab4dc9..900f9da40 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Poa5GConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Poa5GConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/PoaWifiConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/PoaWifiConfig.spec.js index 7d6980315..b3bf446ad 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/PoaWifiConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/PoaWifiConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Point.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Point.spec.js index 2388db8c1..54fad450e 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Point.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Point.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Process.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Process.spec.js index 1ca99cd08..32e6080fc 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Process.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Process.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Processes.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Processes.spec.js index 2613ffcba..c704cc012 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Processes.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Processes.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Replay.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Replay.spec.js index 6b60a834a..174e03f51 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Replay.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Replay.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayEvent.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayEvent.spec.js index 7edab4265..d4cae7f21 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayEvent.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayEvent.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayFileList.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayFileList.spec.js index 1198471f9..f902d9deb 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayFileList.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayFileList.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayInfo.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayInfo.spec.js index ef9351f09..eb9806e83 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayInfo.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayStatus.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayStatus.spec.js index 633f9a10f..a8342142e 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ReplayStatus.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ReplayStatus.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Scenario.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Scenario.spec.js index b3dc9e061..c022aacac 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Scenario.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Scenario.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioConfig.spec.js index 2cbf159ca..28d5893f9 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioNode.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioNode.spec.js index 47290ad85..63cd67b47 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioNode.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ScenarioNode.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ServiceConfig.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ServiceConfig.spec.js index fd9919261..70934c29c 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ServiceConfig.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ServiceConfig.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ServiceInfo.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ServiceInfo.spec.js index 0cee3161d..f000e1687 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ServiceInfo.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ServiceInfo.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/ServicePort.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/ServicePort.spec.js index 7d012d364..27a1af7f4 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/ServicePort.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/ServicePort.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Zone.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Zone.spec.js index c67931e30..afc497ba3 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Zone.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Zone.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/js-packages/meep-sandbox-ctrl-client/test/model/Zones.spec.js b/js-packages/meep-sandbox-ctrl-client/test/model/Zones.spec.js index 9a8f98dd9..5a911397f 100644 --- a/js-packages/meep-sandbox-ctrl-client/test/model/Zones.spec.js +++ b/js-packages/meep-sandbox-ctrl-client/test/model/Zones.spec.js @@ -1,14 +1,14 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 The AdvantEDGE Authors * - * Licensed under the Apache License, Version 2.0 (the \"License\"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an \"AS IS\" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/scripts/K99advantedge b/scripts/K99advantedge old mode 100755 new mode 100644 diff --git a/scripts/build_all.sh b/scripts/build_all.sh old mode 100755 new mode 100644 diff --git a/test/.gitignore b/test/.gitignore index 6619775ab..2b6e3d145 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,5 +1,4 @@ -codecov-*.txt -codecov-*.html +codecov/ cypress/screenshots cypress/videos -coverage \ No newline at end of file +coverage diff --git a/test/cypress/integration/tests/meep-settings-spec.js b/test/cypress/integration/tests/meep-settings-spec.js index 9c1b816c5..9f69e989d 100644 --- a/test/cypress/integration/tests/meep-settings-spec.js +++ b/test/cypress/integration/tests/meep-settings-spec.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/cypress/integration/tests/scenario-cfg-spec.js b/test/cypress/integration/tests/scenario-cfg-spec.js index 7b61aafc9..f83b23d7c 100644 --- a/test/cypress/integration/tests/scenario-cfg-spec.js +++ b/test/cypress/integration/tests/scenario-cfg-spec.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/cypress/integration/tests/scenario-exec-spec-mob-event-demo-app.js b/test/cypress/integration/tests/scenario-exec-spec-mob-event-demo-app.js index ea2a186c0..cc4425cb5 100644 --- a/test/cypress/integration/tests/scenario-exec-spec-mob-event-demo-app.js +++ b/test/cypress/integration/tests/scenario-exec-spec-mob-event-demo-app.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -261,7 +261,7 @@ describe('Scenario Execution', function () { click(meep.EXEC_BTN_NEW_SANDBOX); type(meep.MEEP_DLG_NEW_SANDBOX_NAME, name); click(meep.MEEP_DLG_NEW_SANDBOX, 'Ok'); - cy.wait(15000); + cy.wait(30000); verifyEnabled(meep.EXEC_BTN_NEW_SANDBOX, true); verifyEnabled(meep.EXEC_BTN_DELETE_SANDBOX, true); verifyEnabled(meep.EXEC_BTN_DEPLOY, true); @@ -473,5 +473,3 @@ describe('Scenario Execution', function () { } }); - - diff --git a/test/cypress/integration/tests/scenario-exec-spec.js b/test/cypress/integration/tests/scenario-exec-spec.js index 6f828f7d4..f8c27429a 100644 --- a/test/cypress/integration/tests/scenario-exec-spec.js +++ b/test/cypress/integration/tests/scenario-exec-spec.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -236,7 +236,7 @@ describe('Scenario Execution', function () { click(meep.EXEC_BTN_NEW_SANDBOX); type(meep.MEEP_DLG_NEW_SANDBOX_NAME, name); click(meep.MEEP_DLG_NEW_SANDBOX, 'Ok'); - cy.wait(15000); + cy.wait(30000); verifyEnabled(meep.EXEC_BTN_NEW_SANDBOX, true); verifyEnabled(meep.EXEC_BTN_DELETE_SANDBOX, true); verifyEnabled(meep.EXEC_BTN_DEPLOY, true); @@ -562,5 +562,3 @@ describe('Scenario Execution', function () { } }); - - diff --git a/test/cypress/integration/tests/scenario-monitor-spec.js b/test/cypress/integration/tests/scenario-monitor-spec.js index af04414ec..9cfe841c2 100644 --- a/test/cypress/integration/tests/scenario-monitor-spec.js +++ b/test/cypress/integration/tests/scenario-monitor-spec.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/cypress/integration/util/util.js b/test/cypress/integration/util/util.js index 5a058f2f6..a5b5a017b 100644 --- a/test/cypress/integration/util/util.js +++ b/test/cypress/integration/util/util.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/run-ut.sh b/test/run-ut.sh index 6893d4e96..f43dfb269 100755 --- a/test/run-ut.sh +++ b/test/run-ut.sh @@ -7,11 +7,9 @@ BASEDIR=$(dirname "$SCRIPT") GOAPPS=( meep-loc-serv/server meep-rnis/server - meep-dai/server meep-wais/server meep-ams/server - meep-tm/server - meep-vis/server + #meep-vis/server ) GOPKGS=( @@ -19,7 +17,6 @@ GOPKGS=( meep-gis-asset-mgr meep-vis-traffic-mgr meep-metrics - meep-dai-mgr meep-model meep-mq meep-net-char-mgr @@ -45,6 +42,6 @@ done for app in "${GOAPPS[@]}" ; do echo "+ app: $app" cd $BASEDIR/../go-apps/$app - go test -v -count=1 ./... -cover + go test -count=1 ./... -cover echo "" done diff --git a/test/start-ut-env.sh b/test/start-ut-env.sh index 10067ecb1..1008b14f8 100755 --- a/test/start-ut-env.sh +++ b/test/start-ut-env.sh @@ -1,8 +1,5 @@ #!/bin/bash -#set -e -#set -vx - # Get full path to script directory SCRIPT=$(readlink -f "$0") BASEDIR=$(dirname "$SCRIPT") @@ -41,12 +38,8 @@ helm install meep-ut-postgis --set meepOrigin="ut" --set securityContext.enabled echo "" echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" -echo ">>> Starting meep-gis-asset stub" +echo ">>> Copying Grid Map File" echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" echo "" -cd $BASEDIR -go run ./system_test_http_stub.go > /dev/null 2>&1 & -RESULT=`ps aux | grep "system_test_http_stub" | grep -v grep | awk {'print$2'}` -echo $RESULT -cd - +sudo cp -rf grid_map.yaml /grid_map.yaml diff --git a/test/stop-ut-env.sh b/test/stop-ut-env.sh index d4c944fbb..51d82702d 100755 --- a/test/stop-ut-env.sh +++ b/test/stop-ut-env.sh @@ -1,8 +1,5 @@ #!/bin/bash -#set -e -set -vx - # Get full path to script directory SCRIPT=$(readlink -f "$0") BASEDIR=$(dirname "$SCRIPT") @@ -17,12 +14,8 @@ helm ls --short | grep meep-ut | xargs -L1 helm uninstall echo "" echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" -echo ">>> Stopping meep-gis-asset stub" +echo ">>> Removing Grid Map File" echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" echo "" -PWDX=`ps aux | grep "exe/system_test_http_stub" | grep -v grep | awk {'print$2'}` -if [ ! -z "$PWDX" ] -then - kill $PWDX -fi +sudo rm -rf /grid_map.yaml diff --git a/test/system/app-enablement_test.go b/test/system/app-enablement_test.go index 2f6fdbc73..6bbf295db 100644 --- a/test/system/app-enablement_test.go +++ b/test/system/app-enablement_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -369,8 +369,8 @@ func validateSerAvailabilityNotification(notification *smc.ServiceAvailabilityNo if notification.NotificationType != "SerAvailabilityNotification" { return ("NotificationType of notification not as expected: " + notification.NotificationType + " instead of " + "SerAvailabilityNotification") } - if string(notification.ServiceReferences[0].ChangeType) != expectedChangeType { - return ("ChangeType of notification not as expected: " + string(notification.ServiceReferences[0].ChangeType) + " instead of " + expectedChangeType) + if string(*notification.ServiceReferences[0].ChangeType) != expectedChangeType { + return ("ChangeType of notification not as expected: " + string(*notification.ServiceReferences[0].ChangeType) + " instead of " + expectedChangeType) } return "" } diff --git a/test/system/go.mod b/test/system/go.mod index fa623017f..c3935522b 100644 --- a/test/system/go.mod +++ b/test/system/go.mod @@ -4,27 +4,20 @@ go 1.12 require ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client v0.0.0 - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-dai-client v0.0.0 - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-dai-mgr v0.0.0-00010101000000-000000000000 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-loc-serv-client v0.0.0 - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-20211214133749-f203f7ab4f1c + github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-00010101000000-000000000000 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-platform-ctrl-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0 - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client v0.0.0 github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client v0.0.0 github.com/ghodss/yaml v1.0.0 - github.com/gorilla/handlers v1.4.0 - github.com/gorilla/mux v1.7.4 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v2 v2.2.2 // indirect ) replace ( github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client => ../../go-packages/meep-app-support-client - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-dai-client => ../../go-packages/meep-dai-client - github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-dai-mgr => ../../go-packages/meep-dai-mgr github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client => ../../go-packages/meep-gis-engine-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-loc-serv-client => ../../go-packages/meep-loc-serv-client github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger diff --git a/test/system/go.sum b/test/system/go.sum index 3105c1f1c..1859e1630 100644 --- a/test/system/go.sum +++ b/test/system/go.sum @@ -1,407 +1,40 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/InterDigitalInc/AdvantEDGE v1.8.1 h1:2jZJ/Hu6IDweJifEpbOD8PP9pX03AQlZGNnrhv1Die8= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= -github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/test/system/loc-serv_test.go b/test/system/loc-serv_test.go index 5d4f44305..89b7bc094 100644 --- a/test/system/loc-serv_test.go +++ b/test/system/loc-serv_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/system/loopTest.sh b/test/system/loopTest.sh index 2dfc817ed..e2d6fdfa9 100755 --- a/test/system/loopTest.sh +++ b/test/system/loopTest.sh @@ -1,10 +1,7 @@ #!/bin/bash -#set -e -#set -vx - # This script executes go test X times -export MEEP_HOST_TEST_URL="http://172.29.10.52" +export MEEP_HOST_TEST_URL="http://10.190.115.20" i="0" diff --git a/test/system/rnis_test.go b/test/system/rnis_test.go index c38abc513..2ab128f75 100644 --- a/test/system/rnis_test.go +++ b/test/system/rnis_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 InterDigital Communications, Inc + * Copyright (c) 2022 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. @@ -235,7 +235,7 @@ func Test_RNIS_periodic_nr_5g_5gNei(t *testing.T) { testTrgNCell := rnisClient.NrMeasRepUeNotificationNCell{MeasQuantityResultsSsbCell: &rnisClient.MeasQuantityResultsNr{Rsrp: testTrgServing5GRsrp, Rsrq: testTrgServing5GRsrq}} testTrgServCellMeasInfo := rnisClient.NrMeasRepUeNotificationServCellMeasInfo{Nrcgi: &testTrgServingNrcgi, SCell: &testTrgSCell, NCell: &testTrgNCell} - testTrgNeiNrcgi := "500000003" //not really a nrcgi, its the nrcellid but spec is wrong, so going along + testTrgNeiNrcgi := "500000003" testTrgNei5GRsrp := int32(51) testTrgNei5GRsrq := int32(52) @@ -2064,7 +2064,7 @@ func validateNrMeasRepUeNotification(notification *rnisClient.NrMeasRepUeNotific if expectedNrNeighCellMeasInfo != nil { if notification.NrNeighCellMeasInfo != nil || len(notification.NrNeighCellMeasInfo) > 0 { - if notification.NrNeighCellMeasInfo[0].Nrcgi != expectedNrNeighCellMeasInfo.Nrcgi { + if notification.NrNeighCellMeasInfo[0].Nrcgi.NrcellId != expectedNrNeighCellMeasInfo.Nrcgi.NrcellId { return ("NrNeighCellMeasInfo:Nrcgi of notification not as expected: " + notification.NrNeighCellMeasInfo[0].Nrcgi.NrcellId + " instead of " + expectedNrNeighCellMeasInfo.Nrcgi.NrcellId) } if notification.NrNeighCellMeasInfo[0].MeasQuantityResultsSsbCell.Rsrp != expectedNrNeighCellMeasInfo.MeasQuantityResultsSsbCell.Rsrp { diff --git a/test/system/systemTest.go b/test/system/systemTest.go index 40676f441..4737f231e 100644 --- a/test/system/systemTest.go +++ b/test/system/systemTest.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/system/vis_test.go b/test/system/vis_test.go index 82025a4a9..ff26cad09 100644 --- a/test/system/vis_test.go +++ b/test/system/vis_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 ETSI STF 625 + * Copyright (c) 2022 ETSI STF 625 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/system/wais_test.go b/test/system/wais_test.go index 848a1e97c..8b8bbb5d0 100644 --- a/test/system/wais_test.go +++ b/test/system/wais_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. diff --git a/test/system/zsystemTest_test.go b/test/system/zsystemTest_test.go index 05f10873b..194b5f977 100644 --- a/test/system/zsystemTest_test.go +++ b/test/system/zsystemTest_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 InterDigital Communications, Inc + * Copyright (c) 2022 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. -- GitLab