Skip to content

Commit cf88e85

Browse files
committed
Remove Ceph-related capability flags from report output.
In this commit we stop advertising Ceph backend/ingestion capabilities and align unit tests with the supported location capability set. Issue: CLDSRV-825
1 parent 4269096 commit cf88e85

2 files changed

Lines changed: 0 additions & 8 deletions

File tree

lib/utilities/reportHandler.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ function getCapabilities(cfg = config) {
4444
locationTypeS3Custom: true,
4545
locationTypeSproxyd: true,
4646
locationTypeNFS: true,
47-
locationTypeCephRadosGW: true,
4847
locationTypeHyperdriveV2: true,
4948
locationTypeLocal: true,
5049
preferredReadLocation: true,
@@ -53,7 +52,6 @@ function getCapabilities(cfg = config) {
5352
secureChannelOptimizedPath: true,
5453
s3cIngestLocation: true,
5554
nfsIngestLocation: false,
56-
cephIngestLocation: false,
5755
awsIngestLocation: false,
5856
};
5957

@@ -72,7 +70,6 @@ function getCapabilities(cfg = config) {
7270
caps.locationTypeDigitalOcean &&= cfg.supportedLocationTypes.has('location-do-spaces-v1');
7371
caps.locationTypeSproxyd &&= cfg.supportedLocationTypes.has('location-scality-sproxyd-v1');
7472
caps.locationTypeNFS &&= cfg.supportedLocationTypes.has('location-nfs-mount-v1');
75-
caps.locationTypeCephRadosGW &&= cfg.supportedLocationTypes.has('location-ceph-radosgw-s3-v1');
7673
caps.locationTypeHyperdriveV2 &&= cfg.supportedLocationTypes.has('location-scality-hdclient-v2');
7774
caps.locationTypeLocal &&= cfg.supportedLocationTypes.has('location-file-v1');
7875
}

tests/unit/utils/reportHandler.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ describe('reportHandler.getCapabilities', () => {
2929
locationTypeS3Custom: true,
3030
locationTypeSproxyd: true,
3131
locationTypeNFS: true,
32-
locationTypeCephRadosGW: true,
3332
locationTypeHyperdriveV2: true,
3433
locationTypeLocal: true,
3534
preferredReadLocation: true,
@@ -38,7 +37,6 @@ describe('reportHandler.getCapabilities', () => {
3837
secureChannelOptimizedPath: true,
3938
s3cIngestLocation: true,
4039
nfsIngestLocation: false,
41-
cephIngestLocation: false,
4240
awsIngestLocation: false,
4341
});
4442
});
@@ -217,7 +215,6 @@ describe('reportHandler.getCapabilities', () => {
217215
const locationTypes = [
218216
'location-gcp-v1',
219217
'location-scality-sproxyd-v1',
220-
'location-ceph-radosgw-s3-v1',
221218
'location-file-v1',
222219
'location-scality-artesca-s3-v1',
223220
];
@@ -229,7 +226,6 @@ describe('reportHandler.getCapabilities', () => {
229226
locationTypeS3Custom: true,
230227
locationTypeSproxyd: true,
231228
locationTypeNFS: true,
232-
locationTypeCephRadosGW: true,
233229
locationTypeHyperdriveV2: true,
234230
locationTypeLocal: true,
235231
locationTypes,
@@ -245,7 +241,6 @@ describe('reportHandler.getCapabilities', () => {
245241
assert.strictEqual(caps.locationTypeDigitalOcean, false);
246242
assert.strictEqual(caps.locationTypeSproxyd, true);
247243
assert.strictEqual(caps.locationTypeNFS, false);
248-
assert.strictEqual(caps.locationTypeCephRadosGW, true);
249244
assert.strictEqual(caps.locationTypeHyperdriveV2, false);
250245
assert.strictEqual(caps.locationTypeLocal, true);
251246
});

0 commit comments

Comments
 (0)