Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #6117

Merged
merged 2 commits into from
Jul 17, 2024
+43 −53
Merged

Dev #6117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47b44e1
added some more nformaton to os_details view
dweinholz Jul 16, 2024
cd1af5e
fixed tests
dweinholz Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/app/layouts/full-layout.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down Expand Up @@ -253,7 +252,7 @@
</div>
</a>
</li>
</ng-container>
</span>
<li
class="nav-group"
id="project_list_folded"
Expand Down
87 changes: 39 additions & 48 deletions src/app/projectmanagement/project-os-details/project-os-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions tests/simplevm_application.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading