Browse code

Merge "Fix api extension settings in tempest for Liberty" into stable/liberty

Jenkins authored on 2016/11/29 08:43:42
Showing 1 changed files
... ...
@@ -428,7 +428,15 @@ function configure_tempest {
428 428
     iniset $TEMPEST_CONFIG network-feature-enabled ipv6 "$IPV6_ENABLED"
429 429
     iniset $TEMPEST_CONFIG network-feature-enabled ipv6_subnet_attributes "$IPV6_SUBNET_ATTRIBUTES_ENABLED"
430 430
 
431
-    local network_api_extensions=${NETWORK_API_EXTENSIONS:-"all"}
431
+    DEFAULT_NET_EXT="agent,allowed-address-pairs,binding"
432
+    DEFAULT_NET_EXT+=",dhcp_agent_scheduler,dns-integration"
433
+    DEFAULT_NET_EXT+=",dvr,ext-gw-mode,external-net"
434
+    DEFAULT_NET_EXT+=",extra_dhcp_opt,extraroute,flavors,fwaas"
435
+    DEFAULT_NET_EXT+=",fwaasrouterinsertion,l3-ha,l3_agent_scheduler,lbaas"
436
+    DEFAULT_NET_EXT+=",lbaas_agent_scheduler,metering,multi-provider,net-mtu,port-security"
437
+    DEFAULT_NET_EXT+=",provider,quotas,rbac-policies,router,security-group,service-type"
438
+    DEFAULT_NET_EXT+=",subnet_allocation,vpnaas"
439
+    local network_api_extensions="${NETWORK_API_EXTENSIONS:-$DEFAULT_NET_EXT}"
432 440
     if [[ ! -z "$DISABLE_NETWORK_API_EXTENSIONS" ]]; then
433 441
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint
434 442
         network_api_extensions=${NETWORK_API_EXTENSIONS:-$(iniget $tmp_cfg_file network-feature-enabled api_extensions | tr -d " ")}
... ...
@@ -477,7 +485,11 @@ function configure_tempest {
477 477
     iniset $TEMPEST_CONFIG telemetry-feature-enabled events "True"
478 478
 
479 479
     # Object Store
480
-    local object_storage_api_extensions=${OBJECT_STORAGE_API_EXTENSIONS:-"all"}
480
+    DEFAULT_SWIFT_OPT="account_quotas,bulk,bulk_delete,bulk_upload,container_quotas"
481
+    DEFAULT_SWIFT_OPT+=",container_sync,crossdomain,formpost,ratelimit,slo"
482
+    DEFAULT_SWIFT_OPT+=",staticweb,tempauth,tempurl"
483
+
484
+    local object_storage_api_extensions="${OBJECT_STORAGE_API_EXTENSIONS:-$DEFAULT_SWIFT_OPT}"
481 485
     if [[ ! -z "$DISABLE_OBJECT_STORAGE_API_EXTENSIONS" ]]; then
482 486
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint
483 487
         object_storage_api_extensions=${OBJECT_STORAGE_API_EXTENSIONS:-$(iniget $tmp_cfg_file object-storage-feature-enabled discoverable_apis | tr -d " ")}
... ...
@@ -497,7 +509,18 @@ function configure_tempest {
497 497
     # TODO(obutenko): Remove the incremental_backup_force flag when Kilo and Juno is end of life.
498 498
     iniset $TEMPEST_CONFIG volume-feature-enabled incremental_backup_force True
499 499
 
500
-    local volume_api_extensions=${VOLUME_API_EXTENSIONS:-"all"}
500
+    DEFAULT_VOL_EXT="OS-SCH-HNT,backups,capabilities,cgsnapshots,consistencygroups"
501
+    DEFAULT_VOL_EXT+=",encryption,os-admin-actions,os-availability-zone"
502
+    DEFAULT_VOL_EXT+=",os-extended-services,os-extended-snapshot-attributes"
503
+    DEFAULT_VOL_EXT+=",os-hosts,os-image-create,os-quota-class-sets,os-quota-sets"
504
+    DEFAULT_VOL_EXT+=",os-services,os-snapshot-actions,os-snapshot-manage,os-snapshot-unmanage"
505
+    DEFAULT_VOL_EXT+=",os-types-extra-specs"
506
+    DEFAULT_VOL_EXT+=",os-types-manage,os-used-limits,os-vol-host-attr,os-vol-image-meta"
507
+    DEFAULT_VOL_EXT+=",os-vol-mig-status-attr,os-vol-tenant-attr,os-volume-actions"
508
+    DEFAULT_VOL_EXT+=",os-volume-encryption-metadata,os-volume-manage"
509
+    DEFAULT_VOL_EXT+=",os-volume-replication,os-volume-transfer,os-volume-type-access"
510
+    DEFAULT_VOL_EXT+=",os-volume-unmanage,qos-specs,scheduler-stats"
511
+    local volume_api_extensions="${VOLUME_API_EXTENSIONS:-$DEFAULT_VOL_EXT}"
501 512
     if [[ ! -z "$DISABLE_VOLUME_API_EXTENSIONS" ]]; then
502 513
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint
503 514
         volume_api_extensions=${VOLUME_API_EXTENSIONS:-$(iniget $tmp_cfg_file volume-feature-enabled api_extensions | tr -d " ")}