Changeset 1318 for trunk

Timestamp:

04/07/15 16:42:41 (9 years ago)

Author:

nanardon

Message:

Use new delAttributeValue and addAttributeValue to make code shorter (and working)

Location:

trunk/LATMOS-Accounts

Files:

• bin/la-sql-switch-cname (modified) (3 diffs)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (3 diffs)

trunk/LATMOS-Accounts/bin/la-sql-switch-cname

@@ -52 +52 @@
     pod2usage(1);
 }
-    
+
 my ($to, $from) = ($ARGV[-1], $ARGV[-2]);
 
@@ -72 +72 @@
     warn "CNAME $cname: $nhost => $to\n";
 
-    {
-        my @name = grep { $_ && $_ ne $cname } $onhost->get_attributes('cname');
-        $onhost->set_c_fields(cname => @name ? [ @name ] : undef) or die "Cannot set $cname to $nhost\n";
-    }
-    
-    {
-        my @name = $cname, $oto->get_attributes('cname');
-        $oto->set_c_fields(cname => [ grep { $_ } @name ]) or die "Cannot add $cname to $to\n";
-    }
+    $onhost->delAttributeValue('cname', $cname) or die "Cannot remove $cname from $nhost\n";
+    $oto->addAttributeValue   ('cname', $cname) or die "Cannot add $cname to $to\n";
 }
+
 foreach my $aname (@arecords) {
     my @listhost = $labase->search_objects('nethost', "otherName=$aname");
@@ -97 +91 @@
     warn "CNAME $aname: $nhost => $to";
 
-    {
-        my @name = grep { $_ && $_ ne $aname } $onhost->get_attributes('otherName');
-        $onhost->set_c_fields(otherName => @name ? [ @name ] : undef) or die "Cannot set $aname to $nhost\n";
-    }
-    
-    {
-        my @name = $aname, $oto->get_attributes('otherName');
-        $oto->set_c_fields(otherName => [ grep { $_ } @name ]) or die "Cannot add $aname to $to\n";
-    }
+    $onhost->delAttributeValue('otherName', $aname) or die "Cannot remove $aname from $nhost\n";
+    $oto->addAttributeValue   ('otherName', $aname) or die "Cannot add $aname to $to\n";
 }
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -356 +356 @@
     {
         my $obj = $self->get_object('nethost', $nethostname);
-        my @cname = grep { $_ && $_ ne $to}
-        $obj->get_attributes('cname');
-        $obj->set_c_fields(cname => [ @cname ]) or return;
+        $obj->_delAttributeValue(cname => $to);
     }
     $self->rename_object('nethost', $nethostname, $to) or return;
     if ($config{'addcname'}) {
         my $obj = $self->get_object('nethost', $to);
-        my @cname = grep { $_ } $obj->get_attributes('cname');
-        $obj->set_c_fields(cname => [ @cname, $nethostname ]);
+        $obj->_addAttributeValue(cname => $nethostname);
     }
     return 1;
@@ -381 +378 @@
         $obj1 = $self->get_object('nethost', $host1);
     } else {
-        $self->la_log(LA_ERR, "Cannot find host having $ip1");
+        $self->log(LA_ERR, "Cannot find host having $ip1");
         return;
     }
@@ -387 +384 @@
         $obj2 = $self->get_object('nethost', $host2);
     } else {
-        $self->la_log(LA_ERR, "Cannot find host having $ip2");
+        $self->log(LA_ERR, "Cannot find host having $ip2");
         return;
     }
     if ($obj1->id eq $obj2->id) {
-        $self->la_log(LA_ERR, "Both ip belong to same host (%s)", $obj1->id);
+        $self->log(LA_ERR, "Both ip belong to same host (%s)", $obj1->id);
         return;
     }
 
-    my @ip1 = grep { $_ && $_ ne $ip1 } $obj1->get_attributes('ip');
-    $obj1->set_c_fields(ip => [ @ip1 ]);
-    my @ip2 = grep { $_ && $_ ne $ip2 } $obj2->get_attributes('ip');
-    $obj2->set_c_fields(ip => [ @ip2, $ip1 ]) or return;
-    $obj1->set_c_fields(ip => [ @ip1, $ip2 ]) or return;
+    $self->log(LA_NOTICE, "Exchanging IP between %s and %s", $obj1->id, $obj2->id);
+    $obj1->delAttributeValue('ip', $ip1) or return;
+    $obj2->delAttributeValue('ip', $ip2) or return;
+    $obj1->addAttributeValue('ip', $ip2) or return;
+    $obj2->addAttributeValue('ip', $ip1) or return;
     return 1;
 }