Changeset 18454

Timestamp:

Jul 9, 2008, 4:38:24 PM (18 years ago)

Author:

jhoblitt

Message:

change "any" volume usage to corespond to changes in Nebulous::Server

Location:

trunk/Nebulous

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Client.pm (modified) (2 diffs)
• t/56_client_find_instances.t (modified) (3 diffs)
• t/57_client_find.t (modified) (4 diffs)
• t/65_client_mounts.t (modified) (6 diffs)

trunk/Nebulous/Changes

@@ -2 +2 @@
 
 0.09
+    - change "any" volume usage to corespond to changes in Nebulous::Server
     - add neb-replicate --copies option
     - fix neb-stat to work when a neb key is used that implies a storage volume

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.54 2008-05-22 01:39:41 jhoblitt Exp $
+# $Id: Client.pm,v 1.55 2008-07-10 02:38:24 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -695 +695 @@
 
         # then fall back to looking for isntances on any volume
-        $locations = $self->find_instances( $key, ':any');
+        $locations = $self->find_instances( $key, '~any');
         unless (defined $locations) {
             return;

trunk/Nebulous/t/56_client_find_instances.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 56_client_find_instances.t,v 1.2 2008-05-20 03:46:11 jhoblitt Exp $
+# $Id: 56_client_find_instances.t,v 1.3 2008-07-10 02:38:24 jhoblitt Exp $
 
 use strict;
@@ -126 +126 @@
     $neb->create( "foo", "node01" );
 
-    my $locations = $neb->find_instances( "neb://node02/foo", ":any" );
+    my $locations = $neb->find_instances( "neb://node02/foo", "any" );
 
     is( scalar @$locations, 1, "found 1" );
@@ -140 +140 @@
         proxy => "http://$hostport/nebulous",
     );
-    $neb->create( "foo" );
-    $neb->replicate( "foo" );
+    $neb->create( "foo", "node01" );
+    $neb->replicate( "foo", "node01" );
 
     my $locations = $neb->find_instances( "foo", "node01" );

trunk/Nebulous/t/57_client_find.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 57_client_find.t,v 1.2 2008-05-20 03:46:11 jhoblitt Exp $
+# $Id: 57_client_find.t,v 1.3 2008-07-10 02:38:24 jhoblitt Exp $
 
 use strict;
@@ -52 +52 @@
 {
     # key, volume does not hold key but this works anyways ans find will fall
-    # back to looking for ":any"
+    # back to looking for "any"
     my $neb = Nebulous::Client->new(
         proxy => "http://$hostport/nebulous",
@@ -66 +66 @@
 
 {
-    # key, volume :any
+    # key, volume any
     my $neb = Nebulous::Client->new(
         proxy => "http://$hostport/nebulous",
@@ -72 +72 @@
     my $uri = $neb->create( "foo", "node01" );
 
-    my $path = $neb->find( "foo", ":any" );
+    my $path = $neb->find( "foo", "any" );
 
     ok( -e $path, "file exists" );

trunk/Nebulous/t/65_client_mounts.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 65_client_mounts.t,v 1.1 2008-03-21 01:53:36 jhoblitt Exp $
+# $Id: 65_client_mounts.t,v 1.2 2008-07-10 02:38:24 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 16;
+plan tests => 18;
 
 use lib qw( ./t ./lib );
@@ -33 +33 @@
     my %row;
     # first row
-    @row{qw(mountpoint total used vol_id name path allocate available xattr)}
+    @row{qw(mountpoint total used vol_id name host path allocate available xattr)}
         = @{$mounts->[0]};
 
@@ -40 +40 @@
     is($row{vol_id},    1);
     is($row{name},      "node01");
+    is($row{host},      "node01");
     is($row{allocate},  1);
     is($row{available}, 1);
@@ -45 +46 @@
 
     # 2nd row
-    @row{qw(mountpoint total used vol_id name path allocate available xattr)}
+    @row{qw(mountpoint total used vol_id name host path allocate available xattr)}
         = @{$mounts->[1]};
 
@@ -52 +53 @@
     is($row{vol_id},    2);
     is($row{name},      "node02");
+    is($row{host},      "node02");
     is($row{allocate},  1);
     is($row{available}, 1);