Nova ironic driver review update requests to p4

In https://review.openstack.org/#/c/111425/7/nova/tests/virt/...
...ironic/test_driver.py it was requested to change the way API
testing was conducted.  In doing this, some slight alterations
have been needed to ensure conformity.

Change-Id: Ia2905e4a8a27ff196198e35d04d0570065d2779d

2 files changed, 8 insertions, 8 deletions

diff --git a/ironic/nova/tests/virt/ironic/test_driver.py b/ironic/nova/tests/virt/ironic/test_driver.py
index a9f4a25e2..1910bf376 100644
--- a/ironic/nova/tests/virt/ironic/test_driver.py
+++ b/ironic/nova/tests/virt/ironic/test_driver.py
@@ -97,11 +97,11 @@ class IronicDriverTestCase(test.NoDBTestCase):
     def test_validate_driver_loading(self):
         self.assertIsInstance(self.driver, ironic_driver.IronicDriver)
 
-    def test_get_hypervisor_type(self):
-        self.assertEqual(self.driver.get_hypervisor_type(), 'ironic')
+    def test__get_hypervisor_type(self):
+        self.assertEqual(self.driver._get_hypervisor_type(), 'ironic')
 
-    def test_get_hypervisor_version(self):
-        self.assertEqual(self.driver.get_hypervisor_version(), 1)
+    def test__get_hypervisor_version(self):
+        self.assertEqual(self.driver._get_hypervisor_version(), 1)
 
     @mock.patch.object(FAKE_CLIENT.node, 'get_by_instance_uuid')
     def test__validate_instance_and_node(self, mock_gbiui):
diff --git a/ironic/nova/virt/ironic/driver.py b/ironic/nova/virt/ironic/driver.py
index d26611c61..dd60599d0 100644
--- a/ironic/nova/virt/ironic/driver.py
+++ b/ironic/nova/virt/ironic/driver.py
@@ -231,8 +231,8 @@ class IronicDriver(virt_driver.ComputeDriver):
         dic = {
             'node': str(node.uuid),
             'hypervisor_hostname': str(node.uuid),
-            'hypervisor_type': self.get_hypervisor_type(),
-            'hypervisor_version': self.get_hypervisor_version(),
+            'hypervisor_type': self._get_hypervisor_type(),
+            'hypervisor_version': self._get_hypervisor_version(),
             'cpu_info': 'baremetal cpu',
             'vcpus': vcpus,
             'vcpus_used': vcpus_used,
@@ -336,11 +336,11 @@ class IronicDriver(virt_driver.ComputeDriver):
         """
         return
 
-    def get_hypervisor_type(self):
+    def _get_hypervisor_type(self):
         """Get hypervisor type."""
         return 'ironic'
 
-    def get_hypervisor_version(self):
+    def _get_hypervisor_version(self):
         """Returns the version of the Ironic API service endpoint."""
         return CONF.ironic.api_version