Changeset 17539

Timestamp:

May 6, 2008, 12:12:07 PM (18 years ago)

Author:

jhoblitt

Message:

allow volume name arguments to be undef

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Server.pm (modified) (5 diffs)
• t/03_server_create_object.t (modified) (2 diffs)
• t/04_server_replicate_object.t (modified) (2 diffs)
• t/07_server_find_instances.t (modified) (2 diffs)

trunk/Nebulous-Server/Changes

@@ -1 +1 @@
 Revision history for Nebulous
 
+0.09
+    - allow volume name arguments to be undef
+
 0.08 Thu Apr 17 16:08:16 HST 2008
-    - allow Nebulous::Server::create_object() vol_name to be undef
     - set permissions on storage instance directories
 

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.61 2008-05-06 02:51:20 jhoblitt Exp $
+# $Id: Server.pm,v 1.62 2008-05-06 22:10:58 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -7 +7 @@
 use strict;
 use warnings FATAL => qw( all );
+no warnings qw( uninitialized );
 
 our $VERSION = '0.08';
@@ -151 +152 @@
             callbacks   => {
                 # check that the volume requested is valid
-                'is valid volume name' => sub { $self->_is_valid_volume_name($_[0]) },
+                'is valid volume name' => sub {
+                    return 1 if not defined $_[0];
+                    $self->_is_valid_volume_name($_[0])
+                },
             },
             optional    => 1,
@@ -317 +321 @@
         },
         {
-            type        => SCALAR,
+            type        => SCALAR|UNDEF,
             callbacks   => {
                 # check that the volume name requested is valid
-                'is valid volume name' => sub { $self->_is_valid_volume_name($_[0]) },
+                'is valid volume name' => sub {
+                    return 1 if not defined $_[0];
+                    $self->_is_valid_volume_name($_[0])
+                },
             },
             optional    => 1,
@@ -910 +917 @@
         },
         {
-            type        => SCALAR,
+            type        => SCALAR|UNDEF,
             callbacks   => {
                 # check that the volume name requested is valid
-                'is valid volume name' => sub { $self->_is_valid_volume_name($_[0]) },
+                'is valid volume name' => sub {
+                    return 1 if not defined $_[0];
+                    $self->_is_valid_volume_name($_[0])
+                },
             },
             optional    => 1,

trunk/Nebulous-Server/t/03_server_create_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.25 2008-03-20 21:10:14 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.26 2008-05-06 22:10:58 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 67;
+use Test::More tests => 70;
 
 use lib qw( ./t ./lib );
@@ -251 +251 @@
 Test::Nebulous->setup;
 
+{
+    # undef volume name
+    # OK because the undef is ignored
+    my $uri = $neb->create_object("neb://node01/foo", undef);
+
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    ok($neb->find_instances("foo"), 'object key exists');
+    uri_scheme_ok($uri, 'file');
+}
+
+Test::Nebulous->setup;
+
 eval {
     $neb->create_object("foo");

trunk/Nebulous-Server/t/04_server_replicate_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.12 2008-03-20 21:10:14 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.13 2008-05-06 22:10:58 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 16;
+use Test::More tests => 19;
 
 use lib qw( ./t ./lib );
@@ -49 +49 @@
     $neb->create_object("foo");
     my $uri = $neb->replicate_object("foo", "node01");
+
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
+
+SKIP: {
+    skip "requires xattr support", 1 unless $test_xattr;
+    is(getfattr($path, 'user.nebulous_key'), 'foo', 'user.nebulous_key xattr');
+}
+}
+
+Test::Nebulous->setup;
+
+{
+    # key, $volume is undef
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo", undef);
 
     my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);

trunk/Nebulous-Server/t/07_server_find_instances.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.10 2008-03-20 21:10:14 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.11 2008-05-06 22:10:58 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 15;
+use Test::More tests => 17;
 
 use lib qw( ./t ./lib );
@@ -55 +55 @@
 
     my $locations = $neb->find_instances('foo', 'node01');
+
+    uri_scheme_ok($locations->[0], 'file');
+    is($uri, $locations->[0], "URIs match");
+}
+
+Test::Nebulous->setup;
+
+{
+    # key, volume
+    my $uri = $neb->create_object('foo', 'node01');
+
+    my $locations = $neb->find_instances('foo', undef);
 
     uri_scheme_ok($locations->[0], 'file');