Merge iothub mgmt update

sdk/eventhub/azure-eventhubs/azure/eventhub/aio/client_async.py

@@ -117,8 +117,13 @@ async def _try_delay(self, retried_times, last_exception, timeout_time=None, ent
             raise last_exception
 
     async def _management_request(self, mgmt_msg, op_type):
+        alt_creds = {
+            "username": self._auth_config.get("iot_username"),
+            "password": self._auth_config.get("iot_password")
+        }
+
         retried_times = 0
-        while True:
+        while retried_times <= self.config.max_retries:
             mgmt_auth = self._create_auth(**alt_creds)
             mgmt_client = AMQPClientAsync(self.mgmt_target, auth=mgmt_auth, debug=self.config.network_tracing)
             try:

sdk/eventhub/azure-eventhubs/azure/eventhub/aio/consumer_async.py

@@ -152,9 +152,8 @@ async def _open(self):
             self.source = self.redirected.address
         await super(EventHubConsumer, self)._open()
 
-    @_retry_decorator
-    async def _open_with_retry(self, timeout_time=None, **kwargs):
-        return await self._open(timeout_time=timeout_time, **kwargs)
+    async def _open_with_retry(self):
+        return await self._open()
 
     async def _receive(self, timeout_time=None, max_batch_size=None, **kwargs):
         last_exception = kwargs.get("last_exception")

sdk/eventhub/azure-eventhubs/azure/eventhub/client.py

@@ -119,10 +119,14 @@ def _try_delay(self, retried_times, last_exception, timeout_time=None, entity_na
             raise last_exception
 
     def _management_request(self, mgmt_msg, op_type):
-        retried_times = 0
+        alt_creds = {
+            "username": self._auth_config.get("iot_username"),
+            "password": self._auth_config.get("iot_password")
+        }
 
+        retried_times = 0
         while retried_times <= self.config.max_retries:
-            mgmt_auth = self._create_auth()
+            mgmt_auth = self._create_auth(**alt_creds)
             mgmt_client = uamqp.AMQPClient(self.mgmt_target)
             try:
                 conn = self._conn_manager.get_connection(self.host, mgmt_auth)  #pylint:disable=assignment-from-none

sdk/eventhub/azure-eventhubs/azure/eventhub/consumer.py

@@ -147,9 +147,8 @@ def _open(self):
             self.source = self.redirected.address
         super(EventHubConsumer, self)._open()
 
-    @_retry_decorator
-    def _open_with_retry(self, timeout_time=None, **kwargs):
-        return self._open(timeout_time=timeout_time, **kwargs)
+    def _open_with_retry(self):
+        return self._open()
 
     def _receive(self, timeout_time=None, max_batch_size=None, **kwargs):
         last_exception = kwargs.get("last_exception")