Merge "Move from inheritance HTTPClient in Ironic client"0.0.1

2 files changed, 8 insertions, 8 deletions

diff --git a/ironicclient/tests/test_client.py b/ironicclient/tests/test_client.py
index 1491ee6..f5da5f3 100644
--- a/ironicclient/tests/test_client.py
+++ b/ironicclient/tests/test_client.py
@@ -34,7 +34,7 @@ class ClientTest(utils.BaseTestCase):
         }
         client = get_client('1', **kwargs)
 
-        self.assertEqual(client.auth_token, 'KSCLIENT_AUTH_TOKEN')
+        self.assertEqual(client.http_client.auth_token, 'KSCLIENT_AUTH_TOKEN')
 
     def test_get_client_with_auth_token(self):
         self.useFixture(fixtures.MonkeyPatch(
@@ -48,4 +48,4 @@ class ClientTest(utils.BaseTestCase):
         }
         client = get_client('1', **kwargs)
 
-        self.assertEqual(client.auth_token, 'USER_AUTH_TOKEN')
+        self.assertEqual(client.http_client.auth_token, 'USER_AUTH_TOKEN')
diff --git a/ironicclient/v1/client.py b/ironicclient/v1/client.py
index 6fc058c..6e52770 100644
--- a/ironicclient/v1/client.py
+++ b/ironicclient/v1/client.py
@@ -20,7 +20,7 @@ from ironicclient.v1 import node
 from ironicclient.v1 import port
 
 
-class Client(http.HTTPClient):
+class Client(object):
     """Client for the Ironic v1 API.
 
     :param string endpoint: A user-supplied endpoint URL for the ironic
@@ -32,8 +32,8 @@ class Client(http.HTTPClient):
 
     def __init__(self, *args, **kwargs):
         """Initialize a new client for the Ironic v1 API."""
-        super(Client, self).__init__(*args, **kwargs)
-        self.chassis = chassis.ChassisManager(self)
-        self.node = node.NodeManager(self)
-        self.port = port.PortManager(self)
-        self.driver = driver.DriverManager(self)
+        self.http_client = http.HTTPClient(*args, **kwargs)
+        self.chassis = chassis.ChassisManager(self.http_client)
+        self.node = node.NodeManager(self.http_client)
+        self.port = port.PortManager(self.http_client)
+        self.driver = driver.DriverManager(self.http_client)