Merge pull request #5 from Shawnshank/master

Community Edition More Thingsboard 3.1 REST API Compatible (limit/page_size/page)

Author: imbeacon

tb_rest_client/api/api_ce/alarm_controller_api.py

@@ -499,20 +499,24 @@ def get_alarm_info_by_id_using_get_with_http_info(self, alarm_id, **kwargs):  #
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_alarms_using_get(self, entity_type, entity_id, limit, **kwargs):  # noqa: E501
+    def get_alarms_using_get(self, entity_type, entity_id, page_size, page, **kwargs):  # noqa: E501
         """getAlarms  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api_pe.get_alarms_using_get(entity_type, entity_id, limit, async_req=True)
+        >>> thread = api_pe.get_alarms_using_get(entity_type, entity_id, page_size, page, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str entity_type: entityType (required)
         :param str entity_id: entityId (required)
-        :param int limit: limit (required)
         :param str search_status: searchStatus
         :param str status: status
+        :param str page_size: pageSize (required)
+        :param str page: page (required)
+        :param str text_search: textSearch
+        :param str sort_property: sortProperty
+        :param str sort_order: sortOrder
         :param int start_time: startTime
         :param int end_time: endTime
         :param bool asc_order: ascOrder
@@ -524,25 +528,29 @@ def get_alarms_using_get(self, entity_type, entity_id, limit, **kwargs):  # noqa
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_alarms_using_get_with_http_info(entity_type, entity_id, limit, **kwargs)  # noqa: E501
+            return self.get_alarms_using_get_with_http_info(entity_type, entity_id, page_size, page, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_alarms_using_get_with_http_info(entity_type, entity_id, limit, **kwargs)  # noqa: E501
+            (data) = self.get_alarms_using_get_with_http_info(entity_type, entity_id, page_size, page, **kwargs)  # noqa: E501
             return data
 
-    def get_alarms_using_get_with_http_info(self, entity_type, entity_id, limit, **kwargs):  # noqa: E501
+    def get_alarms_using_get_with_http_info(self, entity_type, entity_id, page_size, page, **kwargs):  # noqa: E501
         """getAlarms  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api_pe.get_alarms_using_get_with_http_info(entity_type, entity_id, limit, async_req=True)
