IOT-576 DevicesList

ClearBlade · rajasd27 · Nov 21, 2022 · Oct 29, 2022 · Oct 29, 2022 · Oct 30, 2022
commit c7ef444e0d296653b1562144735d3e58b35781a7
diff --git a/clearblade/cloud/iot_v1/client.py b/clearblade/cloud/iot_v1/client.py
@@ -48,6 +48,10 @@ def list_device_states(self, request : GetDeviceStatesList):
     def list_device_config_versions(self, request : GetDeviceConfigVersionsList):
         cb_device_manager = ClearBladeDeviceManager()
         return cb_device_manager.getDeviceConfigVersionsList(request=request)
+
+    def list_devices(self, request : ListDevicesRequest):
+        cb_device_manager = ClearBladeDeviceManager()
+        return cb_device_manager.getDevicesList(request=request)
 
 
 class DeviceManagerAsyncClient():
@@ -98,3 +102,7 @@ async def list_device_states(self, request : GetDeviceStatesList):
     async def list_device_config_versions(self, request : GetDeviceConfigVersionsList):
         cb_device_manager = ClearBladeDeviceManager()
         return await cb_device_manager.getDeviceConfigVersionsList_async(request=request)
+
+    async def list_devices(self, request : ListDevicesRequest):
+        cb_device_manager = ClearBladeDeviceManager()
+        return await cb_device_manager.getDevicesList_async(request=request)
diff --git a/clearblade/cloud/iot_v1/developer_tests.py b/clearblade/cloud/iot_v1/developer_tests.py
@@ -1,5 +1,5 @@
 from client import DeviceManagerClient, DeviceManagerAsyncClient
-from devices import SendCommandToDeviceRequest, CreateDeviceRequest, Device, ModifyCloudToDeviceConfigRequest, DeleteDeviceRequest, GetDeviceRequest, BindUnBindGatewayDeviceRequest, SetDeviceStateRequest, GetDeviceStatesList, GetDeviceConfigVersionsList
+from devices import SendCommandToDeviceRequest, CreateDeviceRequest, Device, ModifyCloudToDeviceConfigRequest, DeleteDeviceRequest, GetDeviceRequest, BindUnBindGatewayDeviceRequest, SetDeviceStateRequest, GetDeviceStatesList, GetDeviceConfigVersionsList, ListDevicesRequest
 import asyncio
 
 def test_send_command():
@@ -124,6 +124,19 @@ async def test_get_device_configVersions_async():
     response = await async_client.list_device_config_versions(request=request)
     print(response)
 
+def test_get_devices_list():
+    client =  DeviceManagerClient()
+    get_devices_list_request = ListDevicesRequest(parent='projects/ingressdevelopmentenv/locations/us-central1')
+    response = client.list_devices(request=get_devices_list_request)
+    print(response)
+
+async def test_get_devices_list_async():
+    async_client = DeviceManagerAsyncClient()
+    get_devices_list_request = ListDevicesRequest(parent='projects/ingressdevelopmentenv/locations/us-central1')
+    response = await async_client.list_devices(request=get_devices_list_request)
+    print(response)
+
+
 if __name__ ==  '__main__':
     #test_send_command()
     #asyncio.run(test_send_command_async())
@@ -144,4 +157,6 @@ async def test_get_device_configVersions_async():
     #test_get_device_states()
     #asyncio.run(test_get_device_states_async())
     #test_get_device_configVersions()
