openstack/venus
Code Issues Proposed changes

move the controller to model dir

Browse Source 
Change-Id: I0df0e324d6b9fbaa16c98320745dcf914c2fa102
This commit is contained in:
jiasirui 2020-12-23 17:03:02 +08:00
parent b47c5947e4
commit 8453642b1e
3 changed files with 104 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
venus/api/openstack/__init__.py
View File

@ -83,6 +83,10 @@ class APIRouter(base_wsgi.Router):
self._setup_routes(mapper, ext_mgr) self._setup_routes(mapper, ext_mgr)
self._setup_ext_routes(mapper, ext_mgr) self._setup_ext_routes(mapper, ext_mgr)
self._setup_extensions(ext_mgr) self._setup_extensions(ext_mgr)
for url in mapper.matchlist:
LOG.debug('URL methid: s% register: %s ',
url.conditions, url.routepath)
super(APIRouter, self).__init__(mapper) super(APIRouter, self).__init__(mapper)
def _setup_ext_routes(self, mapper, ext_mgr): def _setup_ext_routes(self, mapper, ext_mgr):

3
venus/api/v1/router.py
View File

@ -20,9 +20,10 @@ from oslo_log import log as logging
from venus.api import extensions from venus.api import extensions
import venus.api.openstack import venus.api.openstack
from venus.api.v1 import controller as search
from venus.api import versions from venus.api import versions
from venus.modules.custom_config import controller as custom_config from venus.modules.custom_config import controller as custom_config
from venus.modules.search import controller as search
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

196
venus/api/v1/controller.py → venus/modules/search/controller.py
View File

@ -1,98 +1,98 @@
# Copyright 2020 Inspur # Copyright 2020 Inspur
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain # not use this file except in compliance with the License. You may obtain
# a copy of the License at # a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
"""The template api.""" """The template api."""
from oslo_log import log as logging from oslo_log import log as logging
from venus.api.openstack import wsgi from venus.api.openstack import wsgi
from venus.modules.search.action import SearchCore from venus.modules.search.action import SearchCore
from venus.modules.search.search_lib import ESSearchObj from venus.modules.search.search_lib import ESSearchObj
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class SearchController(wsgi.Controller): class SearchController(wsgi.Controller):
def __init__(self, ext_mgr): def __init__(self, ext_mgr):
self.ext_mgr = ext_mgr self.ext_mgr = ext_mgr
self.search_api = SearchCore() self.search_api = SearchCore()
self.search_lib = ESSearchObj() self.search_lib = ESSearchObj()
super(SearchController, self).__init__() super(SearchController, self).__init__()
@wsgi.wrap_check_policy @wsgi.wrap_check_policy
def search_params(self, req): def search_params(self, req):
type = req.params.get("type", None) type = req.params.get("type", None)
module_name = req.params.get("module_name", None) module_name = req.params.get("module_name", None)
index_type = req.params.get("index_type", None) index_type = req.params.get("index_type", None)
text = self.search_api.params(type, module_name, index_type) text = self.search_api.params(type, module_name, index_type)
return text return text
@wsgi.wrap_check_policy @wsgi.wrap_check_policy
def search_logs(self, req): def search_logs(self, req):
host_name = req.params.get("host_name", None) host_name = req.params.get("host_name", None)
module_name = req.params.get("module_name", None) module_name = req.params.get("module_name", None)
program_name = req.params.get("program_name", None) program_name = req.params.get("program_name", None)
level = req.params.get("level", None) level = req.params.get("level", None)
user_id = req.params.get("user_id", None) user_id = req.params.get("user_id", None)
project_id = req.params.get("project_id", None) project_id = req.params.get("project_id", None)
query = req.params.get("query", None) query = req.params.get("query", None)
index_type = req.params.get("index_type", None) index_type = req.params.get("index_type", None)
start_time = req.params.get("start_time", None) start_time = req.params.get("start_time", None)
end_time = req.params.get("end_time", None) end_time = req.params.get("end_time", None)
page_num = req.params.get("page_num", None) page_num = req.params.get("page_num", None)
page_size = req.params.get("page_size", None) page_size = req.params.get("page_size", None)
text = self.search_api.logs(host_name, module_name, program_name, text = self.search_api.logs(host_name, module_name, program_name,
level, user_id, project_id, query, level, user_id, project_id, query,
index_type, start_time, end_time, index_type, start_time, end_time,
page_num, page_size) page_num, page_size)
return text return text
@wsgi.wrap_check_policy @wsgi.wrap_check_policy
def search_analyse_logs(self, req): def search_analyse_logs(self, req):
group_name = req.params.get("group_name", None) group_name = req.params.get("group_name", None)
host_name = req.params.get("host_name", None) host_name = req.params.get("host_name", None)
module_name = req.params.get("module_name", None) module_name = req.params.get("module_name", None)
program_name = req.params.get("program_name", None) program_name = req.params.get("program_name", None)
level = req.params.get("level", None) level = req.params.get("level", None)
start_time = req.params.get("start_time", None) start_time = req.params.get("start_time", None)
end_time = req.params.get("end_time", None) end_time = req.params.get("end_time", None)
text = self.search_api.analyse_logs(group_name, host_name, text = self.search_api.analyse_logs(group_name, host_name,
module_name, program_name, module_name, program_name,
level, start_time, end_time) level, start_time, end_time)
return text return text
@wsgi.wrap_check_policy @wsgi.wrap_check_policy
def search_typical_logs(self, req): def search_typical_logs(self, req):
type = req.params.get("type", None) type = req.params.get("type", None)
start_time = req.params.get("start_time", None) start_time = req.params.get("start_time", None)
end_time = req.params.get("end_time", None) end_time = req.params.get("end_time", None)
text = self.search_api.typical_logs(type, start_time, end_time) text = self.search_api.typical_logs(type, start_time, end_time)
return text return text
@wsgi.wrap_check_policy @wsgi.wrap_check_policy
def instance_call_chain(self, req): def instance_call_chain(self, req):
request_id = req.params.get("request_id", None) request_id = req.params.get("request_id", None)
uuid = req.params.get("uuid", None) uuid = req.params.get("uuid", None)
text = self.search_api.instance_call_chain(request_id, uuid) text = self.search_api.instance_call_chain(request_id, uuid)
return text return text
@wsgi.wrap_check_policy @wsgi.wrap_check_policy
def search_global_id(self, req): def search_global_id(self, req):
global_id = req.params.get("global_id", None) global_id = req.params.get("global_id", None)
text = self.search_lib.get_global_log(global_id) text = self.search_lib.get_global_log(global_id)
return text return text
def create_resource(ext_mgr): def create_resource(ext_mgr):
return wsgi.Resource(SearchController(ext_mgr)) return wsgi.Resource(SearchController(ext_mgr))