Merge pull request ceph#61873 from rhcs-dashboard/nfs-create-cluster

mgr/dashboard: NFS Cluster and Export Listing

Author: nizamial09

src/pybind/mgr/dashboard/controllers/nfs.py

@@ -14,6 +14,7 @@
 from ..services.cephfs import CephFS
 from ..services.exception import DashboardException, handle_cephfs_error, \
     serialize_dashboard_exception
+from ..tools import str_to_bool
 from . import APIDoc, APIRouter, BaseController, Endpoint, EndpointDoc, \
     ReadPermission, RESTController, Task, UIRouter
 from ._version import APIVersion
@@ -87,7 +88,11 @@ def composed_decorator(func):
 class NFSGaneshaCluster(RESTController):
     @ReadPermission
     @RESTController.MethodMap(version=APIVersion.EXPERIMENTAL)
-    def list(self):
+    def list(self, info: Optional[bool] = False):
+        if str_to_bool(info):
+            return [
+                {"name": key, **value} for key, value in mgr.remote('nfs', 'cluster_info').items()
+            ]
         return mgr.remote('nfs', 'cluster_ls')
 
 
@@ -109,11 +114,11 @@ def _get_schema_export(export: Dict[str, Any]) -> Dict[str, Any]:
         export['fsal'] = schema_fsal_info
         return export
 
