Merge SB management client to central repo dev branch

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

@@ -0,0 +1,46 @@
+from typing import cast, Union
+from xml.etree.ElementTree import ElementTree
+
+
+try:
+    import urllib.parse as urlparse
+except ImportError:
+    import urlparse  # python 2.7
+
+from azure.servicebus.management import _constants as constants
+from ...management._handle_response_error import _handle_response_error
+
+
+async def extract_data_template(feed_class, convert, feed_element):
+    deserialized = feed_class.deserialize(feed_element)
+    list_of_qd = [convert(x) if convert else x for x in deserialized.entry]
+    next_link = None
+    if deserialized.link and len(deserialized.link) == 2:
+        next_link = deserialized.link[1].href
+    return next_link, iter(list_of_qd)
+
+
+async def get_next_template(list_func, *args, **kwargs):
+    if len(args) > 0:
+        next_link = args[0]
+    else:
+        next_link = kwargs.pop("next_link")
+
+    start_index = kwargs.pop("start_index", 0)
+    max_page_size = kwargs.pop("max_page_size", 100)
+    api_version = constants.API_VERSION
+    if next_link:
+        queries = urlparse.parse_qs(urlparse.urlparse(next_link).query)
+        start_index = int(queries['$skip'][0])
+        max_page_size = int(queries['$top'][0])
+        api_version = queries['api-version'][0]
+    with _handle_response_error():
+        feed_element = cast(
+            ElementTree,
+            await list_func(
+                skip=start_index, top=max_page_size,
+                api_version=api_version,
+                **kwargs
+            )
+        )
+    return feed_element

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

@@ -5,16 +5,29 @@
 
 from ._management_client import ServiceBusManagementClient
 from ._generated.models import AuthorizationRule, MessageCountDetails, \
-    AccessRights, EntityAvailabilityStatus, EntityStatus
-from ._models import QueueRuntimeInfo, QueueDescription
+    AccessRights, EntityAvailabilityStatus, EntityStatus, \
+    NamespaceProperties, MessagingSku, NamespaceType
+
+from ._models import QueueRuntimeInfo, QueueDescription, TopicRuntimeInfo, TopicDescription, \
+    SubscriptionDescription, SubscriptionRuntimeInfo, RuleDescription, \
+    TrueRuleFilter, FalseRuleFilter, SqlRuleFilter, CorrelationRuleFilter, \
+    SqlRuleAction
 
 __all__ = [
-    "ServiceBusManagementClient",
+    'ServiceBusManagementClient',
     'AuthorizationRule',
     'MessageCountDetails',
     'QueueDescription',
     'QueueRuntimeInfo',
+    'TopicDescription',
+    'TopicRuntimeInfo',
+    'SubscriptionDescription',
+    'SubscriptionRuntimeInfo',
     'AccessRights',
     'EntityAvailabilityStatus',
     'EntityStatus',
+    'RuleDescription',
+    'CorrelationRuleFilter', 'SqlRuleFilter', 'TrueRuleFilter', 'FalseRuleFilter',
+    'SqlRuleAction',
+    'NamespaceProperties', 'MessagingSku', 'NamespaceType',
 ]

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

@@ -11,3 +11,4 @@
 TITLE_TAG = "{http://www.w3.org/2005/Atom}title"
 
 ENTITY_TYPE_QUEUES = "queues"
+ENTITY_TYPE_TOPICS = "topics"

sdk/servicebus/azure-servicebus/azure/servicebus/management/_generated/_service_bus_management_client.py

@@ -16,16 +16,25 @@
     from typing import Any, Optional
 
 from ._configuration import ServiceBusManagementClientConfiguration
-from .operations import QueueOperations
+from .operations import EntityOperations
 from .operations import ServiceBusManagementClientOperationsMixin
