Skip to content

Commit

Permalink
Add temporary patch to fix blocker issue
Browse files Browse the repository at this point in the history 
Revert once https://review.openstack.org/#/c/568869/ merges.

Change-Id: I791583c3d925ade81057d3231ef4cb64959f49c1
  • Loading branch information
@karelyatin
karelyatin committed Jun 20, 2018
1 parent 216f331 commit 44ad698
Show file tree
Hide file tree
Showing 2 changed files with 323 additions and 0 deletions.
320 changes: 320 additions & 0 deletions 0001-Use-healthcheck-api-to-determine-swift-service.patch
View file
@@ -0,0 +1,320 @@
From 552b2028a272a72a972e13c3413a73afcefd4400 Mon Sep 17 00:00:00 2001
From: Chandan Kumar <chkumar@redhat.com>
Date: Thu, 14 Jun 2018 22:02:55 +0530
Subject: [PATCH] Use healthcheck api to determine swift service

* Added check_service_status to determine the service
availability and later on it will be used for all services.

* Removed hardcoded values for swift services
* As swift was disabled earlier, SwiftOperator was not getting used
and it is not present in the CI Job, let's use member role for
the same.
* Set operator_role default to admin if admin credential is available
otherwise, set operator_role to ResellerAdmin
* Do not fail if a conflict exist in roles names

Story: 2001253
Task: 5783

Depends-On: https://review.openstack.org/#/c/576472/
Closes-Bug: 1776729
Change-Id: Ie1e9d8e98fde460f9270c2799f971ea017d10d84
---
config_tempest/clients.py | 9 ++-
config_tempest/services/object_storage.py | 65 ++++++++++++++++++----
config_tempest/services/services.py | 23 +-------
config_tempest/tests/base.py | 12 ++++
.../tests/services/test_object_storage.py | 18 +++++-
...healthcheck-api-for-swift-e84cbb999be4ec3d.yaml | 8 +++
.../tasks/main.yaml | 3 +-
.../tasks/generate-tempestconf.sh.j2 | 1 -
8 files changed, 98 insertions(+), 41 deletions(-)
create mode 100644 releasenotes/notes/use-healthcheck-api-for-swift-e84cbb999be4ec3d.yaml

diff --git a/config_tempest/clients.py b/config_tempest/clients.py
index 7b52714..155465d 100644
--- a/config_tempest/clients.py
+++ b/config_tempest/clients.py
@@ -30,6 +30,7 @@ from tempest.lib.services.identity.v3 import services_client as s_client
from tempest.lib.services.identity.v3 import users_client as users_v3_client
from tempest.lib.services.image.v2 import images_client
from tempest.lib.services.network import networks_client
+from tempest.lib.services.object_storage import account_client
try:
# Since Rocky, volume.v3.services_client is the default
from tempest.lib.services.volume.v3 import services_client
@@ -119,6 +120,12 @@ class ClientManager(object):
self.identity_region,
**default_params)

