Browse Source

Support alias for webhook creation

This commit to support alias for webhook creation, to create webhook
use function_alias pramater, and get function_id and function_version
from function_alias. Also add function tests for webhook creation.

Change-Id: Ia5db0b446b6b0e0980da596ed073fa6e2d66d7cc
Story: #2002143
Task: #19988
changes/13/584813/2
Dong Ma 3 years ago
parent
commit
2616494f13
6 changed files with 97 additions and 10 deletions
  1. +1
    -0
      qinling/api/controllers/v1/resources.py
  2. +11
    -3
      qinling/api/controllers/v1/webhook.py
  3. +28
    -0
      qinling/tests/unit/api/controllers/v1/test_webhook.py
  4. +16
    -2
      qinling_tempest_plugin/services/qinling_client.py
  5. +28
    -0
      qinling_tempest_plugin/tests/api/test_webhooks.py
  6. +13
    -5
      qinling_tempest_plugin/tests/base.py

+ 1
- 0
qinling/api/controllers/v1/resources.py View File

@ -365,6 +365,7 @@ class ScaleInfo(Resource):
class Webhook(Resource):
id = types.uuid
function_id = types.uuid
function_alias = wtypes.text
function_version = wsme.wsattr(int)
description = wtypes.text
project_id = wsme.wsattr(wtypes.text, readonly=True)


+ 11
- 3
qinling/api/controllers/v1/webhook.py View File

@ -34,7 +34,6 @@ from qinling.utils import rest_utils
LOG = logging.getLogger(__name__)
POST_REQUIRED = set(['function_id'])
UPDATE_ALLOWED = set(['function_id', 'function_version', 'description'])
@ -104,11 +103,20 @@ class WebhooksController(rest.RestController):
acl.enforce('webhook:create', context.get_ctx())
params = webhook.to_dict()
if not POST_REQUIRED.issubset(set(params.keys())):
if not (params.get("function_id") or params.get("function_alias")):
raise exc.InputException(
'Required param is missing. Required: %s' % POST_REQUIRED
'Either function_alias or function_id must be provided.'
)
# if function_alias provided
function_alias = params.get('function_alias')
if function_alias:
alias_db = db_api.get_function_alias(function_alias)
function_id = alias_db.function_id
version = alias_db.function_version
params.update({'function_id': function_id,
'function_version': version})
LOG.info("Creating %s, params: %s", self.type, params)
# Even admin user can not expose normal user's function


+ 28
- 0
qinling/tests/unit/api/controllers/v1/test_webhook.py View File

@ -80,6 +80,34 @@ class TestWebhookController(base.APITest):
self.assertEqual(201, resp.status_int)
self.assertEqual(1, resp.json.get("function_version"))
def test_post_with_alias(self):
db_api.increase_function_version(self.func_id, 0)
name = self.rand_name(name="alias", prefix=self.prefix)
body = {
'function_id': self.func_id,
'function_version': 1,
'name': name
}
db_api.create_function_alias(**body)
webhook_body = {
'function_alias': name,
'description': 'webhook test'
}
resp = self.app.post_json('/v1/webhooks', webhook_body)
self.assertEqual(201, resp.status_int)
self.assertEqual(1, resp.json.get("function_version"))
def test_post_without_required_params(self):
resp = self.app.post(
'/v1/webhooks',
params={},
expect_errors=True
)
self.assertEqual(400, resp.status_int)
def test_put_with_version(self):
db_api.increase_function_version(self.func_id, 0)
webhook = self.create_webhook(self.func_id)


+ 16
- 2
qinling_tempest_plugin/services/qinling_client.py View File

@ -169,8 +169,22 @@ class QinlingClient(client_base.QinlingClientBase):
return self.get_resources(url)
def create_webhook(self, function_id, version=0):
req_body = {"function_id": function_id, "function_version": version}
def create_webhook(self, function_id=None, function_alias=None,
version=0):
"""Create webhook.
function_alias takes precedence over function_id.
"""
if function_alias:
req_body = {'function_alias': function_alias}
elif function_id:
req_body = {
'function_id': function_id,
'function_version': version
}
else:
raise Exception("Either function_alias or function_id must be "
"provided.")
resp, body = self.post_json('webhooks', req_body)
return resp, body


+ 28
- 0
qinling_tempest_plugin/tests/api/test_webhooks.py View File

@ -76,6 +76,34 @@ class WebhooksTest(base.BaseQinlingTest):
self.assertEqual(200, resp.status)
self.assertIn('version_test', body)
@decorators.idempotent_id('a5b5eed3-82ee-4ab1-b9ca-9898e4da6b5a')
def test_webhook_with_function_alias(self):
version = self.create_function_version(self.function_id)
function_alias = self.create_function_alias(self.function_id, version)
webhook_id, url = self.create_webhook(function_alias=function_alias)
resp = requests.post(url, data={'name': 'alias_test'}, verify=False)
self.assertEqual(202, resp.status_code)
resp_exec_id = resp.json().get('execution_id')
self.addCleanup(self.client.delete_resource, 'executions',
resp_exec_id, ignore_notfound=True)
resp, body = self.client.get_resources(
'executions',
{'description': 'has:%s' % webhook_id}
)
self.assertEqual(200, resp.status)
self.assertEqual(1, len(body['executions']))
exec_id = body['executions'][0]['id']
self.assertEqual(resp_exec_id, exec_id)
self.wait_execution_success(exec_id)
resp, body = self.client.get_execution_log(exec_id)
self.assertEqual(200, resp.status)
self.assertIn('alias_test', body)
@decorators.idempotent_id('8e6e4f76-f748-11e7-8ec3-00224d6b7bc1')
def test_get_all_admin(self):
"""Admin user can get webhooks of other projects"""


+ 13
- 5
qinling_tempest_plugin/tests/base.py View File

@ -169,11 +169,19 @@ class BaseQinlingTest(test.BaseTestCase):
self.assertEqual(200, resp.status_code)
def create_webhook(self, function_id=None, version=0):
if not function_id:
function_id = self.create_function()
resp, body = self.client.create_webhook(function_id, version=version)
def create_webhook(self, function_id=None, function_alias=None,
version=0):
if function_alias:
resp, body = self.client.create_webhook(
function_alias=function_alias
)
else:
if not function_id:
function_id = self.create_function()
resp, body = self.client.create_webhook(
function_id,
version=version
)
self.assertEqual(201, resp.status)
webhook_id = body['id']


Loading…
Cancel
Save