From 41ef563dcff2915b5eac562a47b1d8a91ebe2277 Mon Sep 17 00:00:00 2001
From: DavidWein94 <david-weinholz@web.de>
Date: Fri, 26 Oct 2018 14:15:05 +0200
Subject: [PATCH] Dev (#255)

* feat(version):show volumes if version is right

* feat(client):now checks version featuress

* feat(applications):added error message

* feat(application):added max lifetime 12

* removed unused things
---
 src/app/api-connector/group.service.ts        |  2 +-
 .../addcloudapplication.component.html        | 75 +++++++++++------
 .../applications/addsinglevm.component.html   | 53 ++++++++----
 .../projectmanagement/overview.component.html | 15 ++--
 .../projectmanagement/overview.component.ts   | 83 +++++++++++--------
 .../project_member_application.ts             | 12 +--
 src/app/virtualmachines/addvm.component.ts    |  4 +-
 .../virtualmachinemodels/virtualmachine.ts    | 30 ++++---
 .../virtualmachinemodels/vmclient.ts          | 15 ++--
 .../virtualmachines/vmOverview.component.html |  4 +-
 .../virtualmachines/vmOverview.component.ts   |  2 +-
 11 files changed, 176 insertions(+), 119 deletions(-)

diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts
index 6de32864c4..6f46d82310 100644
--- a/src/app/api-connector/group.service.ts
+++ b/src/app/api-connector/group.service.ts
@@ -4,7 +4,7 @@ import {Observable, throwError} from 'rxjs';
 import {catchError} from 'rxjs/operators';
 import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
 import {Cookie} from 'ng2-cookies/ng2-cookies';
-
+import {Vmclient} from "../virtualmachines/virtualmachinemodels/vmclient";
 
 const header = new HttpHeaders({
     'X-CSRFToken': Cookie.get("csrftoken")
diff --git a/src/app/applications/addcloudapplication.component.html b/src/app/applications/addcloudapplication.component.html
index 04a415c824..60290f9d5c 100755
--- a/src/app/applications/addcloudapplication.component.html
+++ b/src/app/applications/addcloudapplication.component.html
@@ -17,8 +17,10 @@
                             <h5 class="col-md-6 form-control-label">General Information</h5>
                         </div>
                         <div class="form-group row">
-                            <label class="col-md-4"><strong>Cloud Project <i data-balloon="By choosing this project type you will have your own OpenStack project. This allows you to use any framework available in the cloud computing context."
-                                                                             data-balloon-pos="down" data-balloon-length="large"><i class="icon-question menu_links" style="cursor: pointer;"></i></i>
+                            <label class="col-md-4"><strong>Cloud Project <i
+                                    data-balloon="By choosing this project type you will have your own OpenStack project. This allows you to use any framework available in the cloud computing context."
+                                    data-balloon-pos="down" data-balloon-length="large"><i
+                                    class="icon-question menu_links" style="cursor: pointer;"></i></i>
                             </strong>
                             </label>
                             <div class="col-md-8">
@@ -32,7 +34,8 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 'has-success': f.controls.project_application_name?.valid && (f.controls.project_application_name?.dirty || f.controls.project_application_name?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Project
-                                Name* <i data-balloon="Full name of your project" data-balloon-pos="down"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Name* <i data-balloon="Full name of your project" data-balloon-pos="down"><i
+                                        class="icon-question" style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <input required type="text" id="id_project_application_name"
                                        name="project_application_name"
@@ -50,8 +53,10 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 'has-success': f.controls.project_application_shortname?.valid && (f.controls.project_application_shortname?.dirty || f.controls.project_application_shortname?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Project
-                                Short Name* <i data-balloon="Shortname of your project. This name will be referenced in OpenStack and also when you start a new virtual machine. Use between 5 and 15 characters"
-                                               data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Short Name* <i
+                                        data-balloon="Shortname of your project. This name will be referenced in OpenStack and also when you start a new virtual machine. Use between 5 and 15 characters"
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div *ngIf='wronginput'>
                                     <strong><font color="red">Umlauts and special characters are prohibited in the
@@ -74,8 +79,10 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 'has-success': f.controls.project_application_description?.valid && (f.controls.project_application_description?.dirty || f.controls.project_application_description?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Project
-                                Description* <i data-balloon="Full description of your project including tools you might are going to use."
-                                                data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Description* <i
+                                        data-balloon="Full description of your project including tools you might are going to use."
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <textarea required id="id_project_application_description"
                                           name="project_application_description" rows="9"
@@ -92,16 +99,18 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Desired
                                 lifetime* <i data-balloon="Lifetime in months of your project" data-balloon-pos="down">
-                                <i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                    <i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input class="form-control" id="id_project_application_lifetime"
                                            name="project_application_lifetime" placeholder="e.g 3"
-                                           type="number" min="1" step="1" ngModel required>
+                                           type="number" min="1" max="12" step="1" ngModel required
+                                           pattern="^([1-9]|1[012])$"
+                                    >
                                     <span class="input-group-addon"> months
                                     </span>
                                 </div>
-                                <span class="help-block">How long would you like to run this project?</span>
+                                <span class="help-block">How long would you like to run this project (12 month is maximum)?</span>
                             </div>
                         </div>
 
@@ -116,8 +125,10 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Number of
                                 Virtual
-                                Machines* <i data-balloon="A virtual machine allows you to run operating system of your choice with flexible resource parameters like number of CPUs and RAM."
-                                             data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Machines* <i
+                                        data-balloon="A virtual machine allows you to run operating system of your choice with flexible resource parameters like number of CPUs and RAM."
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_vms_requested"
@@ -137,8 +148,10 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 'has-success': f.controls.project_application_cores_per_vm?.valid
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Cores per VM* <i
-                                    data-balloon="A CPU core is the processing unit of your virtual machine." data-balloon-length="medium"
-                                    data-balloon-pos="down"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                    data-balloon="A CPU core is the processing unit of your virtual machine."
+                                    data-balloon-length="medium"
+                                    data-balloon-pos="down"><i class="icon-question"
+                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_cores_per_vm"
@@ -160,7 +173,8 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>RAM per VM* <i
                                     data-balloon="RAM is where data is stored that is accessed by the CPU."
-                                    data-balloon-pos="down" data-balloon-length="medium"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                    data-balloon-pos="down" data-balloon-length="medium"><i class="icon-question"
+                                                                                            style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_ram_per_vm"
@@ -181,7 +195,8 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Storage Limit*
                                 <i
                                         data-balloon="Storage limit is the sum of extra storage provided by volumes."
-                                        data-balloon-pos="down" data-balloon-length="medium"><i  class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                        data-balloon-pos="down" data-balloon-length="medium"><i class="icon-question"
+                                                                                                style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input class="form-control" id="id_project_application_volume_limit"
@@ -201,8 +216,9 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Number of storage
                                 volumes*
-                                <i      data-balloon="Number of volumes allowed to create. The sum of the volumes size equals the value provided in the storage limit field."
-                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                <i data-balloon="Number of volumes allowed to create. The sum of the volumes size equals the value provided in the storage limit field."
+                                   data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                          style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_volume_counter"
@@ -221,7 +237,8 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input">Object Storage <i
                                     data-balloon="Object storage is a method of storing data that does not use a directory tree internally. Object storage combines files with metadata and places it in a flat structure."
-                                    data-balloon-pos="down" data-balloon-length="large"><i  class="icon-question" style="cursor: pointer;"></i></i></label>
+                                    data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                           style="cursor: pointer;"></i></i></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input class="form-control" id="id_project_application_object_storage"
@@ -237,9 +254,11 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
 
 
                         <div class="form-group row">
-                            <label class="col-md-4 form-control-label">Special Hardware <i data-balloon="GPU means Graphics Processing Unit and is often used for machine learning. A field programmable gate array (FPGA) represents a reconfigurable computing architecture."
-                                                                                           data-balloon-pos="down"
-                                                                                           data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></label>
+                            <label class="col-md-4 form-control-label">Special Hardware <i
+                                    data-balloon="GPU means Graphics Processing Unit and is often used for machine learning. A field programmable gate array (FPGA) represents a reconfigurable computing architecture."
+                                    data-balloon-pos="down"
+                                    data-balloon-length="large"><i class="icon-question"
+                                                                   style="cursor: pointer;"></i></i></label>
                             <div class="col-md-8">
                                 <div *ngFor="let sh of special_hardware; let i=index;" class="checkbox">
                                     <label>
@@ -272,7 +291,8 @@ <h5 class="col-md-6 form-control-label">Institutional Information</h5>
                                 'has-success': f.controls.project_application_institute?.valid && (f.controls.project_application_institute?.dirty || f.controls.project_application_institute?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Institute Name* <i
-                                    data-balloon="Your institute" data-balloon-pos="down"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                    data-balloon="Your institute" data-balloon-pos="down"><i class="icon-question"
+                                                                                             style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <input required type="text" id="id_project_application_institute"
                                        name="project_application_institute" class="form-control"
@@ -287,7 +307,8 @@ <h5 class="col-md-6 form-control-label">Institutional Information</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Workgroup Name* <i
                                     data-balloon="Your Workgroup"
-                                    data-balloon-pos="down"><i class="icon-question"  style="cursor: pointer;"></i></i></strong></label>
+                                    data-balloon-pos="down"><i class="icon-question"
+                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <input required type="text" id="id_project_application_workgroup"
                                        name="project_application_workgroup" class="form-control"
@@ -327,7 +348,8 @@ <h5 class="col-md-6 form-control-label">Institutional Information</h5>
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">{{ notificationModalTitle }}</h4>
-              <button type="button" class="close" style="cursor:pointer" (click)="notificationModal.hide()" aria-label="Close">
+                <button type="button" class="close" style="cursor:pointer" (click)="notificationModal.hide()"
+                        aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -370,7 +392,8 @@ <h4 class="modal-title">{{ notificationModalTitle }}</h4>
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title"> {{acknowledgeModalTitle}}</h4>
-              <button type="button" class="close" style="cursor:pointer" (click)="acknowledgemodal.hide()" aria-label="Close">
+                <button type="button" class="close" style="cursor:pointer" (click)="acknowledgemodal.hide()"
+                        aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/applications/addsinglevm.component.html b/src/app/applications/addsinglevm.component.html
index c5c1a10c30..f90fc8b523 100644
--- a/src/app/applications/addsinglevm.component.html
+++ b/src/app/applications/addsinglevm.component.html
@@ -27,7 +27,8 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 <strong>Single Virtual Machines Project
                                     <i data-balloon="You will be able to start virtual machines through the portal with minimal
                                     effort and access them via ssh. This project type does not demand knowlegde in cloud
-                                    computing." data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i>
+                                    computing." data-balloon-pos="down" data-balloon-length="large"><i
+                                            class="icon-question" style="cursor: pointer;"></i></i>
                                 </strong>
 
                             </label>
@@ -43,7 +44,8 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 'has-success': f.controls.project_application_name?.valid && (f.controls.project_application_name?.dirty || f.controls.project_application_name?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Project
-                                Name* <i data-balloon="Full name of your project" data-balloon-pos="down"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Name* <i data-balloon="Full name of your project" data-balloon-pos="down"><i
+                                        class="icon-question" style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <input required type="text" id="id_project_application_name"
                                        name="project_application_name"
@@ -59,8 +61,10 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 'has-success': f.controls.project_application_shortname?.valid && (f.controls.project_application_shortname?.dirty || f.controls.project_application_shortname?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Project
-                                Short Name* <i data-balloon="Shortname of your project. This name will be referenced in OpenStack and also when you start a new virtual machine. Use between 5 and 15 characters"
-                                               data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Short Name* <i
+                                        data-balloon="Shortname of your project. This name will be referenced in OpenStack and also when you start a new virtual machine. Use between 5 and 15 characters"
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div *ngIf='wronginput'>
                                     <strong><font color="red">Umlauts and special characters are prohibited in the
@@ -83,8 +87,10 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 'has-success': f.controls.project_application_description?.valid && (f.controls.project_application_description?.dirty || f.controls.project_application_description?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Project
-                                Description* <i data-balloon="Full description of your project including tools you might are going to use."
-                                                data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Description* <i
+                                        data-balloon="Full description of your project including tools you might are going to use."
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <textarea required id="id_project_application_description"
                                           name="project_application_description" rows="9"
@@ -101,16 +107,18 @@ <h5 class="col-md-6 form-control-label">General Information</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Desired
                                 lifetime* <i data-balloon="Lifetime in months of your project" data-balloon-pos="down">
-                                <i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                    <i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input class="form-control" id="id_project_application_lifetime"
                                            name="project_application_lifetime" placeholder="e.g 3"
-                                           type="number" min="1" step="1" ngModel required>
+                                           type="number" min="1" max="12" step="1" ngModel required
+                                           pattern="^([1-9]|1[012])$"
+                                    >
                                     <span class="input-group-addon"> months
                                     </span>
                                 </div>
-                                <span class="help-block">How long would you like to run this project?</span>
+                                <span class="help-block">How long would you like to run this project (12 month is maximum)?</span>
                             </div>
                         </div>
 
@@ -124,8 +132,10 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 'has-success': f.controls.project_application_vms_requested?.valid
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Number of Virtual
-                                Machines* <i data-balloon="A virtual machine allows you to run operating system of your choice with flexible resource parameters like number of CPUs and RAM."
-                                             data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                Machines* <i
+                                        data-balloon="A virtual machine allows you to run operating system of your choice with flexible resource parameters like number of CPUs and RAM."
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_vms_requested"
@@ -145,8 +155,10 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="textarea-input"><strong>Storage Limit*
                                 <i
-                                        data-balloon="Storage limit is the sum of extra storage provided by volumes." data-balloon-pos="down"
-                                        data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                        data-balloon="Storage limit is the sum of extra storage provided by volumes."
+                                        data-balloon-pos="down"
+                                        data-balloon-length="large"><i class="icon-question"
+                                                                       style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_volume_limit"
@@ -168,7 +180,8 @@ <h5 class="col-md-12 form-control-label">Resources</h5>
                                 volumes*
                                 <i
                                         data-balloon="The number of storage volumes allowed to create. Each vm is allowed to mount only one storage volume. The sum of the volumes size equals the value provided in the sotrage limit field"
-                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                        data-balloon-pos="down" data-balloon-length="large"><i class="icon-question"
+                                                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <div class="input-group">
                                     <input required class="form-control" id="id_project_application_volume_counter"
@@ -213,7 +226,8 @@ <h5 class="col-md-6 form-control-label">Institutional Information</h5>
                                 'has-success': f.controls.project_application_institute?.valid && (f.controls.project_application_institute?.dirty || f.controls.project_application_institute?.touched)
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Institute Name* <i
-                                    data-balloon="Your institute" data-balloon-pos="down"><i class="icon-question" style="cursor: pointer;"></i></i></strong></label>
+                                    data-balloon="Your institute" data-balloon-pos="down"><i class="icon-question"
+                                                                                             style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <input required type="text" id="id_project_application_institute"
                                        name="project_application_institute" class="form-control"
@@ -228,7 +242,8 @@ <h5 class="col-md-6 form-control-label">Institutional Information</h5>
                                 }">
                             <label class="col-md-4 form-control-label" for="text-input"><strong>Workgroup Name* <i
                                     data-balloon="Your Workgroup"
-                                    data-balloon-pos="down"><i class="icon-question"  style="cursor: pointer;"></i></i></strong></label>
+                                    data-balloon-pos="down"><i class="icon-question"
+                                                               style="cursor: pointer;"></i></i></strong></label>
                             <div class="col-md-8">
                                 <input required type="text" id="id_project_application_workgroup"
                                        name="project_application_workgroup" class="form-control"
@@ -268,7 +283,8 @@ <h5 class="col-md-6 form-control-label">Institutional Information</h5>
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">{{ notificationModalTitle }}</h4>
-              <button type="button" class="close" style="cursor:pointer" (click)="notificationModal.hide()" aria-label="Close">
+                <button type="button" class="close" style="cursor:pointer" (click)="notificationModal.hide()"
+                        aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
@@ -311,7 +327,8 @@ <h4 class="modal-title">{{ notificationModalTitle }}</h4>
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title"> {{acknowledgeModalTitle}}</h4>
-              <button type="button" class="close" style="cursor:pointer" (click)="acknowledgemodal.hide()" aria-label="Close">
+                <button type="button" class="close" style="cursor:pointer" (click)="acknowledgemodal.hide()"
+                        aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html
index e36a95dfb3..0ccf4b1c60 100755
--- a/src/app/projectmanagement/overview.component.html
+++ b/src/app/projectmanagement/overview.component.html
@@ -40,7 +40,7 @@ <h1>Projects Overview</h1>
                                     <p *ngIf="project.ComputeCenter?.Name">{{project.ComputeCenter.Name}}</p>
                                     <ul *ngIf="project.ComputeCenter?.Name">
                                         <li *ngIf="project.OpenStackProject"> Login: <a target="_blank"
-                                                                                       href="{{project.ComputeCenter.Login}}">
+                                                                                        href="{{project.ComputeCenter.Login}}">
                                             {{project.ComputeCenter.Login}}</a></li>
                                         <li>Support: {{project.ComputeCenter.Support}}</li>
 
@@ -527,7 +527,7 @@ <h4 class="modal-title">Applications for {{selectedProject?.Name}}</h4>
 
                         <td>{{application.Name}}</td>
                         <td>{{application.DateCreated}}</td>
-                        <td *ngIf="application.UserIsVoMember">
+                        <td>
                             <button
                                     (click)="approveMemberApplication(selectedProject?.Id,application.Id,application.Name); "
                                     class="btn btn-success"><i class="fa fa-check"></i> Approve
@@ -537,7 +537,6 @@ <h4 class="modal-title">Applications for {{selectedProject?.Name}}</h4>
                                     class="btn btn-danger"><i class="fa fa-times"></i> Reject
                             </button>
                         </td>
-                        <td *ngIf="!application.UserIsVoMember"> Membership for the vo must be approved beforehand</td>
                         </tbody>
                     </table>
                 </div>
@@ -550,16 +549,22 @@ <h4 class="modal-title">Applications for {{selectedProject?.Name}}</h4>
                     <strong>Success:</strong> Succesfully {{application_action}} the application of
                     {{application_member_name}}.
                 </p>
-                <p *ngIf="!application_action_success && application_action_done" class="alert alert-danger mr-auto">
+                <p *ngIf="!application_action_success && application_action_done && !application_action_error_message"
+                   class="alert alert-danger mr-auto">
                     <strong>Failed:</strong> The application of {{application_member_name}} could not be
                     {{application_action}} .
                 </p>
+                <p *ngIf="!application_action_success && application_action_done && application_action_error_message"
+                   class="alert alert-danger mr-auto">
+                    <strong>Failed:</strong> User didn't verify his email address yet. Please wait until the email is
+                    verified.
+                </p>
                 <button type="button" class="btn btn-primary"
                         (click)="loadProjectApplications(selectedProject?.Id)">
                     Refresh
                 </button>
                 <button type="button" class="btn btn-secondary"
-                        (click)="application_action_done=false;selectedProject=undefined;applicationModal.hide();">
+                        (click)="application_action_error_message=null;application_action_done=false;selectedProject=undefined;applicationModal.hide();">
                     Close
                 </button>
             </div>
diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts
index 614bd42f37..36fd75437c 100644
--- a/src/app/projectmanagement/overview.component.ts
+++ b/src/app/projectmanagement/overview.component.ts
@@ -34,6 +34,7 @@ export class OverviewComponent {
     application_member_name = '';
     application_action_done = false;
     application_action_success: boolean;
+    application_action_error_message: boolean;
     projects: Project[] = new Array();
     loaded = true;
     details_loaded = false;
@@ -168,7 +169,7 @@ export class OverviewComponent {
                     this.is_admin,
                     compute_center);
                 newProject.OpenStackProject = group['openstack_project'];
-                newProject.RealName=realname;
+                newProject.RealName = realname;
                 this.projects.push(newProject);
             }
             this.isLoaded = true;
@@ -246,7 +247,6 @@ export class OverviewComponent {
 
     loadProjectApplications(project: number) {
         this.loaded = false;
-
         this.groupservice.getGroupApplications(project).subscribe(applications => {
 
             let newProjectApplications = [];
@@ -256,21 +256,17 @@ export class OverviewComponent {
             }
             for (let application of applications) {
                 let dateApplicationCreated = moment(application['createdAt'], "YYYY-MM-DD HH:mm:ss.SSS");
-                let membername = application['user']['firstName'] + ' ' + application['user']['lastName'];
-                let userid = application['user']['id'];
-                this.userservice.isMember(userid).subscribe(isMember => {
+                let membername = application['displayName'];
 
-                        let isMemberBool = isMember['isMember'];
-                        let newMemberApplication = new ProjectMemberApplication(
-                            application['id'], membername, dateApplicationCreated.date() + "." + (dateApplicationCreated.month() + 1) + "." + dateApplicationCreated.year(), userid, isMemberBool
-                        )
-                        newProjectApplications.push(newMemberApplication)
+                let newMemberApplication = new ProjectMemberApplication(
+                    application['id'], membername, dateApplicationCreated.date() + "." + (dateApplicationCreated.month() + 1) + "." + dateApplicationCreated.year()
+                );
+                newProjectApplications.push(newMemberApplication);
+
+                this.selectedProject.ProjectMemberApplications = newProjectApplications;
+                this.loaded = true;
 
-                        this.selectedProject.ProjectMemberApplications = newProjectApplications;
-                        this.loaded = true;
 
-                    }
-                )
             }
 
 
@@ -289,13 +285,21 @@ export class OverviewComponent {
 
             if (application['state'] == 'APPROVED') {
                 this.application_action_success = true;
+            }
+            else if (application['message']) {
+                this.application_action_success = false;
+
+                this.application_action_error_message = application['message'];
+
+
             }
             else {
                 this.application_action_success = false;
             }
+
             this.application_action = 'approved';
             this.application_member_name = membername;
-            this.application_action_done = true
+            this.application_action_done = true;
             this.loadProjectApplications(project);
 
 
@@ -307,24 +311,33 @@ export class OverviewComponent {
         this.application_action_done = false;
 
         this.groupservice.rejectGroupApplication(project, application).subscribe(result => {
-            let application = result;
-            this.selectedProject.ProjectMemberApplications = [];
+                let application = result;
+                this.selectedProject.ProjectMemberApplications = [];
 
 
-            if (application['state'] == 'REJECTED') {
-                this.application_action_success = true;
+                if (application['state'] == 'REJECTED') {
+                    this.application_action_success = true;
 
-            }
-            else {
-                this.application_action_success = false;
-            }
-            this.application_action = 'rejected';
-            this.application_member_name = membername;
-            this.application_action_done = true;
-            this.loadProjectApplications(project);
 
+                }
+                else if (application['message']) {
+                    this.application_action_success = false;
 
-        });
+                    this.application_action_error_message = application['message'];
+                }
+
+
+                else {
+                    this.application_action_success = false;
+                }
+                this.application_action = 'rejected';
+                this.application_member_name = membername;
+                this.application_action_done = true;
+                this.loadProjectApplications(project);
+
+
+            }
+        );
     }
 
     isPi(member: ProjectMember): string {
@@ -412,9 +425,9 @@ export class OverviewComponent {
 
 
     public addMember(groupid: number, memberid: number, firstName: string, lastName: string) {
-         let facility_id=null
-        if (this.UserModalFacility && this.UserModalFacility[1]){
-             facility_id=this.UserModalFacility[1]
+        let facility_id = null
+        if (this.UserModalFacility && this.UserModalFacility[1]) {
+            facility_id = this.UserModalFacility[1]
         }
         this.groupservice.addMember(groupid, memberid, facility_id).subscribe(
             result => {
@@ -443,7 +456,7 @@ export class OverviewComponent {
 
     public addAdmin(groupid: number, memberid: number, userid: number, firstName: string, lastName: string) {
         let facility_id = null;
-        if (this.UserModalFacility && this.UserModalFacility[1]){
+        if (this.UserModalFacility && this.UserModalFacility[1]) {
             facility_id = this.UserModalFacility[1]
         }
         this.groupservice.addMember(groupid, memberid, facility_id).subscribe(result => {
@@ -488,7 +501,7 @@ export class OverviewComponent {
 
     public promoteAdmin(groupid: number, userid: number, username: string) {
         let facility_id = null;
-        if (this.UserModalFacility && this.UserModalFacility[1]){
+        if (this.UserModalFacility && this.UserModalFacility[1]) {
             facility_id = this.UserModalFacility[1]
         }
         this.groupservice.addAdmin(groupid, userid, facility_id).toPromise()
@@ -508,7 +521,7 @@ export class OverviewComponent {
 
     public removeAdmin(groupid: number, userid: number, name: string) {
         let facility_id = null;
-        if (this.UserModalFacility && this.UserModalFacility[1]){
+        if (this.UserModalFacility && this.UserModalFacility[1]) {
             facility_id = this.UserModalFacility[1]
         }
         this.groupservice.removeAdmin(groupid, userid, facility_id).toPromise()
@@ -527,7 +540,7 @@ export class OverviewComponent {
 
     public removeMember(groupid: number, memberid: number, name: string) {
         let facility_id = null
-        if (this.UserModalFacility && this.UserModalFacility[1]){
+        if (this.UserModalFacility && this.UserModalFacility[1]) {
             facility_id = this.UserModalFacility[1]
         }
         this.groupservice.removeMember(groupid, memberid, facility_id).subscribe(result => {
diff --git a/src/app/projectmanagement/project_member_application.ts b/src/app/projectmanagement/project_member_application.ts
index 680f5b7da7..93db7a7003 100644
--- a/src/app/projectmanagement/project_member_application.ts
+++ b/src/app/projectmanagement/project_member_application.ts
@@ -3,16 +3,13 @@ export class ProjectMemberApplication {
     private _Id: number;
     private _Name: string;
     private _DateCreated: string;
-    private _UserId: string;
     private _UserIsVoMember:boolean;
 
 
-    constructor(Id: number, Name: string, DateCreated: string,UserId:string,UserIsVoMember:boolean) {
+    constructor(Id: number, Name: string, DateCreated: string) {
         this._Id = Id;
         this._Name = Name;
         this._DateCreated = DateCreated;
-        this._UserId=UserId;
-        this._UserIsVoMember=UserIsVoMember
 
 
     }
@@ -25,13 +22,6 @@ export class ProjectMemberApplication {
         this._UserIsVoMember=value;
     }
 
-    get UserId(): string {
-        return this._UserId
-    }
-
-    set UserId(value:string){
-        this._UserId=value
-    }
 
     get Id(): number {
         return this._Id;
diff --git a/src/app/virtualmachines/addvm.component.ts b/src/app/virtualmachines/addvm.component.ts
index 7a623ba1a4..de3628b950 100644
--- a/src/app/virtualmachines/addvm.component.ts
+++ b/src/app/virtualmachines/addvm.component.ts
@@ -54,6 +54,7 @@ export class VirtualMachineComponent implements OnInit {
     selectedFlavor: Flavor;
     userinfo: Userinfo;
     vmclient: Vmclient;
+    selectedProjectClient:Vmclient;
     selectedProjectDiskspaceMax: number;
     selectedProjectDiskspaceUsed: number;
     selectedProjectVolumesMax: number;
@@ -63,7 +64,6 @@ export class VirtualMachineComponent implements OnInit {
     selectedProject: [string, number];
     client_avaiable: boolean;
     validPublickey: boolean;
-
     volumeName: string = '';
 
     optional_params = false;
@@ -233,8 +233,10 @@ export class VirtualMachineComponent implements OnInit {
 
     getSelectedProjectClient(groupid: number) {
         this.groupService.getClient(this.selectedProject[1].toString()).subscribe(res => {
+            this.selectedProjectClient=res;
             if (res['status'] == 'Connected') {
                 this.client_avaiable = true;
+
                 this.getSelectedProjectDiskspace();
                 this.getSelectedProjectVms();
                 this.getSelectedProjectVolumes();
diff --git a/src/app/virtualmachines/virtualmachinemodels/virtualmachine.ts b/src/app/virtualmachines/virtualmachinemodels/virtualmachine.ts
index a48965c9e5..d22267fc7e 100644
--- a/src/app/virtualmachines/virtualmachinemodels/virtualmachine.ts
+++ b/src/app/virtualmachines/virtualmachinemodels/virtualmachine.ts
@@ -1,20 +1,24 @@
 import {Image} from './image';
 import {Flavor} from './flavor';
+import {Vmclient} from "./vmclient";
 
 
 export class VirtualMachine {
-  flavor: Flavor;
-  image: Image;
-  project: string;
-  status: string;
-  keyname: string;
-  name: string;
-  openstackid: string;
-  created_at: string;
-  stopped_at: string;
-  elixir_id: string;
-  username: string;
-  floating_ip: string;
-  ssh_command: string;
+    flavor: Flavor;
+    image: Image;
+    project: string;
+    status: string;
+    keyname: string;
+    name: string;
+    client: Vmclient;
+    openstackid: string;
+    created_at: string;
+    stopped_at: string;
+    elixir_id: string;
+    username: string;
+    floating_ip: string;
+    ssh_command: string;
+
+
 }
 
diff --git a/src/app/virtualmachines/virtualmachinemodels/vmclient.ts b/src/app/virtualmachines/virtualmachinemodels/vmclient.ts
index 74044bbf39..242b3a03e9 100644
--- a/src/app/virtualmachines/virtualmachinemodels/vmclient.ts
+++ b/src/app/virtualmachines/virtualmachinemodels/vmclient.ts
@@ -1,7 +1,10 @@
-export class Vmclient{
-  id:string;
-  host: string;
-  status: string;
-  port: string;
-  location: string;
+export class Vmclient {
+    id: string;
+    host: string;
+    status: string;
+    port: string;
+    version: string;
+    features: string[];
+    location: string;
+
 }
diff --git a/src/app/virtualmachines/vmOverview.component.html b/src/app/virtualmachines/vmOverview.component.html
index 236bbe0155..dea59a41fa 100755
--- a/src/app/virtualmachines/vmOverview.component.html
+++ b/src/app/virtualmachines/vmOverview.component.html
@@ -125,12 +125,12 @@
                         <div (clickOutside)="closeCollapse(vm.openstackid)" *ngIf="vm.status !='DELETED'"
                              class="btn-group {{collapse_status[vm.openstackid]}}">
 
-                            <button class="btn btn-secondary" type="button" *ngIf="vm.status !='DELETED'"
+                            <button  class="btn btn-secondary" type="button" *ngIf="vm.status !='DELETED'"
                                     (click)="snapshot_vm=vm;resetSnapshotResult();snapshotModal.show();">
 
                                 Create Snapshot
                             </button>
-                            <button class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
+                            <button  class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
                                     data-toggle="dropdown"
                                     type="button" aria-haspopup="true" aria-expanded="false"
                                     (click)="getCollapseStatus(vm.openstackid)"></button>
diff --git a/src/app/virtualmachines/vmOverview.component.ts b/src/app/virtualmachines/vmOverview.component.ts
index e8ee18e5d3..5b2fe63c0f 100644
--- a/src/app/virtualmachines/vmOverview.component.ts
+++ b/src/app/virtualmachines/vmOverview.component.ts
@@ -7,6 +7,7 @@ import {VirtualMachine} from "./virtualmachinemodels/virtualmachine";
 import {FullLayoutComponent} from "../layouts/full-layout.component";
 import {UserService} from "../api-connector/user.service";
 import {ImageService} from "../api-connector/image.service";
+import {Vmclient} from "./virtualmachinemodels/vmclient";
 
 @Component({
     selector: 'vm-overview',
@@ -349,7 +350,6 @@ export class VmOverviewComponent implements OnInit {
                     }
                 }
                 this.isLoaded=true;
-
                 this.applyFilter();
 
                 this.checkInactiveVms();