ewilliams28/pve-purestorage-plugin
1
0
Fork 0
mirror of https://github.com/kolesa-team/pve-purestorage-plugin.git synced 2026-08-12 21:53:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

purestorage_remove_volume(): minor cleanup and frefactoring

Browse Source
This commit is contained in:
dpetrov67
2025-01-07 07:55:57 -05:00
committed by GitHub
parent e4f9792f66
commit 61a60a5203
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PureStoragePlugin.pm
+8 -19
View File
@@ -487,26 +487,19 @@ sub purestorage_remove_volume {
my ( $class, $scfg, $volname, $storeid, $eradicate ) = @_;
print "Debug :: PVE::Storage::Custom::PureStoragePlugin::sub::purestorage_remove_volume\n" if $DEBUG;
$eradicate //= 0;
$class->assert_blockdev_support();
$class->assert_multipath_support();
if ( $volname =~ /^vm-(\d+)-(cloudinit|state-.+)/ ) {
$eradicate = 1;
} else {
$eradicate //= 0;
}
my $vgname = $scfg->{ vgname } || die "Error :: Volume group name is not defined.\n";
my $url = $scfg->{ address } || die "Error :: Pure Storage host is not defined.\n";
my $hname = pure_host($scfg);
my ( undef, undef, $vmid ) = $class->parse_volname( $volname );
my $params;
my $response;
$eradicate = ( $volname =~ /^vm-(\d+)-(cloudinit|state-.+)/ ) ? 1 : $eradicate;
$params = "names=$vgname/$volname";
my $params = "names=$vgname/$volname";
my $body = { destroyed => \1 };
$response = $class->purestorage_request( $scfg, "volumes", "PATCH", $params, $body );
my $response = $class->purestorage_request( $scfg, "volumes", "PATCH", $params, $body );
if ( $response->{ error } ) {
if ( $response->{ content }->{ errors }->[0]->{ message } eq "Volume has been deleted." ) {
warn "Warning :: PureStorage API :: Destroy volume failed :: Nothing to remove.\n"
@@ -527,9 +520,7 @@ sub purestorage_remove_volume {
}
if ( $eradicate ) {
$params = "names=$vgname/$volname";
$response = $class->purestorage_request( $scfg, "volumes", "DELETE", $params, $body );
$response = $class->purestorage_request( $scfg, "volumes", "DELETE", $params );
if ( $response->{ error } ) {
$Data::Dumper::Indent = 0;
die "Error :: PureStorage API :: Eradicate volume \"$vgname/$volname\" failed.\n"
@@ -542,8 +533,6 @@ sub purestorage_remove_volume {
}
}
$class->purestorage_cleanup_diskmap();
return 1;
}