Generate code to use _2_9_clients along with _clients

Author: cderici

juju/client/_client.py

@@ -3,7 +3,26 @@
 
 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.old_clients import _client2 as _2_9_client2
+from juju.client.old_clients import _client1 as _2_9_client1
+from juju.client.old_clients import _client3 as _2_9_client3
+from juju.client.old_clients import _client4 as _2_9_client4
+from juju.client.old_clients import _client5 as _2_9_client5
+from juju.client.old_clients import _client8 as _2_9_client8
+from juju.client.old_clients import _client7 as _2_9_client7
+from juju.client.old_clients import _client9 as _2_9_client9
+from juju.client.old_clients import _client10 as _2_9_client10
+from juju.client.old_clients import _client6 as _2_9_client6
+from juju.client.old_clients import _client12 as _2_9_client12
+from juju.client.old_clients import _client11 as _2_9_client11
+from juju.client.old_clients import _client13 as _2_9_client13
+from juju.client.old_clients import _client15 as _2_9_client15
+from juju.client.old_clients import _client16 as _2_9_client16
+from juju.client.old_clients import _client17 as _2_9_client17
+from juju.client.old_clients import _client18 as _2_9_client18
+from juju.client.old_clients import _client14 as _2_9_client14
+
+from juju.client import _client2, _client1, _client3, _client4, _client5, _client8, _client7, _client9, _client10, _client6, _client12, _client11, _client13, _client15, _client16, _client17, _client18, _client14
 
 
 CLIENTS = {
@@ -23,20 +42,43 @@
     "15": _client15,
     "16": _client16,
     "17": _client17,
-    "18": _client18
+    "18": _client18,
+    "14": _client14
 }
 
 
+OLD_CLIENTS = {
+    "2": _2_9_client2,
+    "1": _2_9_client1,
+    "3": _2_9_client3,
+    "4": _2_9_client4,
+    "5": _2_9_client5,
+    "8": _2_9_client8,
+    "7": _2_9_client7,
+    "9": _2_9_client9,
+    "10": _2_9_client10,
+    "6": _2_9_client6,
+    "12": _2_9_client12,
+    "11": _2_9_client11,
+    "13": _2_9_client13,
+    "15": _2_9_client15,
+    "16": _2_9_client16,
+    "17": _2_9_client17,
+    "18": _2_9_client18,
+    "14": _2_9_client14
+}
+
 
-def lookup_facade(name, version):
+def lookup_facade(name, version, is_2_9=False):
     """
     Given a facade name and version, attempt to pull that facade out
     of the correct client<version>.py file.
 
     """
     for _version in range(int(version), 0, -1):
         try:
-            facade = getattr(CLIENTS[str(_version)], name)
+            client_directory = OLD_CLIENTS if is_2_9 else CLIENTS
+            facade = getattr(client_directory[str(_version)], name)
             return facade
         except (KeyError, AttributeError):
             continue
@@ -45,7 +87,6 @@ def lookup_facade(name, version):
                           "{}".format(name))
 
 
-
 class TypeFactory:
     @classmethod
     def from_connection(cls, connection):
@@ -66,7 +107,8 @@ def from_connection(cls, connection):
             raise Exception('No facade {} in facades {}'.format(facade_name,
                                                                 connection.facades))
 
-        c = lookup_facade(cls.__name__, version)
+        server_version = connection.info['server-version']
+        c = lookup_facade(cls.__name__, version, server_version.startswith('2.9'))
         c = c()
         c.connect(connection)
 

juju/client/_definitions.py

@@ -9408,6 +9408,30 @@ def __init__(self, actions=None, operation=None, **unknown_fields):
 
 
 
