Try pithos without relative imports

diff --git a/kamaki/cli/commands/pithos_cli.py b/kamaki/cli/commands/pithos_cli.py
index 3b7c325..2ad0ff8 100644 (file)
--- a/kamaki/cli/commands/pithos_cli.py
+++ b/kamaki/cli/commands/pithos_cli.py
@@ -36,7 +36,7 @@ from kamaki.clients.utils import filter_in
 from kamaki.cli.errors import CLIError, raiseCLIError
 from kamaki.cli.utils import format_size, print_dict, pretty_keys, print_list
 from kamaki.cli.argument import FlagArgument, ValueArgument, IntArgument
 from kamaki.cli.errors import CLIError, raiseCLIError
 from kamaki.cli.utils import format_size, print_dict, pretty_keys, print_list
 from kamaki.cli.argument import FlagArgument, ValueArgument, IntArgument

-from . import _command_init
+from kamaki.cli.commands import _command_init

 #set_api_description('store', 'Pithos+ storage commands')
 API_DESCRIPTION = dict(store='Pithos+ storage commands')
 from kamaki.clients.pithos import PithosClient, ClientError
 #set_api_description('store', 'Pithos+ storage commands')
 API_DESCRIPTION = dict(store='Pithos+ storage commands')
 from kamaki.clients.pithos import PithosClient, ClientError

diff --git a/kamaki/clients/tests.py b/kamaki/clients/tests.py
index b1cadaf..97f2d30 100644 (file)
--- a/kamaki/clients/tests.py
+++ b/kamaki/clients/tests.py
@@ -194,16 +194,18 @@ class testCyclades(unittest.TestCase):
                print('\tDelete network %s'%netid)
                self.client.delete_network(netid)
 
                print('\tDelete network %s'%netid)
                self.client.delete_network(netid)
 

-       def _wait_for_nic(self, netid, servid):
+       def _wait_for_nic(self, netid, servid, in_creation=True):

                c=['|','/','-','\\']
                limit = 50
                wait=3
                while wait < limit:
                        nics = self.client.list_server_nics(servid)
                        for net in nics:
                c=['|','/','-','\\']
                limit = 50
                wait=3
                while wait < limit:
                        nics = self.client.list_server_nics(servid)
                        for net in nics:

-                               if net['id'] == netid:
+                               found_nic = net['id'] == netid
+                               if (in_creation and found_nic) or not (in_creation or found_nic):

                                        return True
                                        return True

-                       sys.stdout.write('\twait nic %s to connect to %s: %ss  '%(netid, servid, wait))
+                       dis = '' if in_creation else 'dis'
+                       sys.stdout.write('\twait nic %s to %sconnect to %s: %ss  '%(netid, dis, servid, wait))

                        for i in range(wait*4):
                                sys.stdout.write('\b%s'%c[i%4])
                                sys.stdout.flush()
                        for i in range(wait*4):
                                sys.stdout.write('\b%s'%c[i%4])
                                sys.stdout.flush()

@@ -739,7 +741,10 @@ class testCyclades(unittest.TestCase):
                self._test_disconnect_server()
 
        def _test_disconnect_server(self):
                self._test_disconnect_server()
 
        def _test_disconnect_server(self):

-               pass
+               self.client.disconnect_server(self.server1['id'], self.network1['id'])
+               self.assertTrue(self._wait_for_nic(self.network1['id'], self.server1['id'],
+                       in_creation=False))
+

 
        @if_not_all
        def test_list_server_nics(self):
 
        @if_not_all
        def test_list_server_nics(self):