Fix positional args + add get shim

Author: hpidcock

juju/client/facade.py

@@ -654,6 +654,16 @@ def __setitem__(self, key, value):
         attr = self._toPy[key]
         setattr(self, attr, value)
 
+    # legacy: generated definitions used to not correctly
+    # create typed objects and would use dict instead (from JSON)
+    # so we emulate some dict methods.
+    def get(self, key, default=None):
+        try:
+            attr = self._toPy[key]
+        except KeyError:
+            return default
+        return getattr(self, attr, default)
+
 
 class Schema(dict):
     def __init__(self, schema):

juju/controller.py

@@ -447,7 +447,7 @@ async def reset_user_password(self, username):
         user_facade = client.UserManagerFacade.from_connection(
             self.connection())
         entity = client.Entity(tag.user(username))
-        results = await user_facade.ResetPassword([entity])
+        results = await user_facade.ResetPassword(entities=[entity])
         secret_key = results.results[0].secret_key
         return await self.get_user(username, secret_key=secret_key)
 
@@ -755,7 +755,7 @@ async def create_offer(self, model_uuid, endpoint, offer_name=None, application_
         params.model_tag = tag.model(model_uuid)
 
         facade = client.ApplicationOffersFacade.from_connection(self.connection())
-        return await facade.Offer([params])
+        return await facade.Offer(offers=[params])
 
     async def list_offers(self, model_name):
         """
@@ -766,7 +766,7 @@ async def list_offers(self, model_name):
         params.model_name = model_name
 
         facade = client.ApplicationOffersFacade.from_connection(self.connection())
-        return await facade.ListApplicationOffers([params])
+        return await facade.ListApplicationOffers(filters=[params])
 
     async def remove_offer(self, model_uuid, offer, force=False):
         """
@@ -791,15 +791,15 @@ async def remove_offer(self, model_uuid, offer, force=False):
             raise RemoveError("removing offer will also remove relations, use force and try again.")
 
         facade = client.ApplicationOffersFacade.from_connection(self.connection())
-        return await facade.DestroyOffers(force, [url.string()])
+        return await facade.DestroyOffers(force=force, offer_urls=[url.string()])
 
     async def get_consume_details(self, endpoint):
         """
         get_consume_details returns the details necessary to pass to another
         model to consume the specified offers represented by the urls.
         """
         facade = client.ApplicationOffersFacade.from_connection(self.connection())
-        offers = await facade.GetConsumeDetails([endpoint])
+        offers = await facade.GetConsumeDetails(offer_urls=[endpoint])
         if len(offers.results) != 1:
             raise JujuAPIError("expected to find one result")
         result = offers.results[0]

juju/unit.py

@@ -99,7 +99,7 @@ async def destroy(self):
         log.debug(
             'Destroying %s', self.name)
 
-        return await app_facade.DestroyUnits([self.name])
+        return await app_facade.DestroyUnits(unit_names=[self.name])
     remove = destroy
 
     def get_resources(self, details=False):

tests/integration/test_client.py

@@ -13,7 +13,7 @@ async def test_user_info(event_loop):
 
         um = client.UserManagerFacade.from_connection(controller_conn)
         result = await um.UserInfo(
-            [client.Entity('user-admin')], True)
+            entities=[client.Entity('user-admin')], include_disabled=True)
         await controller_conn.close()
 
         assert isinstance(result, client.UserInfoResults)

tests/integration/test_connection.py

@@ -66,7 +66,7 @@ async def test_full_status(event_loop):
 
         c = client.ClientFacade.from_connection(model.connection())
 
-        await c.FullStatus(None)
+        await c.FullStatus(patterns=None)
 
 
 @base.bootstrapped

tests/integration/test_errors.py

@@ -65,4 +65,4 @@ async def test_juju_error_in_result(event_loop):
         app_facade = client.ApplicationFacade.from_connection(model.connection())
 
         with pytest.raises(JujuError):
-            return await app_facade.GetCharmURL('foo')
+            return await app_facade.GetCharmURL(application='foo')

tests/unit/test_definitions.py

@@ -68,5 +68,5 @@ def test_parse(self):
             raise Exception("status relation is not a RelationStatus")
         if not isinstance(status.relations[0].endpoints[0], client.EndpointStatus):
             raise Exception("status relation endpoint is not a EndpointStatus")
-        if not isinstance(status.applications['app'], client.ApplicationStatus):
+        if not isinstance(status.get('applications')['app'], client.ApplicationStatus):
             raise Exception("status application is not a ApplicationStatus")