Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 87 insertions, 0 deletions

diff --git a/src/test/cli/monmaptool/feature-set-unset-list.t b/src/test/cli/monmaptool/feature-set-unset-list.t
new file mode 100644
index 000000000..6a0c8a17a
--- /dev/null
+++ b/src/test/cli/monmaptool/feature-set-unset-list.t
@@ -0,0 +1,87 @@
+  $ monmaptool --create --add a 10.10.10.10:1234 /tmp/test.monmap.1234
+  monmaptool: monmap file /tmp/test.monmap.1234
+  monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
+  setting min_mon_release = pacific
+  monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
+
+  $ monmaptool --feature-list --feature-list plain --feature-list parseable /tmp/test.monmap.1234
+  monmaptool: monmap file /tmp/test.monmap.1234
+  MONMAP FEATURES:
+      persistent: [none]
+      optional:   [none]
+      required:   [none]
+  
+  AVAILABLE FEATURES:
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  MONMAP FEATURES:
+      persistent: [none]
+      optional:   [none]
+      required:   [none]
+  
+  AVAILABLE FEATURES:
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  monmap:persistent:[none]
+  monmap:optional:[none]
+  monmap:required:[none]
+  available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+
+  $ 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'
+  monmaptool -h for usage
+  [1]
+
+  $ monmaptool --feature-set kraken --feature-set 4096 --optional --feature-set 32 --persistent /tmp/test.monmap.1234
+  monmaptool: monmap file /tmp/test.monmap.1234
+  monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
+
+  $ monmaptool --feature-list /tmp/test.monmap.1234
+  monmaptool: monmap file /tmp/test.monmap.1234
+  MONMAP FEATURES:
+      persistent: [kraken(1),octopus(32)]
+      optional:   [unknown(4096)]
+      required:   [kraken(1),octopus(32),unknown(4096)]
+  
+  AVAILABLE FEATURES:
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+
+  $ monmaptool --feature-unset 32 --optional --feature-list /tmp/test.monmap.1234
+  monmaptool: monmap file /tmp/test.monmap.1234
+  MONMAP FEATURES:
+      persistent: [kraken(1),octopus(32)]
+      optional:   [unknown(4096)]
+      required:   [kraken(1),octopus(32),unknown(4096)]
+  
+  AVAILABLE FEATURES:
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  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
+  monmaptool: monmap file /tmp/test.monmap.1234
+  MONMAP FEATURES:
+      persistent: [kraken(1)]
+      optional:   [none]
+      required:   [kraken(1)]
+  
+  AVAILABLE FEATURES:
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
+
+  $ monmaptool --feature-unset kraken --feature-list /tmp/test.monmap.1234
+  monmaptool: monmap file /tmp/test.monmap.1234
+  MONMAP FEATURES:
+      persistent: [none]
+      optional:   [none]
+      required:   [none]
+  
+  AVAILABLE FEATURES:
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
+
+  $ rm /tmp/test.monmap.1234