code cleanup - introcduce new method resolve_alias

[pve-firewall.git] / src / PVE / API2 / Firewall / IPSet.pm

diff --git a/src/PVE/API2/Firewall/IPSet.pm b/src/PVE/API2/Firewall/IPSet.pm
index 6c7ab5e6c681fdf76aa34122e5e5bf4b40dd674f..24a45ae9a1a046429d7ae59a65712b371ad26270 100644 (file)
--- a/src/PVE/API2/Firewall/IPSet.pm
+++ b/src/PVE/API2/Firewall/IPSet.pm
@@ -145,17 +145,6 @@ sub register_delete_ipset {
        }});
 }
 
-my $verify_alias_exists = sub {
-    my ($cluster_conf, $fw_conf, $cidr) = @_;
-
-    if ($cidr !~ m/^\d/) {
-       my $alias = lc($cidr);
-       die "no such alias '$cidr'\n"
-           if !(($cluster_conf && $cluster_conf->{aliases}->{$alias}) || 
-                ($fw_conf && $fw_conf->{aliases}->{$alias}));
-    }
-};
-
 sub register_create_ip {
     my ($class) = @_;
 
@@ -189,7 +178,8 @@ sub register_create_ip {
                    if $entry->{cidr} eq $cidr;
            }
 
-           &$verify_alias_exists($cluster_conf, $fw_conf, $cidr);
+           # make sure alias exists (if $cidr is an alias)
+           PVE::Firewall::resolve_alias($cluster_conf, $fw_conf, $cidr); 
 
            my $data = { cidr => $cidr };