+from .operations import SubscriptionOperations
+from .operations import RuleOperations
+from .operations import NamespaceOperations
 from . import models
 
 
 class ServiceBusManagementClient(ServiceBusManagementClientOperationsMixin):
     """Azure Service Bus client for managing Queues, Topics, and Subscriptions.
 
-    :ivar queue: QueueOperations operations
-    :vartype queue: azure.servicebus.management._generated.operations.QueueOperations
+    :ivar entity: EntityOperations operations
+    :vartype entity: azure.servicebus.management._generated.operations.EntityOperations
+    :ivar subscription: SubscriptionOperations operations
+    :vartype subscription: azure.servicebus.management._generated.operations.SubscriptionOperations
+    :ivar rule: RuleOperations operations
+    :vartype rule: azure.servicebus.management._generated.operations.RuleOperations
+    :ivar namespace: NamespaceOperations operations
+    :vartype namespace: azure.servicebus.management._generated.operations.NamespaceOperations
     :param endpoint: The Service Bus fully qualified domain name.
     :type endpoint: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
@@ -45,7 +54,13 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.queue = QueueOperations(
+        self.entity = EntityOperations(
+            self._client, self._config, self._serialize, self._deserialize)
+        self.subscription = SubscriptionOperations(
+            self._client, self._config, self._serialize, self._deserialize)
+        self.rule = RuleOperations(
+            self._client, self._config, self._serialize, self._deserialize)
+        self.namespace = NamespaceOperations(
             self._client, self._config, self._serialize, self._deserialize)
 
     def close(self):

sdk/servicebus/azure-servicebus/azure/servicebus/management/_generated/aio/_service_bus_management_client_async.py

@@ -12,16 +12,25 @@
 from msrest import Deserializer, Serializer
 
 from ._configuration_async import ServiceBusManagementClientConfiguration
-from .operations_async import QueueOperations
+from .operations_async import EntityOperations
 from .operations_async import ServiceBusManagementClientOperationsMixin
+from .operations_async import SubscriptionOperations
+from .operations_async import RuleOperations
+from .operations_async import NamespaceOperations
 from .. import models
 
 
 class ServiceBusManagementClient(ServiceBusManagementClientOperationsMixin):
     """Azure Service Bus client for managing Queues, Topics, and Subscriptions.
 
-    :ivar queue: QueueOperations operations
-    :vartype queue: azure.servicebus.management._generated.aio.operations_async.QueueOperations
+    :ivar entity: EntityOperations operations
+    :vartype entity: azure.servicebus.management._generated.aio.operations_async.EntityOperations
+    :ivar subscription: SubscriptionOperations operations
+    :vartype subscription: azure.servicebus.management._generated.aio.operations_async.SubscriptionOperations
+    :ivar rule: RuleOperations operations
+    :vartype rule: azure.servicebus.management._generated.aio.operations_async.RuleOperations
+    :ivar namespace: NamespaceOperations operations
+    :vartype namespace: azure.servicebus.management._generated.aio.operations_async.NamespaceOperations
     :param endpoint: The Service Bus fully qualified domain name.
     :type endpoint: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
