yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move format registration to Plugin.pm

Browse Source
This commit is contained in:
Dietmar Maurer
2015-11-09 06:47:44 +01:00
parent c2dea8e503
commit 5dca5c7c7e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Storage/LVMPlugin.pm
View File

@ -157,18 +157,6 @@ sub lvm_lvs {
# Configuration # Configuration
PVE::JSONSchema::register_format('pve-storage-vgname', \&parse_lvm_name);
sub parse_lvm_name {
my ($name, $noerr) = @_;
if ($name !~ m/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i) {
return undef if $noerr;
die "lvm name '$name' contains illegal characters\n";
}
return $name;
}
sub type { sub type {
return 'lvm'; return 'lvm';
} }
@ -218,7 +206,7 @@ sub options {
sub parse_volname { sub parse_volname {
my ($class, $volname) = @_; my ($class, $volname) = @_;
parse_lvm_name($volname); PVE::Storage::Plugin::parse_lvm_name($volname);
if ($volname =~ m/^(vm-(\d+)-\S+)$/) { if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
return ('images', $1, $2, undef, undef, undef, 'raw'); return ('images', $1, $2, undef, undef, undef, 'raw');

12
PVE/Storage/Plugin.pm
View File

@ -117,6 +117,18 @@ sub verify_server {
return $server; return $server;
} }
PVE::JSONSchema::register_format('pve-storage-vgname', \&parse_lvm_name);
sub parse_lvm_name {
my ($name, $noerr) = @_;
if ($name !~ m/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i) {
return undef if $noerr;
die "lvm name '$name' contains illegal characters\n";
}
return $name;
}
# fixme: do we need this # fixme: do we need this
#PVE::JSONSchema::register_format('pve-storage-portal', \&verify_portal); #PVE::JSONSchema::register_format('pve-storage-portal', \&verify_portal);
#sub verify_portal { #sub verify_portal {