diff options
Diffstat (limited to 'docs/testing/user/userguide')
6 files changed, 21 insertions, 20 deletions
diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst index 5bb64e3bb..cac814667 100644 --- a/docs/testing/user/userguide/04-installation.rst +++ b/docs/testing/user/userguide/04-installation.rst @@ -172,13 +172,13 @@ Environment variables in the ``openrc`` file have to include at least:: OS_AUTH_URL OS_USERNAME OS_PASSWORD - OS_TENANT_NAME + OS_PROJECT_NAME EXTERNAL_NETWORK A sample ``openrc`` file may look like this:: export OS_PASSWORD=console - export OS_TENANT_NAME=admin + export OS_PROJECT_NAME=admin export OS_AUTH_URL=http://172.16.1.222:35357/v2.0 export OS_USERNAME=admin export OS_VOLUME_API_VERSION=2 diff --git a/docs/testing/user/userguide/05-yardstick_plugin.rst b/docs/testing/user/userguide/05-yardstick_plugin.rst index ec0b49ff1..679ce7900 100644 --- a/docs/testing/user/userguide/05-yardstick_plugin.rst +++ b/docs/testing/user/userguide/05-yardstick_plugin.rst @@ -49,7 +49,7 @@ environment and other dependencies: 3. Make sure Jump Host have access to the OpenStack Controller API. 4. Make sure Jump Host must have internet connectivity for downloading docker image. 5. You need to know where to get basic openstack Keystone authorization info, such as - OS_PASSWORD, OS_TENANT_NAME, OS_AUTH_URL, OS_USERNAME. + OS_PASSWORD, OS_PROJECT_NAME, OS_AUTH_URL, OS_USERNAME. 6. To run a Storperf container, you need to have OpenStack Controller environment variables defined and passed to Storperf container. The best way to do this is to put environment variables in a "storperf_admin-rc" file. The storperf_admin-rc @@ -58,8 +58,6 @@ environment and other dependencies: * OS_AUTH_URL * OS_USERNAME * OS_PASSWORD -* OS_TENANT_ID -* OS_TENANT_NAME * OS_PROJECT_NAME * OS_PROJECT_ID * OS_USER_DOMAIN_ID @@ -76,8 +74,9 @@ test/ci/prepare_storperf_admin-rc.sh USERNAME=${OS_USERNAME:-admin} PASSWORD=${OS_PASSWORD:-console} + # OS_TENANT_NAME is still present to keep backward compatibility with legacy + # deployments, but should be replaced by OS_PROJECT_NAME. TENANT_NAME=${OS_TENANT_NAME:-admin} - TENANT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'` PROJECT_NAME=${OS_PROJECT_NAME:-$TENANT_NAME} PROJECT_ID=`openstack project show admin|grep '\bid\b' |awk -F '|' '{print $3}'|sed -e 's/^[[:space:]]*//'` USER_DOMAIN_ID=${OS_USER_DOMAIN_ID:-default} @@ -90,8 +89,6 @@ test/ci/prepare_storperf_admin-rc.sh echo "OS_PASSWORD="$PASSWORD >> ~/storperf_admin-rc echo "OS_PROJECT_NAME="$PROJECT_NAME >> ~/storperf_admin-rc echo "OS_PROJECT_ID="$PROJECT_ID >> ~/storperf_admin-rc - echo "OS_TENANT_NAME="$TENANT_NAME >> ~/storperf_admin-rc - echo "OS_TENANT_ID="$TENANT_ID >> ~/storperf_admin-rc echo "OS_USER_DOMAIN_ID="$USER_DOMAIN_ID >> ~/storperf_admin-rc diff --git a/docs/testing/user/userguide/08-api.rst b/docs/testing/user/userguide/08-api.rst index ff6e62228..92fa408c8 100644 --- a/docs/testing/user/userguide/08-api.rst +++ b/docs/testing/user/userguide/08-api.rst @@ -252,7 +252,6 @@ Example:: "OS_PASSWORD": "console", "OS_PROJECT_DOMAIN_NAME": "default", "OS_PROJECT_NAME": "admin", - "OS_TENANT_NAME": "admin", "OS_USERNAME": "admin", "OS_USER_DOMAIN_NAME": "default" }, diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc056.rst b/docs/testing/user/userguide/opnfv_yardstick_tc056.rst index e6e06df57..09b866c34 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc056.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc056.rst @@ -10,7 +10,7 @@ Yardstick Test Case Description TC056 +-----------------------------------------------------------------------------+ |OpenStack Controller Messaging Queue Service High Availability | -+==============+==============================================================+ ++--------------+--------------------------------------------------------------+ |test case id | OPNFV_YARDSTICK_TC056:OpenStack Controller Messaging Queue | | | Service High Availability | +--------------+--------------------------------------------------------------+ diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc057.rst b/docs/testing/user/userguide/opnfv_yardstick_tc057.rst index 2a4ce40c0..bb42b2aae 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc057.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc057.rst @@ -10,8 +10,11 @@ Yardstick Test Case Description TC057 +-----------------------------------------------------------------------------+ |OpenStack Controller Cluster Management Service High Availability | -+==============+==============================================================+ -|test case id | | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC057_HA: OpenStack Controller Cluster | +| | Management Service High Availability | +| | | +--------------+--------------------------------------------------------------+ |test purpose | This test case will verify the quorum configuration of the | | | cluster manager(pacemaker) on controller nodes. When a | @@ -53,10 +56,11 @@ Yardstick Test Case Description TC057 | | "openstack-cmd" for this monitor. | | | 2) command_name: which is the command name used for request | | | | -| | In this case, the command_name of monitor1 should be services| -| | that are managed by the cluster manager. (Since rabbitmq and | -| | haproxy are managed by pacemaker, most Openstack Services | -| | can be used to check high availability in this case) | +| | In this case, the command_name of monitor1 should be | +| | services that are managed by the cluster manager. | +| | (Since rabbitmq and haproxy are managed by pacemaker, | +| | most Openstack Services can be used to check high | +| | availability in this case) | | | | | | (e.g.) | | | monitor1: | @@ -155,8 +159,8 @@ Yardstick Test Case Description TC057 | | Result: The test case is passed or not. | | | | +--------------+------+----------------------------------+--------------------+ -|post-action | It is the action when the test cases exist. It will check the| -| | status of the cluster messaging process(corosync) on the | +|post-action | It is the action when the test cases exist. It will check | +| | the status of the cluster messaging process(corosync) on the | | | host, and restart the process if it is not running for next | | | test cases | +--------------+------+----------------------------------+--------------------+ diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc058.rst b/docs/testing/user/userguide/opnfv_yardstick_tc058.rst index fb9a4c2d1..7c323e913 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc058.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc058.rst @@ -10,8 +10,9 @@ Yardstick Test Case Description TC058 +-----------------------------------------------------------------------------+ |OpenStack Controller Virtual Router Service High Availability | -+==============+==============================================================+ -|test case id | OPNFV_YARDSTICK_TC058:OpenStack Controller Virtual Router | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC058: OpenStack Controller Virtual Router | | | Service High Availability | +--------------+--------------------------------------------------------------+ |test purpose | This test case will verify the high availability of virtual | |