287246bf4f
1. Refactor dcorch's generic_sync_manager.py and initial_sync_manager
into a main process manager and a worker manager. The main manager
will handle the allocation of eligible subclouds to each worker.
2. Rename the current EngineService to EngineWorkerService and introduce
a new EngineService for the main process, similar to
DCManagerAuditService and DCManagerAuditWorkerService.
3. Rename the current RPC EngineClient to EngineWorkerClient and
introduce a new EngineClient. Adapt the RPC methods to accommodate
the modifications in these main process managers and worker managers.
4. Move master resources data retrieval from each sync_thread to engine
workers.
5. Implement 2 new db APIs for subcloud batch sync and state updates.
6. Remove code related to sync_lock and its associated db table schema.
7. Add ocf script for managing the start and stop of the dcorch
engine-worker service, and make changes in packaging accordingly.
8. Bug fixes for the issues related to the usage of
base64.urlsafe_b64encode and base64.urlsafe_b64decode in python3.
9. Update unit tests for the main process and worker managers.
Test Plan:
PASS: Verify that the dcorch audit runs properly every 5 minutes.
PASS: Verify that the initial sync runs properly every 10 seconds.
PASS: Verify that the sync subclouds operation runs properly every 5
seconds.
PASS: Successfully start and stop the dcorch-engine and
dcorch-engine-worker services using the sm commands.
PASS: Change the admin password on the system controller using
the command "openstack --os-region-name SystemController user
password set". Verify that the admin password is synchronized
to the subcloud and the dcorch receives the corresponding sync
request, followed by successful execution of sync resources for
the subcloud.
PASS: Unmanage and then manage a subcloud, and verify that the initial
sync is executed successfully for that subcloud.
PASS: Verify the removal of the sync_lock table from the dcorch db.
Story: 2011106
Task: 50013
Change-Id: I329847bd1107ec43e67ec59bdd1e3111b7b37cd3
Signed-off-by: lzhu1 <li.zhu@windriver.com>
184 lines
6.6 KiB
Python
184 lines
6.6 KiB
Python
# Copyright (c) 2017-2024 Wind River Systems, Inc.
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
Client side of the DC Orchestrator RPC API.
|
|
"""
|
|
|
|
from dcorch.common import consts
|
|
from dcorch.common import messaging
|
|
|
|
|
|
class EngineClient(object):
|
|
"""Client side of the DC orchestrator engine rpc API.
|
|
|
|
Version History:
|
|
1.0 - Initial version
|
|
"""
|
|
|
|
BASE_RPC_API_VERSION = '1.0'
|
|
|
|
def __init__(self):
|
|
self._client = messaging.get_rpc_client(
|
|
topic=consts.TOPIC_ORCH_ENGINE,
|
|
version=self.BASE_RPC_API_VERSION)
|
|
|
|
@staticmethod
|
|
def make_msg(method, **kwargs):
|
|
return method, kwargs
|
|
|
|
def call(self, ctxt, msg, version=None):
|
|
method, kwargs = msg
|
|
if version is not None:
|
|
client = self._client.prepare(version=version)
|
|
else:
|
|
client = self._client
|
|
return client.call(ctxt, method, **kwargs)
|
|
|
|
def cast(self, ctxt, msg, fanout=None, version=None):
|
|
method, kwargs = msg
|
|
if version or fanout:
|
|
client = self._client.prepare(fanout=fanout, version=version)
|
|
else:
|
|
client = self._client
|
|
return client.cast(ctxt, method, **kwargs)
|
|
|
|
# The sync job info has been written to the DB, alert the sync engine
|
|
# that there is work to do.
|
|
def sync_request(self, ctxt, endpoint_type):
|
|
return self.cast(
|
|
ctxt, self.make_msg('sync_request', endpoint_type=endpoint_type))
|
|
|
|
def get_usage_for_project_and_user(self, ctxt, endpoint_type,
|
|
project_id, user_id=None):
|
|
return self.call(ctxt, self.make_msg('get_usage_for_project_and_user',
|
|
endpoint_type=endpoint_type,
|
|
project_id=project_id,
|
|
user_id=user_id))
|
|
|
|
def quota_sync_for_project(self, ctxt, project_id, user_id):
|
|
return self.cast(ctxt, self.make_msg('quota_sync_for_project',
|
|
project_id=project_id,
|
|
user_id=user_id))
|
|
|
|
|
|
class EngineWorkerClient(object):
|
|
"""Client side of the DC orchestrator engine worker rpc API.
|
|
|
|
Version History:
|
|
1.0 - Initial version
|
|
"""
|
|
|
|
BASE_RPC_API_VERSION = '1.0'
|
|
|
|
def __init__(self):
|
|
self._client = messaging.get_rpc_client(
|
|
topic=consts.TOPIC_ORCH_ENGINE_WORKER,
|
|
version=self.BASE_RPC_API_VERSION)
|
|
|
|
@staticmethod
|
|
def make_msg(method, **kwargs):
|
|
return method, kwargs
|
|
|
|
def call(self, ctxt, msg, version=None):
|
|
method, kwargs = msg
|
|
if version is not None:
|
|
client = self._client.prepare(version=version)
|
|
else:
|
|
client = self._client
|
|
return client.call(ctxt, method, **kwargs)
|
|
|
|
def cast(self, ctxt, msg, fanout=None, version=None):
|
|
method, kwargs = msg
|
|
if version or fanout:
|
|
client = self._client.prepare(fanout=fanout, version=version)
|
|
else:
|
|
client = self._client
|
|
return client.cast(ctxt, method, **kwargs)
|
|
|
|
def keypair_sync_for_user(self, ctxt, job_id, payload):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('keypair_sync_for_user', job_id=job_id,
|
|
payload=payload))
|
|
|
|
def image_sync(self, ctxt, job_id, payload):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('image_sync', job_id=job_id, payload=payload))
|
|
|
|
def add_subcloud(self, ctxt, subcloud_name, sw_version):
|
|
return self.call(
|
|
ctxt,
|
|
self.make_msg('add_subcloud', subcloud_name=subcloud_name,
|
|
sw_version=sw_version))
|
|
|
|
def del_subcloud(self, ctxt, subcloud_name):
|
|
return self.call(
|
|
ctxt,
|
|
self.make_msg('del_subcloud', subcloud_name=subcloud_name))
|
|
|
|
def update_subcloud_states(self, ctxt, subcloud_name, management_state,
|
|
availability_status):
|
|
return self.call(
|
|
ctxt,
|
|
self.make_msg('update_subcloud_states',
|
|
subcloud_name=subcloud_name,
|
|
management_state=management_state,
|
|
availability_status=availability_status))
|
|
|
|
def add_subcloud_sync_endpoint_type(self, ctxt, subcloud_name,
|
|
endpoint_type_list):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('add_subcloud_sync_endpoint_type',
|
|
subcloud_name=subcloud_name,
|
|
endpoint_type_list=endpoint_type_list))
|
|
|
|
def remove_subcloud_sync_endpoint_type(self, ctxt, subcloud_name,
|
|
endpoint_type_list):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('remove_subcloud_sync_endpoint_type',
|
|
subcloud_name=subcloud_name,
|
|
endpoint_type_list=endpoint_type_list))
|
|
|
|
def sync_subclouds(self, ctxt, subcloud_sync_list):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('sync_subclouds',
|
|
subcloud_sync_list=subcloud_sync_list))
|
|
|
|
def run_sync_audit(self, ctxt, subcloud_sync_list):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('run_sync_audit',
|
|
subcloud_sync_list=subcloud_sync_list))
|
|
|
|
def initial_sync_subclouds(self, ctxt, subcloud_capabilities):
|
|
return self.cast(
|
|
ctxt,
|
|
self.make_msg('initial_sync_subclouds',
|
|
subcloud_capabilities=subcloud_capabilities))
|
|
|
|
def update_subcloud_version(self, ctxt, subcloud_name, sw_version):
|
|
return self.call(
|
|
ctxt,
|
|
self.make_msg('update_subcloud_version',
|
|
subcloud_name=subcloud_name, sw_version=sw_version))
|
|
|
|
def update_subcloud_endpoints(self, ctxt, subcloud_name, endpoints):
|
|
return self.cast(ctxt, self.make_msg(
|
|
'update_subcloud_endpoints', subcloud_name=subcloud_name,
|
|
endpoints=endpoints), fanout=True, version=self.BASE_RPC_API_VERSION)
|