Merge "Add usage command for compute api"

This commit is contained in:
Jenkins 2013-07-26 19:55:52 +00:00 committed by Gerrit Code Review
commit 22386eb9e6
2 changed files with 93 additions and 0 deletions

View File

@ -0,0 +1,91 @@
# Copyright 2013 OpenStack Foundation.
#
# 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.
#
"""Usage action implementations"""
import datetime
import logging
from cliff import lister
from openstackclient.common import utils
class ListUsage(lister.Lister):
"""List resource usage per project. """
log = logging.getLogger(__name__ + ".ListUsage")
def get_parser(self, prog_name):
parser = super(ListUsage, self).get_parser(prog_name)
parser.add_argument(
"--start",
metavar="<start>",
default=None,
help="Usage range start date ex 2012-01-20"
" (default: 4 weeks ago)."
)
parser.add_argument(
"--end",
metavar="<end>",
default=None,
help="Usage range end date, ex 2012-01-20 (default: tomorrow)"
)
return parser
def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args)
compute_client = self.app.client_manager.compute
columns = (
"tenant_id",
"total_memory_mb_usage",
"total_vcpus_usage",
"total_local_gb_usage"
)
column_headers = (
"Project ID",
"RAM MB-Hours",
"CPU Hours",
"Disk GB-Hours"
)
dateformat = "%Y-%m-%d"
now = datetime.datetime.utcnow()
if parsed_args.start:
start = datetime.datetime.strptime(parsed_args.start, dateformat)
else:
start = now - datetime.timedelta(weeks=4)
if parsed_args.end:
end = datetime.datetime.strptime(parsed_args.end, dateformat)
else:
end = now + datetime.timedelta(days=1)
usage_list = compute_client.usage.list(start, end)
if len(usage_list) > 0:
print("Usage from %s to %s:" % (start.strftime(dateformat),
end.strftime(dateformat)))
return (column_headers,
(utils.get_item_properties(
s, columns,
formatters={
'total_memory_mb_usage': lambda x: float("%.2f" % x),
'total_vcpus_usage': lambda x: float("%.2f" % x),
'total_local_gb_usage': lambda x: float("%.2f" % x),
},
) for s in usage_list))

View File

@ -208,6 +208,8 @@ openstack.compute.v2 =
keypair_list = openstackclient.compute.v2.keypair:ListKeypair
keypair_show = openstackclient.compute.v2.keypair:ShowKeypair
project_usage_list = openstackclient.compute.v2.usage:ListUsage
server_create = openstackclient.compute.v2.server:CreateServer
server_delete = openstackclient.compute.v2.server:DeleteServer
server_list = openstackclient.compute.v2.server:ListServer