diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 258e06a4a3..74ca79b893 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -1,100 +1,103 @@ /* eslint-disable */ -import { NgModule } from '@angular/core' -import { RouterModule, Routes } from '@angular/router' +import {NgModule} from '@angular/core' +import {RouterModule, Routes} from '@angular/router' // Layouts -import { ConsentInfoComponent } from './consent-info.component' -import { FullLayoutComponent } from './layouts/full-layout.component' -import { MemberGuardService } from './member-guard.service' -import { RegistrationInfoComponent } from './registration-info.component' -import { LoggedInGuard } from './logged-in-guard.service' -import { CreditsCalculatorComponent } from './credits-calculator/credits-calculator.component' +import {ConsentInfoComponent} from './consent-info.component' +import {FullLayoutComponent} from './layouts/full-layout.component' +import {MemberGuardService} from './member-guard.service' +import {RegistrationInfoComponent} from './registration-info.component' +import {LoggedInGuard} from './logged-in-guard.service' +import {CreditsCalculatorComponent} from './credits-calculator/credits-calculator.component' +import {VoGuardService} from './shared/guards/vo-guard.service'; export const routes: Routes = [ - { - path: '', - redirectTo: 'userinfo', - pathMatch: 'full', - }, - { - path: 'registration-info', - component: RegistrationInfoComponent, - pathMatch: 'full', - }, - { - path: 'consent-info', - component: ConsentInfoComponent, - pathMatch: 'full', - }, - { - path: '', - component: FullLayoutComponent, - canActivate: [MemberGuardService], - data: { - title: 'de.NBI Cloud Portal', + { + path: '', + redirectTo: 'userinfo', + pathMatch: 'full', }, - children: [ - { - path: 'userinfo', - canActivate: [LoggedInGuard], + { + path: 'registration-info', + component: RegistrationInfoComponent, + pathMatch: 'full', + }, + { + path: 'consent-info', + component: ConsentInfoComponent, + pathMatch: 'full', + }, + { + path: '', + component: FullLayoutComponent, + canActivate: [MemberGuardService], + data: { + title: 'de.NBI Cloud Portal', + }, + children: [ + { + path: 'userinfo', + canActivate: [LoggedInGuard], - // eslint-disable-next-line @typescript-eslint/promise-function-async - loadChildren: () => import('./userinfo/userinfo.module').then(m => m.UserinfoModule), - }, - { - path: 'help', - canActivate: [LoggedInGuard], + // eslint-disable-next-line @typescript-eslint/promise-function-async + loadChildren: () => import('./userinfo/userinfo.module').then(m => m.UserinfoModule), + }, + { + path: 'help', + canActivate: [LoggedInGuard], - // eslint-disable-next-line @typescript-eslint/promise-function-async - loadChildren: () => import('./help/help.module').then(m => m.HelpModule), - }, - { - path: 'project-management', - canActivate: [LoggedInGuard], + // eslint-disable-next-line @typescript-eslint/promise-function-async + loadChildren: () => import('./help/help.module').then(m => m.HelpModule), + }, + { + path: 'project-management', + canActivate: [LoggedInGuard], - loadChildren: () => import('./projectmanagement/projectmanagement.module').then(m => m.ProjectManagementModule), - }, - { - path: 'applications', - canActivate: [LoggedInGuard], + loadChildren: () => import('./projectmanagement/projectmanagement.module').then(m => m.ProjectManagementModule), + }, + { + path: 'applications', + canActivate: [LoggedInGuard], - loadChildren: () => import('./applications/applications.module').then(m => m.ApplicationsModule), - }, - { - path: 'virtualmachines', - canActivate: [LoggedInGuard], + loadChildren: () => import('./applications/applications.module').then(m => m.ApplicationsModule), + }, + { + path: 'virtualmachines', + canActivate: [LoggedInGuard], - loadChildren: () => import('./virtualmachines/vm.module').then(m => m.VmModule), - }, - { - path: 'vo-manager', - loadChildren: () => import('./vo_manager/VoManager.module').then(m => m.VoManagerModule), - }, - { - path: 'facility-manager', - canActivate: [LoggedInGuard], + loadChildren: () => import('./virtualmachines/vm.module').then(m => m.VmModule), + }, + { + path: 'vo-manager', + loadChildren: () => import('./vo_manager/VoManager.module').then(m => m.VoManagerModule), + canActivate: [VoGuardService] + }, + { + path: 'facility-manager', + canActivate: [LoggedInGuard], - loadChildren: () => import('./facility_manager/facilitymanager.module').then(m => m.FacilitymanagerModule), - }, - { - path: 'credits-calculator', - canActivate: [LoggedInGuard], - component: CreditsCalculatorComponent, + loadChildren: () => import('./facility_manager/facilitymanager.module').then(m => m.FacilitymanagerModule), + }, + { + path: 'credits-calculator', + canActivate: [LoggedInGuard], + component: CreditsCalculatorComponent, - loadChildren: () => - import('./credits-calculator/credits-calculator.module').then(m => m.CreditsCalculatorModule), - }, - ], - }, + loadChildren: () => + import('./credits-calculator/credits-calculator.module').then(m => m.CreditsCalculatorModule), + }, + ], + }, ] /** * App routing module. */ @NgModule({ - imports: [RouterModule.forRoot(routes, {})], - exports: [RouterModule], - providers: [MemberGuardService, LoggedInGuard], + imports: [RouterModule.forRoot(routes, {})], + exports: [RouterModule], + providers: [MemberGuardService, LoggedInGuard], }) -export class AppRoutingModule {} +export class AppRoutingModule { +} /* eslint-enable */ diff --git a/src/app/applications/application-facility-actions/application-facility-actions.component.html b/src/app/applications/application-facility-actions/application-facility-actions.component.html index 734ef802b7..cd541f612a 100644 --- a/src/app/applications/application-facility-actions/application-facility-actions.component.html +++ b/src/app/applications/application-facility-actions/application-facility-actions.component.html @@ -5,7 +5,7 @@ @if (application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION) { - - -
- - - -
- - -
- -
- -
- -
-
-
- SimpleVM -
-
-
-
- -
-
- Ease -
-
- Ease of Use – SimpleVM lets you start and stop VMs with a few clicks which means that - there is no additional configuration necessary. -
-
-
- -
-
- Curve -
-
- Flat Learning Curve – If you want to use SimpleVM you don’t have to learn about - resource management, like network configurations or storage management. No background knowledge in Cloud - Computing is necessary. -
-
-
- -
-
- Remote -
-
- Remote Desktop – If you don’t want to use SimpleVM via terminal you can easily connect - to your VM using a Remote Desktop. -
-
-
-
-
- -
-
- Workshop support – Create a workshop and start multiple configured VMs for your - participants with just a few clicks. To learn more about our workshop support click - here. -
-
-
- -
-
-
-
- Typical use cases: -
-
-
-
-
-
- • Tools and Pipelines - – SimpleVM is a quick way to get up and running with your tools and pipelines in the cloud. -
-
-
-
-
-
- • Remote Desktop - – Launch your own Desktop or a browser based IDE in the cloud (based on Apache Guacamole, RStudio, - Theia IDE and more) and be able to run programs with graphical user interfaces in addition to the - command-line. -
-
-
-
-
- -
-
-
- Want to learn more about SimpleVM? -
-
- - - -
-
-
- -
+@if (is_vo_admin) { +
+ +
+ +
+ Our de.NBI Cloud Project Types + +
+ +
+ +
+ +
+ +
+
+ + + +
+ +
+
+
+ SimpleVM +
+
+
+
+ +
+
+ Ease +
+
+ Ease of Use – SimpleVM lets you start and stop VMs with a few + clicks + which means that + there is no additional configuration necessary. +
+
+
+ +
+
+ Curve +
+
+ Flat Learning Curve – If you want to use SimpleVM you don’t have to + learn about + resource management, like network configurations or storage management. No + background + knowledge in Cloud + Computing is necessary. +
+
+
+ +
+
+ Remote +
+
+ Remote Desktop – If you don’t want to use SimpleVM via terminal you + can + easily connect + to your VM using a Remote Desktop. +
+
+
+
+
+ +
+
+ Workshop support – Create a workshop and start multiple configured + VMs + for your + participants with just a few clicks. To learn more about our workshop support click + here. +
+
+
+ +
+
+ Typical use cases: +
    +
  • + Tools and Pipelines: SimpleVM is a quick way to get up and + running with your tools + and pipelines in the cloud. +
    • +
  • + Remote Desktop: Launch your own Desktop or a browser-based + IDE + in the cloud (based + on Apache Guacamole, RStudio, Theia IDE, and more) and be able to run + programs + with graphical user + interfaces in addition to the command-line. +
    • +
+
+
- - -
-
-
- Want to learn the Difference between SimpleVM and Openstack? -
-
- - - -
-
-
+
+
+ +
+
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+
+
+ +
- -
- -
-
-
- Openstack -
-
-
-
- -
-
- Scale -
-
- Scalability – Easy scaling of virtual machines and distribution of data for efficient - computations. -
-
-
- -
-
- Configuration -
-
- Configurability – OpenStack allows the configuration of any resource type available, - such as virtual machines, network, block and object storage. -
-
-
- -
-
- API -
-
- API Access – Any interaction with OpenStack can be automated via its API enabling users - to script actions, e.g. starting and stopping of virtual machines. -
-
-
- -
-
-
-
- Typical use cases: -
-
-
-
-
-
- • Distributed Workflows - – Distribution of workflows on multiple virtual machines. -
-
-
-
-
-
- • Services - – The ability to offer services for other researchers. -
-
-
-
-
- -
-
-
- Want to learn more about Openstack? -
-
- - - -
-
-
-
- -
- -
- -
-
- -
-
- Want to learn more about SimpleVM? -
-
- - - -
-
- -
-
- Want to learn the Difference? -
-
- - - -
-
- -
-
- Want to learn more about Openstack? -
-
- - - -
-
-
-
- -
- -
- -
- -
- -
+ +
+
+ + + +
+ +
+
+
+ Openstack +
+
+
+
+ +
+
+ Scale +
+
+ Scalability – Easy scaling of virtual machines and distribution of + data + for efficient + computations. +
+
+
+ +
+
+ Configuration +
+
+ Configurability – OpenStack allows the configuration of any + resource + type available, + such as virtual machines, network, block and object storage. +
+
+
+ +
+
+ API +
+
+ API Access – Any interaction with OpenStack can be automated via + its + API enabling users + to script actions, e.g. starting and stopping of virtual machines. +
+
+
+ +
+
+ Typical use cases: +
    +
  • + Distributed Workflows: Distribution of workflows on + multiple + virtual machines. +
    • +
  • Services: The ability to offer services for other + researchers. +
    • +
+
+
+ +
+
+ +
+
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ +
+
+
+ + + +
+ +
+
+
+ Kubernetes +
+
+
+
+ +
+
+ Scale +
+
+ Scalability – Easy scaling of virtual machines and distribution of + data for efficient + computations. +
+
+
+ +
+
+ Configuration +
+
+ Configurability – Kubernetes allows the configuration of any + resource type available, + such as virtual machines, network. +
+
+
+ +
+
+ API +
+
+ API Access – Any interaction with Kubernetes can be automated via + its API enabling + users to script actions, e.g. starting and stopping of containerized services. +
+
+
+ +
+
+ Typical use cases: +
    +
  • + Workflow Engines: Workflow engines like Nextflow allow you + to run your analysis on + top of Kubernetes. +
    • +
  • + Services: The ability to offer stateless and stateful + (databases) services for + other researchers. +
    • +
+
+
+ +
+
+
+
+
+ Want to learn more about Kubernetes? +
+
+ + + +
+
+
+
+ +
+ + + +
+ +
+
+ +
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+ + +
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ Want to learn more about Kubernetes? +
+
+ + + +
+
+ +
+
+
+
+
+
+ Want to learn the Difference? +
+
+ + + +
+
+
+
+
+ +
+ + + + + + + + +} @else { +
+ +
+ +
+ Our de.NBI Cloud Project Types + +
+ +
+ +
+ +
+
+ + + +
+
+ + + +
+ +
+
+ +
+ +
+ +
+
+
+ SimpleVM +
+
+
+
+ +
+
+ Ease +
+
+ Ease of Use – SimpleVM lets you start and stop VMs with a few + clicks which means that + there is no additional configuration necessary. +
+
+
+ +
+
+ Curve +
+
+ Flat Learning Curve – If you want to use SimpleVM you don’t have to + learn about + resource management, like network configurations or storage management. No + background knowledge in Cloud + Computing is necessary. +
+
+
+ +
+
+ Remote +
+
+ Remote Desktop – If you don’t want to use SimpleVM via terminal you + can easily connect + to your VM using a Remote Desktop. +
+
+
+
+
+ +
+
+ Workshop support – Create a workshop and start multiple configured + VMs for your + participants with just a few clicks. To learn more about our workshop support click + here. +
+
+
+ +
+
+
+
+ Typical use cases: +
+
+
+
+
+
+ • Tools and Pipelines + – SimpleVM is a quick way to get up and running with your tools and pipelines in + the cloud. +
+
+
+
+
+
+ • Remote Desktop + – Launch your own Desktop or a browser based IDE in the cloud (based on Apache + Guacamole, RStudio, + Theia IDE and more) and be able to run programs with graphical user interfaces + in addition to the + command-line. +
+
+
+
+
+ +
+
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+
+ +
+ + + +
+
+
+ Want to learn the Difference between SimpleVM and Openstack? +
+
+ + + +
+
+
+ + +
+ +
+
+
+ Openstack +
+
+
+
+ +
+
+ Scale +
+
+ Scalability – Easy scaling of virtual machines and distribution of + data for efficient + computations. +
+
+
+ +
+
+ Configuration +
+
+ Configurability – OpenStack allows the configuration of any + resource type available, + such as virtual machines, network, block and object storage. +
+
+
+ +
+
+ API +
+
+ API Access – Any interaction with OpenStack can be automated via + its API enabling users + to script actions, e.g. starting and stopping of virtual machines. +
+
+
+ +
+
+
+
+ Typical use cases: +
+
+
+
+
+
+ • Distributed Workflows + – Distribution of workflows on multiple virtual machines. +
+
+
+
+
+
+ • Services + – The ability to offer services for other researchers. +
+
+
+
+
+ +
+
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ +
+ +
+ +
+
+ +
+
+ Want to learn more about SimpleVM? +
+
+ + + +
+
+ +
+
+ Want to learn the Difference? +
+
+ + + +
+
+ +
+
+ Want to learn more about Openstack? +
+
+ + + +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +} \ No newline at end of file diff --git a/src/app/applications/type-overview.component.ts b/src/app/applications/type-overview.component.ts index b802721b07..13378e1502 100644 --- a/src/app/applications/type-overview.component.ts +++ b/src/app/applications/type-overview.component.ts @@ -3,6 +3,7 @@ import { MatomoTracker } from 'ngx-matomo-client'; import { WIKI_WORKSHOPS, OPENSTACK_LINK, PROJECT_TYPES_LINK, SIMPLE_VM_LINK, } from '../../links/links'; +import { is_vo } from '../shared/globalvar'; /** * The type overview of the different project classes. @@ -16,12 +17,19 @@ export class TypeOverviewComponent implements OnInit { private readonly tracker = inject(MatomoTracker); title: string = 'Project Type Overview'; + openstack_color: string = '#ed1944'; + simplevm_color: string = '#00adef'; + kubernetes_color: string = '#326ce5'; + is_vo_admin: boolean = is_vo; simpleVM_logo_link: String; simpleVM_ease_logo: String; simpleVM_curve_logo: String; simpleVM_remote_logo: String; + kubernetes_logo_link: string; + kubernetes_logo_border: string; + openstack_logo_link: String; openstack_api_logo: String; openstack_conf_logo: String; @@ -40,6 +48,9 @@ export class TypeOverviewComponent implements OnInit { this.simpleVM_ease_logo = `${this.static_img_folder}/simplevm-info-page/easytouse.svg`; this.simpleVM_remote_logo = `${this.static_img_folder}/simplevm-info-page/remote.svg`; + this.kubernetes_logo_link = `${this.static_img_folder}kubernetes_logo.svg`; + this.kubernetes_logo_border = `${this.static_img_folder}kubernetes_logo_border.svg`; + this.openstack_logo_link = `${this.static_img_folder}openstack_plain_red.svg`; this.openstack_api_logo = `${this.static_img_folder}/openstack-info-page/api.svg`; this.openstack_conf_logo = `${this.static_img_folder}/openstack-info-page/configuration.svg`; diff --git a/src/app/facility_manager/facility.application.component.html b/src/app/facility_manager/facility.application.component.html index 149fdc9b90..4de29ac3f9 100644 --- a/src/app/facility_manager/facility.application.component.html +++ b/src/app/facility_manager/facility.application.component.html @@ -1,260 +1,258 @@
-
- -
+
+ +
-
- -
Applications for review
-
- - + - + - + - + -
+ id="tab_state_button_termination_requests" + > + Termination Requests + {{ numberOfTerminationRequests }} + +
-
-
- Loading applications/requests ... -
-
+
+
+ Loading applications/requests ... +
+
- - @if (allApplicationsToCheck.length <= 0 && !loadingApplications) { -
- -
- } @else { - - } - -
+ + @if (!loadingApplications) { -
-
Application history
-
- -
-
- -
+ + } + +
-
-
- - - - - - - - - - - - - - - - - - - - - - + + + +
Project NameShort NameDate submitted (d/m/y)InstituteStatusActions
- - {{ application?.project_application_name }}{{ application?.project_application_shortname }}{{ application?.project_application_date_submitted }}{{ application?.project_application_institute }} - +
+
Application history
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + - - - + + - - - -
Project NameShort NameDate submitted (d/m/y)InstituteStatusActions
+ + {{ application?.project_application_name }}{{ application?.project_application_shortname }}{{ application?.project_application_date_submitted }}{{ application?.project_application_institute }} + {{ getStatusById(st) }} - - - -
- +   + ShowHide + Information + + +
+ -
+
- -
-
-
-
-
- + > + + +
+
+
+ + diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index a7de433884..d1edbc4dc1 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -89,16 +89,16 @@ > + + + Credits Calculator + + -->
  • - - + @if (application.is_open_stack) { + @if (application.has_kubernetes_access) { + + } @else { + + } + } @else { + + } + - - + @if (application.is_open_stack) { + @if (application.has_kubernetes_access) { + + } @else { + + } + } @else { + + }
    • +
  • + Overviews + +
    • + +
  • Workshops
    • +
  • + + Add workshop VMs +
    • +
  • + Manage workshops +
    • +
  • Facilities
  • @@ -486,10 +509,10 @@
    • + Image Tags +
  • id="withdraw_btn" class="btn btn-danger" type="reset" - data-test-id="withdraw_btn" + data-test-id="confirm_withdraw_btn" (click)="withdrawTarget()" > Withdraw diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index 1ece214eac..1215fdfc9c 100644 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -18,28 +18,42 @@

    - - - - - - + @if (project_application?.project_application_openstack_project) { + @if (project_application?.project_application_kubernetes_access) { + + + + } @else { + + + + } + } @else { + + + + } {{ project_application?.project_application_name }}

    @@ -170,28 +184,43 @@

    - - - - - - + @if (project_application?.project_application_openstack_project) { + @if (project_application?.project_application_kubernetes_access) { + + + + } @else { + + + + } + } @else { + + + + } + {{ project_application?.project_application_shortname }}

    @@ -315,7 +344,7 @@

    (project_application | hasstatusinlist: Application_States.LIFETIME_EXTENSION_REQUESTED) " class="btn btn-outline-warning" - data-test-id="open_modification_request_button" + data-test-id="show_lifetime_extension_withdraw_button" id="show_lifetime_extension_withdraw_button" > Withdraw extension request @@ -530,7 +559,7 @@

    (project_application | hasstatusinlist: Application_States.MODIFICATION_REQUESTED) " class="btn btn-outline-warning" - data-test-id="open_modification_request_button" + data-test-id="show_modification_extension_withdraw_button" id="show_modification_extension_withdraw_button" > Withdraw resource modification diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 4c487d37b5..54789655e6 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -42,6 +42,7 @@ import { STATUS_LINK, WIKI_MEMBER_MANAGEMENT, WIKI_PUBLICATIONS, + KUBERNETES_LINK, } from '../../links/links'; import { Doi } from '../applications/doi/doi'; import { ApiSettings } from '../api-connector/api-settings.service'; @@ -84,6 +85,7 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements PUBLIC_DOI_ENDPOINT: string = PUBLIC_DOI_ENDPOINT; SIMPLE_VM_LINK: string = SIMPLE_VM_LINK; OPENSTACK_LINK: string = OPENSTACK_LINK; + KUBERNETES_LINK: string = KUBERNETES_LINK; STATUS_LINK: string = STATUS_LINK; NEW_SVM_PORTAL_LINK: string = NEW_SVM_PORTAL_LINK; @ViewChild('creditsChart') creditsCanvas: ElementRef; @@ -126,7 +128,7 @@ export class OverviewComponent extends ApplicationBaseClassComponent implements simple_vm_logo: string = 'static/webapp/assets/img/simpleVM_Logo.svg'; openstack_logo: string = 'static/webapp/assets/img/openstack_plain_red.svg'; - + kubernetes_logo: string = 'static/webapp/assets/img/kubernetes_logo.svg'; checked_member_list: number[] = []; // modal variables for User list public project_members: ProjectMember[] = []; diff --git a/src/app/projectmanagement/project-enumeration.ts b/src/app/projectmanagement/project-enumeration.ts index 568caa6d51..cee09a457c 100644 --- a/src/app/projectmanagement/project-enumeration.ts +++ b/src/app/projectmanagement/project-enumeration.ts @@ -6,6 +6,7 @@ export class ProjectEnumeration { application_id: string; has_perun_group: boolean; is_open_stack: boolean; + has_kubernetes_access: boolean = false; project_lifetime: number; project_start_date: string; project_application_statuses: number[]; diff --git a/src/app/shared/guards/vo-guard.service.ts b/src/app/shared/guards/vo-guard.service.ts new file mode 100644 index 0000000000..06ba48bd6c --- /dev/null +++ b/src/app/shared/guards/vo-guard.service.ts @@ -0,0 +1,30 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree, +} from '@angular/router'; +import { Observable } from 'rxjs'; +import { is_vo } from '../globalvar'; + +/** + * Guard which checks if the user is member of the vo. + */ +@Injectable({ + providedIn: 'root', +}) export class VoGuardService { + constructor(private router: Router) { + } + + canActivate( + next: ActivatedRouteSnapshot, + state: RouterStateSnapshot, + ): Observable | Promise | boolean | UrlTree { + + if (is_vo) { + return true; + } else { + this.router.navigate(['/userinfo']); + + return false; + } + } +} diff --git a/src/app/shared/shared_modules/components/applications/application-badges/application-badges.component.html b/src/app/shared/shared_modules/components/applications/application-badges/application-badges.component.html index 55fffcf47a..3028c2f5d5 100644 --- a/src/app/shared/shared_modules/components/applications/application-badges/application-badges.component.html +++ b/src/app/shared/shared_modules/components/applications/application-badges/application-badges.component.html @@ -1,28 +1,33 @@ - - - - - - +@if (application?.project_application_openstack_project) { + @if (application?.project_application_kubernetes_access) { + + + + } @else { + + + + } +} @else { + + + +} @@ -615,7 +615,7 @@ } @else { - + diff --git a/src/links/links.ts b/src/links/links.ts index 336ba2cf86..feaa7f95fc 100644 --- a/src/links/links.ts +++ b/src/links/links.ts @@ -38,6 +38,7 @@ export const CLOUD_PORTAL_SUPPORT_MAIL = 'cloud-helpdesk@denbi.de'; export const POLICY_LINK: string = 'https://cloud.denbi.de/about/policies/'; export const SIMPLE_VM_LINK: string = 'https://cloud.denbi.de/about/project-types/simplevm/'; export const OPENSTACK_LINK: string = 'https://cloud.denbi.de/about/project-types/openstack/'; +export const KUBERNETES_LINK: string = 'https://cloud.denbi.de/about/project-types/kubernetes/'; export const PROJECT_TYPES_LINK: string = 'https://cloud.denbi.de/about/project-types/'; export const PUBLICATIONS_LINK: string = 'https://cloud.denbi.de/about/publications/'; export const PUBLIC_DOI_ENDPOINT: string = `${environment.apiBase}public/statistic/doi/ `; diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 973ec46c47..83f5f65cb6 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -368,6 +368,11 @@ $simplevmcolour: #00ADEF; } +.nav-icon.proj-icon { + max-width: 20px; + height: auto; +} + .sidebar .nav-link { color: $deNBI_darkgrey; } @@ -1158,6 +1163,7 @@ header { margin: 1rem; } + .bg-info-flavor { background-color: $deNBI_lightgrey; } diff --git a/src/static/webapp/assets/img/kubernetes_logo.svg b/src/static/webapp/assets/img/kubernetes_logo.svg new file mode 100644 index 0000000000..9a61c190a0 --- /dev/null +++ b/src/static/webapp/assets/img/kubernetes_logo.svg @@ -0,0 +1,91 @@ + + + + + Kubernetes logo with no border + + + + + + image/svg+xml + + Kubernetes logo with no border + "kubectl" is pronounced "kyoob kuttel" + + + + + + + + + + diff --git a/src/static/webapp/assets/img/kubernetes_logo_border.svg b/src/static/webapp/assets/img/kubernetes_logo_border.svg new file mode 100644 index 0000000000..621bb6a3fe --- /dev/null +++ b/src/static/webapp/assets/img/kubernetes_logo_border.svg @@ -0,0 +1,99 @@ + + + + + Kubernetes logo with white border + + + + + + image/svg+xml + + Kubernetes logo with white border + "kubectl" is pronounced "kyoob kuttel" + + + + + + + + + + + diff --git a/tests/openstack_application.spec.ts b/tests/openstack_application.spec.ts index 9a031c33ea..6a4e952683 100644 --- a/tests/openstack_application.spec.ts +++ b/tests/openstack_application.spec.ts @@ -10,7 +10,7 @@ test.describe.serial('@openstack_application', () => { test.describe('Should delete old openstack applications', () => { test.use({ storageState: Util.VO_MANAGER_STORAGE }); test('VO @openstack_application', async ({ page, baseURL }) => { - test.setTimeout(60 * 1000); + test.setTimeout(80 * 1000); const applicationPage = new ApplicationOverviewPage(page, baseURL); await applicationPage.declineApplications(Util.OPENSTACK_APPLICATION_NAME); const voOverviewPage = new VoOverviewPage(page, baseURL); @@ -21,7 +21,7 @@ test.describe.serial('@openstack_application', () => { test.describe('Should delete old openstack applications', () => { test.use({ storageState: Util.FACILITY_MANAGER_STORAGE }); test('FM @openstack_application', async ({ page, baseURL }) => { - test.setTimeout(60 * 1000); + test.setTimeout(80 * 1000); const facilityApplicationOverviewPage = new FacilityApplicationOverviewPage(page, baseURL); await facilityApplicationOverviewPage.terminateApplications(Util.OPENSTACK_APPLICATION_NAME); }); @@ -62,6 +62,22 @@ test.describe.serial('@openstack_application', () => { }); }); + test.describe('Should withdraw a project extension for OpenStack', () => { + test.use({ storageState: Util.MEMBER_STORAGE }); + test('Member @openstack_application', async ({ page, baseURL }) => { + const projectOverviewPage = new ProjectOverViewPage(page, baseURL); + await projectOverviewPage.goToProjectOverview(Util.OPENSTACK_APPLICATION_NAME); + await projectOverviewPage.withdrawtProjectExtension(); + }); + }); + test.describe('Should request a project extension2 for OpenStack', () => { + test.use({ storageState: Util.MEMBER_STORAGE }); + test('Member @openstack_application', async ({ page, baseURL }) => { + const projectOverviewPage = new ProjectOverViewPage(page, baseURL); + await projectOverviewPage.goToProjectOverview(Util.OPENSTACK_APPLICATION_NAME); + await projectOverviewPage.requestProjectExtension(false); + }); + }); test.describe('Should request a project modification for OpenStack', () => { test.use({ storageState: Util.MEMBER_STORAGE }); test('Member @openstack_application', async ({ page, baseURL }) => { @@ -70,7 +86,22 @@ test.describe.serial('@openstack_application', () => { await projectOverviewPage.requestProjectModification(false); }); }); - + test.describe('Should withdraw a project modification for OpenStack', () => { + test.use({ storageState: Util.MEMBER_STORAGE }); + test('Member @openstack_application', async ({ page, baseURL }) => { + const projectOverviewPage = new ProjectOverViewPage(page, baseURL); + await projectOverviewPage.goToProjectOverview(Util.OPENSTACK_APPLICATION_NAME); + await projectOverviewPage.withdrawtProjectModification(); + }); + }); + test.describe('Should request a project modification2 for OpenStack', () => { + test.use({ storageState: Util.MEMBER_STORAGE }); + test('Member @openstack_application', async ({ page, baseURL }) => { + const projectOverviewPage = new ProjectOverViewPage(page, baseURL); + await projectOverviewPage.goToProjectOverview(Util.OPENSTACK_APPLICATION_NAME); + await projectOverviewPage.requestProjectModification(false); + }); + }); test.describe('Should approve a project extension for OpenStack', () => { test.use({ storageState: Util.VO_MANAGER_STORAGE }); test('VO @openstack_application', async ({ page, baseURL }) => { @@ -106,7 +137,7 @@ test.describe.serial('@openstack_application', () => { test.describe('Aftercare - Should delete old openstack applications', () => { test.use({ storageState: Util.VO_MANAGER_STORAGE }); test('VO @openstack_application', async ({ page, baseURL }) => { - test.setTimeout(60 * 1000); + test.setTimeout(80 * 1000); const applicationPage = new ApplicationOverviewPage(page, baseURL); await applicationPage.declineApplications(Util.OPENSTACK_APPLICATION_NAME); const voOverviewPage = new VoOverviewPage(page, baseURL); @@ -117,7 +148,7 @@ test.describe.serial('@openstack_application', () => { test.describe('Aftercare - Should delete old openstack applications', () => { test.use({ storageState: Util.FACILITY_MANAGER_STORAGE }); test('FM @openstack_application', async ({ page, baseURL }) => { - test.setTimeout(60 * 1000); + test.setTimeout(80 * 1000); const facilityApplicationOverviewPage = new FacilityApplicationOverviewPage(page, baseURL); await facilityApplicationOverviewPage.terminateApplications(Util.OPENSTACK_APPLICATION_NAME); }); diff --git a/tests/page_objects/application_overview.po.ts b/tests/page_objects/application_overview.po.ts index 888fa05b16..1d8bac4900 100644 --- a/tests/page_objects/application_overview.po.ts +++ b/tests/page_objects/application_overview.po.ts @@ -54,11 +54,17 @@ export class ApplicationOverviewPage { async goToSubmittedApplication() { await this.goto(); + console.log('Click submitted tab'); + await this.page.locator(Util.by_data_test_id_str(this.SUBMITTED_APPLICATIONS_TAB)).click(); + console.log('wait till loader is hidden'); await this.page.waitForSelector(Util.by_data_test_id_str(this.LOADING_APPLICATIONS), { state: 'hidden' }); + console.log('wait till submitted visible'); await this.page.waitForSelector(Util.by_data_test_id_str('submitted_applications_container'), { state: 'visible', }); + console.log('submitted visible'); + } async goToLifetimeRequests() { @@ -93,7 +99,7 @@ export class ApplicationOverviewPage { // eslint-disable-next-line no-plusplus for (let i = 0; i < application_count; i++) { // eslint-disable-next-line no-await-in-loop - await this.page.locator(`data-test-id=${this.DECLINE_OPEN_APPLICATION_PRE}${projectName}`).first().click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.DECLINE_OPEN_APPLICATION_PRE + projectName)).first().click(); // eslint-disable-next-line no-await-in-loop await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); // eslint-disable-next-line no-await-in-loop @@ -105,11 +111,10 @@ export class ApplicationOverviewPage { async approveOpenStackModificationRequest(application_name: string): Promise { await this.goToModificationRequests(); - await this.page.locator(Util.by_data_test_id_str(this.MODIFICATION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.MODIFICATION_APPROVAL_BTN_PREFIX + application_name)).click(); await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); - await this.page.waitForSelector( - `data-test-id=${this.NOTIFICATION_MESSAGE} >> text=${this.MODIFICATION_REQUEST_RESULT_TEXT}`, - ); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); + } async approveSimpleVMModificationRequest(application_name: string): Promise { @@ -129,9 +134,8 @@ export class ApplicationOverviewPage { .locator(Util.by_data_test_id_str_prefix(this.APPROVAL_CLIENT_LIMIT_PREFIX + application_name)) .first() .click(); - await this.page.waitForSelector( - `data-test-id=${this.NOTIFICATION_MESSAGE} >> text=${this.MODIFICATION_REQUEST_RESULT_TEXT}`, - ); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); + } async approveSimpleVMExtensionRequest(application_name: string): Promise { @@ -141,48 +145,49 @@ export class ApplicationOverviewPage { .first() .click(); await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); - await this.page.waitForSelector( - `data-test-id=${this.NOTIFICATION_MESSAGE} >> text=${this.EXTENSION_RESULT_SIMPLEVM_TEXT}`, - ); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); + } async approveOpenStackExtensionRequest(application_name: string): Promise { await this.goToLifetimeRequests(); - await this.page.locator(Util.by_data_test_id_str(this.EXTENSION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.EXTENSION_APPROVAL_BTN_PREFIX + application_name)).click(); await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); - await this.page.waitForSelector( - `data-test-id=${this.NOTIFICATION_MESSAGE} >> text=${this.EXTENSION_RESULT_OPENSTACK_TEXT}`, - ); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); + } async approveSimpleVm(application_name: string): Promise { console.log('Approve Simple VM'); await this.goToSubmittedApplication(); - await this.page.waitForSelector(Util.by_data_test_id_str(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { + await this.page.waitForSelector(Util.by_data_test_id_str_prefix(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { state: 'visible', }); - await this.page.selectOption(Util.by_data_test_id_str(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { + await this.page.selectOption(Util.by_data_test_id_str_prefix(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { label: this.DEFAULT_DENBI_COMPUTE_CENTER, }); - await this.page.locator(Util.by_data_test_id_str(this.APPROVAL_PREFIX + application_name)).click(); - await this.page.locator(Util.by_data_test_id_str(this.APPROVAL_CLIENT_LIMIT_PREFIX + application_name)).click(); - await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MESSAGE} >> text=${this.SIMPLE_VM_CREATED}`); + await this.page.locator(Util.by_data_test_id_str_prefix(this.APPROVAL_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.APPROVAL_CLIENT_LIMIT_PREFIX + application_name)).click(); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); + } async approveOpenStackApplication(application_name: string): Promise { console.log('Approve Openstack'); await this.goToSubmittedApplication(); - await this.page.waitForSelector(Util.by_data_test_id_str(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { + await this.page.waitForSelector(Util.by_data_test_id_str_prefix(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { state: 'visible', }); - await this.page.selectOption(Util.by_data_test_id_str(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { + await this.page.selectOption(Util.by_data_test_id_str_prefix(this.COMPUTE_CENTER_SELECTION_PREFIX + application_name), { label: this.DEFAULT_DENBI_COMPUTE_CENTER, }); await this.page.waitForTimeout(10000); - await this.page.locator(Util.by_data_test_id_str(this.APPROVAL_PREFIX + application_name)).isEnabled(); - await this.page.locator(Util.by_data_test_id_str(this.APPROVAL_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.APPROVAL_PREFIX + application_name)).isEnabled(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.APPROVAL_PREFIX + application_name)).click(); await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); await this.page.waitForSelector(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE), { state: 'visible' }); + await this.page.waitForTimeout(5000); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); const approval_response: string = await this.page.innerText(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE)); expect(approval_response).toContain(this.PROJECT_FACILITY_ASSIGNED); diff --git a/tests/page_objects/facility_application_overview.po.ts b/tests/page_objects/facility_application_overview.po.ts index 8c8418411b..39105d0085 100644 --- a/tests/page_objects/facility_application_overview.po.ts +++ b/tests/page_objects/facility_application_overview.po.ts @@ -27,6 +27,7 @@ export class FacilityApplicationOverviewPage { private readonly CLOSE_NOTIFICATION_BTN: string = 'close_notification_modal_btn'; private DEFAULT_DENBI_COMPUTE_CENTER: string = 'de.NBI Cloud Portal - Development'; private readonly SELECT_FACILITY_SELECT: string = 'selectFacilitySelect'; + private CONFIRM_CONFIRMATION_MODAL_BUTTON: string = 'confirm_confirmation_modal_btn'; private readonly TERMINATE_REQUESTS_APPLICATIONS_TAB = 'terminate_requests_applications_tab'; @@ -57,8 +58,12 @@ export class FacilityApplicationOverviewPage { async goToSubmittedApplication() { await this.goto(); + console.log('Click submitted tab'); await this.page.locator(Util.by_data_test_id_str(this.SUBMITTED_APPLICATIONS_TAB)).click(); + console.log('Wait that loader is absent'); await this.page.waitForSelector(Util.by_data_test_id_str(this.LOADING_APPLICATIONS), { state: 'hidden' }); + console.log('Wait till submitted applications are visible'); + await this.page.waitForSelector(Util.by_data_test_id_str(this.SUBMITTED_APPLICATIONS_CONTAINER), { state: 'visible', }); @@ -112,22 +117,24 @@ export class FacilityApplicationOverviewPage { async approveApplication(application_name: string): Promise { await this.goToSubmittedApplication(); - console.log(`Approve Application${application_name}`); - await this.page.locator(Util.by_data_test_id_str(this.APPLICATION_APPROVAL_BTN_PREFIX + application_name)).click(); + console.log(`Approve Application: ${application_name}`); + await this.page.locator(Util.by_data_test_id_str_prefix(this.APPLICATION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); - const approval_response: string = await this.page.innerText(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE)); - expect(approval_response).toContain(this.SUCCESSFULLY_APPROVED_APPL); + // const approval_response: string = await this.page.innerText(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE), { timeout: 10000 }); + // expect(approval_response).toContain(this.SUCCESSFULLY_APPROVED_APPL); await this.page.locator(Util.by_data_test_id_str(this.CLOSE_NOTIFICATION_MODAL)).click(); } async approveApplicationExtension(application_name: string): Promise { await this.goToLifetimeRequests(); console.log(`Approve Application${application_name} Extension`); - await this.page.locator(Util.by_data_test_id_str(this.EXTENSION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.EXTENSION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); - const approval_response: string = await this.page.innerText(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE)); - expect(approval_response).toContain(this.EXTENSION_SUCCESSFULLY); await this.page.locator(Util.by_data_test_id_str(this.CLOSE_NOTIFICATION_MODAL)).click(); } @@ -137,25 +144,28 @@ export class FacilityApplicationOverviewPage { const project_count: number = await this.page.locator(Util.by_data_test_id_str(this.TERMINATE_PROJECT_BTN)).count(); console.log(`Terminating ${project_count} openstack projects with name ${project_name}`); // eslint-disable-next-line no-plusplus - for (let i = 0; i < project_count; i++) { + while (await this.page.locator(Util.by_data_test_id_str(this.TERMINATE_PROJECT_BTN)).first().isVisible()) { // eslint-disable-next-line no-await-in-loop await this.page.locator(Util.by_data_test_id_str(this.TERMINATE_PROJECT_BTN)).first().click(); // eslint-disable-next-line no-await-in-loop - await this.page.locator(Util.by_data_test_id_str(this.APPROVE_TERMINATION_PT_APPLICATION_BTN)).first().click(); + await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); + // eslint-disable-next-line no-await-in-loop - await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MESSAGE} >> text=${this.WAS_TERMINATED}`); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); + // eslint-disable-next-line no-await-in-loop await this.page.locator(Util.by_data_test_id_str(this.CLOSE_NOTIFICATION_BTN)).click(); } + } async approveApplicationModification(application_name: string): Promise { await this.goToModificationRequests(); - await this.page.locator(Util.by_data_test_id_str(this.MODIFICATION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str_prefix(this.MODIFICATION_APPROVAL_BTN_PREFIX + application_name)).click(); + await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_CONFIRMATION_MODAL_BUTTON)).click(); + await this.page.waitForSelector(`data-test-id=${this.NOTIFICATION_MODAL_TITLE} >> text=Success`); - const approval_response: string = await this.page.innerText(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE)); - expect(approval_response).toContain(this.MODIFICATION_EXTENSION_SUCCESS_TEXT); await this.page.locator(Util.by_data_test_id_str(this.CLOSE_NOTIFICATION_MODAL)).click(); } } diff --git a/tests/page_objects/formular.po.ts b/tests/page_objects/formular.po.ts index 388d567fbb..35ea6515cf 100644 --- a/tests/page_objects/formular.po.ts +++ b/tests/page_objects/formular.po.ts @@ -88,7 +88,10 @@ export class FormularPage { await this.page.locator('[role=option]').click(); await this.page.locator(Util.by_data_test_id_str('project_application_horizon_switch')).click(); await this.page.fill(Util.by_data_test_id_str('project_application_horizon2020_input'), 'Horizon2020Project'); + await this.page.fill(Util.by_data_test_id_str('project_application_volume_counter'), '2'); + await this.page.fill(Util.by_data_test_id_str('project_application_volume_limit_input'), '2'); + await this.page.locator(Util.by_data_test_id_str('project_application_report_allowed_switch')).click(); await this.page.locator(Util.by_data_test_id_str('project_application_person_related_data_switch')).click(); await this.page.locator(Util.by_data_test_id_str('project_application_no_personal_data_switch')).click(); diff --git a/tests/page_objects/instance_overview.po.ts b/tests/page_objects/instance_overview.po.ts deleted file mode 100644 index f80f952c7c..0000000000 --- a/tests/page_objects/instance_overview.po.ts +++ /dev/null @@ -1,216 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars,import/no-extraneous-dependencies -import { expect, Page } from '@playwright/test'; -import { Util } from '../util'; - -/** - * Instance Overview Page. - */ -export class InstanceOverviewPage { - // GENERAL - private RESENV_URL_LINK_PREFIX: string = 'https://proxy-dev.bi.denbi.de/'; - private RESENV_VISIBLE_PREFIX: string = 'resenv_visible_'; - private VOLUMES_COUNT_PREFIX: string = 'volumes_count_'; - - // STATUS - private ACTIVE_STATUS_PREFIX: string = 'active_'; - private SHUTOFF_STATUS_PREFIX: string = 'shutoff_'; - private DELETED_STATUS_PREFIX: string = 'deleted_'; - - // ACTIONS - private SHOW_ACTIONS_PREFIX: string = 'show_actions_button_'; - private SHOW_ATTACH_VOLUME_PREFIX: string = 'attach_volume_'; - private SHOW_DETACH_VOLUME_PREFIX: string = 'detach_volume_'; - private SHOW_STOP_VM_PREFIX: string = 'stop_vm_'; - private SHOW_RESTART_VM_PREFIX: string = 'restart_vm_'; - private SHOW_REBOOT_VM_PREFIX: string = 'reboot_vm_'; - private SHOW_DELETE_VM_PREFIX: string = 'delete_vm_'; - private SHOW_CREATE_SNAPSHOT_PREFIX: string = 'create_snapshot_'; - private VERIFY_VM_STOP_BUTTON: string = 'verifyStopButton'; - private VERIFY_VM_RESUME_BUTTON: string = 'verifyRestartButton'; - private VERIFY_REBOOT_BUTTON: string = 'verifyRebootButton'; - private VERIFY_DELETE_BUTTON: string = 'verifyDeleteButton'; - private SOFT_REBOOT_VM: string = 'soft_reboot_vm_'; - private VM_MESSAGE_ALERT: string = 'vm-message-alert'; - private VOLUME_DETACHMENT_DROPDOWN: string = 'volume_detachment_dropdown'; - private VOLUME_ATTACHMENT_DROPDOWN: string = 'volume_attachment_dropdown'; - private DETACH_VOLUME_BUTTON: string = 'detachVolumeButton'; - private ATTACH_VOLUME_BUTTON: string = 'attachVolumeButton'; - - readonly page: Page; - readonly baseURL: string; - - constructor(page: Page, baseURL) { - this.page = page; - this.baseURL = baseURL; - } - - async goto() { - console.log('Goto Instance Overview Page'); - await this.page.goto(`${this.baseURL}/#/virtualmachines/vmOverview`, { waitUntil: 'networkidle' }); - console.log(this.page.url()); - expect(this.page.url()).toContain('/vmOverview'); - } - - async waitForInstanceToBeActive(vm_name: string, timeout: number = 10000): Promise { - console.log(`Waiting for VM ${vm_name} to be shown as active`); - const activeElement = await this.page.waitForSelector( - Util.by_data_test_id_str_prefix(`${this.ACTIVE_STATUS_PREFIX}${vm_name}`), - { - state: 'visible', - timeout, - }, - ); - console.log(`VM ${vm_name} active`); - - return activeElement.isVisible(); - } - - async waitForInstanceToBeShutoff(vm_name: string, timeout: number = 10000): Promise { - console.log(`Waiting for VM ${vm_name} to be shown as shutoff`); - await this.page.waitForSelector(Util.by_data_test_id_str_prefix(`${this.SHUTOFF_STATUS_PREFIX}${vm_name}`), { - state: 'visible', - timeout, - }); - console.log(`VM ${vm_name} shutoff`); - } - - async waitForInstanceToBeDeleted(vm_name: string, timeout: number = 10000): Promise { - console.log(`Waiting for VM ${vm_name} to be shown as deleted`); - await this.page.waitForSelector(Util.by_data_test_id_str_prefix(`${this.DELETED_STATUS_PREFIX}${vm_name}`), { - state: 'visible', - timeout, - }); - console.log(`VM ${vm_name} deleted`); - } - - async waitForInstanceToHaveVolumeAttached(vm_name: string): Promise { - console.log(`Check if ${vm_name} has one volume attached`); - const locator = this.page.locator(Util.by_data_test_id_str_prefix(`${this.VOLUMES_COUNT_PREFIX}${vm_name}`)); - await expect(locator).toContainText('1'); - } - - async waitForInstanceToHaveResenv(vm_name: string): Promise { - console.log(`Check if ${vm_name} has resenv`); - const locator = this.page.locator(Util.by_data_test_id_str_prefix(`${this.RESENV_VISIBLE_PREFIX}${vm_name}`)); - await expect(locator).toBeVisible(); - } - - async showActions(vm_name: string): Promise { - console.log(`Showing actions of ${vm_name}`); - await this.page.locator(Util.by_data_test_id_str_prefix(`${this.SHOW_ACTIONS_PREFIX}${vm_name}`)).click(); - } - - async stopVirtualMachine(vm_name: string, timeout: number = 10000): Promise { - console.log(`Stopping active basic vm ${vm_name} on instance overview page`); - await this.showActions(vm_name); - const locator_stop = this.page.locator(Util.by_data_test_id_str_prefix(`${this.SHOW_STOP_VM_PREFIX}${vm_name}`)); - await expect(locator_stop).toBeVisible(); - await locator_stop.click(); - await this.page.locator(Util.by_data_test_id_str(this.VERIFY_VM_STOP_BUTTON)).isVisible(); - await Util.clickByDataTestIdStr(this.page,this.VERIFY_VM_STOP_BUTTON); - await this.waitForInstanceToBeShutoff(vm_name, timeout); - } - - async resumeVirtualMachine(vm_name: string, timeout: number = 10000): Promise { - console.log(`Resuming shutoff basic vm ${vm_name} on instance overview page`); - await this.showActions(vm_name); - const locator_resume = this.page.locator( - Util.by_data_test_id_str_prefix(`${this.SHOW_RESTART_VM_PREFIX}${vm_name}`), - ); - await expect(locator_resume).toBeVisible(); - await locator_resume.click(); - await this.page.locator(Util.by_data_test_id_str(this.VERIFY_VM_RESUME_BUTTON)).isVisible(); - await Util.clickByDataTestIdStr(this.page,this.VERIFY_VM_RESUME_BUTTON); - await this.waitForInstanceToBeActive(vm_name, timeout); - } - - async rebootVirtualMachine(vm_name: string, timeout: number = 10000): Promise { - console.log(`Rebooting active basic vm ${vm_name} on instance overview page`); - await this.showActions(vm_name); - const locator_reboot = this.page.locator(Util.by_data_test_id_str_prefix(`${this.SHOW_REBOOT_VM_PREFIX}${vm_name}`)); - await expect(locator_reboot).toBeVisible(); - await locator_reboot.click(); - const locator_soft_reboot = this.page.locator(Util.by_data_test_id_str_prefix(`${this.SOFT_REBOOT_VM}${vm_name}`)); - await locator_soft_reboot.click(); - await this.page.locator(Util.by_data_test_id_str(this.VERIFY_REBOOT_BUTTON)).isVisible(); - await Util.clickByDataTestIdStr(this.page,this.VERIFY_REBOOT_BUTTON); - await this.page.waitForSelector(Util.by_data_test_id_str(this.VM_MESSAGE_ALERT), { - state: 'visible', - timeout, - }); - const vm_message_alert_locator = this.page.locator(Util.by_data_test_id_str(this.VM_MESSAGE_ALERT)); - await expect(vm_message_alert_locator).toContainText('Reboot'); - console.log(`Rebooting message for vm ${vm_name} was shown.`); - await this.waitForInstanceToBeActive(vm_name, timeout); - } - - async deleteVirtualMachine(vm_name: string, timeout: number = 10000): Promise { - console.log(`Deleting active basic vm ${vm_name} on instance overview page`); - await this.showActions(vm_name); - const locator_delete = this.page.locator(Util.by_data_test_id_str_prefix(`${this.SHOW_DELETE_VM_PREFIX}${vm_name}`)); - await expect(locator_delete).toBeVisible(); - await locator_delete.click(); - await this.page.locator(Util.by_data_test_id_str(this.VERIFY_DELETE_BUTTON)).isVisible(); - await Util.clickByDataTestIdStr(this.page,this.VERIFY_DELETE_BUTTON); - await this.waitForInstanceToBeDeleted(vm_name, timeout); - } - - async detachVolume(vm_name: string, timeout: number = 10000): Promise { - console.log(`Detaching volume from vm ${vm_name} on instance overview page`); - await this.showActions(vm_name); - const locator_detach = this.page.locator( - Util.by_data_test_id_str_prefix(`${this.SHOW_DETACH_VOLUME_PREFIX}${vm_name}`), - ); - await expect(locator_detach).toBeVisible({ timeout }); - await locator_detach.click(); - await this.page.waitForSelector(Util.by_data_test_id_str(this.VOLUME_DETACHMENT_DROPDOWN), { - state: 'visible', - timeout, - }); - await this.page.selectOption(Util.by_data_test_id_str(this.VOLUME_DETACHMENT_DROPDOWN), { index: 1 }); - const locator_detach_button = this.page.locator(Util.by_data_test_id_str(this.DETACH_VOLUME_BUTTON)); - await expect(locator_detach_button).toBeEnabled({ timeout: 1000 }); - await locator_detach_button.click(); - await this.page.waitForSelector(Util.by_data_test_id_str(this.VM_MESSAGE_ALERT), { - state: 'visible', - timeout, - }); - const vm_message_alert_locator = this.page.locator(Util.by_data_test_id_str(this.VM_MESSAGE_ALERT)); - await expect(vm_message_alert_locator).toContainText('detached', { timeout: 1000 }); - console.log(`Detachment message for volume from vm ${vm_name} was shown.`); - } - - async attachVolume(vm_name: string, timeout: number = 10000): Promise { - console.log(`Attach volume from vm ${vm_name} on instance overview page`); - await this.showActions(vm_name); - const locator_attach = this.page.locator( - Util.by_data_test_id_str_prefix(`${this.SHOW_ATTACH_VOLUME_PREFIX}${vm_name}`), - ); - await expect(locator_attach).toBeVisible(); - await locator_attach.click(); - await this.page.waitForSelector(Util.by_data_test_id_str(this.VOLUME_ATTACHMENT_DROPDOWN), { - state: 'visible', - timeout, - }); - await this.page.selectOption(Util.by_data_test_id_str(this.VOLUME_ATTACHMENT_DROPDOWN), { index: 1 }); - const locator_attach_button = this.page.locator(Util.by_data_test_id_str(this.ATTACH_VOLUME_BUTTON)); - await expect(locator_attach_button).toBeEnabled({ timeout: 1000 }); - await locator_attach_button.click(); - await this.page.waitForSelector(Util.by_data_test_id_str(this.VM_MESSAGE_ALERT), { - state: 'visible', - timeout, - }); - const vm_message_alert_locator = this.page.locator(Util.by_data_test_id_str(this.VM_MESSAGE_ALERT)); - await expect(vm_message_alert_locator).toContainText('attached', { timeout: 1000 }); - console.log(`Attachment message for volume from vm ${vm_name} was shown.`); - } - - async expectWorkshopMachines(amount: number): Promise { - await this.page.waitForTimeout(2000); - const vms = this.page.locator(Util.by_data_test_id_str_prefix(`detail${Util.WORKSHOP_NAME}`)); - console.log(vms); - await expect(vms).toHaveCount(amount); - - return await vms.allTextContents(); - } -} diff --git a/tests/page_objects/login.po.ts b/tests/page_objects/login.po.ts index a605dca664..fc6afbab41 100644 --- a/tests/page_objects/login.po.ts +++ b/tests/page_objects/login.po.ts @@ -5,7 +5,7 @@ import { Util } from '../util'; * LoginPage. */ export class LoginPagePlaywright { - TEST_RP_WARNING: string = 'testRpWarning'; + TEST_RP_WARNING: string = 'testSp'; TEST_RP_CONTINUE: string = 'Continue'; CONSENT_CONTINUE: string = 'Yes, continue'; AUTHORIZE_BTN: string = 'authorize-button'; @@ -123,7 +123,7 @@ export class LoginPagePlaywright { async skipElixirTestWarning(): Promise { console.log('checking for elixir warnining'); try { - await this.page.waitForURL(`**/oidc/${this.TEST_RP_WARNING}**`, { timeout: 5000 }); + await this.page.waitForURL(`**/${this.TEST_RP_WARNING}**`, { timeout: 5000 }); await this.page.locator(`text=${this.TEST_RP_CONTINUE}`).click(); // await this.page.waitForURL('**/profile'); } catch (error) { diff --git a/tests/page_objects/new_instance.po.ts b/tests/page_objects/new_instance.po.ts deleted file mode 100644 index dcc519184d..0000000000 --- a/tests/page_objects/new_instance.po.ts +++ /dev/null @@ -1,143 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars,import/no-extraneous-dependencies -import { expect, Page } from '@playwright/test'; -import { Util } from '../util'; - -/** - * New Instance Page. - */ -export class NewInstancePage { - private PROJECT_SELECTION_DROPDOWN: string = 'project_selection_dropdown'; - private INSTANCE_NAME_INPUT_FIELD: string = 'instance_name_input_field'; - private FLAVOR_SELECTION_PREFIX: string = 'flavor_'; - private IMAGE_SELECTION_PREFIX: string = 'image_'; - private FLAVOR_IMAGE_SELECTED_SUFFIX: string = '_selected'; - private NORMAL_FLAVOR_TO_SELECT: string = 'de_NBI_tiny'; - private NORMAL_IMAGE_PREFIX_TO_SELECT: string = 'Ubuntu_20_04_LTS_de_NBI__'; - private ADD_NEW_VOLUME_TAB: string = 'add_new_volume_tab'; - private NEW_VOLUME_NAME_INPUT: string = 'new_volume_name_input'; - private NEW_VOLUME_MOUNT_PATH_INPUT: string = 'new_volume_mount_path_input'; - private NEW_VOLUME_STORAGE_INPUT: string = 'new_volume_storage_input'; - private NEW_VOLUME_CONFIRMATION_BUTTON: string = 'add_volume_confirmation_button'; - private VM_RESPONSIBILITY_CHECKBOX: string = 'vm_responsibility_input'; - private START_VM_BUTTON: string = 'start_vm_button'; - private RESENV_TEMPLATE_PREFIX: string = 'add_resenv_template_'; - private RESENV_URL_INPUT: string = 'resenv_url_input'; - private ANSIBLE_NEED_OKAY: string = 'ansible_need_okay'; - private RESENV_ACCORDION_HEADING: string = 'resenv_accordion_heading'; - private SITE_LOADER: string = 'site-loader'; - private REDIRECTING_INSTANCE_OVERVIEW: string = 'redirecting_instance_overview'; - private RESENV_IMAGE_TYPE_TAB: string = 'resenv-image-tab'; - private PREBUILD_RESENV_IMAGE_PREFIX: string = 'TheiaIDE-ubuntu20_04_de_NBI__'; - - readonly page: Page; - readonly baseURL: string; - - constructor(page: Page, baseURL) { - this.page = page; - this.baseURL = baseURL; - } - - async goto() { - console.log('Goto New Instance Page'); - await this.page.goto(`${this.baseURL}/#/virtualmachines/newVM`, { waitUntil: 'networkidle' }); - console.log(this.page.url()); - expect(this.page.url()).toContain('/newVM'); - await this.page.locator('text=New Virtual Machine').waitFor(); - } - - async selectProject(application_name: string): Promise { - console.log('Selecting project'); - await this.page.waitForSelector(Util.by_data_test_id_str(this.SITE_LOADER), { state: 'hidden' }); - const dropdown = await this.page.locator(Util.by_data_test_id_str(this.PROJECT_SELECTION_DROPDOWN)).isVisible(); - if (dropdown) { - await this.page.selectOption(Util.by_data_test_id_str(this.PROJECT_SELECTION_DROPDOWN), { - label: application_name, - }); - await this.page.locator(Util.by_data_test_id_str(this.INSTANCE_NAME_INPUT_FIELD)).isVisible(); - } else { - await this.page.locator(Util.by_data_test_id_str(this.INSTANCE_NAME_INPUT_FIELD)).isVisible(); - } - console.log('Project selected'); - } - - async startNormalVM( - application_name: string, - vm_name: string, - with_volume: boolean = false, - with_resenv: boolean = false, - prebuild: boolean = false, - ): Promise { - console.log('Fill name'); - await this.page.fill(Util.by_data_test_id_str(this.INSTANCE_NAME_INPUT_FIELD), vm_name); - console.log('Choose flavor'); - await Util.clickByDataTestIdStr(this.page, this.FLAVOR_SELECTION_PREFIX + this.NORMAL_FLAVOR_TO_SELECT); - // eslint-disable-next-line @typescript-eslint/await-thenable - await this.page - .locator( - Util.by_data_test_id_str( - this.FLAVOR_SELECTION_PREFIX + this.NORMAL_FLAVOR_TO_SELECT + this.FLAVOR_IMAGE_SELECTED_SUFFIX, - ), - ) - .isVisible(); - console.log('Flavor chosen'); - console.log('Choose image'); - if (prebuild) { - await this.page.locator(Util.by_data_test_id_str(this.RESENV_IMAGE_TYPE_TAB)).click(); - console.log('clicked resenv tab'); - await this.page - .locator(Util.by_data_test_id_str_prefix(this.IMAGE_SELECTION_PREFIX + this.PREBUILD_RESENV_IMAGE_PREFIX)) - .first() - .click(); - // eslint-disable-next-line @typescript-eslint/await-thenable - await this.page - .locator( - `${Util.by_data_test_id_str_prefix( - this.IMAGE_SELECTION_PREFIX + this.PREBUILD_RESENV_IMAGE_PREFIX, - )} and ${Util.by_data_test_id_str_suffix(this.FLAVOR_IMAGE_SELECTED_SUFFIX)}`, - ) - .isVisible(); - console.log('Image chosen'); - } else { - await Util.clickByDataTestIdStrPrefix(this.page, this.IMAGE_SELECTION_PREFIX + this.NORMAL_IMAGE_PREFIX_TO_SELECT); - // eslint-disable-next-line @typescript-eslint/await-thenable - await this.page - .locator( - `${Util.by_data_test_id_str_prefix( - this.IMAGE_SELECTION_PREFIX + this.NORMAL_IMAGE_PREFIX_TO_SELECT, - )} and ${Util.by_data_test_id_str_suffix(this.FLAVOR_IMAGE_SELECTED_SUFFIX)}`, - ) - .isVisible(); - console.log('Image chosen'); - } - - if (with_volume) { - console.log('Adding volume'); - await Util.clickByDataTestIdStr(this.page, this.ADD_NEW_VOLUME_TAB); - await this.page.fill(Util.by_data_test_id_str(this.NEW_VOLUME_NAME_INPUT), `volume_${application_name}`); - await this.page.fill(Util.by_data_test_id_str(this.NEW_VOLUME_MOUNT_PATH_INPUT), 'test'); - await this.page.fill(Util.by_data_test_id_str(this.NEW_VOLUME_STORAGE_INPUT), '1'); - await Util.clickByDataTestIdStr(this.page, this.NEW_VOLUME_CONFIRMATION_BUTTON); - console.log('Volume added'); - } - if (with_resenv) { - if (prebuild) { - console.log('Adding resenv (prebuild)'); - await this.page.fill(Util.by_data_test_id_str(this.RESENV_URL_INPUT), Util.RESENV_URL); - await Util.clickByDataTestIdStr(this.page, this.ANSIBLE_NEED_OKAY); - console.log('Resenv added (prebuild)'); - } else { - console.log('Adding resenv'); - await Util.clickByDataTestIdStr(this.page, this.RESENV_ACCORDION_HEADING); - await Util.clickByDataTestIdStr(this.page, `${this.RESENV_TEMPLATE_PREFIX}${Util.RSTUDIO}`); - await this.page.fill(Util.by_data_test_id_str(this.RESENV_URL_INPUT), Util.RESENV_URL); - await Util.clickByDataTestIdStr(this.page, this.ANSIBLE_NEED_OKAY); - console.log('Resenv added'); - } - } - await Util.clickByDataTestIdStr(this.page, this.VM_RESPONSIBILITY_CHECKBOX); - await Util.clickByDataTestIdStr(this.page, this.START_VM_BUTTON); - await this.page.waitForSelector(Util.by_data_test_id_str(this.REDIRECTING_INSTANCE_OVERVIEW), { - state: 'visible', - }); - } -} diff --git a/tests/page_objects/profile.po.ts b/tests/page_objects/profile.po.ts index f50950dab4..f6fa4e9eab 100644 --- a/tests/page_objects/profile.po.ts +++ b/tests/page_objects/profile.po.ts @@ -62,7 +62,8 @@ export class ProfilePage { await this.page.locator(Util.by_data_test_id_str(this.OPEN_SET_KEY_BUTTON)).click(); console.log('Copying public key into textfield.'); await this.page.fill(Util.by_data_test_id_str(this.ENTER_PUBLIC_KEY_AREA), this.TEST_PUBLIC_KEY); - await this.page.locator(Util.by_data_test_id_str(this.PUBLIC_KEY_ACKNOWLEDGE_CHECKBOX)).click(); + console.log('Confirming effects of generating a new Key'); + // await this.page.locator(Util.by_data_test_id_str(this.GENERATE_KEY_CHECKBOX)).click(); console.log('Clicking on Set-Button'); await Promise.all([ this.page.waitForResponse(response => response.status() === 200), diff --git a/tests/page_objects/project_overview.po.ts b/tests/page_objects/project_overview.po.ts index 9f11b6efb8..5e3fed71a6 100644 --- a/tests/page_objects/project_overview.po.ts +++ b/tests/page_objects/project_overview.po.ts @@ -16,6 +16,9 @@ export class ProjectOverViewPage { // MODIFICATIONS private OPEN_EXTENSION_REQUEST_BUTTON: string = 'open_extension_request_button'; + private CONFIRM_WITHDRAW_BTN: string = 'confirm_withdraw_btn'; + private SHOW_LIFETIME_EXTENSIO_WITHDRAW_BUTTON: string = 'show_lifetime_extension_withdraw_button'; + private SHOW_MODIFICATION_EXTENSION_WITHDRAW_BUTTON: string = 'show_modification_extension_withdraw_button'; private OPEN_MODIFICATION_REQUEST_BUTTON: string = 'open_modification_request_button'; private OPEN_TERMINATION_REQUEST_BUTTON: string = 'open_termination_request_button'; private DECLINE_NEW_PUBLICATION_BUTTON: string = 'decline_publication_button'; @@ -79,6 +82,7 @@ export class ProjectOverViewPage { await this.page .locator(Util.by_data_test_id_str_prefix(`${this.PROJECT_OVERVIEW_BUTTON_PREFIX}${project_name}`)) + .first() .click(); console.log(this.page.url()); @@ -92,9 +96,9 @@ export class ProjectOverViewPage { simpleVM ? console.log('Filling extension formular and requesting extension for SimpleVM project') : console.log('Filling extension formular and requesting extension for Openstack project'); - await this.page.locator(Util.by_data_test_id_str(this.OPEN_EXTENSION_REQUEST_BUTTON)).click(); - await this.page.locator(Util.by_data_test_id_str(this.CONTINUE_TESTIMONIAL_MODAL_BUTTON)).click(); - await this.page.locator(Util.by_data_test_id_str(this.DECLINE_NEW_PUBLICATION_BUTTON)).click(); + await this.page.locator(Util.by_data_test_id_str(this.OPEN_EXTENSION_REQUEST_BUTTON)).first().click(); + await this.page.locator(Util.by_data_test_id_str(this.CONTINUE_TESTIMONIAL_MODAL_BUTTON)).first().click(); + // await this.page.locator(Util.by_data_test_id_str(this.DECLINE_NEW_PUBLICATION_BUTTON)).first().click(); await this.page.waitForSelector(`data-test-id=${this.PROJECT_EXTENSION_MONTHS_INPUT}`); await this.page.fill(Util.by_data_test_id_str(this.PROJECT_EXTENSION_MONTHS_INPUT), '3'); await this.page.locator(Util.by_data_test_id_str(this.SUBMIT_EXTENSION_REQUEST_BUTTON)).click(); @@ -104,12 +108,33 @@ export class ProjectOverViewPage { ); } + async withdrawtProjectExtension() { + console.log('Withdraw extension request'); + + // eslint-disable-next-line no-unused-expressions,@typescript-eslint/no-unused-expressions + await this.page.locator(Util.by_data_test_id_str(this.SHOW_LIFETIME_EXTENSIO_WITHDRAW_BUTTON)).click(); + await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_WITHDRAW_BTN)).click(); + await this.page.waitForSelector(Util.by_data_test_id_str(this.SHOW_LIFETIME_EXTENSIO_WITHDRAW_BUTTON), { + state: 'hidden', + }); + } + + async withdrawtProjectModification() { + console.log('Withdraw modification request'); + // eslint-disable-next-line no-unused-expressions,@typescript-eslint/no-unused-expressions + await this.page.locator(Util.by_data_test_id_str(this.SHOW_MODIFICATION_EXTENSION_WITHDRAW_BUTTON)).click(); + await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_WITHDRAW_BTN)).click(); + await this.page.waitForSelector(Util.by_data_test_id_str(this.SHOW_MODIFICATION_EXTENSION_WITHDRAW_BUTTON), { + state: 'hidden', + }); + } + async requestProjectModification(simpleVM: boolean) { // eslint-disable-next-line no-unused-expressions,@typescript-eslint/no-unused-expressions simpleVM ? console.log('Filling modification formular and requesting extension for SimpleVM project') : console.log('Filling modification formular and requesting extension for Openstack project'); - await this.page.locator(Util.by_data_test_id_str(this.OPEN_MODIFICATION_REQUEST_BUTTON)).click(); + await this.page.locator(Util.by_data_test_id_str(this.OPEN_MODIFICATION_REQUEST_BUTTON)).first().click(); await this.page.fill(Util.by_data_test_id_str('std_1'), this.NUMBER_MODIFICATION_FLAVORS); await this.page.fill( Util.by_data_test_id_str(this.MODIFICATION_REQUEST_VOLUME_COUNTER_INPUT), @@ -127,7 +152,7 @@ export class ProjectOverViewPage { } async requestTermination() { - await this.page.locator(Util.by_data_test_id_str(this.OPEN_TERMINATION_REQUEST_BUTTON)).click(); + await this.page.locator(Util.by_data_test_id_str(this.OPEN_TERMINATION_REQUEST_BUTTON)).first().click(); await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_TERMINATION_REQUEST_INPUT)).click(); await this.page.locator(Util.by_data_test_id_str(this.CONFIRM_TERMINATION_REQUEST_BUTTON)).click(); await this.page.waitForSelector( diff --git a/tests/page_objects/vo_overview.po.ts b/tests/page_objects/vo_overview.po.ts index f5a939f1b7..508f1f50a2 100644 --- a/tests/page_objects/vo_overview.po.ts +++ b/tests/page_objects/vo_overview.po.ts @@ -12,12 +12,13 @@ export class VoOverviewPage { private NOTIFICATION_MESSAGE: string = 'notification_message'; private CLOSE_NOTIFICATION_BTN: string = 'close_notification_modal_btn'; private PROJECT_TERMINATED_MESSAGE: string = 'The project was terminated.'; - private PROJECT_TERMINATION_FORWARDED_TO_FACILITY: string = 'The request to terminate the project was forwarded to the facility manager.'; + private PROJECT_TERMINATION_FORWARDED_TO_FACILITY: string = 'The request to terminate the project was forwarded to the facility manager.'; private TERMINATE_BUTTON_TEXT: string = 'Terminate Project'; private NOTIFICATION_MODAL_TITLE: string = 'notification_modal_title'; private SUCCESS: string = 'Success'; private SITE_LOADER: string = 'site-loader'; + private SPINNER: string = 'spinner'; readonly page: Page; readonly baseURL: string; @@ -34,6 +35,17 @@ export class VoOverviewPage { expect(this.page.url()).toContain(this.VO_OVERVIEW_URL); await this.page.waitForSelector(Util.by_data_test_id_str(this.SITE_LOADER), { state: 'hidden' }); + + try { + await this.page.waitForSelector(Util.by_data_test_id_str(this.SPINNER), { state: 'visible', timeout: 5000 }); + } catch (error) { + console.log('Spinner not visible within 5 seconds, continuing...'); + } + + await this.page.waitForSelector(Util.by_data_test_id_str(this.SPINNER), { state: 'hidden' }); + + // Add a 3-second wait at the end + await this.page.waitForTimeout(3000); } async filterForProjects(filter: string): Promise { @@ -46,12 +58,12 @@ export class VoOverviewPage { await this.goto(); await this.filterForProjects(project_name); - const project_count: number = await this.page + let project_count: number = await this.page .locator(Util.by_data_test_id_str_prefix(this.SHOW_TERMINATE_PREFIX + Util.OPENSTACK_APPLICATION_NAME)) .count(); console.log(`Terminating ${project_count} openstack projects with name ${project_name}`); // eslint-disable-next-line no-plusplus - for (let i = 0; i < project_count; i++) { + while (project_count > 0) { // eslint-disable-next-line no-await-in-loop await this.page .locator(Util.by_data_test_id_str_prefix(this.SHOW_TERMINATE_PREFIX + Util.OPENSTACK_APPLICATION_NAME)) @@ -64,7 +76,13 @@ export class VoOverviewPage { await expect(this.page.locator(Util.by_data_test_id_str(this.NOTIFICATION_MESSAGE))).toHaveClass(/alert-success/); // eslint-disable-next-line no-await-in-loop await this.page.locator(Util.by_data_test_id_str(this.CLOSE_NOTIFICATION_BTN)).click(); + await this.page.waitForTimeout(1500); + + project_count = await this.page + .locator(Util.by_data_test_id_str_prefix(this.SHOW_TERMINATE_PREFIX + Util.OPENSTACK_APPLICATION_NAME)) + .count(); } + } async terminateSimpleVMProjects(project_name: string): Promise { diff --git a/tests/page_objects/workshop_instances.po.ts b/tests/page_objects/workshop_instances.po.ts deleted file mode 100644 index 4e36192c03..0000000000 --- a/tests/page_objects/workshop_instances.po.ts +++ /dev/null @@ -1,81 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars,import/no-extraneous-dependencies -import { expect, Locator, Page } from '@playwright/test'; -import { Util } from '../util'; - -/** - * Workshop instances Page. - */ -export class WorkshopInstancesPage { - private PROJECT_SELECT: string = 'projectSelect'; - private WORKSHOP_OPTION: string = 'workshop_option_'; - private FLAVOR_PREFIX: string = 'flavor_'; - private IMAGE_PREFIX: string = 'image_'; - private RESENV_PREFIX: string = 'add_resenv_template_'; - private ADD_USER_PREFIX: string = 'add_user_'; - private ANSIBLE_OKAY_CHECKBOX: string = 'ansible_need_okay'; - private RESPONSIBILITY_CHECKBOX: string = 'vm_responsibility'; - private START_VMS_BUTTON: string = 'startVMButton'; - private REDIRECT_MODAL: string = 'redirect_modal'; - private RESENV_IMAGE_TYPE_TAB: string = 'resenv-image-tab'; - private PREBUILD_RESENV_IMAGE_PREFIX: string = 'TheiaIDE-ubuntu20_04_de_NBI__'; - readonly page: Page; - readonly baseURL: string; - - constructor(page: Page, baseURL) { - this.page = page; - this.baseURL = baseURL; - } - - async goToWorkshopInstances() { - console.log('Goto Workshop instances Page'); - await this.page.goto(`${this.baseURL}/#/virtualmachines/newWorkshop`, { waitUntil: 'networkidle' }); - console.log(this.page.url()); - expect(this.page.url()).toContain('/virtualmachines/newWorkshop'); - } - - async selectProject(project_name: string = Util.WORKSHOP_PROJECT_NAME) { - console.log('Selecting project'); - await this.page.waitForTimeout(2000); - await this.page.locator(Util.by_data_test_id_str(this.PROJECT_SELECT)).isVisible(); - console.log(`Should select ${project_name}`); - await this.page.selectOption(Util.by_data_test_id_str(this.PROJECT_SELECT), { index: 0 }); - console.log('Project selected'); - } - async selectWorkshop(workshop_name: string = Util.WORKSHOP_NAME) { - await this.page.locator(Util.by_data_test_id_str(`${this.WORKSHOP_OPTION}${workshop_name}`)).click(); - } - - async startVMsForUsers(elixir_id_list: string[]) { - await this.fillForm(Util.DEFAULT_FLAVOR_NAME, Util.UBUNTU_18_TITLE, Util.CWLAB, elixir_id_list, false); - } - - async startVMsForUsersPrebuild(elixir_id_list: string[]) { - await this.fillForm(Util.DEFAULT_FLAVOR_NAME, this.PREBUILD_RESENV_IMAGE_PREFIX, '', elixir_id_list, true); - } - - async fillForm(flavor: string, image: string, resenv: string, user_elixir_ids: string[], prebuild: boolean = false) { - await this.page.locator(Util.by_data_test_id_str(`${this.FLAVOR_PREFIX}${flavor}`)).click(); - if (prebuild) { - await this.page.locator(Util.by_data_test_id_str(this.RESENV_IMAGE_TYPE_TAB)).click(); - const selectorString: string = `${this.IMAGE_PREFIX}${this.PREBUILD_RESENV_IMAGE_PREFIX}`; - await this.page.locator(Util.by_data_test_id_str_prefix(selectorString)).first().click(); - // eslint-disable-next-line @typescript-eslint/await-thenable - } else { - await this.page.locator(Util.by_data_test_id_str(`${this.IMAGE_PREFIX}${image}`)).click(); - await this.page.locator(Util.by_data_test_id_str(`${this.RESENV_PREFIX}${resenv}`)).click(); - } - - let add_buttons: Locator[] = await this.page.locator(Util.by_data_test_id_str_prefix(this.ADD_USER_PREFIX)).all(); - while (add_buttons.length !== 0) { - // eslint-disable-next-line no-await-in-loop - await add_buttons[0].click(); - // eslint-disable-next-line no-await-in-loop - add_buttons = await this.page.locator(Util.by_data_test_id_str_prefix(this.ADD_USER_PREFIX)).all(); - } - console.log('Users got added'); - await this.page.locator(Util.by_data_test_id_str(this.ANSIBLE_OKAY_CHECKBOX)).click(); - await this.page.locator(Util.by_data_test_id_str(this.RESPONSIBILITY_CHECKBOX)).click(); - await this.page.locator(Util.by_data_test_id_str(this.START_VMS_BUTTON)).click(); - await this.page.locator(Util.by_data_test_id_str(this.REDIRECT_MODAL)).isVisible(); - } -} diff --git a/tests/page_objects/workshop_overview.po.ts b/tests/page_objects/workshop_overview.po.ts deleted file mode 100644 index 297de6e3d8..0000000000 --- a/tests/page_objects/workshop_overview.po.ts +++ /dev/null @@ -1,160 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars,import/no-extraneous-dependencies -import { expect, Page, Response } from '@playwright/test'; -import { Util } from '../util'; - -/** - * Workshop Overview Page. - */ -export class WorkshopOverviewPage { - // GENERAL - private PROJECT_SELECT: string = 'projectSelect'; - - // ADD WORKSHOP - private NEW_WORKSHOP_BUTTON: string = 'new_workshop_button_id'; - private CREATE_WORKSHOP_BUTTON: string = 'create_workshop_button_id'; - private CREATION_STATUS_MODAL: string = 'creation_status_modal'; - private CREATION_STATUS_MESSAGE_FIELD: string = 'creation_status_message'; - private SUCCESS_ALERT: string = 'creation_success'; - private ERROR_ALERT: string = 'creation_failure'; - private CLOSE_CEATION_STATUS_MODAL: string = 'close_creation_status_modal'; - private LONGNAME_FIELD: string = 'workshop_longname'; - private SHORTNAME_FIELD: string = 'workshop_shortname'; - - // CLEANUP WORKSHOP - private CLEANUP_WORKSHOP_BUTTON: string = 'cleanup_workshop_button_id'; - private VERIFY_CLEANUP_MODAL: string = 'verify_delete_modal'; - private VERIFY_CLEANUP_BUTTON: string = 'confirm_delete_workshop_button'; - private DELETE_STATUS_MODAL: string = 'delete_status_modal'; - private DELETE_SUCCESS: string = 'delete_success_id'; - private CLOSE_DELETION_STATUS_MODAL: string = 'close_deletion_status'; - - // SELECT WORKSHOP - private WORKSHOP_OPTION: string = 'select_workshop_'; - - // WORKSHOP MEMBERS - private USER_ROW_PREFIX: string = 'user_'; - private USER_ROLE_PREFIX: string = 'user_role_'; - private USER_SUFFIX: string = 'Participant'; - private ADMIN_SUFFIX: string = 'Admin'; - private VM_NAME_PREFIX: string = 'vm_name_'; - private RESENV_URL_PREFIX: string = 'resenv_url_'; - - readonly page: Page; - readonly baseURL: string; - - constructor(page: Page, baseURL) { - this.page = page; - this.baseURL = baseURL; - } - - async goToWorkshopOverview() { - console.log('Goto Workshop overview Page'); - await this.page.goto(`${this.baseURL}/#/virtualmachines/workshopOverview`, { waitUntil: 'networkidle' }); - console.log(this.page.url()); - expect(this.page.url()).toContain('/virtualmachines/workshopOverview'); - console.log(await this.page.title()); - } - - async selectProject(project_name: string = Util.WORKSHOP_PROJECT_NAME) { - console.log('Selecting project'); - await this.page.waitForTimeout(2000); - await this.page.locator(Util.by_data_test_id_str(this.PROJECT_SELECT)).isVisible(); - console.log(`should select ${project_name}`); - await this.page.locator(Util.by_data_test_id_str(this.PROJECT_SELECT)).selectOption({ index: 0 }); - await this.page.locator(Util.by_data_test_id_str(this.NEW_WORKSHOP_BUTTON)).isVisible(); - console.log('Project selected'); - } - - async createNewWorkshop(workshop_name: string = Util.WORKSHOP_NAME) { - await this.page.locator(Util.by_data_test_id_str(this.NEW_WORKSHOP_BUTTON)).click(); - await this.page.type(Util.by_data_test_id_str(this.LONGNAME_FIELD), workshop_name); - await this.page.type(Util.by_data_test_id_str(this.SHORTNAME_FIELD), workshop_name); - await this.page.locator(Util.by_data_test_id_str(this.CREATE_WORKSHOP_BUTTON)).click(); - } - - async waitForSuccess() { - await this.page.locator(Util.by_data_test_id_str(this.CREATION_STATUS_MODAL)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.CREATION_STATUS_MESSAGE_FIELD)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.SUCCESS_ALERT)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.CLOSE_CEATION_STATUS_MODAL)).click(); - } - - async waitForError() { - await this.page.locator(Util.by_data_test_id_str(this.CREATION_STATUS_MODAL)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.CREATION_STATUS_MESSAGE_FIELD)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.ERROR_ALERT)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.CLOSE_CEATION_STATUS_MODAL)).click(); - } - - async createNewWorkshopWithSuccess(workshop_name: string = Util.WORKSHOP_NAME) { - await this.createNewWorkshop(workshop_name); - await this.waitForSuccess(); - } - - async createNewWorkshopWithError(workshop_name: string = Util.WORKSHOP_NAME) { - await this.createNewWorkshop(workshop_name); - await this.waitForError(); - } - - async selectWorkshop(workshop_name: string = Util.WORKSHOP_NAME) { - console.log(`Selecting workshop ${workshop_name}`); - await this.page.locator(Util.by_data_test_id_str(`${this.WORKSHOP_OPTION}${workshop_name}`)).click(); - } - - async hasUser(user_elixir_id: string) { - await this.page.locator(Util.by_data_test_id_str(`${this.USER_ROW_PREFIX}${user_elixir_id}`)).isVisible(); - } - - async userIsParticipant(user_elixir_id: string) { - await this.hasUser(user_elixir_id); - console.log(`Checking if user is participant for ${user_elixir_id}`); - const test_id_str: string = `${this.USER_ROLE_PREFIX}${user_elixir_id}${this.USER_SUFFIX}`; - await this.page.locator(Util.by_data_test_id_str(test_id_str)).isVisible(); - } - - async userIsAdmin(user_elixir_id: string) { - await this.hasUser(user_elixir_id); - console.log(`Checking if user is admin for ${user_elixir_id}`); - const test_id_str: string = `${this.USER_ROLE_PREFIX}${user_elixir_id}${this.ADMIN_SUFFIX}`; - await this.page.locator(Util.by_data_test_id_str(test_id_str)).isVisible(); - } - - async deleteWorkshop() { - await this.page.locator(Util.by_data_test_id_str(this.CLEANUP_WORKSHOP_BUTTON)).click(); - await this.page.locator(Util.by_data_test_id_str(this.VERIFY_CLEANUP_MODAL)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.VERIFY_CLEANUP_BUTTON)).click(); - await this.page.locator(Util.by_data_test_id_str(this.DELETE_STATUS_MODAL)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.DELETE_SUCCESS)).isVisible(); - await this.page.locator(Util.by_data_test_id_str(this.CLOSE_DELETION_STATUS_MODAL)).click(); - } - - async workshopHasVms(elixir_ids: string[]) { - for (const elixir_id of elixir_ids) { - console.log(`Checking workshop vm for ${elixir_id}`); - // eslint-disable-next-line no-await-in-loop - await this.getVmOfUser(elixir_id); - } - } - - async getResenvUrlOfUser(elixir_id: string): Promise { - const vm_name: string = await this.getVmOfUser(elixir_id); - - return this.getResEnvUrlOfVm(vm_name); - } - - async getVmOfUser(elixir_id: string): Promise { - const name = await this.page.locator(Util.by_data_test_id_str(`${this.VM_NAME_PREFIX}${elixir_id}`)).textContent(); - - return name.trim(); - } - - async getResEnvUrlOfVm(vm_name: string): Promise { - return await this.page.locator(Util.by_data_test_id_str(`${this.RESENV_URL_PREFIX}${vm_name}`)).textContent(); - } - - async visitResEnv(url: string) { - const response: Response = await this.page.goto(url, { waitUntil: 'networkidle' }); - - expect(response.status()).toEqual(200); - } -} diff --git a/tests/virtual_machines.spec.ts b/tests/virtual_machines.spec.ts deleted file mode 100644 index f002d33621..0000000000 --- a/tests/virtual_machines.spec.ts +++ /dev/null @@ -1,199 +0,0 @@ -import { test } from '@playwright/test'; -import { NewInstancePage } from './page_objects/new_instance.po'; -import { Util } from './util'; -import { InstanceOverviewPage } from './page_objects/instance_overview.po'; -import { ApplicationOverviewPage } from './page_objects/application_overview.po'; -import { VoOverviewPage } from './page_objects/vo_overview.po'; -import { FormularPage } from './page_objects/formular.po'; - -test.describe.serial('@instances', () => { - test.describe('Should delete old simple_vm_instances applications', () => { - test.use({ storageState: Util.VO_MANAGER_STORAGE }); - test('VO @instances', async ({ page, baseURL }) => { - test.setTimeout(60 * 1000); - const applicationPage = new ApplicationOverviewPage(page, baseURL); - await applicationPage.declineApplications(Util.INSTANCES_PROJECT_NAME); - const voOverviewPage = new VoOverviewPage(page, baseURL); - await voOverviewPage.terminateSimpleVMProjects(Util.INSTANCES_PROJECT_NAME); - }); - }); - - test.describe('Should request a simple_vm_instances application', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @instances', async ({ page, baseURL }) => { - const formularPage = new FormularPage(page, baseURL); - await formularPage.goToNewSimpleVMProject(); - await formularPage.fillApplicationFormular(Util.INSTANCES_PROJECT_NAME, true, false); - await formularPage.submitApplication(); - }); - }); - - test.describe('Should approve a simple_vm_instances application', () => { - test.use({ storageState: Util.VO_MANAGER_STORAGE }); - test('VO @instances', async ({ page, baseURL }) => { - const applicationPage = new ApplicationOverviewPage(page, baseURL); - await applicationPage.approveSimpleVm(Util.INSTANCES_PROJECT_NAME); - }); - }); - - test.describe('Should start a VM without volume', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @instances', async ({ page, baseURL }) => { - const addVMPage = new NewInstancePage(page, baseURL); - await addVMPage.goto(); - await addVMPage.selectProject(Util.INSTANCES_PROJECT_NAME); - await addVMPage.startNormalVM(Util.INSTANCES_PROJECT_NAME, Util.BASIC_VM_NAME, false); - }); - }); - - test.describe('Should start a VM with volume', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @instances', async ({ page, baseURL }) => { - const addVMPage = new NewInstancePage(page, baseURL); - await addVMPage.goto(); - await addVMPage.selectProject(Util.INSTANCES_PROJECT_NAME); - await addVMPage.startNormalVM(Util.INSTANCES_PROJECT_NAME, Util.VOLUME_VM_NAME, true); - }); - }); - - test.describe('Should start a VM with resenv (prebuild image)', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @instances', async ({ page, baseURL }) => { - const addVMPage = new NewInstancePage(page, baseURL); - await addVMPage.goto(); - await addVMPage.selectProject(Util.INSTANCES_PROJECT_NAME); - await addVMPage.startNormalVM(Util.INSTANCES_PROJECT_NAME, Util.RESENV_VM_NAME, false, true, true); - }); - }); - - /** - * unused as the prebuild version is used - * test.describe('Should start a VM with resenv', () => { - * test.use({ storageState: Util.MEMBER_STORAGE }); - * test('Member @instances', async ({ page, baseURL }) => { - * const addVMPage = new NewInstancePage(page, baseURL); - * await addVMPage.goto(); - * await addVMPage.selectProject(Util.INSTANCES_PROJECT_NAME); - * await addVMPage.startNormalVM(Util.INSTANCES_PROJECT_NAME, Util.RESENV_VM_NAME, false, true, false); - * }); - }); * */ - - test.describe('Should see basic VM as active in instance overview', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.BASIC_VM_NAME, 12 * 10000); - }); - }); - - test.describe('Should see volume VM as active with volume attached in instance overview', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.VOLUME_VM_NAME, 2 * 60000); - await vmOverviewPage.waitForInstanceToHaveVolumeAttached(Util.VOLUME_VM_NAME); - }); - }); - - test.describe('Should detach volume from volume VM in instance overview', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.VOLUME_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - await vmOverviewPage.detachVolume(Util.VOLUME_VM_NAME, Util.MIN_TIMEOUT_1); - }); - }); - - test.describe('Should attach volume to volume VM in instance overview', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.VOLUME_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - await vmOverviewPage.attachVolume(Util.VOLUME_VM_NAME, Util.MIN_TIMEOUT_1); - await vmOverviewPage.waitForInstanceToHaveVolumeAttached(Util.VOLUME_VM_NAME); - }); - }); - - test.describe('Should see resenv VM as active with resenv in instance overview', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - // TODO: if longer timeout has no effect, check what is the problem with the current checks - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.RESENV_VM_NAME, Util.MIN_TIMEOUT_45); - await vmOverviewPage.waitForInstanceToHaveResenv(Util.RESENV_VM_NAME); - }); - }); - - test.describe('Should stop basic active VM', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - await vmOverviewPage.stopVirtualMachine(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - }); - }); - - test.describe('Should resume basic active VM', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeShutoff(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - await vmOverviewPage.resumeVirtualMachine(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - }); - }); - - test.describe('Should soft reboot basic active VM', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - await vmOverviewPage.rebootVirtualMachine(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - }); - }); - - test.describe('Should delete basic active VM', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1 * 5); - test('Member @instances', async ({ page, baseURL }) => { - await page.waitForTimeout(5000); - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - await vmOverviewPage.waitForInstanceToBeActive(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - await vmOverviewPage.deleteVirtualMachine(Util.BASIC_VM_NAME, 2 * Util.MIN_TIMEOUT_1); - }); - }); - - test.describe('Aftercare - Should delete old simple_vm_instances applications', () => { - test.use({ storageState: Util.VO_MANAGER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1); - test('VO @instances', async ({ page, baseURL }) => { - const applicationPage = new ApplicationOverviewPage(page, baseURL); - await applicationPage.declineApplications(Util.INSTANCES_PROJECT_NAME); - const voOverviewPage = new VoOverviewPage(page, baseURL); - await voOverviewPage.terminateSimpleVMProjects(Util.INSTANCES_PROJECT_NAME); - }); - }); -}); diff --git a/tests/workshops.spec.ts b/tests/workshops.spec.ts deleted file mode 100644 index e630c7b0b3..0000000000 --- a/tests/workshops.spec.ts +++ /dev/null @@ -1,149 +0,0 @@ -import { test } from '@playwright/test'; -// @ts-ignore -import environment from './environment.json'; -import { Util } from './util'; -import { ApplicationOverviewPage } from './page_objects/application_overview.po'; -import { VoOverviewPage } from './page_objects/vo_overview.po'; -import { WorkshopOverviewPage } from './page_objects/workshop_overview.po'; -import { InstanceOverviewPage } from './page_objects/instance_overview.po'; -import { WorkshopInstancesPage } from './page_objects/workshop_instances.po'; -import { ProjectOverViewPage } from './page_objects/project_overview.po'; -import { FormularPage } from './page_objects/formular.po'; - -test.describe.serial('@workshops', () => { - test.describe('Should delete old workshop applications', () => { - test.use({ storageState: Util.VO_MANAGER_STORAGE }); - test('VO @workshops', async ({ page, baseURL }) => { - test.setTimeout(60 * 1000); - const applicationPage = new ApplicationOverviewPage(page, baseURL); - await applicationPage.declineApplications(Util.WORKSHOP_PROJECT_NAME); - const voOverviewPage = new VoOverviewPage(page, baseURL); - await voOverviewPage.terminateSimpleVMProjects(Util.WORKSHOP_PROJECT_NAME); - }); - }); - - test.describe('Should request a workshop application', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const formularPage = new FormularPage(page, baseURL); - await formularPage.goToNewSimpleVMProject(); - await formularPage.fillApplicationFormular(Util.WORKSHOP_PROJECT_NAME, true, false); - await formularPage.submitApplication(); - }); - }); - - test.describe('Should approve a workshop application', () => { - test.use({ storageState: Util.VO_MANAGER_STORAGE }); - test('VO @workshops', async ({ page, baseURL }) => { - const applicationPage = new ApplicationOverviewPage(page, baseURL); - await applicationPage.approveSimpleVm(Util.WORKSHOP_PROJECT_NAME); - }); - }); - - test.describe('Should add a member to workshop application', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const projectOverviewPage = new ProjectOverViewPage(page, baseURL); - await projectOverviewPage.goToProjectOverview(Util.WORKSHOP_PROJECT_NAME); - await projectOverviewPage.addMember(environment.email_fm); - }); - }); - - test.describe('Should create a workshop', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const workshopOverviewPage = new WorkshopOverviewPage(page, baseURL); - await workshopOverviewPage.goToWorkshopOverview(); - await workshopOverviewPage.selectProject(); - await workshopOverviewPage.createNewWorkshopWithSuccess(); - await workshopOverviewPage.createNewWorkshopWithError(); - }); - }); - - test.describe('Should have users', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const workshopOverviewPage = new WorkshopOverviewPage(page, baseURL); - await workshopOverviewPage.goToWorkshopOverview(); - await workshopOverviewPage.selectProject(); - await workshopOverviewPage.selectWorkshop(); - await workshopOverviewPage.userIsAdmin(environment.elixir_id_user); - await workshopOverviewPage.userIsParticipant(environment.elixir_id_fm); - }); - }); - - test.describe('Should start workshop vms', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const workshopInstancesPage = new WorkshopInstancesPage(page, baseURL); - await workshopInstancesPage.goToWorkshopInstances(); - await workshopInstancesPage.selectProject(); - await workshopInstancesPage.selectWorkshop(); - await workshopInstancesPage.startVMsForUsersPrebuild([environment.elixir_id_user, environment.elixir_id_fm]); - }); - }); - - test.describe('Should have vms active', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const vmOverviewPage = new InstanceOverviewPage(page, baseURL); - await vmOverviewPage.goto(); - const workshopMachines: string[] = await vmOverviewPage.expectWorkshopMachines(2); - const results: any[] = []; - for (const workshopMachine of workshopMachines) { - console.log(`Wating for ${workshopMachine}`); - // eslint-disable-next-line no-await-in-loop - results.push(vmOverviewPage.waitForInstanceToBeActive(workshopMachine.trim(), Util.MIN_TIMEOUT_30)); - } - - await Promise.all(results); - }); - }); - - test.describe('Should have instances on workshop overview', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const workshopOverviewPage = new WorkshopOverviewPage(page, baseURL); - await workshopOverviewPage.goToWorkshopOverview(); - await workshopOverviewPage.selectProject(); - await workshopOverviewPage.selectWorkshop(); - await workshopOverviewPage.workshopHasVms([environment.elixir_id_user, environment.elixir_id_fm]); - }); - }); - - /* - test.describe('Should login to resenv', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member and Admin @workshops', async ({ page, baseURL }) => { - const workshopOverviewPage = new WorkshopOverviewPage(page, baseURL); - await page.waitForTimeout(2000); - await workshopOverviewPage.goToWorkshopOverview(); - await workshopOverviewPage.selectProject(); - await workshopOverviewPage.selectWorkshop(); - const resenv_url_admin = await workshopOverviewPage.getResenvUrlOfUser(environment.elixir_id_user); - await workshopOverviewPage.visitResEnv(resenv_url_admin); - }); - }); - */ - test.describe('Should cleanup a workshop', () => { - test.use({ storageState: Util.MEMBER_STORAGE }); - test('Member @workshops', async ({ page, baseURL }) => { - const workshopOverviewPage = new WorkshopOverviewPage(page, baseURL); - await workshopOverviewPage.goToWorkshopOverview(); - await workshopOverviewPage.selectProject(); - await workshopOverviewPage.selectWorkshop(); - await workshopOverviewPage.deleteWorkshop(); - }); - }); - - test.describe('Aftercare - Should delete old workshop applications', () => { - test.use({ storageState: Util.VO_MANAGER_STORAGE }); - test.setTimeout(Util.MIN_TIMEOUT_1); - test('VO @workshops', async ({ page, baseURL }) => { - const applicationPage = new ApplicationOverviewPage(page, baseURL); - await applicationPage.declineApplications(Util.WORKSHOP_PROJECT_NAME); - const voOverviewPage = new VoOverviewPage(page, baseURL); - await voOverviewPage.terminateSimpleVMProjects(Util.WORKSHOP_PROJECT_NAME); - }); - }); -});