From 2e13515bad426ad78ab1e3b423df9b89214d4866 Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Fri, 13 Oct 2023 13:53:23 +0530 Subject: [PATCH] mgr/dashboard: add port and zone endpoints to import realm token form in rgw multisite Signed-off-by: Aashish Sharma (cherry picked from commit 84ec19442b2db4f4e389810efbc01674d9824408) --- src/pybind/mgr/dashboard/controllers/rgw.py | 4 +- .../rgw-multisite-import.component.html | 122 +++++++++++++++++- .../rgw-multisite-import.component.ts | 115 +++++++++++++++-- .../src/app/shared/api/rgw-realm.service.ts | 16 +-- src/pybind/mgr/dashboard/openapi.yaml | 6 +- .../mgr/dashboard/services/ceph_service.py | 5 +- src/pybind/mgr/rgw/module.py | 13 +- 7 files changed, 249 insertions(+), 32 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py index 65c809ebec0..9ccf4b36b2b 100644 --- a/src/pybind/mgr/dashboard/controllers/rgw.py +++ b/src/pybind/mgr/dashboard/controllers/rgw.py @@ -812,10 +812,10 @@ class RgwRealm(RESTController): @UpdatePermission @allow_empty_body # pylint: disable=W0613 - def import_realm_token(self, realm_token, zone_name, daemon_name=None): + def import_realm_token(self, realm_token, zone_name, port, placement_spec): try: multisite_instance = RgwMultisite() - result = CephService.import_realm_token(realm_token, zone_name) + result = CephService.import_realm_token(realm_token, zone_name, port, placement_spec) multisite_instance.update_period() return result except NoRgwDaemonsException as e: diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html index bf11e04029a..a001e4b00c7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-import/rgw-multisite-import.component.html @@ -13,9 +13,9 @@
  • This feature allows you to configure a connection between your primary and secondary Ceph clusters for data replication. By importing a token, you establish a link between the clusters, enabling data synchronization.
  • To obtain the token, generate it from your secondary Ceph cluster. This token includes encoded information about the secondary cluster's endpoint, access key, and secret key.
  • The secondary zone represents the destination cluster where your data will be replicated.
    • -
  • Please create an RGW service using the secondary zone (created after submitting this form) to start the replication between zones.
    • + Zone Details
    + + Service Details +
    +
    +
    + + + If set to true, the orchestrator will not start nor stop any daemon associated with this service. + Placement and all other properties will be ignored. +
    +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + + This field is required. +
    +
    + + +
    + +
    + + +
    +
    + + +
    + +
    + + The value must be at least 1. + The entered value needs to be a number. +
    +
    + + + + +
    + +
    + + The entered value needs to be a number. + The value must be at least 1. + The value cannot exceed 65535. +
    +
    +
    (); + labelFocus = new Subject(); constructor( public activeModal: NgbActiveModal, + public hostService: HostService, + public rgwRealmService: RgwRealmService, public actionLabels: ActionLabelsI18n, public notificationService: NotificationService ) { + this.hosts = { + options: [], + messages: new SelectMessages({ + empty: $localize`There are no hosts.`, + filter: $localize`Filter hosts` + }) + }; this.createForm(); } ngOnInit(): void { @@ -41,6 +62,20 @@ export class RgwMultisiteImportComponent implements OnInit { this.zoneNames = this.zoneList.map((zone) => { return zone['name']; }); + const hostContext = new CdTableFetchDataContext(() => undefined); + this.hostService.list(hostContext.toParams(), 'false').subscribe((resp: object[]) => { + const options: SelectOption[] = []; + _.forEach(resp, (host: object) => { + if (_.get(host, 'sources.orchestrator', false)) { + const option = new SelectOption(false, _.get(host, 'hostname'), ''); + options.push(option); + } + }); + this.hosts.options = [...options]; + }); + this.hostService.getLabels().subscribe((resp: string[]) => { + this.labels = resp; + }); } createForm() { @@ -55,23 +90,75 @@ export class RgwMultisiteImportComponent implements OnInit { return this.zoneNames && this.zoneNames.indexOf(zoneName) !== -1; }) ] - }) + }), + rgw_frontend_port: new FormControl(null, { + validators: [Validators.required, Validators.pattern('^[0-9]*$')] + }), + placement: new FormControl('hosts'), + label: new FormControl(null, [ + CdValidators.requiredIf({ + placement: 'label', + unmanaged: false + }) + ]), + hosts: new FormControl([]), + count: new FormControl(null, [CdValidators.number(false)]), + unmanaged: new FormControl(false) }); } onSubmit() { const values = this.importTokenForm.value; - this.rgwRealmService.importRealmToken(values['realmToken'], values['zoneName']).subscribe( - () => { - this.notificationService.show( - NotificationType.success, - $localize`Realm token import successfull` - ); - this.activeModal.close(); - }, - () => { - this.importTokenForm.setErrors({ cdSubmitButton: true }); + const placementSpec: object = { + placement: {} + }; + if (!values['unmanaged']) { + switch (values['placement']) { + case 'hosts': + if (values['hosts'].length > 0) { + placementSpec['placement']['hosts'] = values['hosts']; + } + break; + case 'label': + placementSpec['placement']['label'] = values['label']; + break; } - ); + if (_.isNumber(values['count']) && values['count'] > 0) { + placementSpec['placement']['count'] = values['count']; + } + } + this.rgwRealmService + .importRealmToken( + values['realmToken'], + values['zoneName'], + values['rgw_frontend_port'], + placementSpec + ) + .subscribe( + () => { + this.notificationService.show( + NotificationType.success, + $localize`Realm token import successfull` + ); + this.activeModal.close(); + }, + () => { + this.importTokenForm.setErrors({ cdSubmitButton: true }); + } + ); } + + searchLabels = (text$: Observable) => { + return merge( + text$.pipe(debounceTime(200), distinctUntilChanged()), + this.labelFocus, + this.labelClick.pipe(filter(() => !this.typeahead.isPopupOpen())) + ).pipe( + map((value) => + this.labels + .filter((label: string) => label.toLowerCase().indexOf(value.toLowerCase()) > -1) + .slice(0, 10) + ) + ); + }; } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-realm.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-realm.service.ts index efa882c8b34..e81731cd520 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-realm.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-realm.service.ts @@ -66,14 +66,14 @@ export class RgwRealmService { }; } - importRealmToken(realm_token: string, zone_name: string) { - return this.rgwDaemonService.request((params: HttpParams) => { - params = params.appendAll({ - realm_token: realm_token, - zone_name: zone_name - }); - return this.http.post(`${this.url}/import_realm_token`, null, { params: params }); - }); + importRealmToken(realm_token: string, zone_name: string, port: number, placementSpec: object) { + let requestBody = { + realm_token: realm_token, + zone_name: zone_name, + port: port, + placement_spec: placementSpec + }; + return this.http.post(`${this.url}/import_realm_token`, requestBody); } getRealmTokens() { diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index 3cb74667304..aeb5d946439 100644 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -9228,7 +9228,9 @@ paths: application/json: schema: properties: - daemon_name: + placement_spec: + type: string + port: type: string realm_token: type: string @@ -9237,6 +9239,8 @@ paths: required: - realm_token - zone_name + - port + - placement_spec type: object responses: '201': diff --git a/src/pybind/mgr/dashboard/services/ceph_service.py b/src/pybind/mgr/dashboard/services/ceph_service.py index 135f88ca2c9..53cd0e7ad93 100644 --- a/src/pybind/mgr/dashboard/services/ceph_service.py +++ b/src/pybind/mgr/dashboard/services/ceph_service.py @@ -317,9 +317,10 @@ class CephService(object): return tokens_info @classmethod - def import_realm_token(cls, realm_token, zone_name): + def import_realm_token(cls, realm_token, zone_name, port, placement_spec): tokens_info = mgr.remote('rgw', 'import_realm_token', zone_name=zone_name, - realm_token=realm_token, start_radosgw=True) + realm_token=realm_token, port=port, placement=placement_spec, + start_radosgw=True) return tokens_info @classmethod diff --git a/src/pybind/mgr/rgw/module.py b/src/pybind/mgr/rgw/module.py index 079e7e817ca..f48e2e09fc3 100644 --- a/src/pybind/mgr/rgw/module.py +++ b/src/pybind/mgr/rgw/module.py @@ -307,10 +307,11 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): zone_name: Optional[str] = None, realm_token: Optional[str] = None, port: Optional[int] = None, - placement: Optional[str] = None, + placement: Optional[Union[str, Dict[str, Any]]] = None, start_radosgw: Optional[bool] = True, zone_endpoints: Optional[str] = None, inbuf: Optional[str] = None) -> Any: + if inbuf: try: rgw_specs = self._parse_rgw_specs(inbuf) @@ -318,7 +319,10 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): return HandleCommandResult(retval=-errno.EINVAL, stderr=f'{e}') elif (zone_name and realm_token): token = RealmToken.from_base64_str(realm_token) - placement_spec = PlacementSpec.from_string(placement) if placement else None + if isinstance(placement, dict): + placement_spec = PlacementSpec.from_json(placement) if placement else None + elif isinstance(placement, str): + placement_spec = PlacementSpec.from_string(placement) if placement else None rgw_specs = [RGWSpec(rgw_realm=token.realm_name, rgw_zone=zone_name, rgw_realm_token=realm_token, @@ -371,8 +375,9 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): zone_name: Optional[str] = None, realm_token: Optional[str] = None, port: Optional[int] = None, - placement: Optional[str] = None, + placement: Optional[dict] = None, start_radosgw: Optional[bool] = True, zone_endpoints: Optional[str] = None) -> None: - self.rgw_zone_create(zone_name, realm_token, port, placement, start_radosgw, + placement_spec = placement.get('placement') if placement else None + self.rgw_zone_create(zone_name, realm_token, port, placement_spec, start_radosgw, zone_endpoints) -- 2.39.5