Revision 1c3231aa lib/client/gnt_instance.py
| b/lib/client/gnt_instance.py | ||
|---|---|---|
| 915 | 915 |
return constants.EXIT_SUCCESS |
| 916 | 916 |
|
| 917 | 917 |
|
| 918 |
def _FormatLogicalID(dev_type, logical_id, roman):
|
|
| 918 |
def _FormatDiskDetails(dev_type, dev, roman):
|
|
| 919 | 919 |
"""Formats the logical_id of a disk. |
| 920 | 920 |
|
| 921 | 921 |
""" |
| 922 | 922 |
if dev_type == constants.LD_DRBD8: |
| 923 |
node_a, node_b, port, minor_a, minor_b, key = logical_id
|
|
| 923 |
drbd_info = dev["drbd_info"]
|
|
| 924 | 924 |
data = [ |
| 925 |
("nodeA", "%s, minor=%s" % (node_a, compat.TryToRoman(minor_a,
|
|
| 926 |
convert=roman))), |
|
| 927 |
("nodeB", "%s, minor=%s" % (node_b, compat.TryToRoman(minor_b,
|
|
| 928 |
convert=roman))), |
|
| 929 |
("port", str(compat.TryToRoman(port, convert=roman))),
|
|
| 930 |
("auth key", str(key)),
|
|
| 925 |
("nodeA", "%s, minor=%s" %
|
|
| 926 |
(drbd_info["primary_node"], |
|
| 927 |
compat.TryToRoman(drbd_info["primary_minor"], |
|
| 928 |
convert=roman))), |
|
| 929 |
("nodeB", "%s, minor=%s" %
|
|
| 930 |
(drbd_info["secondary_node"], |
|
| 931 |
compat.TryToRoman(drbd_info["secondary_minor"], |
|
| 932 |
convert=roman))), |
|
| 933 |
("port", str(compat.TryToRoman(drbd_info["port"], convert=roman))),
|
|
| 934 |
("auth key", str(drbd_info["secret"])),
|
|
| 931 | 935 |
] |
| 932 | 936 |
elif dev_type == constants.LD_LV: |
| 933 |
vg_name, lv_name = logical_id
|
|
| 937 |
vg_name, lv_name = dev["logical_id"]
|
|
| 934 | 938 |
data = ["%s/%s" % (vg_name, lv_name)] |
| 935 | 939 |
else: |
| 936 |
data = [str(logical_id)]
|
|
| 940 |
data = [str(dev["logical_id"])]
|
|
| 937 | 941 |
|
| 938 | 942 |
return data |
| 939 | 943 |
|
| ... | ... | |
| 1032 | 1036 |
data.append(("access mode", dev["mode"]))
|
| 1033 | 1037 |
if dev["logical_id"] is not None: |
| 1034 | 1038 |
try: |
| 1035 |
l_id = _FormatLogicalID(dev["dev_type"], dev["logical_id"], roman)
|
|
| 1039 |
l_id = _FormatDiskDetails(dev["dev_type"], dev, roman)
|
|
| 1036 | 1040 |
except ValueError: |
| 1037 | 1041 |
l_id = [str(dev["logical_id"])] |
| 1038 | 1042 |
if len(l_id) == 1: |
Also available in: Unified diff