[LIB-757] - Remove unused imports.

Syncano · ilu2112 · Jul 6, 2016 · Jun 28, 2016 · Jun 28, 2016 · Jun 28, 2016
commit d84be9de5ade6a8a54c2e46e1f76be4fe3f8756c
diff --git a/syncano/models/backups.py b/syncano/models/backups.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import time
-
 from . import fields
 from .base import Model
 from .instances import Instance
@@ -48,24 +46,33 @@ class Meta:
                 'methods': ['post', 'get'],
                 'path': '/backups/full/',
             },
-            'restore': {
-                'methods': ['post'],
-                'path': '/restores/',
-            }
         }
 
-    def restore(self):
-        properties = self.get_endpoint_data()
-        endpoint = self._meta.resolve_endpoint('restore', properties)
-        kwargs = {
-            'data': {
-                'backup': self.id
+    def schedule_restore(self):
+        restore = Restore(backup=self.id).save()
+        return restore
+
+
+class Restore(Model):
+
+    author = fields.ModelField('Admin')
+    status = fields.StringField(read_only=True)
+    status_info = fields.StringField(read_only=True)
+    updated_at = fields.DateTimeField(read_only=True, required=False)
+    created_at = fields.DateTimeField(read_only=True, required=False)
+    links = fields.LinksField()
+    backup = fields.StringField()
+    archive = fields.StringField(read_only=True)
+
+    class Meta:
+        parent = Instance
+        endpoints = {
+            'list': {
+                'methods': ['get', 'post'],
+                'path': '/restores/',
+            },
+            'detail': {
+                'methods': ['get'],
+                'path': '/restores/{id}/',
             }
         }
-        connection = self._get_connection()
-        response = connection.request('POST', endpoint, **kwargs)
-        restore_endpoint = response['links']['self']
-        restore_response = connection.request('GET', restore_endpoint)
-        while restore_response['status'] == 'running':
-            time.sleep(1)
-            restore_response = connection.request('GET', restore_endpoint)
diff --git a/tests/integration_test_backups.py b/tests/integration_test_backups.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import time
 
-from syncano.models import Backup, Class, Instance
+from syncano.models import Backup
 from tests.integration_test import InstanceMixin, IntegrationTest
 
 
@@ -29,37 +29,19 @@ def _test_backup_list(self):
         backups = [backup for backup in Backup.please.list()]
         self.assertTrue(len(backups))  # at least one backup here;
 
-    def _test_backup_restore(self, backup_id):
+    def _test_backup_schedule_restore(self, backup_id):
         backup = Backup.please.get(id=backup_id)
-        instance_name = backup.instance
-        instance = Instance.please.get(name=instance_name)
-        classes_count = len(list(instance.classes))
-
-        test_class = Class(name='testclass')
-        test_class.save()
-        instance.reload()
-        classes_count_after_update = len(list(instance.classes))
-
-        self.assertTrue(
-            classes_count_after_update - classes_count == 1,
-            'There should be only 1 more instance class after new class creation.'
-        )
 
         # wait for backup to be saved
-        while backup.status != 'success':
+        seconds_waited = 0
+        while backup.status in ['scheduled', 'running']:
+            seconds_waited += 1
+            self.assertTrue(seconds_waited < 20, 'Waiting for backup to be saved takes too long.')
             time.sleep(1)
             backup.reload()
 
-        backup.restore()
-
-        instance.reload()
-        classes_count_after_restore = len(list(instance.classes))
-
-        self.assertEqual(
-            classes_count,
-            classes_count_after_restore,
-            'Classes count after restore should be equal to original classes count.'
-        )
+        restore = backup.schedule_restore()
+        self.assertIn(restore.status, ['success', 'scheduled'])
 
     def _test_backup_delete(self, backup_id):
         backup = Backup.please.get(id=backup_id)
@@ -72,5 +54,5 @@ def test_backup(self):
         backup_id = self._test_backup_create()
         self._test_backup_list()
         self._test_backup_detail(backup_id=backup_id)
-        self._test_backup_restore(backup_id=backup_id)
+        self._test_backup_schedule_restore(backup_id=backup_id)
         self._test_backup_delete(backup_id=backup_id)