From: runsisi <runsisi@zte.com.cn>
Date: Mon, 19 Jun 2017 05:31:22 +0000 (+0800)
Subject: test/cli-integration/rbd: verify formatting for image create timestamp
X-Git-Tag: v12.1.0~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15757%2Fhead;p=ceph.git

test/cli-integration/rbd: verify formatting for image create timestamp

Signed-off-by: runsisi <runsisi@zte.com.cn>
---

diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t
index 229a4d3cb81a..aefdbf91e344 100644
--- a/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@ -118,9 +118,11 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff, deep-flatten (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   $ rbd info bar --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -153,6 +155,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>deep-flatten</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
   </image>
   $ rbd info bar@snap
   rbd image 'bar':
@@ -162,10 +165,12 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff, deep-flatten (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   \tprotected: True (esc)
   $ rbd info bar@snap --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -199,6 +204,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>deep-flatten</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
     <protected>true</protected>
   </image>
   $ rbd info bar@snap2
@@ -209,10 +215,12 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff, deep-flatten (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   \tprotected: False (esc)
   $ rbd info bar@snap2 --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -246,6 +254,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>deep-flatten</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
     <protected>false</protected>
   </image>
   $ rbd info baz
@@ -256,9 +265,11 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   $ rbd info baz --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering"
       ], 
@@ -283,6 +294,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>layering</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
   </image>
   $ rbd info quux
   rbd image 'quux':
@@ -318,9 +330,11 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   $ rbd info rbd_other/child --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -351,6 +365,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>fast-diff</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
   </image>
   $ rbd info rbd_other/child@snap
   rbd image 'child':
@@ -360,12 +375,14 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   \tprotected: False (esc)
   \tparent: rbd/bar@snap (esc)
   \toverlap: 512 MB (esc)
   $ rbd info rbd_other/child@snap --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -403,6 +420,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>fast-diff</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
     <protected>false</protected>
     <parent>
       <pool>rbd</pool>
@@ -419,9 +437,11 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff, deep-flatten (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   $ rbd info rbd_other/deep-flatten-child --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -454,6 +474,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>deep-flatten</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
   </image>
   $ rbd info rbd_other/deep-flatten-child@snap
   rbd image 'deep-flatten-child':
@@ -463,10 +484,12 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
   \tformat: 2 (esc)
   \tfeatures: layering, exclusive-lock, object-map, fast-diff, deep-flatten (esc)
   \tflags:  (esc)
+  \tcreate_timestamp:* (glob)
   \tprotected: False (esc)
   $ rbd info rbd_other/deep-flatten-child@snap --format json | python -mjson.tool | sed 's/,$/, /'
   {
       "block_name_prefix": "rbd_data.*",  (glob)
+      "create_timestamp": "*",  (glob)
       "features": [
           "layering", 
           "exclusive-lock", 
@@ -500,6 +523,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <feature>deep-flatten</feature>
     </features>
     <flags></flags>
+    <create_timestamp>*</create_timestamp> (glob)
     <protected>false</protected>
   </image>
   $ rbd list