Use configurable driver name in lookup URL

jimrollenhagen · jimrollenhagen · commit 46e9776d4275 · 2014-04-14T11:32:16.000-07:00
Allow configuration via command line arguments or kernel parameters. Default to agent_ipmitool, the reference driver. Depends on https://review.openstack.org/#/c/84795/12 Change-Id: I55c4a8713308d038002a6567471cd862bf89ec76
diff --git a/ironic_python_agent/agent.py b/ironic_python_agent/agent.py
@@ -66,7 +66,8 @@ def __init__(self, agent):
         super(IronicPythonAgentHeartbeater, self).__init__()
         self.agent = agent
         self.hardware = hardware.get_manager()
-        self.api = ironic_api_client.APIClient(agent.api_url)
+        self.api = ironic_api_client.APIClient(agent.api_url,
+                                               agent.driver_name)
         self.log = log.getLogger(__name__)
         self.stop_event = threading.Event()
         self.error_delay = self.initial_delay
@@ -105,10 +106,12 @@ def stop(self):
 
 class IronicPythonAgent(base.ExecuteCommandMixin):
     def __init__(self, api_url, advertise_address, listen_address,
-                 lookup_timeout, lookup_interval):
+                 lookup_timeout, lookup_interval, driver_name):
         super(IronicPythonAgent, self).__init__()
         self.api_url = api_url
-        self.api_client = ironic_api_client.APIClient(self.api_url)
+        self.driver_name = driver_name
+        self.api_client = ironic_api_client.APIClient(self.api_url,
+                                                      self.driver_name)
         self.listen_address = listen_address
         self.advertise_address = advertise_address
         self.version = pkg_resources.get_distribution('ironic-python-agent')\
diff --git a/ironic_python_agent/cmd/agent.py b/ironic_python_agent/cmd/agent.py
@@ -90,10 +90,17 @@ def run():
                              'doubled after each failure until timeout is '
                              'exceeded.')
 
+    parser.add_argument('--driver-name',
+                        default=kparams.get('ipa-driver-name',
+                                            'agent_ipmitool'),
+                        type=str,
+                        help='The Ironic driver in use for this node')
+
     args = parser.parse_args()
 
     agent.IronicPythonAgent(api_url or args.api_url,
                             (args.advertise_host, args.advertise_port),
                             (args.listen_host, args.listen_port),
                             args.lookup_timeout,
-                            args.lookup_interval).run()
+                            args.lookup_interval,
+                            args.driver_name).run()
diff --git a/ironic_python_agent/ironic_api_client.py b/ironic_python_agent/ironic_api_client.py
@@ -30,8 +30,9 @@ class APIClient(object):
     api_version = 'v1'
     payload_version = '2'
 
-    def __init__(self, api_url):
+    def __init__(self, api_url, driver_name):
         self.api_url = api_url.rstrip('/')
+        self.driver_name = driver_name
         self.session = requests.Session()
         self.encoder = encoding.RESTJSONEncoder()
         self.log = log.getLogger(__name__)
@@ -92,8 +93,9 @@ def _do_lookup(self, hardware_info):
         """The actual call to lookup a node. Should be called inside
         loopingcall.BackOffLoopingCall.
         """
-        path = '/{api_version}/drivers/teeth/vendor_passthru/lookup'.format(
-            api_version=self.api_version
+        path = '/{api_version}/drivers/{driver}/vendor_passthru/lookup'.format(
+            api_version=self.api_version,
+            driver=self.driver_name
         )
         # This hardware won't be saved on the node currently, because of
         # how driver_vendor_passthru is implemented (no node saving).
diff --git a/ironic_python_agent/tests/agent.py b/ironic_python_agent/tests/agent.py
@@ -130,8 +130,9 @@ def setUp(self):
                                              'org:8081/',
                                              ('203.0.113.1', 9990),
                                              ('192.0.2.1', 9999),
-                                             lookup_timeout=300,
-                                             lookup_interval=1)
+                                             300,
+                                             1,
+                                             'agent_ipmitool')
 
     def assertEqualEncoded(self, a, b):
         # Evidently JSONEncoder.default() can't handle None (??) so we have to
diff --git a/ironic_python_agent/tests/ironic_api_client.py b/ironic_python_agent/tests/ironic_api_client.py
@@ -25,6 +25,7 @@
 from ironic_python_agent.openstack.common import loopingcall
 
 API_URL = 'http://agent-api.ironic.example.org/'
+DRIVER = 'agent_ipmitool'
 
 
 class FakeResponse(object):
@@ -38,7 +39,7 @@ def __init__(self, content=None, status_code=200, headers=None):
 class TestBaseIronicPythonAgent(test_base.BaseTestCase):
     def setUp(self):
         super(TestBaseIronicPythonAgent, self).setUp()
-        self.api_client = ironic_api_client.APIClient(API_URL)
+        self.api_client = ironic_api_client.APIClient(API_URL, DRIVER)
         self.hardware_info = {
             'interfaces': [
                 hardware.NetworkInterface('eth0', '00:0c:29:8c:11:b1'),
@@ -158,10 +159,11 @@ def test_do_lookup(self):
                           self.api_client._do_lookup,
                           hardware_info=self.hardware_info)
 
+        url = '{api_url}v1/drivers/{driver}/vendor_passthru/lookup'.format(
+                api_url=API_URL, driver=DRIVER)
         request_args = self.api_client.session.request.call_args[0]
         self.assertEqual(request_args[0], 'POST')
-        self.assertEqual(request_args[1],
-                         API_URL + 'v1/drivers/teeth/vendor_passthru/lookup')
+        self.assertEqual(request_args[1], url)
 
         data = self.api_client.session.request.call_args[1]['data']
         content = json.loads(data)