-    asyncio.run(test_get_device_configVersions_async())
+    #asyncio.run(test_get_device_configVersions_async())
+    #test_get_devices_list()
+    asyncio.run(test_get_devices_list_async())
diff --git a/clearblade/cloud/iot_v1/devices.py b/clearblade/cloud/iot_v1/devices.py
@@ -220,6 +220,50 @@ def __init__(self, name: str = None,
     def numVersions(self):
         return self._numversions
 
+class ListDevicesRequest(Request):
+    def __init__(self, parent:str = None ,
+                 deviceNumIds: str = None,
+                 deviceIds: str = None,
+                 fieldMask: str = None,
+                 gatewayListOptions: dict = None,
+                 pageSize: int = None,
+                 pageToken: str = None) -> None:
+        self._parent = parent
+        self._device_num_ids = deviceNumIds
+        self._device_ids = deviceIds
+        self._field_mask = fieldMask
+        self._gateway_list_options = gatewayListOptions
+        self._page_size = pageSize
+        self._page_token = pageToken
+
+    @property
+    def parent(self):
+        return self._parent
+
+    @property
+    def device_num_ids(self):
+        return self._device_num_ids
+
+    @property
+    def device_ids(self):
+        return self._device_ids
+
+    @property
+    def field_mask(self):
+        return self._field_mask
+
+    @property
+    def gateway_list_options(self):
+        return self._gateway_list_options
+
+    @property
+    def page_size(self):
+        return self._page_size
+
+    @property
+    def page_token(self):
+        return self._page_token
+
 class ClearBladeDeviceManager():
 
     def _prepare_for_send_command(self,
@@ -273,6 +317,13 @@ def _prepare_modify_cloud_config_device(self,
     def _create_device_config(self, response):
         return DeviceConfig.from_json(response)
 
+    def _create_device_list_from_response(self, json_response):
+        devicesList = []
+        print(json_response['devices'])
+        for deviceJson in json_response['devices']:
+            devicesList.append(Device.from_json(json=deviceJson))
+        return devicesList
+
     def send_command(self,
                     request: SendCommandToDeviceRequest,
                     name: str = None,
@@ -476,3 +527,29 @@ async def getDeviceConfigVersionsList_async(self,
         if response.status_code is 200:
             return response.json()
         return None
+
+    def getDevicesList(self,
+            request: ListDevicesRequest):
+        sync_client = SyncClient()
+        params = {'parent':request.parent}
+        body = {'deviceNumIds':request.device_num_ids, 'deviceIds':request.device_ids,
+            'fieldMask':request.field_mask, 'gatewayListOptions':request.gateway_list_options,
+            'pageSize':request.page_size, 'pageToken':request.page_token}
+        response = sync_client.list(request_body=body, request_params=params)
+
+        if response.status_code is 200:
+            return response.json()
+        return None
+
+    async def getDevicesList_async(self,
+            request: ListDevicesRequest):
+        async_client = AsyncClient()
+        params = {'parent':request.parent}
+        body = {'deviceNumIds':request.device_num_ids, 'deviceIds':request.device_ids,
+            'fieldMask':request.field_mask, 'gatewayListOptions':request.gateway_list_options,
+            'pageSize':request.page_size, 'pageToken':request.page_token}
+        response = await async_client.list(request_body=body, request_params=params)
+
+        if response.status_code is 200:
+            return response.json()
+        return None
diff --git a/clearblade/cloud/iot_v1/http_client.py b/clearblade/cloud/iot_v1/http_client.py
@@ -57,6 +57,11 @@ def getConfigVersionsList(self, request_params):
         self._post_url = self._cb_api_url+ self._process_request_params(request_params=request_params)
         self._request_headers = self._headers()        
 
+    def list(self, request_params = {}, request_body = {}):
+        self._post_url = self._cb_api_url+ self._process_request_params(request_params=request_params)
+        self._request_headers = self._headers()
+        self._post_body = self._process_request_body(request_body=request_body)
+
     def post(self, request_params = {}, request_body = {}):
         if request_params.get('method') is not None:
             if request_params['method'] == 'bindDeviceToGateway' or request_params['method'] == 'unbindDeviceFromGateway':
@@ -70,7 +75,6 @@ def post(self, request_params = {}, request_body = {}):
         self._post_url = self._cb_api_url+ self._process_request_params(request_params=request_params)
         self._request_headers = self._headers()
         self._post_body = self._process_request_body(request_body=request_body)
-        print("post_url = {}\nheaders = {}\nbody= {}\n".format(self._post_url,self._request_headers,self._post_body))
 
     def delete(self, request_params):
         self._post_url = self._cb_api_url+ self._process_request_params(request_params=request_params)
@@ -100,6 +104,13 @@ def get(self, request_params = {}):
                                             headers=self._request_headers)
         return response
 
+    def list(self, request_params = {}, request_body = {}):
+        super().list(request_body=request_body, request_params=request_params)
+        httpx_sync_client = httpx.Client()
+        response = httpx_sync_client.request("GET", url=self._post_url,
+                                            headers=self._request_headers, data=self._post_body)
+        return response
+
     def getStateList(self, request_params = {}):
         super().getStateList(request_params=request_params)
         httpx_sync_client = httpx.Client()
@@ -141,6 +152,14 @@ async def get(self, request_params):
         await httpx_async_client.aclose()
         return response
 
+    async def list(self, request_params = {}, request_body = {}):
+        super().list(request_body=request_body, request_params=request_params)
+        httpx_async_client= httpx.AsyncClient()
+        response = await httpx_async_client.request("GET", url=self._post_url,
+                                            headers=self._request_headers, data=self._post_body)
+        await httpx_async_client.aclose()
+        return response
+
     async def getStateList(self, request_params = {}):
         super().getStateList(request_params=request_params)
         httpx_async_client= httpx.AsyncClient()

diff --git a/samples/clearblade/get_devices_list_async.py b/samples/clearblade/get_devices_list_async.py
@@ -0,0 +1,8 @@
+from clearblade.cloud import iot_v1
+
+async def sample_get_devices_list_async():
+    client = iot_v1.DeviceManagerAsyncClient()
+
+    request = iot_v1.ListDevicesRequest(parent='projects/ingressdevelopmentenv/locations/us-central1')
+
+    response = await client.list_devices(request)
diff --git a/samples/clearblade/get_devices_list_sync.py b/samples/clearblade/get_devices_list_sync.py
@@ -0,0 +1,7 @@
+from clearblade.cloud import iot_v1
+
+def sample_get_devices_list():
+    client = iot_v1.DeviceManagerClient()
+
+    request = iot_v1.ListDevicesRequest(parent='projects/ingressdevelopmentenv/locations/us-central1')
+    response = client.list_devices(request=request)