Browse code
Configure enabled and disabled extensions in tempest
This patch adds support for configuring the api_extensions
option of the various feature-$service-(enabled|disabled)
sections in tempest's configuration file.
Please note that enabled extensions for the object storage
service are specified in tempest using the discoverable_apis
configuration options.
Partially-implements: Blueprint branchless-tempest-extensions
Change-Id: Ib64c0a474b153f42f3a4a427d86275c85f107997
Salvatore Orlando authored on 2014/08/22 04:11:10Showing 1 changed files
| ... | ... |
@@ -292,6 +292,10 @@ function configure_tempest {
|
| 292 | 292 |
iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False}
|
| 293 | 293 |
iniset $TEMPEST_CONFIG compute-feature-enabled change_password False |
| 294 | 294 |
iniset $TEMPEST_CONFIG compute-feature-enabled block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
|
| 295 |
+ iniset $TEMPEST_CONFIG compute-feature-enabled api_extensions ${COMPUTE_API_EXTENSIONS:-"all"}
|
|
| 296 |
+ iniset $TEMPEST_CONFIG compute-feature-disabled api_extensions ${DISABLE_COMPUTE_API_EXTENSIONS}
|
|
| 297 |
+ iniset $TEMPEST_CONFIG compute-feature-enabled api_v3_extensions ${COMPUTE_API_V3_EXTENSIONS:-"all"}
|
|
| 298 |
+ iniset $TEMPEST_CONFIG compute-feature-disabled api_v3_extensions ${DISABLE_COMPUTE_API_V3_EXTENSIONS}
|
|
| 295 | 299 |
|
| 296 | 300 |
# Compute admin |
| 297 | 301 |
iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME |
| ... | ... |
@@ -306,6 +310,8 @@ function configure_tempest {
|
| 306 | 306 |
iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE" |
| 307 | 307 |
iniset $TEMPEST_CONFIG network-feature-enabled ipv6 "$IPV6_ENABLED" |
| 308 | 308 |
iniset $TEMPEST_CONFIG network-feature-enabled ipv6_subnet_attributes "$IPV6_SUBNET_ATTRIBUTES_ENABLED" |
| 309 |
+ iniset $TEMPEST_CONFIG network-feature-enabled api_extensions ${NETWORK_API_EXTENSIONS:-"all"}
|
|
| 310 |
+ iniset $TEMPEST_CONFIG network-feature-disabled api_extensions ${DISABLE_NETWORK_API_EXTENSIONS}
|
|
| 309 | 311 |
|
| 310 | 312 |
# boto |
| 311 | 313 |
iniset $TEMPEST_CONFIG boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud" |
| ... | ... |
@@ -346,7 +352,13 @@ function configure_tempest {
|
| 346 | 346 |
# Once Tempest retires support for icehouse this flag can be removed. |
| 347 | 347 |
iniset $TEMPEST_CONFIG telemetry too_slow_to_test "False" |
| 348 | 348 |
|
| 349 |
+ # Object storage |
|
| 350 |
+ iniset $TEMPEST_CONFIG object-storage-feature-enabled discoverable_apis ${OBJECT_STORAGE_API_EXTENSIONS:-"all"}
|
|
| 351 |
+ iniset $TEMPEST_CONFIG object-storage-feature-disabled discoverable_apis ${OBJECT_STORAGE_DISABLE_API_EXTENSIONS}
|
|
| 352 |
+ |
|
| 349 | 353 |
# Volume |
| 354 |
+ iniset $TEMPEST_CONFIG volume-feature-enabled api_extensions ${VOLUME_API_EXTENSIONS:-"all"}
|
|
| 355 |
+ iniset $TEMPEST_CONFIG volume-feature-disabled api_extensions ${DISABLE_VOLUME_API_EXTENSIONS}
|
|
| 350 | 356 |
if ! is_service_enabled c-bak; then |
| 351 | 357 |
iniset $TEMPEST_CONFIG volume-feature-enabled backup False |
| 352 | 358 |
fi |
| ... | ... |
@@ -369,9 +381,6 @@ function configure_tempest {
|
| 369 | 369 |
# cli |
| 370 | 370 |
iniset $TEMPEST_CONFIG cli cli_dir $NOVA_BIN_DIR |
| 371 | 371 |
|
| 372 |
- # Networking |
|
| 373 |
- iniset $TEMPEST_CONFIG network-feature-enabled api_extensions "${NETWORK_API_EXTENSIONS:-all}"
|
|
| 374 |
- |
|
| 375 | 372 |
# Baremetal |
| 376 | 373 |
if [ "$VIRT_DRIVER" = "ironic" ] ; then |
| 377 | 374 |
iniset $TEMPEST_CONFIG baremetal driver_enabled True |