Changeset 13067

Timestamp:

Apr 27, 2007, 1:50:57 PM (19 years ago)

Author:

jhoblitt

Message:

add $volume param to ->copy()

Location:

trunk/Nebulous

Files:

• lib/Nebulous/Client.pm (modified) (4 diffs)
• lib/Nebulous/Client.pod (modified) (3 diffs)
• t/60_client_copy.t (modified) (6 diffs)

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.26 2007-04-27 21:30:16 jhoblitt Exp $
+# $Id: Client.pm,v 1.27 2007-04-27 23:50:57 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -583 +583 @@
     my $self = shift;
 
-    my ( $key, $new_key ) = validate_pos( @_,
+    my ( $key, $new_key, $volume ) = validate_pos( @_,
         {
             type => SCALAR,
@@ -589 +589 @@
         {
             type => SCALAR,
+        },
+        {
+            #volume
+            type        => SCALAR,
+            optional    => 1,
         },
     );
@@ -602 +607 @@
     }
 
-    my $new_fh  = $self->open_create( $new_key );
+    my $new_fh;
+    if (defined $volume) {
+        $new_fh  = $self->open_create( $new_key, 0, $volume );
+    } else {
+        $new_fh  = $self->open_create( $new_key );
+    }
     unless ( $new_fh ) {
         $log->debug( "can not open object" );

trunk/Nebulous/lib/Nebulous/Client.pod

@@ -24 +24 @@
     my $fh = $neb->open( "key", 'read' );
     $data->delete( "key" );
-    $data->copy( "key", "new_key" );
+    $data->copy( "key", "new_key", "node01" );
     $data->move( "key", "new_key" );
     $data->delete_instance( $uri );
@@ -330 +330 @@
 
 
-=item * copy($key, $new_key)
+=item * copy($key, $new_key, $volume)
 
 Copy a storage object.
@@ -343 +343 @@
 
 The destination object.
+
+=item * volume
+
+The preferred storage location of the new instance.
+
+This parameter is optional.
 
 =back

trunk/Nebulous/t/60_client_copy.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 60_client_copy.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 60_client_copy.t,v 1.2 2007-04-27 23:50:57 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 8;
+plan tests => 11;
 
 use lib qw( ./t ./lib );
@@ -43 +43 @@
         proxy => "http://$hostport/nebulous",
     );
+    $neb->create( "foo" );
+
+    ok( $neb->copy( "foo", "foobar", "node01" ), "copied object" );
+
+    my $locations1 = $neb->find_instances( "foobar" );
+    my $locations2 = $neb->find_instances( "foobar" );
+
+    is( scalar @$locations1, 1, "old object has an instances" );
+    is( scalar @$locations2, 1, "new object has an instances" );
+}
+
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
 
     ok( ! $neb->copy( "foo", "foobar" ), "copy non-existant object" );
@@ -59 +76 @@
     $neb->copy();
 };
-like( $@, qr/2 were expected/, "no params" );
+like( $@, qr/2 - 3 were expected/, "no params" );
 
 Test::Nebulous->setup;
@@ -69 +86 @@
     $neb->copy( "foo" );
 };
-like( $@, qr/2 were expected/, "not enough params" );
+like( $@, qr/2 - 3 were expected/, "not enough params" );
 
 Test::Nebulous->setup;
@@ -77 +94 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->copy( "foo", "bar", "baz" );
+    $neb->copy( "foo", "bar", "baz", "bong" );
 };
-like( $@, qr/2 were expected/, "too many params" );
+like( $@, qr/2 - 3 were expected/, "too many params" );
 
 Test::Nebulous->cleanup;