Merge "Changed pvs separator from ':' to '|' to support names with ':'."

diff --cc cinder/brick/local_dev/lvm.py
Simple merge

diff --cc cinder/tests/brick/test_brick_lvm.py
index cce74b9b2ebbb26f42511b69443eb9ed005d12b8,8d8a454a260846801e28e7a92dcc8b8e5086c00e..cd8ad48cb3fc5736b74ae551ac1004b29e0348b0
--- 1/cinder/tests/brick/test_brick_lvm.py
--- 2/cinder/tests/brick/test_brick_lvm.py
+++ b/cinder/tests/brick/test_brick_lvm.py
@@@ -126,16 -107,13 +126,16 @@@ class BrickLvmTestCase(test.TestCase)
              else:
                  data = '  owi-a-'
          elif 'env, LC_ALL=C, pvs, --noheadings' in cmd_string:
-             data = "  fake-vg:/dev/sda:10.00:1.00\n"
-             data += "  fake-vg:/dev/sdb:10.00:1.00\n"
-             data += "  fake-vg:/dev/sdc:10.00:8.99\n"
-             data += "  fake-vg-2:/dev/sdd:10.00:9.99\n"
+             data = "  fake-vg|/dev/sda|10.00|1.00\n"
+             data += "  fake-vg|/dev/sdb|10.00|1.00\n"
+             data += "  fake-vg|/dev/sdc|10.00|8.99\n"
+             data += "  fake-vg-2|/dev/sdd|10.00|9.99\n"
          elif 'env, LC_ALL=C, lvs, --noheadings, --unit=g' \
               ', -o, size,data_percent, --separator, :' in cmd_string:
 -            data = "  9:12\n"
 +            if 'test-prov-cap-pool' in cmd_string:
 +                data = "  9.5:20\n"
 +            else:
 +                data = "  9:12\n"
          elif 'lvcreate, -T, -L, ' in cmd_string:
              pass
          elif 'lvcreate, -T, -V, ' in cmd_string:

diff --cc cinder/tests/test_srb.py
Simple merge