diff --git a/spec/MicroWaveDeviceInventory+config.json b/spec/MicroWaveDeviceInventory+config.json index 3b4ddadb..fceda715 100644 --- a/spec/MicroWaveDeviceInventory+config.json +++ b/spec/MicroWaveDeviceInventory+config.json @@ -17338,7 +17338,7 @@ { "local-id": "2000", "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_OUTPUT", - "logical-termination-point": "mwdi-1-3-0-op-c-get-es-1-0-0-000" + "logical-termination-point": "mwdi-1-3-0-es-c-es-1-0-0-000" } ] }, diff --git a/spec/MicroWaveDeviceInventory+forwardings.yaml b/spec/MicroWaveDeviceInventory+forwardings.yaml index f7002778..caff110c 100644 --- a/spec/MicroWaveDeviceInventory+forwardings.yaml +++ b/spec/MicroWaveDeviceInventory+forwardings.yaml @@ -1561,8 +1561,8 @@ forwardings: - server-name: /v1/provide-list-of-connected-devices uuid: mwdi-1-3-0-op-s-is-010 consequent-requests: - - client-name: ElasticSearch://?fields=control-construct(uuid) - uuid: mwdi-1-3-0-op-c-get-es-1-0-0-000 + - client-name: ElasticSearch + uuid: mwdi-1-3-0-es-c-es-1-0-0-000 - forwarding-name: RequestForListOfDeviceInterfacesCausesReadingFromCache uuid: mwdi-1-3-0-op-fc-is-021 diff --git a/spec/MicroWaveDeviceInventory.yaml b/spec/MicroWaveDeviceInventory.yaml index 38de95ca..60255ae0 100644 --- a/spec/MicroWaveDeviceInventory.yaml +++ b/spec/MicroWaveDeviceInventory.yaml @@ -1543,8 +1543,9 @@ paths: items: type: string description: > - 'MountName of devices in connected state at the Controller - from {$RequestForListOfConnectedDevicesCausesReadingFromCache.response.body#/core-model-1-4:control-construct/uuid}' + 'MountName of devices in connected state at the Controller, + list of devices in deviceMetadataList with connection-status==connected + from {$RequestForListOfConnectedDevicesCausesReadingFromCache}' example: mount-name-list: - '305251234' @@ -1573,59 +1574,7 @@ paths: $ref: '#/components/responses/responseForErroredServiceRequests' default: $ref: '#/components/responses/responseForErroredServiceRequests' - callbacks: - RequestForListOfConnectedDevicesCausesReadingFromCache: - url: #[/core-model-1-4:control-construct/logical-termination-point=mwdi-1-3-0-tcp-c-es-1-0-0-000/layer-protocol=0/tcp-client-interface-1-0:tcp-client-interface-pac/tcp-client-interface-configuration/remote-protocol]://[/core-model-1-4:control-construct/logical-termination-point=mwdi-1-3-0-tcp-c-es-1-0-0-000/layer-protocol=0/tcp-client-interface-1-0:tcp-client-interface-pac/tcp-client-interface-configuration/remote-address/domain-name or /core-model-1-4:control-construct/logical-termination-point=mwdi-1-3-0-tcp-c-es-1-0-0-000/layer-protocol=0/tcp-client-interface-1-0:tcp-client-interface-pac/tcp-client-interface-configuration/remote-address/ip-address/ipv-4-address]:[/core-model-1-4:control-construct/logical-termination-point=mwdi-1-3-0-tcp-c-es-1-0-0-000/layer-protocol=0/tcp-client-interface-1-0:tcp-client-interface-pac/tcp-client-interface-configuration/remote-port][/core-model-1-4:control-construct/logical-termination-point=mwdi-1-3-0-op-c-get-es-1-0-0-000/layer-protocol=0/operation-client-interface-1-0:operation-client-interface-pac/operation-client-interface-configuration/operation-name] - get: - parameters: - - name: fields - in: query - required: true - schema: - type: string - enum: - - 'control-construct(uuid)' - responses: - '200': - description: 'List of connected devices provided from cache' - content: - application/json: - schema: - type: object - required: - - / - properties: - /: - type: object - required: - - core-model-1-4:control-construct - properties: - core-model-1-4:control-construct: - type: array - items: - type: object - required: - - uuid - properties: - uuid: - type: string - example: - /: - core-model-1-4:control-construct: - - uuid: '305251234' - - uuid: '105258888' - '400': - $ref: '#/components/responses/responseForErroredServiceRequests' - '401': - $ref: '#/components/responses/responseForErroredServiceRequests' - '403': - $ref: '#/components/responses/responseForErroredServiceRequests' - '404': - $ref: '#/components/responses/responseForErroredServiceRequests' - '500': - $ref: '#/components/responses/responseForErroredServiceRequests' - default: - $ref: '#/components/responses/responseForErroredServiceRequests' + /v1/provide-list-of-device-interfaces: parameters: - $ref: '#/components/parameters/user' diff --git a/spec/diagrams/100_ProvideListOfConnectedDevices.plantuml b/spec/diagrams/100_ProvideListOfConnectedDevices.plantuml index e9df5a0e..a21639f3 100644 --- a/spec/diagrams/100_ProvideListOfConnectedDevices.plantuml +++ b/spec/diagrams/100_ProvideListOfConnectedDevices.plantuml @@ -5,12 +5,16 @@ title RequestForListOfConnectedDevicesCausesReadingFromCache participant "external" as requestor participant "MWDI://v1/provide-list-of-connected-devices" as provideListOfConnectedDevices -participant "ElasticSearch://?fields=control-construct(uuid)" as ConnectedDeviceList +participant "ElasticSearch \n(deviceMetadataList)" as ConnectedDeviceList requestor -> provideListOfConnectedDevices: (apiKeyAuth) activate provideListOfConnectedDevices provideListOfConnectedDevices -> ConnectedDeviceList +note over ConnectedDeviceList + filter for devices with + connection-status == connected +end note ConnectedDeviceList --> provideListOfConnectedDevices: {mount-name-list} provideListOfConnectedDevices --> requestor: {mount-name-list} diff --git a/spec/diagrams/100_ProvideListOfConnectedDevices.png b/spec/diagrams/100_ProvideListOfConnectedDevices.png index dacc9a41..c006fc8b 100644 Binary files a/spec/diagrams/100_ProvideListOfConnectedDevices.png and b/spec/diagrams/100_ProvideListOfConnectedDevices.png differ