Changeset 1321 for branches

Timestamp:

04/07/15 16:47:26 (9 years ago)

Author:

nanardon

Message:

Fix exchange IP function, use new function to clarify code

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm (modified) (3 diffs)
• LATMOS-Accounts/t/11_bases_unix.t (modified) (2 diffs)

branches/4.0/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;
 }

branches/4.0/LATMOS-Accounts/t/11_bases_unix.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 29;
+use Test::More tests => 33;
 use File::Temp;
 
@@ -51 +51 @@
 ok(eq_set($group->get_c_field('memberUID'), [ 'admin' ]), 'can get group\'s member after change');
 
+ok($group->addAttributeValue('memberUID', 'root'), 'can use addAttributeValue');
+ok(eq_set($group->get_c_field('memberUID'), [ 'admin', 'root' ]), 'can get group\'s member after addAttributeValue');
+ok($group->delAttributeValue('memberUID', 'root'), 'can use addAttributeValue');
+ok(eq_set($group->get_c_field('memberUID'), [ 'admin' ]), 'can get group\'s member after addAttributeValue');
 
 ok(my $unixbmod = LATMOS::Accounts::Bases->new(