2
0
Lucian Petrut 1 долоо хоног өмнө
parent
commit
23ea58c2e4

+ 1 - 1
coriolis/api/v1/transfer_tasks_executions.py

@@ -1,8 +1,8 @@
 # Copyright 2016 Cloudbase Solutions Srl
 # Copyright 2016 Cloudbase Solutions Srl
 # All Rights Reserved.
 # All Rights Reserved.
 
 
-from coriolis.api.v1.views import transfer_tasks_execution_view
 from coriolis.api import common
 from coriolis.api import common
+from coriolis.api.v1.views import transfer_tasks_execution_view
 from coriolis.api import wsgi as api_wsgi
 from coriolis.api import wsgi as api_wsgi
 from coriolis import exception
 from coriolis import exception
 from coriolis.policies import transfer_tasks_executions as executions_policies
 from coriolis.policies import transfer_tasks_executions as executions_policies

+ 1 - 0
coriolis/exception.py

@@ -294,6 +294,7 @@ class MarkerNotFound(NotFound):
         "Could not find database record "
         "Could not find database record "
         "identified by marker: %(marker)s")
         "identified by marker: %(marker)s")
 
 
+
 class RegionNotFound(NotFound):
 class RegionNotFound(NotFound):
     message = _("The specified Coriolis region(s) could not be found.")
     message = _("The specified Coriolis region(s) could not be found.")
 
 

+ 6 - 5
coriolis/tests/integration/test_pagination.py

@@ -16,7 +16,6 @@ from coriolis.db.sqlalchemy import models
 from coriolis.tests.integration import base
 from coriolis.tests.integration import base
 
 
 
 
-
 class PaginationTest(base.CoriolisIntegrationTestBase):
 class PaginationTest(base.CoriolisIntegrationTestBase):
     FAKE_USER_ID = "fake-user-id"
     FAKE_USER_ID = "fake-user-id"
     FAKE_PROJECT_ID = "fake-project-id"
     FAKE_PROJECT_ID = "fake-project-id"
@@ -77,8 +76,9 @@ class PaginationTest(base.CoriolisIntegrationTestBase):
         cls,
         cls,
         **kwargs,
         **kwargs,
     ) -> models.Endpoint:
     ) -> models.Endpoint:
-        kwargs["id"] = kwargs.get("id", str(uuid.uuid4()))
-        kwargs["name"] = kwargs.get("name", f"test-endpoint-{kwargs["id"]}")
+        endpoint_id = kwargs.get("id", str(uuid.uuid4()))
+        kwargs["id"] = endpoint_id
+        kwargs["name"] = kwargs.get("name", f"test-endpoint-{endpoint_id}")
         kwargs["type"] = kwargs.get("type", "openstack")
         kwargs["type"] = kwargs.get("type", "openstack")
         endpoint = models.Endpoint(
         endpoint = models.Endpoint(
             **kwargs)
             **kwargs)
@@ -147,7 +147,7 @@ class PaginationTest(base.CoriolisIntegrationTestBase):
         # *all* fields, just the ones that are relevant for pagination.
         # *all* fields, just the ones that are relevant for pagination.
         created_at = record.created_at
         created_at = record.created_at
         if isinstance(created_at, str):
         if isinstance(created_at, str):
-            created_at =  datetime.datetime.fromisoformat(created_at)
+            created_at = datetime.datetime.fromisoformat(created_at)
         # The service may not have microsecond level precision
         # The service may not have microsecond level precision
         # and we need to compare records.
         # and we need to compare records.
         created_at = created_at.replace(microsecond=0)
         created_at = created_at.replace(microsecond=0)
@@ -274,4 +274,5 @@ class PaginationTest(base.CoriolisIntegrationTestBase):
             sort_dirs=['asc'],
             sort_dirs=['asc'],
             marker=transfers[-1].id)
             marker=transfers[-1].id)
         ret_transfer_summary = [self._get_record_summary(t) for t in transfers]
         ret_transfer_summary = [self._get_record_summary(t) for t in transfers]
-        self.assertEqual(exp_sorted_transfer_summary[2:4], ret_transfer_summary)
+        self.assertEqual(
+            exp_sorted_transfer_summary[2:4], ret_transfer_summary)