Change type of nova_api_version from float to str

[doctor.git] / tests / inspector.py

diff --git a/tests/inspector.py b/tests/inspector.py
index c643210..c8fb00f 100644 (file)
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -15,10 +15,12 @@ import os
 
 import novaclient.client as novaclient
 
+import nova_force_down
+
 
 class DoctorInspectorSample(object):
 
-    nova_api_version = 2.11
+    nova_api_version = '2.11'
 
     def __init__(self):
         self.nova = novaclient.Client(self.nova_api_version,
@@ -34,7 +36,15 @@ class DoctorInspectorSample(object):
         opts = {'all_tenants': True, 'host': hostname}
         for server in self.nova.servers.list(detailed=False, search_opts=opts):
             self.nova.servers.reset_state(server, 'error')
-        self.nova.services.force_down(hostname, 'nova-compute', True)
+
+        # NOTE: We use our own client here instead of this novaclient for a
+        #       workaround.  Once keystone provides v2.1 nova api endpoint
+        #       in the service catalog which is configured by OpenStack
+        #       installer, we can use this:
+        #
+        # self.nova.services.force_down(hostname, 'nova-compute', True)
+        #
+        nova_force_down.force_down(hostname)
 
 
 app = Flask(__name__)
@@ -55,9 +65,9 @@ def event_posted():
 
 
 def get_args():
-    parser = argparse.ArgumentParser(description='Doctor Sample Monitor')
+    parser = argparse.ArgumentParser(description='Doctor Sample Inspector')
     parser.add_argument('port', metavar='PORT', type=int, nargs='?',
-                        help='a port for inspectpr')
+                        help='a port for inspector')
     return parser.parse_args()