+        >>> thread = api_pe.get_alarms_using_get_with_http_info(entity_type, entity_id, page_size, page, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str entity_type: entityType (required)
         :param str entity_id: entityId (required)
-        :param int limit: limit (required)
         :param str search_status: searchStatus
         :param str status: status
+        :param str page_size: pageSize (required)
+        :param str page: page (required)
+        :param str text_search: textSearch
+        :param str sort_property: sortProperty
+        :param str sort_order: sortOrder
         :param int start_time: startTime
         :param int end_time: endTime
         :param bool asc_order: ascOrder
@@ -553,7 +561,7 @@ def get_alarms_using_get_with_http_info(self, entity_type, entity_id, limit, **k
                  returns the request thread.
         """
 
-        all_params = ['entity_type', 'entity_id', 'limit', 'search_status', 'status', 'start_time', 'end_time', 'asc_order', 'offset', 'fetch_originator']  # noqa: E501
+        all_params = ['entity_type', 'entity_id', 'search_status', 'status', 'page_size', 'page', 'text_search', 'sort_property', 'sort_order', 'start_time', 'end_time', 'asc_order', 'offset', 'fetch_originator']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -572,10 +580,14 @@ def get_alarms_using_get_with_http_info(self, entity_type, entity_id, limit, **k
         if ('entity_id' not in params or
                 params['entity_id'] is None):
             raise ValueError("Missing the required parameter `entity_id` when calling `get_alarms_using_get`")  # noqa: E501
-        # verify the required parameter 'limit' is set
-        if ('limit' not in params or
-                params['limit'] is None):
-            raise ValueError("Missing the required parameter `limit` when calling `get_alarms_using_get`")  # noqa: E501
+        # verify the required parameter 'page_size' is set
+        if ('page_size' not in params or
+                params['page_size'] is None):
+            raise ValueError("Missing the required parameter `page_size` when calling `get_alarms_using_get`")  # noqa: E501
+        # verify the required parameter 'page' is set
+        if ('page' not in params or
+                params['page'] is None):
+            raise ValueError("Missing the required parameter `page` when calling `get_alarms_using_get`")  # noqa: E501
 
         collection_formats = {}
 
@@ -590,8 +602,16 @@ def get_alarms_using_get_with_http_info(self, entity_type, entity_id, limit, **k
             query_params.append(('searchStatus', params['search_status']))  # noqa: E501
         if 'status' in params:
             query_params.append(('status', params['status']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'page_size' in params:
+            query_params.append(('pageSize', params['page_size']))  # noqa: E501
+        if 'page' in params:
+            query_params.append(('page', params['page']))  # noqa: E501
+        if 'text_search' in params:
+            query_params.append(('textSearch', params['text_search']))  # noqa: E501
+        if 'sort_property' in params:
+            query_params.append(('sortProperty', params['sort_property']))  # noqa: E501
+        if 'sort_order' in params:
+            query_params.append(('sortOrder', params['sort_order']))  # noqa: E501
         if 'start_time' in params:
             query_params.append(('startTime', params['start_time']))  # noqa: E501
         if 'end_time' in params:
@@ -621,7 +641,7 @@ def get_alarms_using_get_with_http_info(self, entity_type, entity_id, limit, **k
         auth_settings = ['X-Authorization']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/alarm/{entityType}/{entityId}{?searchStatus,status,limit,startTime,endTime,ascOrder,offset,fetchOriginator}', 'GET',
+            '/api/alarm/{entityType}/{entityId}{?searchStatus,status,pageSize,page,textSearch,sortProperty,sortOrder,startTime,endTime,offset,fetchOriginator}', 'GET',
             path_params,
             query_params,
             header_params,

tb_rest_client/api/api_ce/asset_controller_api.py

@@ -685,53 +685,55 @@ def get_assets_by_ids_using_get_with_http_info(self, asset_ids, **kwargs):  # no
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_customer_assets_using_get(self, customer_id, limit, **kwargs):  # noqa: E501
+    def get_customer_assets_using_get(self, customer_id, page_size, page, **kwargs):  # noqa: E501
         """getCustomerAssets  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api_pe.get_customer_assets_using_get(customer_id, limit, async_req=True)
+        >>> thread = api_pe.get_customer_assets_using_get(customer_id, page_size, page, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str customer_id: customerId (required)
-        :param str limit: limit (required)
         :param str type: type
         :param str text_search: textSearch
-        :param str id_offset: idOffset
-        :param str text_offset: textOffset
+        :param str sort_property: sortProperty
+        :param str sort_order: sortOrder
+        :param str page_size: pageSize (required)
+        :param str page: page (required)
         :return: TextPageDataAsset
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_customer_assets_using_get_with_http_info(customer_id, limit, **kwargs)  # noqa: E501
+            return self.get_customer_assets_using_get_with_http_info(customer_id, page_size, page, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_customer_assets_using_get_with_http_info(customer_id, limit, **kwargs)  # noqa: E501
+            (data) = self.get_customer_assets_using_get_with_http_info(customer_id, page_size, page, **kwargs)  # noqa: E501
             return data
 
-    def get_customer_assets_using_get_with_http_info(self, customer_id, limit, **kwargs):  # noqa: E501
+    def get_customer_assets_using_get_with_http_info(self, customer_id, page_size, page, **kwargs):  # noqa: E501
         """getCustomerAssets  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api_pe.get_customer_assets_using_get_with_http_info(customer_id, limit, async_req=True)
+        >>> thread = api_pe.get_customer_assets_using_get_with_http_info(customer_id, page_size, page, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
         :param str customer_id: customerId (required)
-        :param str limit: limit (required)
         :param str type: type
         :param str text_search: textSearch
-        :param str id_offset: idOffset
-        :param str text_offset: textOffset
+        :param str sort_property: sortProperty
+        :param str sort_order: sortOrder
+        :param str page_size: pageSize (required)
+        :param str page: page (required)
         :return: TextPageDataAsset
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['customer_id', 'limit', 'type', 'text_search', 'id_offset', 'text_offset']  # noqa: E501
+        all_params = ['customer_id', 'type', 'text_search', 'sort_property', 'sort_order', 'page_size', 'page']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -746,10 +748,14 @@ def get_customer_assets_using_get_with_http_info(self, customer_id, limit, **kwa
         if ('customer_id' not in params or
                 params['customer_id'] is None):
             raise ValueError("Missing the required parameter `customer_id` when calling `get_customer_assets_using_get`")  # noqa: E501
-        # verify the required parameter 'limit' is set
-        if ('limit' not in params or
-                params['limit'] is None):
-            raise ValueError("Missing the required parameter `limit` when calling `get_customer_assets_using_get`")  # noqa: E501
+        # verify the required parameter 'page_size' is set
+        if ('page_size' not in params or
+                params['page_size'] is None):
+            raise ValueError("Missing the required parameter `page_size` when calling `get_customer_assets_using_get`")  # noqa: E501
+        # verify the required parameter 'page' is set
+        if ('page' not in params or
+                params['page'] is None):
+            raise ValueError("Missing the required parameter `page` when calling `get_customer_assets_using_get`")  # noqa: E501
 
         collection_formats = {}
 
@@ -762,12 +768,14 @@ def get_customer_assets_using_get_with_http_info(self, customer_id, limit, **kwa
             query_params.append(('type', params['type']))  # noqa: E501
         if 'text_search' in params:
             query_params.append(('textSearch', params['text_search']))  # noqa: E501
-        if 'id_offset' in params:
-            query_params.append(('idOffset', params['id_offset']))  # noqa: E501
-        if 'text_offset' in params:
-            query_params.append(('textOffset', params['text_offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'sort_property' in params:
+            query_params.append(('sortProperty', params['sort_property']))  # noqa: E501
+        if 'sort_order' in params:
+            query_params.append(('sortOrder', params['sort_order']))  # noqa: E501
+        if 'page_size' in params:
+            query_params.append(('pageSize', params['page_size']))  # noqa: E501
+        if 'page' in params:
+            query_params.append(('page', params['page']))  # noqa: E501
 
         header_params = {}
 
@@ -787,7 +795,7 @@ def get_customer_assets_using_get_with_http_info(self, customer_id, limit, **kwa
         auth_settings = ['X-Authorization']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/customer/{customerId}/assets{?type,textSearch,idOffset,textOffset,limit}', 'GET',
+            '/api/customer/{customerId}/assets{?type,textSearch,sortProperty,sortOrder,pageSize,page}', 'GET',
             path_params,
             query_params,
             header_params,
@@ -895,51 +903,53 @@ def get_tenant_asset_using_get_with_http_info(self, asset_name, **kwargs):  # no
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def get_tenant_assets_using_get(self, limit, **kwargs):  # noqa: E501
+    def get_tenant_assets_using_get(self, page_size, page, **kwargs):  # noqa: E501
         """getTenantAssets  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api_pe.get_tenant_assets_using_get(limit, async_req=True)
+        >>> thread = api_pe.get_tenant_assets_using_get(page_size, page, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str limit: limit (required)
         :param str type: type
         :param str text_search: textSearch
-        :param str id_offset: idOffset
-        :param str text_offset: textOffset
+        :param str sort_property: sortProperty
+        :param str sort_order: sortOrder
+        :param str page_size: pageSize (required)
+        :param str page: page (required)
         :return: TextPageDataAsset
                  If the method is called asynchronously,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
         if kwargs.get('async_req'):
-            return self.get_tenant_assets_using_get_with_http_info(limit, **kwargs)  # noqa: E501
+            return self.get_tenant_assets_using_get_with_http_info(page_size, page, **kwargs)  # noqa: E501
         else:
-            (data) = self.get_tenant_assets_using_get_with_http_info(limit, **kwargs)  # noqa: E501
+            (data) = self.get_tenant_assets_using_get_with_http_info(page_size, page, **kwargs)  # noqa: E501
             return data
 
-    def get_tenant_assets_using_get_with_http_info(self, limit, **kwargs):  # noqa: E501
+    def get_tenant_assets_using_get_with_http_info(self, page_size, page, **kwargs):  # noqa: E501
         """getTenantAssets  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api_pe.get_tenant_assets_using_get_with_http_info(limit, async_req=True)
+        >>> thread = api_pe.get_tenant_assets_using_get_with_http_info(page_size, page, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param str limit: limit (required)
         :param str type: type
         :param str text_search: textSearch
-        :param str id_offset: idOffset
-        :param str text_offset: textOffset
+        :param str sort_property: sortProperty
+        :param str sort_order: sortOrder
+        :param str page_size: pageSize (required)
+        :param str page: page (required)
         :return: TextPageDataAsset
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['limit', 'type', 'text_search', 'id_offset', 'text_offset']  # noqa: E501
+        all_params = ['type', 'text_search', 'sort_property', 'sort_order', 'page_size', 'page']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -950,10 +960,14 @@ def get_tenant_assets_using_get_with_http_info(self, limit, **kwargs):  # noqa:
 
             params[key] = val
         del params['kwargs']
-        # verify the required parameter 'limit' is set
-        if ('limit' not in params or
-                params['limit'] is None):
-            raise ValueError("Missing the required parameter `limit` when calling `get_tenant_assets_using_get`")  # noqa: E501
+        # verify the required parameter 'page_size' is set
+        if ('page_size' not in params or
+                params['page_size'] is None):
+            raise ValueError("Missing the required parameter `page_size` when calling `get_tenant_assets_using_get`")  # noqa: E501
+        # verify the required parameter 'page' is set
+        if ('page' not in params or
+                params['page'] is None):
+            raise ValueError("Missing the required parameter `page` when calling `get_tenant_assets_using_get`")  # noqa: E501
 
         collection_formats = {}
 
@@ -964,12 +978,14 @@ def get_tenant_assets_using_get_with_http_info(self, limit, **kwargs):  # noqa:
             query_params.append(('type', params['type']))  # noqa: E501
         if 'text_search' in params:
             query_params.append(('textSearch', params['text_search']))  # noqa: E501
-        if 'id_offset' in params:
-            query_params.append(('idOffset', params['id_offset']))  # noqa: E501
-        if 'text_offset' in params:
-            query_params.append(('textOffset', params['text_offset']))  # noqa: E501
-        if 'limit' in params:
-            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'sort_property' in params:
+            query_params.append(('sortProperty', params['sort_property']))  # noqa: E501
+        if 'sort_order' in params:
+            query_params.append(('sortOrder', params['sort_order']))  # noqa: E501
+        if 'page_size' in params:
+            query_params.append(('pageSize', params['page_size']))  # noqa: E501
+        if 'page' in params:
+            query_params.append(('page', params['page']))  # noqa: E501
 
         header_params = {}
 
@@ -989,7 +1005,7 @@ def get_tenant_assets_using_get_with_http_info(self, limit, **kwargs):  # noqa:
         auth_settings = ['X-Authorization']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/tenant/assets{?type,textSearch,idOffset,textOffset,limit}', 'GET',
+            '/api/tenant/assets{?type,textSearch,sortProperty,sortOrder,pageSize,page}', 'GET',
             path_params,
             query_params,
             header_params,