From: Sage Weil <sage@redhat.com>
Date: Fri, 11 May 2018 03:09:54 +0000 (-0500)
Subject: test/cli/monmaptool: fix test
X-Git-Tag: v14.0.0^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55bccd44daee309a613d0edd3d5a563fc18597c8;p=ceph.git

test/cli/monmaptool: fix test

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/cli/monmaptool/feature-set-unset-list.t b/src/test/cli/monmaptool/feature-set-unset-list.t
index 216566ebb48a..ea15c211c24f 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)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
   MONMAP FEATURES:
       persistent: [none]
       optional:   [none]
       required:   [none]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
   monmap:persistent:[none]
   monmap:optional:[none]
   monmap:required:[none]
-  available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
-  available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+  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)]
 
   $ 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'
@@ -49,8 +49,8 @@
       required:   [kraken(1),unknown(16),unknown(32)]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
 
   $ monmaptool --feature-unset 32 --optional --feature-list /tmp/test.monmap.1234
   monmaptool: monmap file /tmp/test.monmap.1234
@@ -60,8 +60,8 @@
       required:   [kraken(1),unknown(16),unknown(32)]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ monmaptool --feature-unset 32 --persistent --feature-unset 16 --optional --feature-list /tmp/test.monmap.1234
@@ -72,8 +72,8 @@
       required:   [kraken(1)]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ monmaptool --feature-unset kraken --feature-list /tmp/test.monmap.1234
@@ -84,8 +84,8 @@
       required:   [none]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16)]
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ rm /tmp/test.monmap.1234