+ self.accounts = account_client.AccountClient(
+ self.auth_provider,
+ conf.get_defaulted('object-storage', 'catalog_type'),
+ self.identity_region,
+ **default_params)
+
self.set_users_client(
auth=self.auth_provider,
identity_version=creds.identity_version,
@@ -227,7 +234,7 @@ class ClientManager(object):
# and so on.
if service_name == "image":
return self.images
- elif service_name == "network":
+ elif service_name in ["network", "object-store"]:
# return whole ClientManager object because NetworkService
# currently needs to have an access to get_neutron/nova_client
# methods which are chosen according to neutron presence
diff --git a/config_tempest/services/object_storage.py b/config_tempest/services/object_storage.py
index 277825c..8a5575f 100644
--- a/config_tempest/services/object_storage.py
+++ b/config_tempest/services/object_storage.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.

+import ConfigParser
import json

from base import Service
@@ -21,28 +22,68 @@ from tempest.lib import exceptions


class ObjectStorageService(Service):
- def set_extensions(self, object_store_discovery=False):
- if not object_store_discovery:
+ def set_extensions(self):
+ if 'v3' not in self.service_url: # it's not a v3 url
+ try:
+ body = self.do_get(self.service_url, top_level=True,
+ top_level_path="info")
+ body = json.loads(body)
+ # Remove Swift general information from extensions list
+ body.pop('swift')
+ self.extensions = body.keys()
+ except Exception:
+ self.extensions = []
+ else:
self.extensions = []
- elif 'v3' not in self.service_url: # it's not a v3 url
- body = self.do_get(self.service_url, top_level=True,
- top_level_path="info")
- body = json.loads(body)
- # Remove Swift general information from extensions list
- body.pop('swift')
- self.extensions = body.keys()

def list_create_roles(self, conf, client):
try:
roles = client.list_roles()['roles']
except exceptions.Forbidden:
LOG.info("Roles can't be listed - the user needs permissions.")
+ # If is not admin, we set the operator_role to Member
+ # otherwise we set to admin
+ conf.set('object-storage', 'operator_role', 'Member')
return

- for section_key in ["operator_role", "reseller_admin"]:
+ for section_key in ["operator_role", "reseller_admin_role"]:
key_value = conf.get_defaulted("object-storage", section_key)
if key_value not in [r['name'] for r in roles]:
LOG.info("Creating %s role", key_value)
- client.create_role(name=key_value)
+ try:
+ client.create_role(name=key_value)
+ except exceptions.Conflict:
+ LOG.info("Role %s already exists", key_value)
+ conf.set('object-storage', 'operator_role', 'admin')

- conf.set("object-storage", section_key, key_value)
+ def check_service_status(self, conf):
+ """Use healthcheck api to check the service status
+
+ :type conf: TempestConf object
+ """
+ # Check for swift discoverability if it is False
+ # check_service_status returns False
+ # Else above is True, then we can check for healthcheck
+ # API then we can find the service_status
+ try:
+ if not conf.get_bool_value(
+ conf.get(
+ 'object-storage-feature-enabled',
+ 'discoverability')):
+ return False
+ except ConfigParser.NoSectionError:
+ # Turning http://.../v1/foobar into http://.../
+ self.client.accounts.skip_path()
+ resp, _ = self.client.accounts.get("healthcheck", {})
+ return resp['status'] == '200'
+ except Exception:
+ return False
+
+ def set_default_tempest_options(self, conf):
+ """Set default values for swift
+
+ """
+ swift_status = self.check_service_status(conf)
+ # Set roles based on service status
+ if swift_status:
+ self.list_create_roles(conf, self.client.roles)
diff --git a/config_tempest/services/services.py b/config_tempest/services/services.py
index a608e6d..6c03f60 100644
--- a/config_tempest/services/services.py
+++ b/config_tempest/services/services.py
@@ -40,9 +40,6 @@ class Services(object):
self._clients = clients
self._conf = conf
self._creds = creds
- swift_discover = conf.get_defaulted('object-storage-feature-enabled',
- 'discoverability')
- self._object_store_discovery = conf.get_bool_value(swift_discover)
self._ssl_validation = creds.disable_ssl_certificate_validation
self._region = clients.identity_region
self._services = []
@@ -61,10 +58,7 @@ class Services(object):
service = service_class(name, url, token, self._ssl_validation,
self._clients.get_service_client(name))
# discover extensions of the service
- if name == 'object-store':
- service.set_extensions(self._object_store_discovery)
- else:
- service.set_extensions()
+ service.set_extensions()
# discover versions of the service
service.set_versions()

@@ -202,15 +196,6 @@ class Services(object):
self._clients.volume_client,
self.is_service("volumev3"))

- # query the config for swift availability and get the current value
- # in case, it was overridden in CLI
- swift_default = self._conf.get_bool_value(
- self._conf.get_defaulted('service_available', 'swift')
- )
- if self.is_service('object-store') and swift_default:
- object_storage = self.get_service('object-store')
- object_storage.list_create_roles(self._conf, self._clients.roles)
-
ceilometer.check_ceilometer_service(self._conf,
self._clients.service_client)

@@ -282,10 +267,4 @@ class Services(object):
service_object = self.get_service(service)
if service_object is not None:
extensions = ','.join(service_object.get_extensions())
-
- if service == 'object-store':
- # tempest.conf is inconsistent and uses 'object-store' for
- # the catalog name but 'object-storage-feature-enabled'
- service = 'object-storage'
-
self._conf.set(service + postfix, ext_key, extensions)
diff --git a/config_tempest/tests/base.py b/config_tempest/tests/base.py
index 35f8fa6..ee6ee28 100644
--- a/config_tempest/tests/base.py
+++ b/config_tempest/tests/base.py
@@ -211,6 +211,18 @@ class BaseServiceTest(base.BaseTestCase):
]
}
)
+ FAKE_ACCOUNTS = (
+ {
+ 'status': '200',
+ u'content-length': '2',
+ 'content-location': 'http://192.168.122.120:8080/healthcheck',
+ u'connection': 'close',
+ u'x-trans-id': 'txec03483c96cd4958a5c6b-005b17c346',
+ u'date': 'Wed, 06 Jun 2018 11:19:34 GMT',
+ u'content-type': 'text/plain',
+ u'x-openstack-request-id': 'txec03483c96cd4958a5c6b-005b17c346'
+ },
+ 'OK')

