Instead of relying on list_volumes of Plugin.pm (which filters by the content types set in the config), use our own to always show the luns of an iscsi.
This makes sense here, since we need it to show the luns when using it as base storage for LVM (where we have content type 'none' set). It does not interfere with the rest of the GUI, since on e.g. disk creation, we already filter the storages in the dropdown by content type, iow. an iscsi storage used this way still does not show up when trying to create a disk. This also shows the luns now in the 'Content' tab, but this is also OK, since the user cannot actually do anything there with the luns. (Besides looking at them) Signed-off-by: Dominik Csapak <d.csa...@proxmox.com> --- PVE/Storage/ISCSIPlugin.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/PVE/Storage/ISCSIPlugin.pm b/PVE/Storage/ISCSIPlugin.pm index 546349e..d5cb733 100644 --- a/PVE/Storage/ISCSIPlugin.pm +++ b/PVE/Storage/ISCSIPlugin.pm @@ -315,6 +315,20 @@ sub free_image { die "can't free space in iscsi storage\n"; } +# list all luns regardless of set content_types, since we need it for +# listing in the gui and we can only have images anyway +sub list_volumes { + my ($class, $storeid, $scfg, $vmid, $content_types) = @_; + + my $res = $class->list_images($storeid, $scfg, $vmid); + + for my $item (@$res) { + $item->{content} = 'images'; # we only have images + } + + return $res; +} + sub list_images { my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_; -- 2.20.1 _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel