Merge "port Instance_usage_audit_log API into v3 part1"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
96167c6d90
@ -0,0 +1,137 @@
|
||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2012 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
import datetime
|
||||
|
||||
from oslo.config import cfg
|
||||
import webob.exc
|
||||
|
||||
from nova.api.openstack import extensions
|
||||
from nova import compute
|
||||
from nova import utils
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('compute_topic', 'nova.compute.rpcapi')
|
||||
|
||||
|
||||
authorize = extensions.extension_authorizer('compute',
|
||||
'instance_usage_audit_log')
|
||||
|
||||
|
||||
class InstanceUsageAuditLogController(object):
|
||||
def __init__(self):
|
||||
self.host_api = compute.HostAPI()
|
||||
|
||||
def index(self, req):
|
||||
context = req.environ['nova.context']
|
||||
authorize(context)
|
||||
task_log = self._get_audit_task_logs(context)
|
||||
return {'instance_usage_audit_logs': task_log}
|
||||
|
||||
def show(self, req, id):
|
||||
context = req.environ['nova.context']
|
||||
authorize(context)
|
||||
try:
|
||||
if '.' in id:
|
||||
before_date = datetime.datetime.strptime(str(id),
|
||||
"%Y-%m-%d %H:%M:%S.%f")
|
||||
else:
|
||||
before_date = datetime.datetime.strptime(str(id),
|
||||
"%Y-%m-%d %H:%M:%S")
|
||||
except ValueError:
|
||||
msg = _("Invalid timestamp for date %s") % id
|
||||
raise webob.exc.HTTPBadRequest(explanation=msg)
|
||||
task_log = self._get_audit_task_logs(context,
|
||||
before=before_date)
|
||||
return {'instance_usage_audit_log': task_log}
|
||||
|
||||
def _get_audit_task_logs(self, context, begin=None, end=None,
|
||||
before=None):
|
||||
"""Returns a full log for all instance usage audit tasks on all
|
||||
computes.
|
||||
|
||||
:param begin: datetime beginning of audit period to get logs for,
|
||||
Defaults to the beginning of the most recently completed
|
||||
audit period prior to the 'before' date.
|
||||
:param end: datetime ending of audit period to get logs for,
|
||||
Defaults to the ending of the most recently completed
|
||||
audit period prior to the 'before' date.
|
||||
:param before: By default we look for the audit period most recently
|
||||
completed before this datetime. Has no effect if both begin and end
|
||||
are specified.
|
||||
"""
|
||||
defbegin, defend = utils.last_completed_audit_period(before=before)
|
||||
if begin is None:
|
||||
begin = defbegin
|
||||
if end is None:
|
||||
end = defend
|
||||
task_logs = self.host_api.task_log_get_all(context,
|
||||
"instance_usage_audit",
|
||||
begin, end)
|
||||
# We do this this way to include disabled compute services,
|
||||
# which can have instances on them. (mdragon)
|
||||
filters = {'topic': CONF.compute_topic}
|
||||
services = self.host_api.service_get_all(context, filters=filters)
|
||||
hosts = set(serv['host'] for serv in services)
|
||||
seen_hosts = set()
|
||||
done_hosts = set()
|
||||
running_hosts = set()
|
||||
total_errors = 0
|
||||
total_items = 0
|
||||
for tlog in task_logs:
|
||||
seen_hosts.add(tlog['host'])
|
||||
if tlog['state'] == "DONE":
|
||||
done_hosts.add(tlog['host'])
|
||||
if tlog['state'] == "RUNNING":
|
||||
running_hosts.add(tlog['host'])
|
||||
total_errors += tlog['errors']
|
||||
total_items += tlog['task_items']
|
||||
log = dict((tl['host'], dict(state=tl['state'],
|
||||
instances=tl['task_items'],
|
||||
errors=tl['errors'],
|
||||
message=tl['message']))
|
||||
for tl in task_logs)
|
||||
missing_hosts = hosts - seen_hosts
|
||||
overall_status = "%s hosts done. %s errors." % (
|
||||
'ALL' if len(done_hosts) == len(hosts)
|
||||
else "%s of %s" % (len(done_hosts), len(hosts)),
|
||||
total_errors)
|
||||
return dict(period_beginning=str(begin),
|
||||
period_ending=str(end),
|
||||
num_hosts=len(hosts),
|
||||
num_hosts_done=len(done_hosts),
|
||||
num_hosts_running=len(running_hosts),
|
||||
num_hosts_not_run=len(missing_hosts),
|
||||
hosts_not_run=list(missing_hosts),
|
||||
total_instances=total_items,
|
||||
total_errors=total_errors,
|
||||
overall_status=overall_status,
|
||||
log=log)
|
||||
|
||||
|
||||
class Instance_usage_audit_log(extensions.ExtensionDescriptor):
|
||||
"""Admin-only Task Log Monitoring."""
|
||||
name = "OSInstanceUsageAuditLog"
|
||||
alias = "os-instance_usage_audit_log"
|
||||
namespace = "http://docs.openstack.org/ext/services/api/v1.1"
|
||||
updated = "2012-07-06T01:00:00+00:00"
|
||||
|
||||
def get_resources(self):
|
||||
ext = extensions.ResourceExtension('os-instance_usage_audit_log',
|
||||
InstanceUsageAuditLogController())
|
||||
return [ext]
|
||||
@ -0,0 +1,190 @@
|
||||
# Copyright (c) 2012 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import datetime
|
||||
|
||||
from nova.api.openstack.compute.contrib import instance_usage_audit_log as ial
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import test
|
||||
from nova.tests.api.openstack import fakes
|
||||
from nova import utils
|
||||
|
||||
|
||||
TEST_COMPUTE_SERVICES = [dict(host='foo', topic='compute'),
|
||||
dict(host='bar', topic='compute'),
|
||||
dict(host='baz', topic='compute'),
|
||||
dict(host='plonk', topic='compute'),
|
||||
dict(host='wibble', topic='bogus'),
|
||||
]
|
||||
|
||||
|
||||
begin1 = datetime.datetime(2012, 7, 4, 6, 0, 0)
|
||||
begin2 = end1 = datetime.datetime(2012, 7, 5, 6, 0, 0)
|
||||
begin3 = end2 = datetime.datetime(2012, 7, 6, 6, 0, 0)
|
||||
end3 = datetime.datetime(2012, 7, 7, 6, 0, 0)
|
||||
|
||||
|
||||
#test data
|
||||
|
||||
|
||||
TEST_LOGS1 = [
|
||||
#all services done, no errors.
|
||||
dict(host="plonk", period_beginning=begin1, period_ending=end1,
|
||||
state="DONE", errors=0, task_items=23, message="test1"),
|
||||
dict(host="baz", period_beginning=begin1, period_ending=end1,
|
||||
state="DONE", errors=0, task_items=17, message="test2"),
|
||||
dict(host="bar", period_beginning=begin1, period_ending=end1,
|
||||
state="DONE", errors=0, task_items=10, message="test3"),
|
||||
dict(host="foo", period_beginning=begin1, period_ending=end1,
|
||||
state="DONE", errors=0, task_items=7, message="test4"),
|
||||
]
|
||||
|
||||
|
||||
TEST_LOGS2 = [
|
||||
#some still running...
|
||||
dict(host="plonk", period_beginning=begin2, period_ending=end2,
|
||||
state="DONE", errors=0, task_items=23, message="test5"),
|
||||
dict(host="baz", period_beginning=begin2, period_ending=end2,
|
||||
state="DONE", errors=0, task_items=17, message="test6"),
|
||||
dict(host="bar", period_beginning=begin2, period_ending=end2,
|
||||
state="RUNNING", errors=0, task_items=10, message="test7"),
|
||||
dict(host="foo", period_beginning=begin2, period_ending=end2,
|
||||
state="DONE", errors=0, task_items=7, message="test8"),
|
||||
]
|
||||
|
||||
|
||||
TEST_LOGS3 = [
|
||||
#some errors..
|
||||
dict(host="plonk", period_beginning=begin3, period_ending=end3,
|
||||
state="DONE", errors=0, task_items=23, message="test9"),
|
||||
dict(host="baz", period_beginning=begin3, period_ending=end3,
|
||||
state="DONE", errors=2, task_items=17, message="test10"),
|
||||
dict(host="bar", period_beginning=begin3, period_ending=end3,
|
||||
state="DONE", errors=0, task_items=10, message="test11"),
|
||||
dict(host="foo", period_beginning=begin3, period_ending=end3,
|
||||
state="DONE", errors=1, task_items=7, message="test12"),
|
||||
]
|
||||
|
||||
|
||||
def fake_task_log_get_all(context, task_name, begin, end,
|
||||
host=None, state=None):
|
||||
assert task_name == "instance_usage_audit"
|
||||
|
||||
if begin == begin1 and end == end1:
|
||||
return TEST_LOGS1
|
||||
if begin == begin2 and end == end2:
|
||||
return TEST_LOGS2
|
||||
if begin == begin3 and end == end3:
|
||||
return TEST_LOGS3
|
||||
raise AssertionError("Invalid date %s to %s" % (begin, end))
|
||||
|
||||
|
||||
def fake_last_completed_audit_period(unit=None, before=None):
|
||||
audit_periods = [(begin3, end3),
|
||||
(begin2, end2),
|
||||
(begin1, end1)]
|
||||
if before is not None:
|
||||
for begin, end in audit_periods:
|
||||
if before > end:
|
||||
return begin, end
|
||||
raise AssertionError("Invalid before date %s" % (before))
|
||||
return begin1, end1
|
||||
|
||||
|
||||
class InstanceUsageAuditLogTest(test.TestCase):
|
||||
def setUp(self):
|
||||
super(InstanceUsageAuditLogTest, self).setUp()
|
||||
self.context = context.get_admin_context()
|
||||
timeutils.set_time_override(datetime.datetime(2012, 7, 5, 10, 0, 0))
|
||||
self.controller = ial.InstanceUsageAuditLogController()
|
||||
self.host_api = self.controller.host_api
|
||||
|
||||
def fake_service_get_all(context, disabled):
|
||||
self.assertTrue(disabled is None)
|
||||
return TEST_COMPUTE_SERVICES
|
||||
|
||||
self.stubs.Set(utils, 'last_completed_audit_period',
|
||||
fake_last_completed_audit_period)
|
||||
self.stubs.Set(db, 'service_get_all',
|
||||
fake_service_get_all)
|
||||
self.stubs.Set(db, 'task_log_get_all',
|
||||
fake_task_log_get_all)
|
||||
|
||||
def tearDown(self):
|
||||
super(InstanceUsageAuditLogTest, self).tearDown()
|
||||
timeutils.clear_time_override()
|
||||
|
||||
def test_index(self):
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/os-instance_usage_audit_log')
|
||||
result = self.controller.index(req)
|
||||
self.assertIn('instance_usage_audit_logs', result)
|
||||
logs = result['instance_usage_audit_logs']
|
||||
self.assertEquals(57, logs['total_instances'])
|
||||
self.assertEquals(0, logs['total_errors'])
|
||||
self.assertEquals(4, len(logs['log']))
|
||||
self.assertEquals(4, logs['num_hosts'])
|
||||
self.assertEquals(4, logs['num_hosts_done'])
|
||||
self.assertEquals(0, logs['num_hosts_running'])
|
||||
self.assertEquals(0, logs['num_hosts_not_run'])
|
||||
self.assertEquals("ALL hosts done. 0 errors.", logs['overall_status'])
|
||||
|
||||
def test_show(self):
|
||||
req = fakes.HTTPRequest.blank(
|
||||
'/v2/fake/os-instance_usage_audit_log/show')
|
||||
result = self.controller.show(req, '2012-07-05 10:00:00')
|
||||
self.assertIn('instance_usage_audit_log', result)
|
||||
logs = result['instance_usage_audit_log']
|
||||
self.assertEquals(57, logs['total_instances'])
|
||||
self.assertEquals(0, logs['total_errors'])
|
||||
self.assertEquals(4, len(logs['log']))
|
||||
self.assertEquals(4, logs['num_hosts'])
|
||||
self.assertEquals(4, logs['num_hosts_done'])
|
||||
self.assertEquals(0, logs['num_hosts_running'])
|
||||
self.assertEquals(0, logs['num_hosts_not_run'])
|
||||
self.assertEquals("ALL hosts done. 0 errors.", logs['overall_status'])
|
||||
|
||||
def test_show_with_running(self):
|
||||
req = fakes.HTTPRequest.blank(
|
||||
'/v2/fake/os-instance_usage_audit_log/show')
|
||||
result = self.controller.show(req, '2012-07-06 10:00:00')
|
||||
self.assertIn('instance_usage_audit_log', result)
|
||||
logs = result['instance_usage_audit_log']
|
||||
self.assertEquals(57, logs['total_instances'])
|
||||
self.assertEquals(0, logs['total_errors'])
|
||||
self.assertEquals(4, len(logs['log']))
|
||||
self.assertEquals(4, logs['num_hosts'])
|
||||
self.assertEquals(3, logs['num_hosts_done'])
|
||||
self.assertEquals(1, logs['num_hosts_running'])
|
||||
self.assertEquals(0, logs['num_hosts_not_run'])
|
||||
self.assertEquals("3 of 4 hosts done. 0 errors.",
|
||||
logs['overall_status'])
|
||||
|
||||
def test_show_with_errors(self):
|
||||
req = fakes.HTTPRequest.blank(
|
||||
'/v2/fake/os-instance_usage_audit_log/show')
|
||||
result = self.controller.show(req, '2012-07-07 10:00:00')
|
||||
self.assertIn('instance_usage_audit_log', result)
|
||||
logs = result['instance_usage_audit_log']
|
||||
self.assertEquals(57, logs['total_instances'])
|
||||
self.assertEquals(3, logs['total_errors'])
|
||||
self.assertEquals(4, len(logs['log']))
|
||||
self.assertEquals(4, logs['num_hosts'])
|
||||
self.assertEquals(4, logs['num_hosts_done'])
|
||||
self.assertEquals(0, logs['num_hosts_running'])
|
||||
self.assertEquals(0, logs['num_hosts_not_run'])
|
||||
self.assertEquals("ALL hosts done. 3 errors.",
|
||||
logs['overall_status'])
|
||||
Loading…
x
Reference in New Issue
Block a user