[JUJU-1457] Merge 3.0 compatibility branch onto master

juju/application.py

@@ -431,10 +431,9 @@ async def get_actions(self, schema=False):
         :return dict: The charms actions, empty dict if none are defined.
         """
         actions = {}
-        entity = [{"tag": self.tag}]
+        entity = {"tag": self.tag}
         action_facade = client.ActionFacade.from_connection(self.connection)
-        results = (
-            await action_facade.ApplicationsCharmsActions(entities=entity)).results
+        results = (await action_facade.ApplicationsCharmsActions(entities=[entity])).results
         for result in results:
             if result.application_tag == self.tag and result.actions:
                 actions = result.actions
@@ -563,7 +562,10 @@ async def set_config(self, config):
             else:
                 raise JujuApplicationConfigError(config, [k, v])
 
-        await app_facade.Set(application=self.name, options=str_config)
+        return await app_facade.SetConfigs(args=[{
+            "application": self.name,
+            "config": str_config,
+        }])
 
     async def reset_config(self, to_default):
         """
@@ -577,7 +579,10 @@ async def reset_config(self, to_default):
         log.debug(
             'Restoring default config for %s: %s', self.name, to_default)
 
-        return await app_facade.Unset(application=self.name, options=to_default)
+        return await app_facade.UnsetApplicationsConfig(args=[{
+            "application": self.name,
+            "options": to_default,
+        }])
 
     async def set_constraints(self, constraints):
         """Set machine constraints for this application.
@@ -619,7 +624,7 @@ async def refresh(
         if switch is not None and revision is not None:
             raise ValueError("switch and revision are mutually exclusive")
 
-        client_facade = client.ClientFacade.from_connection(self.connection)
+        charms_facade = client.CharmsFacade.from_connection(self.connection)
         resources_facade = client.ResourcesFacade.from_connection(
             self.connection)
         app_facade = self._facade()
@@ -644,11 +649,15 @@ async def refresh(
         if charm_url == self.data['charm-url']:
             raise JujuError('already running charm "%s"' % charm_url)
 
+        # TODO (caner) : this needs to be revisited and updated with the charmhub stuff
+        origin = client.CharmOrigin(source="charm-store",
+                                    risk=channel,
+                                    )
         # Update charm
-        await client_facade.AddCharm(
+        await charms_facade.AddCharm(
             url=charm_url,
             force=force,
-            channel=channel
+            charm_origin=origin,
         )
 
         # Update resources

juju/bundle.py

@@ -52,6 +52,8 @@ def __init__(self, model, trusted=False, forced=False):
             model.connection())
         self.ann_facade = client.AnnotationsFacade.from_connection(
             model.connection())
+        self.machine_manager_facade = client.MachineManagerFacade.from_connection(
+            model.connection())
 
         # Feature detect if we have the new charms facade, otherwise fallback
         # to the client facade, when making calls.
@@ -617,10 +619,8 @@ async def run(self, context):
                 self.application, charm, overrides=self.resources)
         elif Schema.CHARM_HUB.matches(url.schema):
             c_hub = charmhub.CharmHub(context.model)
-            info = await c_hub.info(url.name, channel=self.channel)
-            if info.errors.error_list.code:
-                raise JujuError("unable to resolve the charm {} with channel {}".format(url.name, channel))
-            origin.id_ = info.result.id_
+            id_, _ = c_hub.get_charm_id(url.name)
+            origin.id_ = id_
             resources = await context.model._add_charmhub_resources(
                 self.application, charm, origin, overrides=self.resources)
         else:
@@ -726,7 +726,7 @@ async def run(self, context):
         if Schema.CHARM_STORE.matches(url.schema):
             entity_id = await context.charmstore.entityId(self.charm, channel=self.channel)
             log.debug('Adding %s', entity_id)
-            await context.client_facade.AddCharm(channel=self.channel, url=entity_id, force=False)
+            await context.charms_facade.AddCharm(channel=self.channel, url=entity_id, force=False)
             identifier = entity_id
             origin = client.CharmOrigin(source="charm-store", risk="stable")
 
@@ -837,7 +837,7 @@ async def run(self, context):
 
         # Submit the request.
         params = client.AddMachineParams(**params)
-        results = await context.client_facade.AddMachines(params=[params])
+        results = await context.machine_manager_facade.AddMachines(params=[params])
         error = results.machines[0].error
         if error:
             raise ValueError("Error adding machine: %s" % error.message)

juju/charmhub.py

@@ -1,11 +1,42 @@
 from .client import client
 from .errors import JujuError
+from juju import jasyncio
+
+import requests
+import json
 
 
 class CharmHub:
     def __init__(self, model):
         self.model = model
 
+    def request_charmhub_with_retry(self, url, retries):
+        for attempt in range(retries):
+            _response = requests.get(url)
+            if _response.status_code == 200:
+                return _response
+            jasyncio.sleep(5)
+        raise JujuError("Got {} from {}".format(_response.status_code, url))
+
+    def get_charm_id(self, charm_name):
+        conn, headers, path_prefix = self.model.connection().https_connection()
+
+        url = "http://api.snapcraft.io/v2/charms/info/{}".format(charm_name)
+        _response = self.request_charmhub_with_retry(url, 5)
+        response = json.loads(_response.text)
+        return response['id'], response['name']
+
+    def is_subordinate(self, charm_name):
+        conn, headers, path_prefix = self.model.connection().https_connection()
+
+        url = "http://api.snapcraft.io/v2/charms/info/{}?fields=default-release.revision.subordinate".format(charm_name)
+        _response = self.request_charmhub_with_retry(url, 5)
+        response = json.loads(_response.text)
+        return 'subordinate' in response['default-release']['revision']
+
+    # TODO (caner) : we should be able to recreate the channel-map through the
+    #  api call without needing the CharmHub facade
+
     async def info(self, name, channel=None):
         """info displays detailed information about a CharmHub charm. The charm
         can be specified by the exact name.

juju/client/_client.py

@@ -3,7 +3,8 @@
 
 from juju.client._definitions import *
 
-from juju.client import _client2, _client1, _client3, _client4, _client5, _client8, _client7, _client9, _client10, _client6, _client12, _client11, _client13, _client15, _client16, _client17, _client18
+
+from juju.client import _client2, _client1, _client3, _client4, _client5, _client8, _client7, _client9, _client10, _client6, _client12, _client11, _client13, _client15, _client16, _client17, _client18, _client14
 
 
 CLIENTS = {
@@ -23,11 +24,11 @@
     "15": _client15,
     "16": _client16,
     "17": _client17,
-    "18": _client18
+    "18": _client18,
+    "14": _client14
 }
 
 
-
 def lookup_facade(name, version):
     """
     Given a facade name and version, attempt to pull that facade out
@@ -45,7 +46,6 @@ def lookup_facade(name, version):
                           "{}".format(name))
 
 
-
 class TypeFactory:
     @classmethod
     def from_connection(cls, connection):
@@ -259,6 +259,10 @@ class EntityWatcherFacade(TypeFactory):
     pass
 
 
+class EnvironUpgraderFacade(TypeFactory):
+    pass
+
+
 class ExternalControllerUpdaterFacade(TypeFactory):
     pass