Merge branch 'openstack' into 'morphemic-rc1.5'

fix

See merge request !29

src/app/deploying-application/service/deployment.service.ts

@@ -99,8 +99,7 @@ export class DeploymentService {
 
   private mapCloudConfForReadToCloudConf(cloudConf: CloudConfigurationForRead): CloudConfiguration {
     const chosenProperty = cloudConf.properties.filter(value => value.checked);
-    return new CloudConfiguration(cloudConf.nodeGroup, chosenProperty);
-  }
+    return new CloudConfiguration(cloudConf.nodeGroup, chosenProperty, cloudConf.scopePrefix, cloudConf.scopeValue, cloudConf.identityVersion);  }
 
 }
 

src/app/provider/cloud-definition-form/cloud-definition-form.component.html

@@ -71,6 +71,9 @@
               'visibility'}}
             </mat-icon>
           </mat-form-field>
+          <mat-form-field *ngIf="isOpenstack(apiForm)">
+            <input matInput formControlName="domain" placeholder="domain">
+          </mat-form-field>
         </form>
       </mat-card>
 
@@ -89,6 +92,20 @@
               {{getNodeGroupPatternMsg()}}
             </mat-error>
           </mat-form-field>
+          <div *ngIf="isOpenstack(apiForm)">
+            <mat-form-field>
+              <input matInput formControlName="identityVersion" placeholder="identityVersion" >
+            </mat-form-field>
+
+            <mat-form-field>
+              <input matInput formControlName="scopePrefix" placeholder="scopePrefix" >
+            </mat-form-field>
+
+            <mat-form-field>
+              <input matInput formControlName="scopeValue" placeholder="scopeValue" >
+            </mat-form-field>
+          </div>
+
 
           <mat-card-subtitle><h3>Cloud properties</h3></mat-card-subtitle>
 

src/app/provider/cloud-definition-form/cloud-definition-form.component.ts

@@ -75,13 +75,17 @@ export class CloudDefinitionFormComponent implements OnInit {
         [Validators.required])
         : ['', [Validators.required]],
       secret: this.cloudData ? new FormControl({value: this.cloudData.credential.secret, disabled: this.isReadMode})
-        : ['', Validators.required]
+        : ['', Validators.required],
+      domain: this.cloudData.credential.domain
     });
     this.cloudConfigurationForm = this.formBuilder.group({
       id: this.cloudData ? this.cloudData.cloudConfiguration.id : null,
       nodeGroup: this.cloudData ? new FormControl({value: this.cloudData.cloudConfiguration.nodeGroup, disabled: this.isReadMode})
         : ['', [Validators.required, Validators.pattern(this.nodeGroupPattern)]],
-      properties: this.cloudData ? this.cloudData.cloudConfiguration.properties : this.cloudProperties
+      properties: this.cloudData ? this.cloudData.cloudConfiguration.properties : this.cloudProperties,
+      identityVersion: this.cloudData.cloudConfiguration.identityVersion,
+      scopePrefix: this.cloudData.cloudConfiguration.scopePrefix,
+      scopeValue: this.cloudData.cloudConfiguration.scopeValue
     });
     this.cloudDefinitionForm = this.formBuilder.group({
       id: this.cloudData ? this.cloudData.id : null,
@@ -204,6 +208,10 @@ export class CloudDefinitionFormComponent implements OnInit {
     });
   }
 
+  isOpenstack(apiForm: FormGroup) {
+    return apiForm.value.providerName === 'openstack';
+  }
+
   private deleteCloudProperty(row: ParentProperty) {
     const deletedPropertyId = this.cloudProperties.findIndex(value => value.id === row.id);
     this.cloudProperties.splice(deletedPropertyId, 1);

src/app/provider/model/cloud-configuration.ts

@@ -2,10 +2,17 @@ export class CloudConfiguration {
   id?: number;
   nodeGroup: string;
   properties: {};
+  scopePrefix: string;
+  scopeValue: string;
+  identityVersion: string;
 
-  constructor(nodeGroupArg: string, propertiesArg: {}, idArg?: number) {
+  constructor(nodeGroupArg: string, propertiesArg: {}, scopePrefixArg: string,
+              scopeValueArg: string, identityVersionArg: string, idArg?: number) {
     this.id = idArg;
     this.nodeGroup = nodeGroupArg;
     this.properties = propertiesArg;
+    this.scopePrefix = scopePrefixArg;
+    this.scopeValue = scopeValueArg;
+    this.identityVersion = identityVersionArg;
   }
 }

src/app/provider/model/credential.ts

@@ -2,4 +2,5 @@ export class Credential {
   id?: number;
   user: string;
   secret: string;
+  domain: string;
 }

src/app/provider/model/view/cloud-configuration-for-read.ts

@@ -4,4 +4,7 @@ export class CloudConfigurationForRead {
   id?: number;
   nodeGroup: string;
   properties: Array<ParentProperty>;
+  identityVersion: string;
+  scopePrefix: string;
+  scopeValue: string;
 }