Remove redundant code in client codegen in facade.py

As long as we keep a tight manifold at the client.py and provide the
facade classes from the correct _client modules, then those facades
will use the corresponding lookup functions where they're from. This
way we're sure the correct _client* will be used, so no need to import
everything from old_clients/_client.py into the _client.py. The main
separation happens at the client.py.

Author: cderici

juju/client/_client.py

@@ -3,24 +3,6 @@
 
 from juju.client._definitions import *
 
-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
 
@@ -47,38 +29,15 @@
 }
 
 
-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, is_2_9=False):
+def lookup_facade(name, version):
     """
     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:
-            client_directory = OLD_CLIENTS if is_2_9 else CLIENTS
-            facade = getattr(client_directory[str(_version)], name)
+            facade = getattr(CLIENTS[str(_version)], name)
             return facade
         except (KeyError, AttributeError):
             continue
@@ -107,8 +66,7 @@ def from_connection(cls, connection):
             raise Exception('No facade {} in facades {}'.format(facade_name,
                                                                 connection.facades))
 
-        server_version = connection.info['server-version']
-        c = lookup_facade(cls.__name__, version, server_version.startswith('2.9'))
+        c = lookup_facade(cls.__name__, version)
         c = c()
         c.connect(connection)
 

juju/client/client.py

@@ -35,7 +35,7 @@
             if not a.startswith('_'):
                 setattr(c_type, a, getattr(o_type, a))
     # This unfortunately needs to be a separate loop
-    for old_client_version in _client.OLD_CLIENTS.values():
+    for old_client_version in _2_9_client.CLIENTS.values():
         try:
             c_type = getattr(old_client_version, o)
         except AttributeError:
@@ -56,20 +56,16 @@ def __init__(self):
         new_client (bool): True if we're working with juju>3.0
         """
         self.new_client = None
-        self.defs = _definitions
         self.client_module = _client
 
     __all__ = list(set(vars().keys()) - {'__module__', '__qualname__'})
 
     def __getattr__(self, item):
-        if 'Facade' in item:
-            return getattr(self.client_module, item)
-        return getattr(self.defs, item)
+        return getattr(self.client_module, item)
 
     def set_new_client(self, server_version):
         self.new_client = server_version.startswith('3.')
         if not self.new_client:
-            self.defs = _2_9_definitions
             self.client_module = _2_9_client
 
 

juju/client/facade.py

@@ -44,16 +44,15 @@
 
 # Classes and helper functions that we'll write to _client.py
 LOOKUP_FACADE = '''
-def lookup_facade(name, version, is_2_9=False):
+def lookup_facade(name, version):
     """
     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:
-            client_directory = OLD_CLIENTS if is_2_9 else CLIENTS
-            facade = getattr(client_directory[str(_version)], name)
+            facade = getattr(CLIENTS[str(_version)], name)
             return facade
         except (KeyError, AttributeError):
             continue
@@ -84,8 +83,7 @@ def from_connection(cls, connection):
             raise Exception('No facade {} in facades {}'.format(facade_name,
                                                                 connection.facades))
 
-        server_version = connection.info['server-version']
-        c = lookup_facade(cls.__name__, version, server_version.startswith('2.9'))
+        c = lookup_facade(cls.__name__, version)
         c = c()
         c.connect(connection)
 
@@ -116,14 +114,6 @@ def best_facade_version(cls, connection):
 '''
 
 
-OLD_CLIENTS_TABLE = '''
-OLD_CLIENTS = {{
-    {old_clients}
-}}
-
-'''
-
-
 class KindRegistry(dict):
 
     def register(self, name, version, obj):
@@ -882,18 +872,13 @@ 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)
-        # 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]):