Merge pull request #20460 from colletj/v1_image_creation_disallow

librbd: disallow creation of v1 image format

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc qa/workunits/rbd/cli_generic.sh
Simple merge

diff --cc qa/workunits/rbd/import_export.sh
Simple merge

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/test/cli-integration/rbd/formatted-output.t
index 2e73dcd7a6c2dbe10e45c21eeb55bd1e3a7f604d,6859ff965b83065d37795197c7e96ff6d7c9c220..f9ec49b22be27408045e1e054816b2e2aef26cae
--- 1/src/test/cli-integration/rbd/formatted-output.t
--- 2/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@@ -12,11 -12,11 +12,11 @@@ ls on empty pool never containing image
  
  create
  =======
-   $ rbd create -s 1024 --image-format 1 foo
 -  $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1024 --image-format 1 foo
++  $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1024 --image-format 1 foo --log-to-stderr=false
    rbd: image format 1 is deprecated
    $ rbd create -s 512 --image-format 2 bar
    $ rbd create -s 2048 --image-format 2 --image-feature layering baz
-   $ rbd create -s 1 --image-format 1 quux
 -  $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1 --image-format 1 quux
++  $ RBD_FORCE_ALLOW_V1=1 rbd create -s 1 --image-format 1 quux --log-to-stderr=false
    rbd: image format 1 is deprecated
    $ rbd create -s 1G --image-format 2 quuy
  

diff --cc src/test/pybind/test_rbd.py
Simple merge