From 4b4e09776a2ae3a4a16957b70393bab994cf9d28 Mon Sep 17 00:00:00 2001
From: Luz Cazares <luz.cazares@intel.com>
Date: Mon, 27 Feb 2017 21:22:32 +0000
Subject: [PATCH] Fix api extension settings in tempest for Newton

On stable branches, we are supposed to hard code the extension list of
what API extensions are available when we branch the project so that
test cases against new features will be skipped. However, we didn't do
this on Newton release.

Change-Id: Iac8f858793d5ab514d6ba69b68d5420acd0fe903
---
 lib/tempest | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/lib/tempest b/lib/tempest
index fb14cbf18e..1493b1cce0 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -61,7 +61,7 @@ BUILD_TIMEOUT=${BUILD_TIMEOUT:-196}
 # This must be False on stable branches, as master tempest
 # deps do not match stable branch deps. Set this to True to
 # have tempest installed in DevStack by default.
-INSTALL_TEMPEST=${INSTALL_TEMPEST:-"True"}
+INSTALL_TEMPEST=${INSTALL_TEMPEST:-"False"}
 
 # This variable is passed directly to pip install inside the common tox venv
 # that is created
@@ -584,7 +584,19 @@ function configure_tempest {
         DISABLE_NETWORK_API_EXTENSIONS+=", metering"
     fi
 
-    local network_api_extensions=${NETWORK_API_EXTENSIONS:-"all"}
+    DEFAULT_NET_EXT="address-scope,agent,allowed-address-pairs,auto-allocated-topology"
+    DEFAULT_NET_EXT+=",availability_zone,binding,default-subnetpools"
+    DEFAULT_NET_EXT+=",dhcp_agent_scheduler,dvr,ext-gw-mode,external-net"
+    DEFAULT_NET_EXT+=",extra_dhcp_opt,extraroute,flavors,l3-flavors,l3-ha"
+    DEFAULT_NET_EXT+=",l3_agent_scheduler,multi-provider,net-mtu"
+    DEFAULT_NET_EXT+=",network-ip-availability,network_availability_zone,pagination"
+    DEFAULT_NET_EXT+=",port-security,project-id,provider,quotas,rbac-policies,router"
+    DEFAULT_NET_EXT+=",router_availability_zone,security-group,service-type,sorting"
+    DEFAULT_NET_EXT+=",standard-attr-description,standard-attr-revisions"
+    DEFAULT_NET_EXT+=",standard-attr-timestamp,subnet-service-types,subnet_allocation"
+    DEFAULT_NET_EXT+=",tag"
+
+    local network_api_extensions=${NETWORK_API_EXTENSIONS:-$DEFAULT_NET_EXT}
     if [[ ! -z "$DISABLE_NETWORK_API_EXTENSIONS" ]]; then
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint
         network_api_extensions=${NETWORK_API_EXTENSIONS:-$(iniget $tmp_cfg_file network-feature-enabled api_extensions | tr -d " ")}
@@ -592,8 +604,12 @@ function configure_tempest {
         network_api_extensions=$(remove_disabled_extensions $network_api_extensions $DISABLE_NETWORK_API_EXTENSIONS)
     fi
     iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions
+
     # Swift API Extensions
-    local object_storage_api_extensions=${OBJECT_STORAGE_API_EXTENSIONS:-"all"}
+    DEFAULT_SWIFT_OPT="account_quotas,bulk_delete,bulk_upload,container_quotas"
+    DEFAULT_SWIFT_OPT+=",container_sync,crossdomain,formpost,ratelimit,slo"
+    DEFAULT_SWIFT_OPT+=",staticweb,tempauth,tempurl"
+    local object_storage_api_extensions=${OBJECT_STORAGE_API_EXTENSIONS:-$DEFAULT_SWIFT_OPT}
     if [[ ! -z "$DISABLE_OBJECT_STORAGE_API_EXTENSIONS" ]]; then
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint
         object_storage_api_extensions=${OBJECT_STORAGE_API_EXTENSIONS:-$(iniget $tmp_cfg_file object-storage-feature-enabled discoverable_apis | tr -d " ")}
@@ -602,7 +618,16 @@ function configure_tempest {
     fi
     iniset $TEMPEST_CONFIG object-storage-feature-enabled discoverable_apis $object_storage_api_extensions
     # Cinder API Extensions
-    local volume_api_extensions=${VOLUME_API_EXTENSIONS:-"all"}
+    DEFAULT_VOL_EXT="OS-SCH-HNT,backups,capabilities,cgsnapshots,consistencygroups,encryption"
+    DEFAULT_VOL_EXT+=",os-admin-actions,os-availability-zone,os-extended-services"
+    DEFAULT_VOL_EXT+=",os-extended-snapshot-attributes,os-hosts,os-image-create,os-quota-class-sets"
+    DEFAULT_VOL_EXT+=",os-quota-sets,os-services,os-snapshot-actions,os-snapshot-manage,"
+    DEFAULT_VOL_EXT+="os-snapshot-unmanage,os-types-extra-specs,os-types-manage,os-used-limits"
+    DEFAULT_VOL_EXT+=",os-vol-host-attr,os-vol-image-meta,os-vol-mig-status-attr,os-vol-tenant-attr"
+    DEFAULT_VOL_EXT+=",os-volume-actions,os-volume-encryption-metadata,os-volume-manage,os-volume-transfer"
+    DEFAULT_VOL_EXT+=",os-volume-type-access,os-volume-unmanage,qos-specs,scheduler-stats"
+    local volume_api_extensions=${VOLUME_API_EXTENSIONS:-$DEFAULT_VOL_EXT}
+
     if [[ ! -z "$DISABLE_VOLUME_API_EXTENSIONS" ]]; then
         # Enabled extensions are either the ones explicitly specified or those available on the API endpoint
         volume_api_extensions=${VOLUME_API_EXTENSIONS:-$(iniget $tmp_cfg_file volume-feature-enabled api_extensions | tr -d " ")}