From f46cb1fc3d8cfd85e74833380052aacfc716d3a4 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Fri, 18 Aug 2017 11:16:02 +0800 Subject: [PATCH] Remove deprecated usage of CORS.set_latent Method set_latent is deprecated in favor of method set_defaults in e9c3a23e845d8c53b266a3b2e4ca7fb0a5a0425a. We need remove the usage of method set_latent. We just use these config options in tests, it works well for unit tests without them, so it's safe to remove them. Change-Id: I582c787395d6eef559d7914bea815440cc09c0e2 Closes-Bug: #1707151 --- magnum/tests/unit/api/controllers/auth-paste.ini | 3 --- magnum/tests/unit/api/controllers/auth-root-access.ini | 3 --- magnum/tests/unit/api/controllers/auth-v1-access.ini | 3 --- magnum/tests/unit/api/controllers/noauth-paste.ini | 3 --- 4 files changed, 12 deletions(-) diff --git a/magnum/tests/unit/api/controllers/auth-paste.ini b/magnum/tests/unit/api/controllers/auth-paste.ini index 34229a4dea..0964f0ee01 100644 --- a/magnum/tests/unit/api/controllers/auth-paste.ini +++ b/magnum/tests/unit/api/controllers/auth-paste.ini @@ -13,9 +13,6 @@ paste.filter_factory = oslo_middleware:RequestId.factory [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory oslo_config_project = magnum -latent_allow_methods = GET, PUT, POST, DELETE, PATCH -latent_allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID -latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID [filter:healthcheck] paste.filter_factory = oslo_middleware:Healthcheck.factory diff --git a/magnum/tests/unit/api/controllers/auth-root-access.ini b/magnum/tests/unit/api/controllers/auth-root-access.ini index 8abdf3c936..c8475c6d30 100644 --- a/magnum/tests/unit/api/controllers/auth-root-access.ini +++ b/magnum/tests/unit/api/controllers/auth-root-access.ini @@ -14,9 +14,6 @@ paste.filter_factory = oslo_middleware:RequestId.factory [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory oslo_config_project = magnum -latent_allow_methods = GET, PUT, POST, DELETE, PATCH -latent_allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID -latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID [filter:healthcheck] paste.filter_factory = oslo_middleware:Healthcheck.factory diff --git a/magnum/tests/unit/api/controllers/auth-v1-access.ini b/magnum/tests/unit/api/controllers/auth-v1-access.ini index 64eb1820d1..604bec1647 100644 --- a/magnum/tests/unit/api/controllers/auth-v1-access.ini +++ b/magnum/tests/unit/api/controllers/auth-v1-access.ini @@ -14,9 +14,6 @@ paste.filter_factory = oslo_middleware:RequestId.factory [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory oslo_config_project = magnum -latent_allow_methods = GET, PUT, POST, DELETE, PATCH -latent_allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID -latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID [filter:healthcheck] paste.filter_factory = oslo_middleware:Healthcheck.factory diff --git a/magnum/tests/unit/api/controllers/noauth-paste.ini b/magnum/tests/unit/api/controllers/noauth-paste.ini index d7a74d2fe8..5c20152987 100644 --- a/magnum/tests/unit/api/controllers/noauth-paste.ini +++ b/magnum/tests/unit/api/controllers/noauth-paste.ini @@ -14,6 +14,3 @@ paste.filter_factory = oslo_middleware:RequestId.factory [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory oslo_config_project = magnum -latent_allow_methods = GET, PUT, POST, DELETE, PATCH -latent_allow_headers = X-Auth-Token, X-Identity-Status, X-Roles, X-Service-Catalog, X-User-Id, X-Tenant-Id, X-OpenStack-Request-ID -latent_expose_headers = X-Auth-Token, X-Subject-Token, X-Service-Token, X-OpenStack-Request-ID