]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37440 from Devp00l/wip-44433
authorLenz Grimmer <lgrimmer@suse.com>
Fri, 23 Oct 2020 11:57:51 +0000 (13:57 +0200)
committerGitHub <noreply@github.com>
Fri, 23 Oct 2020 11:57:51 +0000 (13:57 +0200)
mgr/dashboard: Add clay plugin support

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
1  2 
src/pybind/mgr/dashboard/controllers/erasure_code_profile.py
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.ts

index a42a51f4f995d80c681a08a562c4aea45a67d3ab,1f01a8f1af05ba5fd785642d770306ef477525c2..9a7cb43674b6852836540d2dc03856f45c2583c0
@@@ -25,10 -26,35 +25,29 @@@ describe('ErasureCodeProfileFormModalCo
    let fixture: ComponentFixture<ErasureCodeProfileFormModalComponent>;
    let formHelper: FormHelper;
    let fixtureHelper: FixtureHelper;
-   let data: {};
+   let data: { plugins: string[]; names: string[]; nodes: CrushNode[] };
+   const expectTechnique = (current: string) =>
+     expect(component.form.getValue('technique')).toBe(current);
+   const expectTechniques = (techniques: string[], current: string) => {
+     expect(component.techniques).toEqual(techniques);
+     expectTechnique(current);
+   };
+   const expectRequiredControls = (controlNames: string[]) => {
+     controlNames.forEach((name) => {
+       const value = component.form.getValue(name);
+       formHelper.expectValid(name);
+       formHelper.expectErrorChange(name, null, 'required');
+       // This way other fields won't fail through getting invalid.
+       formHelper.expectValidChange(name, value);
+     });
+     fixtureHelper.expectIdElementsVisible(controlNames, true);
+   };
  
    configureTestBed({
 -    imports: [
 -      HttpClientTestingModule,
 -      RouterTestingModule,
 -      ToastrModule.forRoot(),
 -      PoolModule,
 -      NgBootstrapFormValidationModule.forRoot()
 -    ],
 +    imports: [HttpClientTestingModule, RouterTestingModule, ToastrModule.forRoot(), PoolModule],
      providers: [ErasureCodeProfileService, NgbActiveModal]
    });