From 1d198c764f91788bf4ddaadbfa656f71fad4461b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Mar 2019 06:22:44 -0500 Subject: [PATCH] test/cli/osdmaptool/feature-set-unset-list: add octopus to output Signed-off-by: Sage Weil --- .../cli/monmaptool/feature-set-unset-list.t | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/test/cli/monmaptool/feature-set-unset-list.t b/src/test/cli/monmaptool/feature-set-unset-list.t index 45b2f4c7110..ca57e9b3774 100644 --- a/src/test/cli/monmaptool/feature-set-unset-list.t +++ b/src/test/cli/monmaptool/feature-set-unset-list.t @@ -11,21 +11,21 @@ required: [none] AVAILABLE FEATURES: - supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] MONMAP FEATURES: persistent: [none] optional: [none] required: [none] AVAILABLE FEATURES: - supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] monmap:persistent:[none] monmap:optional:[none] monmap:required:[none] - available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] $ monmaptool --feature-set foo /tmp/test.monmap.1234 unknown features name 'foo' or unable to parse value: Expected option value to be integer, got 'foo' @@ -39,24 +39,24 @@ $ monmaptool --feature-list /tmp/test.monmap.1234 monmaptool: monmap file /tmp/test.monmap.1234 MONMAP FEATURES: - persistent: [kraken(1),unknown(32)] + persistent: [kraken(1),octopus(32)] optional: [unknown(4096)] - required: [kraken(1),unknown(32),unknown(4096)] + required: [kraken(1),octopus(32),unknown(4096)] AVAILABLE FEATURES: - supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] $ monmaptool --feature-unset 32 --optional --feature-list /tmp/test.monmap.1234 monmaptool: monmap file /tmp/test.monmap.1234 MONMAP FEATURES: - persistent: [kraken(1),unknown(32)] + persistent: [kraken(1),octopus(32)] optional: [unknown(4096)] - required: [kraken(1),unknown(32),unknown(4096)] + required: [kraken(1),octopus(32),unknown(4096)] AVAILABLE FEATURES: - supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors) $ monmaptool --feature-unset 32 --persistent --feature-unset 4096 --optional --feature-list /tmp/test.monmap.1234 @@ -67,8 +67,8 @@ required: [kraken(1)] AVAILABLE FEATURES: - supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors) $ monmaptool --feature-unset kraken --feature-list /tmp/test.monmap.1234 @@ -79,8 +79,8 @@ required: [none] AVAILABLE FEATURES: - supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] - persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)] + supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] + persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32)] monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors) $ rm /tmp/test.monmap.1234 -- 2.39.5