Skip to content

Commit c57e19a

Browse files
mihaelabalutoiuDany9966
authored andcommitted
Propagate refresh flag through API and RPC layers
Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>
1 parent 4be5960 commit c57e19a

6 files changed

Lines changed: 18 additions & 11 deletions

File tree

coriolis/api/v1/endpoint_instances.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# All Rights Reserved.
33

44
from coriolis.api import common
5+
from coriolis.api.v1 import utils as api_utils
56
from coriolis.api.v1.views import endpoint_resources_view
67
from coriolis.api import wsgi as api_wsgi
78
from coriolis.endpoint_resources import api
@@ -24,6 +25,8 @@ def index(self, req, endpoint_id):
2425
endpoint_policies.ENDPOINTS_POLICY_PREFIX))
2526
marker, limit = common.get_paging_params(req)
2627
instance_name_pattern = req.GET.get("name")
28+
refresh = api_utils.get_bool_url_arg(
29+
req, "refresh", default=False)
2730

2831
env = req.GET.get("env")
2932
if env is not None:
@@ -34,7 +37,7 @@ def index(self, req, endpoint_id):
3437
return endpoint_resources_view.instances_collection(
3538
self._instance_api.get_endpoint_instances(
3639
context, endpoint_id, env, marker, limit,
37-
instance_name_pattern))
40+
instance_name_pattern, refresh=refresh))
3841

3942
def show(self, req, endpoint_id, id):
4043
context = req.environ['coriolis.context']

coriolis/conductor/rpc/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@ def delete_endpoint(self, ctxt, endpoint_id):
5858

5959
def get_endpoint_instances(self, ctxt, endpoint_id, source_environment,
6060
marker=None, limit=None,
61-
instance_name_pattern=None):
61+
instance_name_pattern=None, refresh=False):
6262
return self._call(
6363
ctxt, 'get_endpoint_instances',
6464
endpoint_id=endpoint_id,
6565
source_environment=source_environment,
6666
marker=marker,
6767
limit=limit,
68-
instance_name_pattern=instance_name_pattern)
68+
instance_name_pattern=instance_name_pattern,
69+
refresh=refresh)
6970

7071
def get_endpoint_instance(
7172
self, ctxt, endpoint_id, source_environment, instance_name):

coriolis/conductor/rpc/server.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,8 @@ def delete_endpoint(self, ctxt, endpoint_id):
493493
db_api.delete_endpoint(ctxt, endpoint_id)
494494

495495
def get_endpoint_instances(self, ctxt, endpoint_id, source_environment,
496-
marker, limit, instance_name_pattern):
496+
marker, limit, instance_name_pattern,
497+
refresh=False):
497498
endpoint = self.get_endpoint(ctxt, endpoint_id)
498499

499500
worker_rpc = self._get_worker_service_rpc_for_specs(
@@ -503,7 +504,8 @@ def get_endpoint_instances(self, ctxt, endpoint_id, source_environment,
503504
endpoint.type: [constants.PROVIDER_TYPE_ENDPOINT_INSTANCES]})
504505
return worker_rpc.get_endpoint_instances(
505506
ctxt, endpoint.type, endpoint.connection_info,
506-
source_environment, marker, limit, instance_name_pattern)
507+
source_environment, marker, limit, instance_name_pattern,
508+
refresh=refresh)
507509

508510
def get_endpoint_instance(
509511
self, ctxt, endpoint_id, source_environment, instance_name):

coriolis/endpoint_resources/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ def __init__(self):
1010

1111
def get_endpoint_instances(self, ctxt, endpoint_id, source_environment,
1212
marker=None, limit=None,
13-
instance_name_pattern=None):
13+
instance_name_pattern=None, refresh=False):
1414
return self._rpc_client.get_endpoint_instances(
1515
ctxt, endpoint_id, source_environment, marker,
16-
limit, instance_name_pattern)
16+
limit, instance_name_pattern, refresh=refresh)
1717

1818
def get_endpoint_instance(
1919
self, ctxt, endpoint_id, source_environment, instance_name):

coriolis/worker/rpc/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,16 @@ def cancel_task(self, ctxt, task_id, process_id, force):
7272

7373
def get_endpoint_instances(self, ctxt, platform_name, connection_info,
7474
source_environment, marker=None, limit=None,
75-
instance_name_pattern=None):
75+
instance_name_pattern=None, refresh=False):
7676
return self._call(
7777
ctxt, 'get_endpoint_instances',
7878
platform_name=platform_name,
7979
connection_info=connection_info,
8080
source_environment=source_environment,
8181
marker=marker,
8282
limit=limit,
83-
instance_name_pattern=instance_name_pattern)
83+
instance_name_pattern=instance_name_pattern,
84+
refresh=refresh)
8485

8586
def get_endpoint_instance(self, ctxt, platform_name, connection_info,
8687
source_environment, instance_name):

coriolis/worker/rpc/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def exec_task(self, ctxt, task_id, task_type, origin, destination,
334334

335335
def get_endpoint_instances(self, ctxt, platform_name, connection_info,
336336
source_environment, marker, limit,
337-
instance_name_pattern):
337+
instance_name_pattern, refresh=False):
338338
export_provider = providers_factory.get_provider(
339339
platform_name, constants.PROVIDER_TYPE_ENDPOINT_INSTANCES, None)
340340

@@ -344,7 +344,7 @@ def get_endpoint_instances(self, ctxt, platform_name, connection_info,
344344
instances_info = export_provider.get_instances(
345345
ctxt, secret_connection_info, source_environment,
346346
last_seen_id=marker, limit=limit,
347-
instance_name_pattern=instance_name_pattern)
347+
instance_name_pattern=instance_name_pattern, refresh=refresh)
348348
for instance_info in instances_info:
349349
schemas.validate_value(
350350
instance_info, schemas.CORIOLIS_VM_INSTANCE_INFO_SCHEMA)

0 commit comments

Comments
 (0)