Add project id to openstack wizard

src/app/cluster/cluster-details/edit-provider-settings/openstack-provider-settings/openstack-provider-settings.component.spec.ts

@@ -64,6 +64,7 @@ describe('OpenstackProviderSettingsComponent', () => {
       password: '',
       username: '',
       tenant: '',
+      tenantID: '',
       domain: '',
       network: '',
       securityGroups: '',

src/app/core/services/wizard/provider/openstack.ts

@@ -13,12 +13,8 @@ export class Openstack extends Provider {
     super(http, provider);
 
     this._setRequiredHeaders(
-        Openstack.Header.Username,
-        Openstack.Header.Password,
-        Openstack.Header.Domain,
-        Openstack.Header.Datacenter,
-        Openstack.Header.Tenant,
-    );
+        Openstack.Header.Username, Openstack.Header.Password, Openstack.Header.Domain, Openstack.Header.Datacenter,
+        Openstack.Header.Tenant);
   }
 
   credential(credential: string): Openstack {
@@ -61,6 +57,14 @@ export class Openstack extends Provider {
     return this;
   }
 
+  tenantID(tenantID: string): Openstack {
+    if (tenantID) {
+      this._changeRequiredHeader(Openstack.Header.Tenant, Openstack.Header.TenantID);
+      this._headers = this._headers.set(Openstack.Header.TenantID, tenantID);
+    }
+    return this;
+  }
+
   flavors(): Observable<OpenstackFlavor[]> {
     if (!this._hasRequiredHeaders()) {
       return EMPTY;
@@ -107,5 +111,6 @@ export namespace Openstack {
     Domain = 'Domain',
     Datacenter = 'DatacenterName',
     Tenant = 'Tenant',
+    TenantID = 'TenantID',
   }
 }

src/app/core/services/wizard/provider/provider.ts

@@ -15,6 +15,13 @@ export abstract class Provider {
     this._requiredHeaders = headers;
   }
 
+  protected _changeRequiredHeader(from: any, to: any): void {
+    const idx = this._requiredHeaders.indexOf(from);
+    if (idx > -1) {
+      this._requiredHeaders[idx] = to;
+    }
+  }
+
   protected _hasRequiredHeaders(): boolean {
     return this._headers.get(Provider.SharedHeader.Credential) !== null ||
         this._requiredHeaders.filter(header => this._headers.keys().includes(header)).length ===

src/app/node-data/openstack-node-data/openstack-node-data.component.ts

@@ -61,16 +61,12 @@ export class OpenstackNodeDataComponent implements OnInit, OnDestroy {
     });
 
     this._wizard.clusterProviderSettingsFormChanges$.pipe(takeUntil(this._unsubscribe)).subscribe((data) => {
-      if (!this.hasCredentials() && !this._selectedPreset) {
-        return;
-      }
-
       this.cloudSpec = data.cloudSpec;
       this.osNodeForm.controls.flavor.setValue('');
       this.flavors = [];
       this.checkFlavorState();
-      if (data.cloudSpec.openstack.username !== '' || data.cloudSpec.openstack.password !== '' ||
-          data.cloudSpec.openstack.domain !== '' || data.cloudSpec.openstack.tenant !== '' || this._selectedPreset) {
+
+      if (this.hasCredentials() || this._selectedPreset) {
         this.loadFlavors();
       }
     });
@@ -136,8 +132,9 @@ export class OpenstackNodeDataComponent implements OnInit, OnDestroy {
   hasCredentials(): boolean {
     return !!this.cloudSpec.openstack.username && this.cloudSpec.openstack.username.length > 0 &&
         !!this.cloudSpec.openstack.password && this.cloudSpec.openstack.password.length > 0 &&
-        !!this.cloudSpec.openstack.tenant && this.cloudSpec.openstack.tenant.length > 0 &&
-        !!this.cloudSpec.openstack.domain && this.cloudSpec.openstack.domain.length > 0;
+        !!this.cloudSpec.openstack.domain && this.cloudSpec.openstack.domain.length > 0 &&
+        ((!!this.cloudSpec.openstack.tenant && this.cloudSpec.openstack.tenant.length > 0) ||
+         (!!this.cloudSpec.openstack.tenantID && this.cloudSpec.openstack.tenantID.length > 0));
   }
 
   private handleFlavours(flavors: OpenstackFlavor[]): void {
@@ -153,13 +150,18 @@ export class OpenstackNodeDataComponent implements OnInit, OnDestroy {
   }
 
   loadFlavors(): void {
+    if (!this.hasCredentials() && !this._selectedPreset) {
+      return;
+    }
+
     this.loadingFlavors = !this.isInWizard() || this.hasCredentials() || !!this._selectedPreset;
 
     iif(() => this.isInWizard(),
         this._wizard.provider(NodeProvider.OPENSTACK)
             .username(this.cloudSpec.openstack.username)
             .password(this.cloudSpec.openstack.password)
             .tenant(this.cloudSpec.openstack.tenant)
+            .tenantID(this.cloudSpec.openstack.tenantID)
             .domain(this.cloudSpec.openstack.domain)
             .credential(this._selectedPreset)
             .datacenter(this.cloudSpec.dc)
@@ -171,7 +173,7 @@ export class OpenstackNodeDataComponent implements OnInit, OnDestroy {
           this.handleFlavours(flavors);
           this.checkFlavorState();
           this.loadingFlavors = false;
-        }, () => this.loadingSizes = false);
+        }, () => this.loadingFlavors = false);
   }
 
   isFloatingIPEnforced(): boolean {

src/app/shared/entity/cloud/OpenstackCloudSpec.ts

@@ -2,6 +2,7 @@ export class OpenstackCloudSpec {
   username: string;
   password: string;
   tenant: string;
+  tenantID: string;
   domain: string;
   network: string;
   securityGroups: string;

src/app/testing/fake-data/cluster.fake.ts

@@ -247,6 +247,7 @@ export function fakeOpenstackCluster(): ClusterEntity {
           network: 'test-network',
           domain: 'test-domain',
           tenant: 'test-tenant',
+          tenantID: '',
           subnetID: 'test-subnet-id',
         },
         baremetal: null,

src/app/wizard/set-settings/provider-settings/openstack/openstack.component.html

@@ -59,6 +59,18 @@
     </mat-error>
     <mat-hint *ngIf="showHint('tenant')">Please enter your credentials first.</mat-hint>
   </mat-form-field>
+  <mat-form-field fxFlex
+                  [ngClass]="showHint('tenant') ? 'km-with-hint' : ''">
+    <mat-label>Project ID</mat-label>
+    <input matInput
+           formControlName="tenantID"
+           name="tenantID"
+           placeholder="Project ID">
+    <mat-error *ngIf="form.controls.tenantID.hasError('required')">
+      Project ID is <strong>required</strong>.
+    </mat-error>
+    <mat-hint *ngIf="showHint('tenant')">Please enter your credentials first.</mat-hint>
+  </mat-form-field>
 
   <mat-form-field fxFlex
                   id="km-floating-ip-pool-field"

src/app/wizard/set-settings/provider-settings/openstack/openstack.component.spec.ts

@@ -34,9 +34,10 @@ describe('OpenstackClusterSettingsComponent', () => {
   beforeEach(async(() => {
     wizardMock =
         jasmine.createSpyObj('WizardService', ['provider', 'getSelectedDatacenter', 'changeClusterProviderSettings']);
-    providerMock = jasmine.createSpyObj(
-        'Provider',
-        ['tenants', 'networks', 'securityGroups', 'subnets', 'username', 'password', 'domain', 'datacenter', 'tenant']);
+    providerMock = jasmine.createSpyObj('Provider', [
+      'tenants', 'networks', 'securityGroups', 'subnets', 'username', 'password', 'domain', 'datacenter', 'tenant',
+      'tenantID'
+    ]);
 
     wizardMock.changeClusterProviderSettings.and.callThrough();
     wizardMock.onCustomPresetsDisable = new EventEmitter<boolean>();
@@ -48,6 +49,7 @@ describe('OpenstackClusterSettingsComponent', () => {
     providerMock.domain.and.returnValue(providerMock);
     providerMock.datacenter.and.returnValue(providerMock);
     providerMock.tenant.and.returnValue(providerMock);
+    providerMock.tenantID.and.returnValue(providerMock);
 
     wizardMock.getSelectedDatacenter.and.returnValue(fakeOpenstackDatacenter());
 
@@ -95,6 +97,7 @@ describe('OpenstackClusterSettingsComponent', () => {
       component.cluster = fakeOpenstackCluster();
       component.cluster.spec.cloud.openstack = {
         tenant: '',
+        tenantID: '',
         domain: '',
         network: '',
         securityGroups: '',
@@ -261,7 +264,7 @@ describe('OpenstackClusterSettingsComponent', () => {
     it('should set correct tenant placeholder', () => {
       component.form.controls.username.setValue('');
       fixture.detectChanges();
-      expect(component.getTenantsFormState()).toEqual('Project*');
+      expect(component.getTenantsFormState()).toEqual('Project');
 
       component.form.controls.username.setValue('username');
       component.form.controls.password.setValue('password');
@@ -272,7 +275,7 @@ describe('OpenstackClusterSettingsComponent', () => {
 
       component.tenants = openstackTenantsFake();
       fixture.detectChanges();
-      expect(component.getTenantsFormState()).toEqual('Project*');
+      expect(component.getTenantsFormState()).toEqual('Project');
     });
 
     it('should set correct optional settings placeholder', (() => {
@@ -319,6 +322,43 @@ describe('OpenstackClusterSettingsComponent', () => {
       fixture.detectChanges();
       expect(component.getSubnetIDFormState()).toEqual('Subnet ID');
     });
+
+    it('should disable Project field when Project ID is provided', fakeAsync(() => {
+         fixture.detectChanges();
+
+         expect(component.form.controls.tenant.disabled).toBeTruthy();
+         expect(component.form.controls.tenantID.disabled).toBeTruthy();
+
+         component.form.controls.username.setValue('username');
+         component.form.controls.password.setValue('password');
+         component.form.controls.domain.setValue('domain');
+         component.form.controls.tenantID.setValue('tenantID');
+         fixture.detectChanges();
+         tick(1001);
+
+         expect(component.form.controls.tenant.disabled).toBeTruthy();
+         expect(component.form.controls.tenantID.enabled).toBeTruthy();
+         discardPeriodicTasks();
+       }));
+
+    it('should disable Project ID field when Project is provided', fakeAsync(() => {
+         fixture.detectChanges();
+
+         expect(component.form.controls.tenant.disabled).toBeTruthy();
+         expect(component.form.controls.tenantID.disabled).toBeTruthy();
+
+         component.form.controls.username.setValue('username');
+         component.form.controls.password.setValue('password');
+         component.form.controls.domain.setValue('domain');
+         component.form.controls.tenant.setValue('test-project');
+         component.tenants = [{id: 'test-id', name: 'test-project'}];
+         fixture.detectChanges();
+         tick(1001);
+
+         expect(component.form.controls.tenant.enabled).toBeTruthy();
+         expect(component.form.controls.tenantID.disabled).toBeTruthy();
+         discardPeriodicTasks();
+       }));
   });
 
   describe('Config with DefaultUserName', () => {
@@ -332,6 +372,7 @@ describe('OpenstackClusterSettingsComponent', () => {
       component.cluster = fakeOpenstackCluster();
       component.cluster.spec.cloud.openstack = {
         tenant: '',
+        tenantID: '',
         domain: '',
         network: '',
         securityGroups: '',