From 5dca5c7c7e30b5dd52e5fc97d510b2394de558e9 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 9 Nov 2015 06:47:44 +0100
Subject: [PATCH] move format registration to Plugin.pm

---
 PVE/Storage/LVMPlugin.pm | 14 +-------------
 PVE/Storage/Plugin.pm    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/PVE/Storage/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm
index 6cbf0f0..3ec0401 100644
--- a/PVE/Storage/LVMPlugin.pm
+++ b/PVE/Storage/LVMPlugin.pm
@@ -157,18 +157,6 @@ sub lvm_lvs {
 
 # 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 {
     return 'lvm';
 }
@@ -218,7 +206,7 @@ sub options {
 sub parse_volname {
     my ($class, $volname) = @_;
 
-    parse_lvm_name($volname);
+    PVE::Storage::Plugin::parse_lvm_name($volname);
 
     if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
 	return ('images', $1, $2, undef, undef, undef, 'raw');
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index ccec759..2638476 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -117,6 +117,18 @@ sub verify_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
 #PVE::JSONSchema::register_format('pve-storage-portal', \&verify_portal);
 #sub verify_portal {
-- 
2.39.2