summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/userguide/featureusage.rst5
-rw-r--r--tests/clean.py2
-rw-r--r--tests/inspector.py2
-rw-r--r--tests/nova_force_down.py2
-rwxr-xr-xtests/run.sh3
5 files changed, 8 insertions, 6 deletions
diff --git a/docs/userguide/featureusage.rst b/docs/userguide/featureusage.rst
index 4df2d41a..d24c1acb 100644
--- a/docs/userguide/featureusage.rst
+++ b/docs/userguide/featureusage.rst
@@ -37,9 +37,12 @@ See
http://artifacts.opnfv.org/doctor/brahmaputra/docs/manuals/mark-host-down_manual.html
for more detail.
+Valid compute host status given to VM owner
+-------------------------------------------
+
The resource state of a compute host can be retrieved by a user with the
OpenStack Compute (Nova) servers API.
See
-http://artifacts.opnfv.org/doctor/colorado/docs/manuals/get-valid-server-state.html
+http://artifacts.opnfv.org/doctor/docs/manuals/get-valid-server-state.html
for more detail.
diff --git a/tests/clean.py b/tests/clean.py
index af966aed..f8394055 100644
--- a/tests/clean.py
+++ b/tests/clean.py
@@ -14,7 +14,7 @@ import os
import novaclient.client as novaclient
-nova_api_version = 2.11
+nova_api_version = '2.11'
def enable_compute_host(hostname):
self.nova = novaclient.Client(self.nova_api_version,
diff --git a/tests/inspector.py b/tests/inspector.py
index db7db39e..c8fb00f9 100644
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -20,7 +20,7 @@ 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,
diff --git a/tests/nova_force_down.py b/tests/nova_force_down.py
index bb10e9ea..abea5671 100644
--- a/tests/nova_force_down.py
+++ b/tests/nova_force_down.py
@@ -36,7 +36,7 @@ def force_down(hostname, force_down=True):
'Content-Type': 'application/json',
'Accept': 'application/json',
'X-Auth-Token': keystone.auth_ref['token']['id'],
- 'X-OpenStack-Nova-API-Version': 2.11,
+ 'X-OpenStack-Nova-API-Version': '2.11',
}
print requests.put(url, data=json.dumps(data), headers=headers)
diff --git a/tests/run.sh b/tests/run.sh
index 06aa6848..7f5a6c01 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -22,8 +22,7 @@ CONSUMER_PORT=12346
DOCTOR_USER=doctor
DOCTOR_PW=doctor
DOCTOR_PROJECT=doctor
-#TODO: change back to `_member_` when JIRA DOCTOR-55 is done
-DOCTOR_ROLE=admin
+DOCTOR_ROLE=_member_
SUPPORTED_INSTALLER_TYPES="apex local"
INSTALLER_TYPE=${INSTALLER_TYPE:-apex}