Index: /trunk/Nebulous/lib/Nebulous/Client.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Client.pm (revision 20987) +++ /trunk/Nebulous/lib/Nebulous/Client.pm (revision 20988) @@ -1,5 +1,5 @@ # Copyright (c) 2004-2008 Joshua Hoblitt # -# $Id: Client.pm,v 1.63 2008-12-12 21:13:41 jhoblitt Exp $ +# $Id: Client.pm,v 1.64 2008-12-14 22:48:35 eugene Exp $ package Nebulous::Client; @@ -243,5 +243,5 @@ # if the copy failed we now have a zero length instances floating # around that must be removed - unless ($self->delete_instance($key, "$uri")) { + unless ($self->delete_instance("$uri")) { $log->logdie( "can not copy instance $uri AND FAILED TO CLEANUP EMPTY INSTANCE" ); } @@ -256,5 +256,5 @@ unless ($src_md5 eq $dst_md5) { - $self->delete_instance($key, "$uri"); + $self->delete_instance("$uri"); $log->logdie( "md5sum mismatch" ); } @@ -327,5 +327,5 @@ } - my $uri = $self->delete_instance($key, @$locations[0]); + my $uri = $self->delete_instance( @$locations[0] ); $log->debug("leaving"); @@ -813,5 +813,5 @@ # a lock is implicitly removed when the last storage object is deleted foreach my $uri ( @$locations ) { - $self->delete_instance($key, $uri) or return undef; + $self->delete_instance( $uri ) or return undef; } @@ -944,8 +944,5 @@ my $self = shift; - my ($key, $uri) = validate_pos(@_, - { - type => SCALAR, - }, + my ($uri) = validate_pos(@_, { type => SCALAR, @@ -964,5 +961,5 @@ $log->logdie( $@ ) if $@; - my $response = $self->{ 'server' }->delete_instance($key, $uri); + my $response = $self->{ 'server' }->delete_instance( $uri ); if ( $response->fault ) { $self->set_err($response->faultstring); Index: /trunk/Nebulous/nebclient/nebulous.wsdl =================================================================== --- /trunk/Nebulous/nebclient/nebulous.wsdl (revision 20987) +++ /trunk/Nebulous/nebclient/nebulous.wsdl (revision 20988) @@ -125,5 +125,4 @@ - Index: /trunk/Nebulous/nebclient/src/nebclient.c =================================================================== --- /trunk/Nebulous/nebclient/src/nebclient.c (revision 20987) +++ /trunk/Nebulous/nebclient/src/nebclient.c (revision 20988) @@ -4,5 +4,5 @@ * Copyright (C) 2005 Joshua Hoblitt * - * $Id: nebclient.c,v 1.55 2008-12-12 21:13:41 jhoblitt Exp $ + * $Id: nebclient.c,v 1.56 2008-12-14 22:48:35 eugene Exp $ */ @@ -253,5 +253,5 @@ } - if (!nebDeleteInstance(server, key, locations->URI[0])) { + if (!nebDeleteInstance(server, locations->URI[0])) { nebObjectInstancesFree(locations); @@ -539,5 +539,5 @@ for (int i = 0; i < locations->n; i++) { - if (!nebDeleteInstance(server, key, locations->URI[i])) { + if (!nebDeleteInstance(server, locations->URI[i])) { nebSetErr(server, "can not delete instance"); nebObjectInstancesFree(locations); @@ -655,5 +655,5 @@ } -bool nebDeleteInstance(nebServer *server, const char *key, const char *URI) +bool nebDeleteInstance(nebServer *server, const char *URI) { int response; @@ -676,5 +676,5 @@ if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint, - NULL, (char *)key, (char *)URI, &response) != SOAP_OK) { + NULL, (char *)URI, &response) != SOAP_OK) { nebFree(filename); Index: /trunk/Nebulous/nebclient/src/nebclient.h =================================================================== --- /trunk/Nebulous/nebclient/src/nebclient.h (revision 20987) +++ /trunk/Nebulous/nebclient/src/nebclient.h (revision 20988) @@ -4,5 +4,5 @@ * Copyright (C) 2005 Joshua Hoblitt * - * $Id: nebclient.h,v 1.37 2008-12-12 21:13:41 jhoblitt Exp $ + * $Id: nebclient.h,v 1.38 2008-12-14 22:48:35 eugene Exp $ */ @@ -248,5 +248,4 @@ bool nebDeleteInstance( nebServer *server, ///< nebServer object - const char *key, ///< storage object key (name) const char *URI ///< URL of instance to remove ); Index: /trunk/Nebulous/nebclient/src/nebulous.h =================================================================== --- /trunk/Nebulous/nebclient/src/nebulous.h (revision 20987) +++ /trunk/Nebulous/nebclient/src/nebulous.h (revision 20988) @@ -1,5 +1,5 @@ /* src/nebulous.h Generated by wsdl2h 1.2.11 from nebulous.wsdl and typemap.dat - 2008-12-11 21:42:13 GMT + 2008-10-16 23:26:37 GMT Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: @@ -808,5 +808,4 @@ NULL, // char *action = NULL selects default action for this operation // request parameters: - char* key, char* uri, // response parameters: @@ -820,5 +819,4 @@ struct soap *soap, // request parameters: - char* key, char* uri, // response parameters: @@ -833,5 +831,4 @@ //gsoap ns1 service method-action: delete_USCOREinstance urn:Nebulous/Server/SOAP#delete_instance int ns1__delete_USCOREinstance( - char* key, ///< Request parameter char* uri, ///< Request parameter int *result ///< Response parameter Index: /trunk/Nebulous/nebclient/src/soapC.c =================================================================== --- /trunk/Nebulous/nebclient/src/soapC.c (revision 20987) +++ /trunk/Nebulous/nebclient/src/soapC.c (revision 20988) @@ -12,5 +12,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-12-11 21:42:14 GMT") +SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-10-16 23:26:39 GMT") @@ -1342,5 +1342,4 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ - soap_default_string(soap, &a->key); soap_default_string(soap, &a->uri); } @@ -1349,5 +1348,4 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ - soap_serialize_string(soap, &a->key); soap_serialize_string(soap, &a->uri); } @@ -1365,6 +1363,4 @@ if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__delete_USCOREinstance), type)) return soap->error; - if (soap_out_string(soap, "key", -1, &a->key, "")) - return soap->error; if (soap_out_string(soap, "uri", -1, &a->uri, "")) return soap->error; @@ -1382,5 +1378,4 @@ SOAP_FMAC3 struct ns1__delete_USCOREinstance * SOAP_FMAC4 soap_in_ns1__delete_USCOREinstance(struct soap *soap, const char *tag, struct ns1__delete_USCOREinstance *a, const char *type) { - size_t soap_flag_key = 1; size_t soap_flag_uri = 1; if (soap_element_begin_in(soap, tag, 0, type)) @@ -1394,9 +1389,4 @@ for (;;) { soap->error = SOAP_TAG_MISMATCH; - if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "key", &a->key, "xsd:string")) - { soap_flag_key--; - continue; - } if (soap_flag_uri && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) if (soap_in_string(soap, "uri", &a->uri, "xsd:string")) Index: /trunk/Nebulous/nebclient/src/soapClient.c =================================================================== --- /trunk/Nebulous/nebclient/src/soapClient.c (revision 20987) +++ /trunk/Nebulous/nebclient/src/soapClient.c (revision 20988) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008-12-11 21:42:13 GMT") +SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008-10-16 23:26:38 GMT") @@ -700,5 +700,5 @@ } -SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result) +SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result) { struct ns1__delete_USCOREinstance soap_tmp_ns1__delete_USCOREinstance; struct ns1__delete_USCOREinstanceResponse *soap_tmp_ns1__delete_USCOREinstanceResponse; @@ -708,5 +708,4 @@ soap_action = "urn:Nebulous/Server/SOAP#delete_instance"; soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; - soap_tmp_ns1__delete_USCOREinstance.key = key; soap_tmp_ns1__delete_USCOREinstance.uri = uri; soap_begin(soap); Index: /trunk/Nebulous/nebclient/src/soapServer.c =================================================================== --- /trunk/Nebulous/nebclient/src/soapServer.c (revision 20987) +++ /trunk/Nebulous/nebclient/src/soapServer.c (revision 20988) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-12-11 21:42:13 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-10-16 23:26:38 GMT") @@ -643,5 +643,5 @@ || soap_end_recv(soap)) return soap->error; - soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.key, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int); + soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int); if (soap->error) return soap->error; Index: /trunk/Nebulous/nebclient/src/soapStub.h =================================================================== --- /trunk/Nebulous/nebclient/src/soapStub.h (revision 20987) +++ /trunk/Nebulous/nebclient/src/soapStub.h (revision 20988) @@ -283,5 +283,4 @@ struct ns1__delete_USCOREinstance { - char *key; /* optional element of type xsd:string */ char *uri; /* optional element of type xsd:string */ }; @@ -433,5 +432,5 @@ SOAP_FMAC5 int SOAP_FMAC6 ns1__find_USCOREinstances(struct soap*, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3); -SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *key, char *uri, int *result); +SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *uri, int *result); SOAP_FMAC5 int SOAP_FMAC6 ns1__stat_USCOREobject(struct soap*, char *key, struct ns1__stat_USCOREobjectResponse *_param_4); @@ -468,5 +467,5 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__find_USCOREinstances(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3); -SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result); +SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result); SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__stat_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, struct ns1__stat_USCOREobjectResponse *_param_4); Index: /trunk/Nebulous/t/62_client_delete_instance.t =================================================================== --- /trunk/Nebulous/t/62_client_delete_instance.t (revision 20987) +++ /trunk/Nebulous/t/62_client_delete_instance.t (revision 20988) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 62_client_delete_instance.t,v 1.2 2008-12-12 21:13:41 jhoblitt Exp $ +# $Id: 62_client_delete_instance.t,v 1.3 2008-12-14 22:48:35 eugene Exp $ use strict; @@ -10,5 +10,5 @@ use Apache::Test qw( -withtestmore ); -plan tests => 11; +plan tests => 9; use lib qw( ./t ./lib ); @@ -26,11 +26,9 @@ proxy => "http://$hostport/nebulous", ); + $neb->create( "foo" ); - my $key = "foo"; - $neb->create($key); + my $locations = $neb->find_instances( "foo" ); - my $locations = $neb->find_instances($key); - - my $uri = $neb->delete_instance($key, @$locations[0]); + my $uri = $neb->delete_instance( @$locations[0] ); is( $uri, @$locations[0], "delete instance" ); @@ -45,11 +43,10 @@ proxy => "http://$hostport/nebulous", ); - my $key = "foo"; - $neb->create($key); - $neb->replicate($key); + $neb->create( "foo" ); + $neb->replicate( "foo" ); my $uri1 = $neb->find_instances( "foo" )->[0]; - ok( $neb->delete_instance($key, $uri1), "delete instance" ); + ok( $neb->delete_instance( $uri1 ), "delete instance" ); my $uri2 = $neb->find_instances( "foo" )->[0]; @@ -57,12 +54,10 @@ isnt( $uri1, $uri2, "other instance remains" ); - ok( $neb->delete_instance($key, $uri2), "delete instance" ); + ok( $neb->delete_instance( $uri2 ), "delete instance" ); my $locations = $neb->find_instances( "foo" ); - is( $locations, undef, "no remaining instances" ); + is( $locations, undef, "no remaning instances" ); } - -Test::Nebulous->setup; { @@ -70,7 +65,5 @@ proxy => "http://$hostport/nebulous", ); - my $key = "foo"; - $neb->create($key); - my $uri = $neb->delete_instance($key, "file:/foo" ); + my $uri = $neb->delete_instance( "file:/foo" ); is( $uri, undef, "uri does not exist" ); @@ -83,7 +76,7 @@ proxy => "http://$hostport/nebulous", ); - my $uri = $neb->delete_instance("foo", "file:/foo" ); + $neb->delete_instance(); }; -like( $@, qr/is valid object key/, "bad object key" ); +like( $@, qr/1 was expected/, "no params" ); Test::Nebulous->setup; @@ -93,27 +86,7 @@ proxy => "http://$hostport/nebulous", ); - my $uri = $neb->delete_instance("foo"); + $neb->delete_instance( "foo", 2 ); }; -like( $@, qr/2 were expected/, "missing second param" ); - -Test::Nebulous->setup; - -eval { - my $neb = Nebulous::Client->new( - proxy => "http://$hostport/nebulous", - ); - $neb->delete_instance(); -}; -like( $@, qr/2 were expected/, "no params" ); - -Test::Nebulous->setup; - -eval { - my $neb = Nebulous::Client->new( - proxy => "http://$hostport/nebulous", - ); - $neb->delete_instance("foo", 2, 3); -}; -like( $@, qr/2 were expected/, "too many params" ); +like( $@, qr/1 was expected/, "too many params" ); Test::Nebulous->cleanup;