Add list_runtime_infos

Author: YijunXieMS

sdk/servicebus/azure-servicebus/azure/servicebus/management/_management_client.py

@@ -117,11 +117,32 @@ def _get_queue_object(self, queue_name, clazz):
             )
         return _convert_xml_to_object(queue_name, et, clazz)
 
+    def _list_queues(self, skip, max_count, clazz):
+        # type: (int, int, Type[Model]) -> Union[List[QueueDescription], List[QueueRuntimeInfo])
+        with _handle_response_error():
+            et = cast(
+                ElementTree,
+                self._impl.list_entities(
+                    entity_type="queues", skip=skip, top=max_count, api_version=constants.API_VERSION
+                )
+            )
+        entries = et.findall(constants.ENTRY_TAG)
+        queues = []
+        for entry in entries:
+            entity_name = entry.find(constants.TITLE_TAG).text  # type: ignore
+            queue_description = _convert_xml_to_object(
+                entity_name,   # type: ignore
+                cast(Element, entry),
+                clazz
+            )
+            queues.append(queue_description)
+        return queues
+
     def get_queue(self, queue_name):
         # type: (str) -> QueueDescription
         return self._get_queue_object(queue_name, QueueDescription)
 
-    def get_queue_metrics(self, queue_name):
+    def get_queue_runtime_info(self, queue_name):
         # type: (str) -> QueueRuntimeInfo
         return self._get_queue_object(queue_name, QueueRuntimeInfo)
 
@@ -189,19 +210,8 @@ def delete_queue(self, queue_name):
 
     def list_queues(self, skip=0, max_count=100):
         # type: (int, int) -> List[QueueDescription]
+        return self._list_queues(skip, max_count, QueueDescription)
 
-        with _handle_response_error():
-            et = cast(
-                ElementTree,
-                self._impl.list_entities(entity_type="queues", skip=skip, top=max_count, api_version=constants.API_VERSION)
-            )
-        entries = et.findall(constants.ENTRY_TAG)
-        queue_descriptions = []
-        for entry in entries:
-            entity_name = entry.find(constants.TITLE_TAG).text  # type: ignore
-            queue_description = _convert_xml_to_object(
-                entity_name,  # type: ignore
-                cast(Element, entry),
-                QueueDescription)
-            queue_descriptions.append(queue_description)
-        return queue_descriptions
+    def list_queues_runtime_info(self, skip=0, max_count=100):
+        # type: (int, int) -> List[QueueRuntimeInfo]
+        return self._list_queues(skip, max_count, QueueRuntimeInfo)

sdk/servicebus/azure-servicebus/azure/servicebus/management/aio/_management_client_async.py

@@ -94,11 +94,32 @@ async def _get_queue_object(self, queue_name, clazz):
             )
         return _convert_xml_to_object(queue_name, et, clazz)
 
+    async def _list_queues(self, skip, max_count, clazz):
+        # type: (int, int, Type[Model]) -> Union[List[QueueDescription], List[QueueRuntimeInfo])
+        with _handle_response_error():
+            et = cast(
+                ElementTree,
+                await self._impl.list_entities(
+                    entity_type="queues", skip=skip, top=max_count, api_version=constants.API_VERSION
+                )
+            )
+        entries = et.findall(constants.ENTRY_TAG)
+        queues = []
+        for entry in entries:
+            entity_name = entry.find(constants.TITLE_TAG).text  # type: ignore
+            queue_description = _convert_xml_to_object(
+                entity_name,   # type: ignore
+                cast(Element, entry),
+                clazz
+            )
+            queues.append(queue_description)
+        return queues
+
     async def get_queue(self, queue_name):
         # type: (str) -> QueueDescription
         return await self._get_queue_object(queue_name, QueueDescription)
 
-    async def get_queue_metrics(self, queue_name):
+    async def get_queue_runtime_info(self, queue_name):
         # type: (str) -> QueueRuntimeInfo
         return await self._get_queue_object(queue_name, QueueRuntimeInfo)
 
@@ -161,21 +182,8 @@ async def delete_queue(self, queue_name):
 
     async def list_queues(self, skip=0, max_count=100):
         # type: (int, int) -> List[QueueDescription]
-        with _handle_response_error():
-            et = cast(
-                ElementTree,
-                await self._impl.list_entities(
-                    entity_type="queues", skip=skip, top=max_count, api_version=constants.API_VERSION
-                )
-            )
-        entries = et.findall(constants.ENTRY_TAG)
-        queue_descriptions = []
-        for entry in entries:
-            entity_name = entry.find(constants.TITLE_TAG).text  # type: ignore
-            queue_description = _convert_xml_to_object(
-                entity_name,   # type: ignore
-                cast(Element, entry),
-                QueueDescription
-            )
-            queue_descriptions.append(queue_description)
-        return queue_descriptions
+        return await self._list_queues(skip, max_count, QueueDescription)
+
+    async def list_queues_runtime_info(self, skip=0, max_count=100):
+        # type: (int, int) -> List[QueueRuntimeInfo]
+        return await self._list_queues(skip, max_count, QueueRuntimeInfo)