Merge pull request ceph#25415 from dillaman/wip-rbd-cli-integration

test/cli-integration/rbd: added new parent image attributes Reviewed-by: Mykola Golub <[email protected]>
atta · Dec 7, 2018 · af96e16 · af96e16
2 parents 73caf0a + fb0ea62
commit af96e16
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t
@@ -496,10 +496,13 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       "op_features": [], 
       "order": 22, 
       "parent": {
+          "id": "*",  (glob)
           "image": "bar", 
           "overlap": 536870912, 
           "pool": "rbd", 
-          "snapshot": "snap"
+          "pool_namespace": "", 
+          "snapshot": "snap", 
+          "trash": false
       }, 
       "protected": "false", 
       "size": 536870912, 
@@ -530,8 +533,11 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
     <protected>false</protected>
     <parent>
       <pool>rbd</pool>
+      <pool_namespace></pool_namespace>
       <image>bar</image>
+      <id>*</id> (glob)
       <snapshot>snap</snapshot>
+      <trash>false</trash>
       <overlap>536870912</overlap>
     </parent>
   </image>
@@ -828,6 +834,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
           "parent": {
               "image": "bar", 
               "pool": "rbd", 
+              "pool_namespace": "", 
               "snapshot": "snap"
           }, 
           "protected": "false", 
@@ -860,6 +867,7 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
       <size>536870912</size>
       <parent>
         <pool>rbd</pool>
+        <pool_namespace></pool_namespace>
         <image>bar</image>
         <snapshot>snap</snapshot>
       </parent>