@@ -40,7 +49,13 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.queue = QueueOperations(
+        self.entity = EntityOperations(
+            self._client, self._config, self._serialize, self._deserialize)
+        self.subscription = SubscriptionOperations(
+            self._client, self._config, self._serialize, self._deserialize)
+        self.rule = RuleOperations(
+            self._client, self._config, self._serialize, self._deserialize)
+        self.namespace = NamespaceOperations(
             self._client, self._config, self._serialize, self._deserialize)
 
     async def close(self) -> None:

sdk/servicebus/azure-servicebus/azure/servicebus/management/_generated/aio/operations_async/__init__.py

@@ -6,10 +6,16 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._queue_operations_async import QueueOperations
+from ._entity_operations_async import EntityOperations
 from ._service_bus_management_client_operations_async import ServiceBusManagementClientOperationsMixin
+from ._subscription_operations_async import SubscriptionOperations
+from ._rule_operations_async import RuleOperations
+from ._namespace_operations_async import NamespaceOperations
 
 __all__ = [
-    'QueueOperations',
+    'EntityOperations',
     'ServiceBusManagementClientOperationsMixin',
+    'SubscriptionOperations',
+    'RuleOperations',
+    'NamespaceOperations',
 ]

sdk/servicebus/azure-servicebus/azure/servicebus/management/_generated/aio/operations_async/_queue_operations_async.py → sdk/servicebus/azure-servicebus/azure/servicebus/management/_generated/aio/operations_async/_entity_operations_async.py

@@ -17,8 +17,8 @@
 T = TypeVar('T')
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
-class QueueOperations:
-    """QueueOperations async operations.
+class EntityOperations:
+    """EntityOperations async operations.
 
     You should not instantiate this class directly. Instead, you should create a Client instance that
     instantiates it for you and attaches it as an attribute.
@@ -41,17 +41,17 @@ def __init__(self, client, config, serializer, deserializer) -> None:
 
     async def get(
         self,
-        queue_name: str,
+        entity_name: str,
         enrich: Optional[bool] = False,
         api_version: Optional[str] = "2017_04",
         **kwargs
     ) -> object:
-        """Get the details about the Queue with the given queueName.
+        """Get the details about the Queue or Topic with the given entityName.
 
-        Get Queue.
+        Get Queue or Topic.
 
-        :param queue_name: The name of the queue relative to the Service Bus namespace.
-        :type queue_name: str
+        :param entity_name: The name of the queue or topic relative to the Service Bus namespace.
+        :type entity_name: str
         :param enrich: A query parameter that sets enrich to true or false.
         :type enrich: bool
         :param api_version: Api Version.
@@ -69,7 +69,7 @@ async def get(
         url = self.get.metadata['url']  # type: ignore
         path_format_arguments = {
             'endpoint': self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
-            'queueName': self._serialize.url("queue_name", queue_name, 'str', min_length=1),
+            'entityName': self._serialize.url("entity_name", entity_name, 'str', min_length=1),
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -100,21 +100,21 @@ async def get(
             return cls(pipeline_response, deserialized, {})
 
         return deserialized
-    get.metadata = {'url': '/{queueName}'}  # type: ignore
+    get.metadata = {'url': '/{entityName}'}  # type: ignore
 
     async def put(
         self,
-        queue_name: str,
+        entity_name: str,
         request_body: object,
         api_version: Optional[str] = "2017_04",
         if_match: Optional[str] = None,
         **kwargs
     ) -> object:
-        """Create or update a queue at the provided queuePath.
+        """Create or update a queue or topic at the provided entityName.
 
-        :param queue_name: The name of the queue relative to the Service Bus namespace.
-        :type queue_name: str
-        :param request_body: Parameters required to make or edit a queue.
+        :param entity_name: The name of the queue or topic relative to the Service Bus namespace.
+        :type entity_name: str
+        :param request_body: Parameters required to make or edit a queue or topic.
         :type request_body: object
         :param api_version: Api Version.
         :type api_version: str
@@ -131,13 +131,13 @@ async def put(
         cls = kwargs.pop('cls', None)  # type: ClsType[object]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        content_type = kwargs.pop("content_type", "application/xml")
+        content_type = kwargs.pop("content_type", "application/atom+xml")
 
         # Construct URL
         url = self.put.metadata['url']  # type: ignore
         path_format_arguments = {
             'endpoint': self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
-            'queueName': self._serialize.url("queue_name", queue_name, 'str', min_length=1),
+            'entityName': self._serialize.url("entity_name", entity_name, 'str', min_length=1),
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -178,20 +178,20 @@ async def put(
             return cls(pipeline_response, deserialized, {})
 
         return deserialized
-    put.metadata = {'url': '/{queueName}'}  # type: ignore
+    put.metadata = {'url': '/{entityName}'}  # type: ignore
 
     async def delete(
         self,
-        queue_name: str,
+        entity_name: str,
         api_version: Optional[str] = "2017_04",
         **kwargs
     ) -> object:
-        """Delete the Queue with the given queueName.
+        """Delete the Queue or Topic with the given entityName.
 
-        Delete Queue.
+        Delete Queue or Topic.
 
-        :param queue_name: The name of the queue relative to the Service Bus namespace.
-        :type queue_name: str
+        :param entity_name: The name of the queue or topic relative to the Service Bus namespace.
+        :type entity_name: str
         :param api_version: Api Version.
         :type api_version: str
         :keyword callable cls: A custom type or function that will be passed the direct response
@@ -207,7 +207,7 @@ async def delete(
         url = self.delete.metadata['url']  # type: ignore
         path_format_arguments = {
             'endpoint': self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
-            'queueName': self._serialize.url("queue_name", queue_name, 'str', min_length=1),
+            'entityName': self._serialize.url("entity_name", entity_name, 'str', min_length=1),
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -236,4 +236,4 @@ async def delete(
             return cls(pipeline_response, deserialized, {})
 
         return deserialized
-    delete.metadata = {'url': '/{queueName}'}  # type: ignore
+    delete.metadata = {'url': '/{entityName}'}  # type: ignore