class FakeRequestResponse(object):
URL = 'https://docs.openstack.org/api/openstack-identity/3/ext/'
diff --git a/config_tempest/tests/services/test_object_storage.py b/config_tempest/tests/services/test_object_storage.py
index 5f5e6e9..f43f9d3 100644
--- a/config_tempest/tests/services/test_object_storage.py
+++ b/config_tempest/tests/services/test_object_storage.py
@@ -28,14 +28,18 @@ class TestObjectStorageService(BaseServiceTest):
self.FAKE_URL,
self.FAKE_TOKEN,
disable_ssl_validation=False)
+ self.Service.conf = tempest_conf.TempestConf()

def test_set_get_extensions(self):
expected_resp = ['formpost', 'ratelimit',
'methods', 'account_quotas']
self._fake_service_do_get_method(self.FAKE_STORAGE_EXTENSIONS)
- self.Service.set_extensions(object_store_discovery=True)
+ self.Service.set_extensions()
self.assertItemsEqual(self.Service.extensions, expected_resp)
self.assertItemsEqual(self.Service.get_extensions(), expected_resp)
+
+ def test_set_get_extensions_empty(self):
+ self.Service.service_url = self.FAKE_URL + 'v3'
self.Service.set_extensions()
self.assertItemsEqual(self.Service.extensions, [])
self.assertItemsEqual(self.Service.get_extensions(), [])
@@ -51,7 +55,15 @@ class TestObjectStorageService(BaseServiceTest):
self.Service.list_create_roles(conf, client)
self.assertEqual(conf.get('object-storage', 'reseller_admin'),
'ResellerAdmin')
- # Member role is inherited from tempest.config
self.assertEqual(conf.get('object-storage', 'operator_role'),
- 'Member')
+ 'admin')
self.assertTrue(client.create_role.called)
+
+ def test_check_service_status(self):
+ self.Service.client = mock.Mock()
+ self.Service.client.accounts = mock.Mock()
+ return_mock = mock.Mock(return_value=self.FAKE_ACCOUNTS)
+ self.Service.client.accounts.skip_check = mock.Mock()
+ self.Service.client.accounts.get = return_mock
+ self.Service.check_service_status(self.Service.conf)
+ self.assertTrue(self.Service.check_service_status)
diff --git a/releasenotes/notes/use-healthcheck-api-for-swift-e84cbb999be4ec3d.yaml b/releasenotes/notes/use-healthcheck-api-for-swift-e84cbb999be4ec3d.yaml
new file mode 100644
index 0000000..4e42527
--- /dev/null
+++ b/releasenotes/notes/use-healthcheck-api-for-swift-e84cbb999be4ec3d.yaml
@@ -0,0 +1,8 @@
+---
+prelude: >
+ Use healthcheck api for determine swift service availability
+features:
+ - |
+ Discover swift service only when healthcheck api is working otherwise
+ set it to false.
+ It also removes hardcoded values from swift.
diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml
index e4bf4e9..8e57ea4 100644
--- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml
+++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml
@@ -39,8 +39,7 @@
--non-admin \
{% endif %}
--os-cloud {{ cloud_user }} \
- auth.tempest_roles Member \
- service_available.swift False
+ auth.tempest_roles Member
args:
chdir: "{{ tempestconf_src_relative_path }}"
executable: /bin/bash
diff --git a/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 b/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2
index 68ada88..ab456b9 100644
--- a/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2
+++ b/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2
@@ -17,5 +17,4 @@ discover-tempest-config \
{% endif %}
identity.uri $OS_AUTH_URL \
auth.admin_password $OS_PASSWORD \
-service_available.swift False \
{{ aditional_tempestconf_params }}
--
2.13.6

3 changes: 3 additions & 0 deletions python-tempestconf.spec
View file
Expand Up @@ -20,6 +20,9 @@ License: ASL 2.0
URL: http://git.openstack.org/cgit/openstack/python-%{pname}
Source0: http://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz

# FIXME(ykarel) Remove me once https://review.openstack.org/#/c/568869/ is merged
Patch0001: 0001-Use-healthcheck-api-to-determine-swift-service.patch

BuildArch: noarch

BuildRequires: python2-devel
Expand Down

0 comments on commit 44ad698

Please sign in to comment.