Merge pull request #6117 from deNBI/dev

Dev
deNBI · Jul 17, 2024 · 6e7fa9d · 6e7fa9d
2 parents 1af3e2b + cd1af5e
commit 6e7fa9d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 53 deletions.
diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html
@@ -110,11 +110,10 @@
 					New Project
 				</a>
 			</li>
-			<ng-container class="nav-group" *ngIf="project_enumeration?.length <= 3">
+			<span data-test-id="project_list" class="nav-group" *ngIf="project_enumeration?.length <= 3">
 				<li
 					class="nav-item"
 					id="project_list"
-					data-test-id="project_list"
 					*ngFor="let application of project_enumeration"
 					style="width: 100% !important"
 				>
@@ -253,7 +252,7 @@
 						</div>
 					</a>
 				</li>
-			</ng-container>
+			</span>
 			<li
 				class="nav-group"
 				id="project_list_folded"

diff --git a/src/app/projectmanagement/project-os-details/project-os-details.component.html b/src/app/projectmanagement/project-os-details/project-os-details.component.html
@@ -1,65 +1,56 @@
 <div *ngIf="!project?.project_application_openstack_project && !details_loaded">
-	<div class="spinner-border text-primary" style="display:block; margin:auto;"></div>
+	<div class="spinner-border text-primary" style="display: block; margin: auto"></div>
 </div>
 <div *ngIf="!project?.project_application_openstack_project && details_loaded" role="alert">
 	<table *ngIf="selectedProjectVms.length > 0" class="table table-striped table-bordered">
-
 		<tbody>
-		<tr>
-			<th colspan="3">Virtual Machines</th>
-
-		</tr>
-		<tr>
-			<th>Id</th>
-			<th>Name</th>
-		</tr>
-		<tr *ngFor="let vm of selectedProjectVms">
-			<td>{{vm?.openstackid}}</td>
-			<td>{{vm?.name}}</td>
-
-		</tr>
+			<tr>
+				<th colspan="3">Virtual Machines</th>
+			</tr>
+			<tr>
+				<th>Id</th>
+				<th>Name</th>
+				<th>Flavor</th>
+			</tr>
+			<tr *ngFor="let vm of selectedProjectVms">
+				<td>{{ vm?.openstackid }}</td>
+				<td>{{ vm?.name }}</td>
+				<td>{{ vm?.flavor?.name }}</td>
+			</tr>
 		</tbody>
 	</table>
 	<table *ngIf="selectedProjectVolumes.length > 0" class="table table-striped table-bordered">
 		<tbody>
-
-
-		<tr>
-			<th colspan="3">Volumes</th>
-
-		</tr>
-		<tr>
-			<th>Id</th>
-			<th>Name</th>
-		</tr>
-		<ng-container *ngFor="let volume of selectedProjectVolumes">
-			<tr *ngIf="volume?.volume_status !== 'DELETED'">
-				<td>{{volume?.volume_openstackid}}</td>
-				<td>{{volume?.volume_name}}</td>
+			<tr>
+				<th colspan="3">Volumes</th>
+			</tr>
+			<tr>
+				<th>Id</th>
+				<th>Name</th>
+				<th>Storage</th>
 			</tr>
-		</ng-container>
-
-
+			<ng-container *ngFor="let volume of selectedProjectVolumes">
+				<tr *ngIf="volume?.volume_status !== 'DELETED'">
+					<td>{{ volume?.volume_openstackid }}</td>
+					<td>{{ volume?.volume_name }}</td>
+					<td>{{ volume?.volume_storage }} GiB</td>
+				</tr>
+			</ng-container>
 		</tbody>
 	</table>
 	<table *ngIf="selectedProjectSnapshots.length > 0" class="table table-striped table-bordered">
 		<tbody>
-
-
-		<tr>
-			<th colspan="3">Snapshots</th>
-
-		</tr>
-		<tr>
-			<th>Id</th>
-			<th>Name</th>
-		</tr>
-		<tr *ngFor="let snapshot of selectedProjectSnapshots">
-			<td>{{snapshot?.snapshot_openstackid}}</td>
-			<td>{{snapshot?.snapshot_name}}</td>
-
-		</tr>
-
+			<tr>
+				<th colspan="3">Snapshots</th>
+			</tr>
+			<tr>
+				<th>Id</th>
+				<th>Name</th>
+			</tr>
+			<tr *ngFor="let snapshot of selectedProjectSnapshots">
+				<td>{{ snapshot?.snapshot_openstackid }}</td>
+				<td>{{ snapshot?.snapshot_name }}</td>
+			</tr>
 		</tbody>
 	</table>
 </div>
diff --git a/tests/simplevm_application.spec.ts b/tests/simplevm_application.spec.ts
@@ -9,7 +9,7 @@ test.describe.serial('@simple_vm_application', () => {
 	test.describe('Should delete old simple_vm applications', () => {
 		test.use({ storageState: Util.VO_MANAGER_STORAGE });
 		test('VO @simple_vm_application', async ({ page, baseURL }) => {
-			test.setTimeout(60 * 1000);
+			test.setTimeout(80 * 1000);
 			const applicationPage = new ApplicationOverviewPage(page, baseURL);
 			await applicationPage.declineApplications(Util.SIMPLE_VM_APPLICATION_NAME);
 			const voOverviewPage = new VoOverviewPage(page, baseURL);
@@ -72,7 +72,7 @@ test.describe.serial('@simple_vm_application', () => {
 	test.describe('Aftercare - Should delete old simple_vm_application', () => {
 		test.use({ storageState: Util.VO_MANAGER_STORAGE });
 		test('VO @simple_vm_application', async ({ page, baseURL }) => {
-			test.setTimeout(60 * 1000);
+			test.setTimeout(80 * 1000);
 			const applicationPage = new ApplicationOverviewPage(page, baseURL);
 			await applicationPage.declineApplications(Util.SIMPLE_VM_APPLICATION_NAME);
 			const voOverviewPage = new VoOverviewPage(page, baseURL);