openstack/swift
Code Issues Proposed changes

Merge "Print 'Container Count' in data base info"

Browse Source
This commit is contained in:
Jenkins 2014-04-14 16:59:40 +00:00 committed by Gerrit Code Review
commit e0108af54f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/cli/info.py
View File

@ -106,6 +106,8 @@ def print_db_info_metadata(db_type, info, metadata):
print (' Delete Timestamp: %s (%s)' % print (' Delete Timestamp: %s (%s)' %
(datetime.utcfromtimestamp(float(info['delete_timestamp'])), (datetime.utcfromtimestamp(float(info['delete_timestamp'])),
info['delete_timestamp'])) info['delete_timestamp']))
if db_type == 'account':
print ' Container Count: %s' % info['container_count']
print ' Object Count: %s' % info['object_count'] print ' Object Count: %s' % info['object_count']
print ' Bytes Used: %s' % info['bytes_used'] print ' Bytes Used: %s' % info['bytes_used']
if db_type == 'container': if db_type == 'container':

2
test/unit/cli/test_info.py
View File

@ -86,6 +86,7 @@ class TestCliInfo(unittest.TestCase):
created_at=100.1, created_at=100.1,
put_timestamp=106.3, put_timestamp=106.3,
delete_timestamp=107.9, delete_timestamp=107.9,
container_count='3',
object_count='20', object_count='20',
bytes_used='42') bytes_used='42')
info['hash'] = 'abaddeadbeefcafe' info['hash'] = 'abaddeadbeefcafe'
@ -102,6 +103,7 @@ Metadata:
Created at: 1970-01-01 00:01:40.100000 (100.1) Created at: 1970-01-01 00:01:40.100000 (100.1)
Put Timestamp: 1970-01-01 00:01:46.300000 (106.3) Put Timestamp: 1970-01-01 00:01:46.300000 (106.3)
Delete Timestamp: 1970-01-01 00:01:47.900000 (107.9) Delete Timestamp: 1970-01-01 00:01:47.900000 (107.9)
Container Count: 3
Object Count: 20 Object Count: 20
Bytes Used: 42 Bytes Used: 42
Chexor: abaddeadbeefcafe Chexor: abaddeadbeefcafe