+class EnqueuedActionsV2(Type):
+    _toSchema = {'actions': 'actions', 'operation': 'operation'}
+    _toPy = {'actions': 'actions', 'operation': 'operation'}
+    def __init__(self, actions=None, operation=None, **unknown_fields):
+        '''
+        actions : typing.Sequence[~ActionResult]
+        operation : str
+        '''
+        actions_ = [ActionResult.from_json(o) for o in actions or []]
+        operation_ = operation
+
+        # Validate arguments against known Juju API types.
+        if actions_ is not None and not isinstance(actions_, (bytes, str, list)):
+            raise Exception("Expected actions_ to be a Sequence, received: {}".format(type(actions_)))
+
+        if operation_ is not None and not isinstance(operation_, (bytes, str)):
+            raise Exception("Expected operation_ to be a str, received: {}".format(type(operation_)))
+
+        self.actions = actions_
+        self.operation = operation_
+        self.unknown_fields = unknown_fields
+
+
+
 class Entities(Type):
     _toSchema = {'entities': 'entities'}
     _toPy = {'entities': 'entities'}
@@ -28161,10 +28185,10 @@ class ValidateModelUpgradeParams(Type):
     def __init__(self, force=None, model=None, **unknown_fields):
         '''
         force : bool
-        model : typing.Sequence[~ValidateModelUpgradeParam]
+        model : typing.Sequence[~ModelParam]
         '''
         force_ = force
-        model_ = [ValidateModelUpgradeParam.from_json(o) for o in model or []]
+        model_ = [ModelParam.from_json(o) for o in model or []]
 
         # Validate arguments against known Juju API types.
         if force_ is not None and not isinstance(force_, bool):

juju/client/facade.py

@@ -44,23 +44,23 @@
 
 # Classes and helper functions that we'll write to _client.py
 LOOKUP_FACADE = '''
-def lookup_facade(name, version):
+def lookup_facade(name, version, is_2_9=False):
     """
     Given a facade name and version, attempt to pull that facade out
     of the correct client<version>.py file.
 
     """
     for _version in range(int(version), 0, -1):
         try:
-            facade = getattr(CLIENTS[str(_version)], name)
+            client_directory = OLD_CLIENTS if is_2_9 else CLIENTS
+            facade = getattr(client_directory[str(_version)], name)
             return facade
         except (KeyError, AttributeError):
             continue
     else:
         raise ImportError("No supported version for facade: "
                           "{}".format(name))
 
-
 '''
 
 TYPE_FACTORY = '''
@@ -84,7 +84,8 @@ def from_connection(cls, connection):
             raise Exception('No facade {} in facades {}'.format(facade_name,
                                                                 connection.facades))
 
-        c = lookup_facade(cls.__name__, version)
+        server_version = connection.info['server-version']
+        c = lookup_facade(cls.__name__, version, server_version.startswith('2.9'))
         c = c()
         c.connect(connection)
 
@@ -112,6 +113,13 @@ def best_facade_version(cls, connection):
     {clients}
 }}
 
+'''
+
+
+OLD_CLIENTS_TABLE = '''
+OLD_CLIENTS = {{
+    {old_clients}
+}}
 
 '''
 
@@ -874,9 +882,18 @@ def write_client(captures, options):
         f.write(HEADER)
         f.write("from juju.client._definitions import *\n\n")
         clients = ", ".join("_client{}".format(v) for v in captures)
-        f.write("from juju.client import " + clients + "\n\n")
+        # from juju.client.old_clients import _client{} as _2_9_client{}
+        for v in captures:
+            pre = "from juju.client.old_clients import "
+            f.write(pre + "_client{num} as _2_9_client{num}\n".format(num=v))
+        # from juju.client import _client2, _client1, _client3 ...
+        f.write("\nfrom juju.client import " + clients + "\n\n")
+        # CLIENTS = { ....
         f.write(CLIENT_TABLE.format(clients=",\n    ".join(
             ['"{}": _client{}'.format(v, v) for v in captures])))
+        # OLD_CLIENTS = { ....
+        f.write(OLD_CLIENTS_TABLE.format(old_clients=",\n    ".join(
+            ['"{}": _2_9_client{}'.format(v, v) for v in captures])))
         f.write(LOOKUP_FACADE)
         f.write(TYPE_FACTORY)
         for key in sorted([k for k in factories.keys() if "Facade" in k]):