In consume use controller from offer url

consume takes a controller_name argument. This is not needed and should
be automatically generated from the offer url. A deprecation warning is
logged and the variable is not used.

Also update offer and consume integration tests to no longer be skipped.

Author: Aflynn50

juju/model.py

@@ -1526,8 +1526,7 @@ async def integrate(self, relation1, relation2):
                     remote_endpoint.source = current.controller_name
             # consume the remote endpoint
             await self.consume(remote_endpoint.string(),
-                               application_alias=remote_endpoint.application,
-                               controller_name=remote_endpoint.source)
+                               application_alias=remote_endpoint.application)
 
         log.debug(
             'Adding relation %s <-> %s', endpoints[0], endpoints[1])
@@ -2535,7 +2534,15 @@ async def consume(self, endpoint, application_alias="", controller_name=None, co
         """
         Adds a remote offer to the model. Relations can be created later using
         "juju relate".
+
+        If consuming a relation from a model on different controller the
+        controller name must be included in the endpoint. The controller_name
+        argument is being deprecated.
         """
+        if controller_name:
+            log.warning(
+                'controller_name argument will soon be deprecated, controller '
+                'should be specified in endpoint url')
         if controller and controller_name:
             raise JujuError("cannot set both controller_name and controller")
         try:
@@ -2549,9 +2556,8 @@ async def consume(self, endpoint, application_alias="", controller_name=None, co
             offer.user = self.info.username
             endpoint = offer.string()
 
-        source = None
-        if controller_name:
-            source = await self._get_source_api(offer, controller_name=controller_name)
+        if offer.source:
+            source = await self._get_source_api(offer)
         else:
             if controller:
                 source = controller
@@ -2766,12 +2772,15 @@ async def revoke_secret(self, secret_name, application, *applications):
         if result_error.error is not None:
             raise JujuAPIError(result_error.error)
 
-    async def _get_source_api(self, url, controller_name=None):
+    async def _get_source_api(self, url):
         controller = Controller()
         if url.has_empty_source():
             async with ConnectedController(self.connection()) as current:
                 if current.controller_name is not None:
                     controller_name = current.controller_name
+        else:
+            controller_name = url.source
+
         await controller.connect(controller_name=controller_name)
         return controller
 

tests/integration/test_crossmodel.py

@@ -188,4 +188,4 @@ async def test_add_bundle():
                 await model_2.deploy('local:{}'.format(tmp_path))
                 await model_2.wait_for_idle(status="active")
 
-            await model_1.remove_offer("admin/{}.influxdb".format(model_1.name), force=True)
+            await model_1.remove_offer("admin/{}.influxdb".format(model_1.name), force=True)