self.assertEqual(len(data), 1)
self.assertIn('teuth-test-bucket', data)
+ # List all buckets with stats.
+ data = self._get('/api/rgw/bucket?stats=true')
+ self.assertStatus(200)
+ self.assertEqual(len(data), 1)
+ self.assertSchema(data[0], JObj(sub_elems={
+ 'bid': JLeaf(str),
+ 'bucket': JLeaf(str),
+ 'bucket_quota': JObj(sub_elems={}, allow_unknown=True),
+ 'id': JLeaf(str),
+ 'owner': JLeaf(str),
+ 'usage': JObj(sub_elems={}, allow_unknown=True),
+ 'tenant': JLeaf(str),
+ }, allow_unknown=True))
+
# Get the bucket.
data = self._get('/api/rgw/bucket/teuth-test-bucket')
self.assertStatus(200)
'tenant': JLeaf(str),
'bucket': JLeaf(str),
'bucket_quota': JObj(sub_elems={}, allow_unknown=True),
- 'owner': JLeaf(str)
+ 'owner': JLeaf(str),
+ 'mfa_delete': JLeaf(str),
+ 'usage': JObj(sub_elems={}, allow_unknown=True),
+ 'versioning': JLeaf(str)
}, allow_unknown=True))
self.assertEqual(data['bucket'], 'teuth-test-bucket')
self.assertEqual(data['owner'], 'admin')
from ..tools import json_str_to_object, str_to_bool
try:
- from typing import List
+ from typing import Any, List
except ImportError: # pragma: no cover
pass # Just for type checking
bucket_name = '{}:{}'.format(tenant, bucket_name)
return bucket_name
- def list(self):
- # type: () -> List[str]
- return self.proxy('GET', 'bucket')
+ def list(self, stats=False):
+ # type: (bool) -> List[Any]
+ query_params = '?stats' if stats else ''
+ result = self.proxy('GET', 'bucket{}'.format(query_params))
+
+ if stats:
+ result = [self._append_bid(bucket) for bucket in result]
+
+ return result
def get(self, bucket):
# type: (str) -> dict
+import { HttpClientTestingModule } from '@angular/common/http/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TabsModule } from 'ngx-bootstrap/tabs';
+import { of } from 'rxjs';
import { configureTestBed, i18nProviders } from '../../../../testing/unit-test-helper';
+import { RgwBucketService } from '../../../shared/api/rgw-bucket.service';
import { CdTableSelection } from '../../../shared/models/cd-table-selection';
import { SharedModule } from '../../../shared/shared.module';
import { RgwBucketDetailsComponent } from './rgw-bucket-details.component';
describe('RgwBucketDetailsComponent', () => {
let component: RgwBucketDetailsComponent;
let fixture: ComponentFixture<RgwBucketDetailsComponent>;
+ let rgwBucketService: RgwBucketService;
+ let rgwBucketServiceGetSpy: jasmine.Spy;
configureTestBed({
declarations: [RgwBucketDetailsComponent],
- imports: [SharedModule, TabsModule.forRoot()],
+ imports: [SharedModule, TabsModule.forRoot(), HttpClientTestingModule],
providers: [i18nProviders]
});
beforeEach(() => {
+ rgwBucketService = TestBed.get(RgwBucketService);
+ rgwBucketServiceGetSpy = spyOn(rgwBucketService, 'get');
+ rgwBucketServiceGetSpy.and.returnValue(of(null));
fixture = TestBed.createComponent(RgwBucketDetailsComponent);
component = fixture.componentInstance;
component.selection = new CdTableSelection();
it('should create', () => {
expect(component).toBeTruthy();
});
+
+ it('should retrieve bucket full info', () => {
+ component.selection = { bid: 'bucket' };
+ component.ngOnChanges();
+ expect(rgwBucketServiceGetSpy).toHaveBeenCalled();
+ });
});
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges } from '@angular/core';
+
+import { RgwBucketService } from '../../../shared/api/rgw-bucket.service';
@Component({
selector: 'cd-rgw-bucket-details',
templateUrl: './rgw-bucket-details.component.html',
styleUrls: ['./rgw-bucket-details.component.scss']
})
-export class RgwBucketDetailsComponent {
+export class RgwBucketDetailsComponent implements OnChanges {
@Input()
selection: any;
- constructor() {}
+ constructor(private rgwBucketService: RgwBucketService) {}
+
+ ngOnChanges() {
+ if (this.selection) {
+ this.rgwBucketService.get(this.selection.bid).subscribe((bucket: object) => {
+ this.selection = bucket;
+ });
+ }
+ }
}
expect(service).toBeTruthy();
});
- it('should call list, with enumerate returning empty', () => {
- let result;
- service.list().subscribe((resp) => {
- result = resp;
- });
- const req = httpTesting.expectOne('api/rgw/bucket');
- req.flush([]);
- expect(req.request.method).toBe('GET');
- expect(result).toEqual([]);
- });
-
- it('should call list, with enumerate returning 2 elements', () => {
- let result;
- service.list().subscribe((resp) => {
- result = resp;
- });
- let req = httpTesting.expectOne('api/rgw/bucket');
- req.flush(['foo', 'bar']);
-
- req = httpTesting.expectOne('api/rgw/bucket/foo');
- req.flush({ name: 'foo' });
-
- req = httpTesting.expectOne('api/rgw/bucket/bar');
- req.flush({ name: 'bar' });
-
+ it('should call list', () => {
+ service.list().subscribe();
+ const req = httpTesting.expectOne('api/rgw/bucket?stats=true');
expect(req.request.method).toBe('GET');
- expect(result).toEqual([{ name: 'foo' }, { name: 'bar' }]);
});
it('should call get', () => {
import { Injectable } from '@angular/core';
import * as _ from 'lodash';
-import { forkJoin as observableForkJoin, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
import { mergeMap } from 'rxjs/operators';
import { cdEncode } from '../decorators/cd-encode';
* @return {Observable<Object[]>}
*/
list() {
- return this.enumerate().pipe(
- mergeMap((buckets: string[]) => {
- if (buckets.length > 0) {
- return observableForkJoin(
- buckets.map((bucket: string) => {
- return this.get(bucket);
- })
- );
- }
- return observableOf([]);
- })
- );
+ let params = new HttpParams();
+ params = params.append('stats', 'true');
+ return this.http.get(this.url, { params: params });
}
/**
projects / ceph.git / commitdiff