-    @EndpointDoc("List all NFS-Ganesha exports",
+    @EndpointDoc("List all or cluster specific NFS-Ganesha exports ",
                  responses={200: [EXPORT_SCHEMA]})
-    def list(self) -> List[Dict[str, Any]]:
+    def list(self, cluster_id=None) -> List[Dict[str, Any]]:
         exports = []
-        for export in mgr.remote('nfs', 'export_ls'):
+        for export in mgr.remote('nfs', 'export_ls', cluster_id, True):
             exports.append(self._get_schema_export(export))
 
         return exports

src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts

@@ -26,7 +26,6 @@ import { ServicesComponent } from './ceph/cluster/services/services.component';
 import { TelemetryComponent } from './ceph/cluster/telemetry/telemetry.component';
 import { DashboardComponent } from './ceph/dashboard/dashboard/dashboard.component';
 import { NfsFormComponent } from './ceph/nfs/nfs-form/nfs-form.component';
-import { NfsListComponent } from './ceph/nfs/nfs-list/nfs-list.component';
 import { PerformanceCounterComponent } from './ceph/performance-counter/performance-counter/performance-counter.component';
 import { LoginPasswordFormComponent } from './core/auth/login-password-form/login-password-form.component';
 import { LoginComponent } from './core/auth/login/login.component';
@@ -56,6 +55,7 @@ import { SmbTabsComponent } from './ceph/smb/smb-tabs/smb-tabs.component';
 import { SmbShareFormComponent } from './ceph/smb/smb-share-form/smb-share-form.component';
 import { SmbJoinAuthFormComponent } from './ceph/smb/smb-join-auth-form/smb-join-auth-form.component';
 import { SmbUsersgroupsFormComponent } from './ceph/smb/smb-usersgroups-form/smb-usersgroups-form.component';
+import { NfsClusterComponent } from './ceph/nfs/nfs-cluster/nfs-cluster.component';
 
 @Injectable()
 export class PerformanceCounterBreadcrumbsResolver extends BreadcrumbsResolver {
@@ -417,7 +417,7 @@ const routes: Routes = [
               breadcrumbs: 'File/NFS'
             },
             children: [
-              { path: '', component: NfsListComponent },
+              { path: '', component: NfsClusterComponent },
               {
                 path: `${URLVerbs.CREATE}/:fs_name/:subvolume_group`,
                 component: NfsFormComponent,

src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/models/nfs-cluster-config.ts

@@ -0,0 +1,12 @@
+export interface NFSBackend {
+  hostname: string;
+  ip: string;
+  port: number;
+}
+
+export interface NFSCluster {
+  name: string;
+  virtual_ip: number;
+  port: number;
+  backend: NFSBackend[];
+}

src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-cluster-details/nfs-cluster-details.component.html

@@ -0,0 +1,11 @@
+  <ng-container *ngIf="!!selection">
+  <legend
+  i18n
+  >
+  {{title | titlecase}}
+  <cd-help-text>
+    Lists exports for a cluster
+  </cd-help-text>
+  </legend>
+  <cd-nfs-list [clusterId]="selection.name"></cd-nfs-list>
+  </ng-container>

src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-cluster-details/nfs-cluster-details.component.scss

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NfsClusterDetailsComponent } from './nfs-cluster-details.component';
+import { configureTestBed } from '~/testing/unit-test-helper';
+import { SharedModule } from '~/app/shared/shared.module';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+
+describe('NfsClusterDetailsComponent', () => {
+  let component: NfsClusterDetailsComponent;
+  let fixture: ComponentFixture<NfsClusterDetailsComponent>;
+
+  configureTestBed({
+    declarations: [NfsClusterDetailsComponent],
+    imports: [HttpClientTestingModule, SharedModule]
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NfsClusterDetailsComponent);
+    component = fixture.componentInstance;
+  });
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-cluster-details/nfs-cluster-details.component.spec.ts

@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+import { CdTableSelection } from '~/app/shared/models/cd-table-selection';
+
+@Component({
+  selector: 'cd-nfs-cluster-details',
+  templateUrl: './nfs-cluster-details.component.html',
+  styleUrls: ['./nfs-cluster-details.component.scss']
+})
+export class NfsClusterDetailsComponent {
+  title = $localize`Export`;
+  @Input()
+  selection: CdTableSelection;
+}

src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-cluster-details/nfs-cluster-details.component.ts

@@ -0,0 +1,51 @@
+  <ng-container *ngIf="orchStatus?.available && clusters$ | async as clusters">
+  <cd-table [autoReload]="true"
+            [data]="clusters"
+            columnMode="flex"
+            [columns]="columns"
+            selectionType="single"
+            [hasDetails]="true"
+            (setExpandedRow)="setExpandedRow($event)"
+            (fetchData)="loadData()"
+            (updateSelection)="updateSelection($event)">
+  <cd-table-actions class="table-actions"
+                    [selection]="selection"
+                    [permission]="permission"
+                    [tableActions]="tableActions"></cd-table-actions>
+  <cd-nfs-cluster-details  *cdTableDetail
+                           [selection]="expandedRow"></cd-nfs-cluster-details>
+  </cd-table>
+  </ng-container>
+
+  <ng-template
+  #virtualIpTpl
+  let-row="data.row"
+  >
+  <span *ngIf="row.virtual_ip || row.ports">
+  <cds-tag size="md">
+    {{ row.virtual_ip }}:{{row.ports}}
+  </cds-tag>
+  </span>
+  </ng-template>
+
+  <ng-template
+  #ipAddrTpl
+  let-backends="data.value"
+  >
+  <span *ngFor="let backend of backends">
+  <span *ngIf="backend.ip || backend.port">
+  <cds-tag size="md">
+    {{ backend.ip }}:{{backend.port}}
+  </cds-tag>
+  </span>
+  </span>
+  </ng-template>
+
+  <ng-template #hostnameTpl
+               let-backends="data.value">
+  <span *ngFor="let backend of backends">
+    <span *ngIf="backend.hostname">
+      <cds-tag size="md">{{backend.hostname }}</cds-tag>
+    </span>
+  </span>
+  </ng-template>

src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-cluster/nfs-cluster.component.html

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { configureTestBed } from '~/testing/unit-test-helper';
+import { SharedModule } from '~/app/shared/shared.module';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { NfsClusterComponent } from './nfs-cluster.component';
+
+describe('NfsClusterComponent', () => {
+  let component: NfsClusterComponent;
+  let fixture: ComponentFixture<NfsClusterComponent>;
+
+  configureTestBed({
+    declarations: [NfsClusterComponent],
+    imports: [HttpClientTestingModule, SharedModule]
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NfsClusterComponent);
+    component = fixture.componentInstance;
+  });
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});