Merge ~adam-collard/maas:lxd-no-proxy into maas:master

[Adam Collard]

Create a Session before instantiating the pylxd Client

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-no-proxy lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1983/consoleText
COMMIT: 1905663384d4eedd5f231f5003bda6bb397ed8dd

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-no-proxy lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1987/consoleText
COMMIT: 1905663384d4eedd5f231f5003bda6bb397ed8dd

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-no-proxy lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 51b5c92faf5702711e726eb6d8a7fa366e1d6408

review: Approve

[Alberto Donato (ack)]

+1

small nit inline

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lxd-no-proxy lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/1995/consoleText

diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 0f67883..571ef0b 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -13,6 +13,7 @@ from urllib.parse import urlparse
 import uuid
 
 from pylxd import Client
+from pylxd.client import get_session_for_url
 from pylxd.exceptions import ClientConnectionFailed, LXDAPIException, NotFound
 import urllib3
 
@@ -849,14 +850,16 @@ class LXDPodDriver(PodDriver):
             raise Error("No certificates available")
 
         def client_with_certs(cert):
+            session = get_session_for_url(endpoint, cert=cert, verify=False)
+            # Don't inherit proxy environment variables
+            session.trust_env = False
             client = self._pylxd_client_class(
                 endpoint=endpoint,
                 project=project,
                 cert=cert,
                 verify=False,
+                session=session,
             )
-            # Don't inherit proxy environment variables
-            client.api.session.trust_env = False
             if not client.trusted and password:
                 try:
                     client.authenticate(password)
diff --git a/src/provisioningserver/drivers/pod/tests/test_lxd.py b/src/provisioningserver/drivers/pod/tests/test_lxd.py
index 1c02b0c..baf0c4a 100644
--- a/src/provisioningserver/drivers/pod/tests/test_lxd.py
+++ b/src/provisioningserver/drivers/pod/tests/test_lxd.py
@@ -127,6 +127,7 @@ class FakeClient:
     project: str
     cert: Optional[Tuple[str, str]]
     verify: bool
+    session: Session
 
     _PROXIES = (
         "host_info",
@@ -143,7 +144,7 @@ class FakeClient:
         self.trusted = False
         self._fail_auth = False
         self.host_info = self.fake_lxd.host_info
-        self.api = FakeAPINode()
+        self.api = FakeAPINode(self.session)
 
     def authenticate(self, password):
         if self._fail_auth:
@@ -157,11 +158,11 @@ class FakeClient:
         raise AttributeError(name)
 
 
[e-mail]
 class FakeAPINode:
     """A fake pylxd.client._APINode"""
 
-    def __init__(self):
-        self.session = Session()
+    session: Session
 
 
 class FakeLXD:
@@ -201,8 +202,16 @@ class FakeLXD:
         project="default",
         cert=None,
         verify=False,
+        session=None,
     ):
-        client = FakeClient(self, endpoint, project, cert, verify)
+        client = FakeClient(
+            fake_lxd=self,
+            endpoint=endpoint,
+            project=project,
+            cert=cert,
+            verify=verify,
+            session=session,
+        )
 
         if self._client_behaviors is not None:
             try:
@@ -264,10 +273,13 @@ class FakeLXDCluster:
         project="default",
         cert=None,
         verify=False,
+        session=None,
     ):
         if self.client_idx == len(self.clients):
             self.client_idx = 0
-        client = self.clients[self.client_idx](endpoint, project, cert, verify)
+        client = self.clients[self.client_idx](
+            endpoint, project, cert, verify, session
+        )
         client._PROXIES += ("cluster", "cluster/members")
         self.client_idx += 1
         return client