</button>
<div *ngIf="isCluster || !isCluster && !isKSU && !isProfile && getK8sType !== 'repo' " class="btn-group" placement="bottom-right" ngbDropdown
display="dynamic" container="body">
- <button type="button" class="btn btn-primary" [disabled]="!isCluster" ngbDropdownToggle placement="top"
+ <button type="button" class="btn btn-primary" [disabled]="!isCluster || state != 'CREATED'" ngbDropdownToggle placement="top"
container="body" ngbTooltip="{{'Attach Profile' | translate}}">
<i class="fas fa-link"></i>
</button>
</div>
</div>
<div *ngIf="((isCluster || !isCluster)&& !isKSU && !isProfile && getK8sType !== 'repo' )" class="btn-group" ngbDropdown display="dynamic" container="body">
- <button type="button" [disabled]="!isCluster" class="btn btn-primary dropdown-toggle action-button"
+ <button type="button" [disabled]="!isCluster || state != 'CREATED'" class="btn btn-primary dropdown-toggle action-button"
ngbDropdownToggle>
{{'ACTION' | translate}}
</button>
<div class="dropdown-menu list-action-dropdown" ngbDropdownMenu>
+ <button *ngIf="isCluster" type="button" class="btn btn-primary dropdown-item" placement="left"
+ (click)="editCluster('update')" container="body" ngbTooltip="{{'PAGE.K8S.UPDATECLUSTER' | translate}}">
+ <i class="fa fa-edit icons"></i> {{'PAGE.K8S.UPDATECLUSTER' | translate}}
+ </button>
<button *ngIf="isCluster" type="button" class="btn btn-primary dropdown-item" placement="left"
(click)="editCluster('upgrade')" container="body" ngbTooltip="{{'PAGE.K8S.UPGRADECLUSTER' | translate}}">
<i class="fa fa-arrow-up"></i> {{'PAGE.K8S.UPGRADECLUSTER' | translate}}
<h4 *ngIf="profileType === 'upgrade'" class="modal-title" id="modal-basic-title">{{'PAGE.K8S.UPGRADECLUSTER' |
translate}}
</h4>
+ <h4 *ngIf="profileType === 'update'" class="modal-title" id="modal-basic-title">{{'PAGE.K8S.UPDATECLUSTER' |
+ translate}}
+ </h4>
<h4 *ngIf="profileType === 'vertical'" class="modal-title" id="modal-basic-title">{{'PAGE.K8S.VERTICALSCALING' |
translate}}
</h4>
formControlName="name" id="name" [ngClass]="{ 'is-invalid': submitted && f.name.errors }" required>
</div>
</div>
+ <div class="form-group row mb-3" *ngIf="profileType === 'update'">
+ <label class="col-sm-4 col-form-label" for="name">{{'PAGE.K8S.NAME' | translate}}</label>
+ <div class="col-sm-8">
+ <input autocomplete="off" class="form-control" placeholder="{{'PAGE.K8S.NAME' | translate}}" type="text"
+ formControlName="update" id="name" [ngClass]="{ 'is-invalid': submitted && f.update.errors }">
+ </div>
+ </div>
<div class="form-group row mb-3" *ngIf="profileType === 'Manage'|| !isChecked">
<label class="col-sm-4 col-form-label" for="k8s_version">{{'PAGE.K8S.K8SVERSION' | translate}}*</label>
<div class="col-sm-8">
</ng-select>
</div>
</div>
- <div class="form-group row mb-3" *ngIf="profileType === 'Manage' || profileType === 'Register' || !isChecked">
+ <div class="form-group row mb-3" *ngIf="profileType === 'Manage' || profileType === 'Register' || !isChecked || profileType === 'update'">
<label class="col-sm-4 col-form-label" for="description">{{'PAGE.K8S.DESCRIPTION' | translate}}</label>
<div class="col-sm-8">
<textarea class="form-control" placeholder="{{'PAGE.K8S.DESCRIPTION' | translate}}" type="text"
<button type="button" class="btn btn-danger" (click)="activeModal.close()">{{'CANCEL' | translate}}</button>
<button *ngIf="profileType === 'Manage'" type="submit" class="btn btn-primary">{{'CREATE' | translate}}</button>
<button *ngIf="profileType === 'Register'" type="submit" class="btn btn-primary">{{'REGISTER' | translate}}</button>
- <button *ngIf="profileType === 'upgrade' || profileType === 'vertical' || profileType === 'horizontal'"
+ <button *ngIf="profileType === 'upgrade' || profileType === 'vertical' || profileType === 'horizontal' || profileType === 'update'"
type="submit" class="btn btn-primary">{{'APPLY'
| translate}}</button>
</div>
import { APIURLHEADER, ERRORDATA, MODALCLOSERESPONSEDATA, TYPESECTION } from 'CommonModel';
import { environment } from 'environment';
import * as jsyaml from 'js-yaml';
-import { K8SPayload } from 'K8sModel';
+import { K8SCLUSTERDATA, K8SPayload } from 'K8sModel';
import { RestService } from 'RestService';
import { isNullOrUndefined, SharedService } from 'SharedService';
import { VimAccountDetails } from 'VimAccountModel';
/** Contains all deployment methods selected */
public selectedDeploymentMethods: string[] = ['helm-chart-v3', 'juju-bundle'];
+ /** Contains all action types */
+ public actionTypes: string[] = ['update', 'upgrade', 'horizontal', 'vertical'];
+
/** Instance for active modal service @public */
public activeModal: NgbActiveModal;
'Content-Type': 'application/json',
'Cache-Control': 'no-cache, no-store, must-revalidate, max-age=0'
});
+ this.actionTypes.forEach((type: string): void => {
+ if (type === this.profileType) {
+ this.k8sClusterDetail();
+ }
+ });
}
/** On modal initializing forms @public */
bootstrap: [true],
k8sVersion: ['', [Validators.required]],
nodeCount: ['', [Validators.required]],
- nodeSize: ['', [Validators.required]]
+ nodeSize: ['', [Validators.required]],
+ update: ['']
});
}
});
}
+ /** patch the form values for edit @public */
+ public k8sClusterDetail(): void {
+ this.isLoadingResults = true;
+ this.restService.getResource(environment.K8SCREATECLUSTER_URL + '/' + this.profileID).subscribe((k8sData: K8SCLUSTERDATA) => {
+ if (this.profileType === 'update') {
+ this.k8sclusterForm.patchValue({ update: k8sData.name, description: !isNullOrUndefined(k8sData.description) ? k8sData.description : '' });
+ } else if (this.profileType === 'upgrade') {
+ this.k8sclusterForm.patchValue({ k8sVersion: !isNullOrUndefined(k8sData.k8s_version) ? k8sData.k8s_version : '' });
+ } else if (this.profileType === 'horizontal') {
+ this.k8sclusterForm.patchValue({ nodeCount: !isNullOrUndefined(k8sData.node_count) ? k8sData.node_count : '' });
+ } else if (this.profileType === 'vertical') {
+ this.k8sclusterForm.patchValue({ nodeSize: !isNullOrUndefined(k8sData.node_size) ? k8sData.node_size : '' });
+ }
+ this.isLoadingResults = false;
+ }, (error: ERRORDATA) => {
+ this.restService.handleError(error, 'get');
+ this.isLoadingResults = false;
+ });
+ }
+
/** Call the event when checkbox is checked @public */
public getValue(event: Event): void {
this.isChecked = (event.target as HTMLInputElement).checked;
this.getFormControl('k8sVersion').disable();
this.getFormControl('nodeSize').disable();
this.getFormControl('nodeCount').disable();
+ this.getFormControl('update').disable();
this.manageCluster();
} else if (this.profileType === 'Register' && this.isChecked === true) {
this.clusterUrl = environment.K8SCREATECLUSTER_URL + '/register';
this.getFormControl('k8sVersion').disable();
this.getFormControl('nodeSize').disable();
this.getFormControl('nodeCount').disable();
+ this.getFormControl('update').disable();
this.registerCluster();
} if (this.isChecked === false && this.profileType === 'Register') {
this.clusterUrl = environment.K8SCLUSTER_URL;
this.getFormControl('k8sVersion').disable();
this.getFormControl('nodeSize').disable();
this.getFormControl('nodeCount').disable();
+ this.getFormControl('update').disable();
this.oldregisterCluster();
} else if (this.profileType === 'upgrade' || this.profileType === 'horizontal' || this.profileType === 'vertical') {
this.clusterUrl = environment.K8SCREATECLUSTER_URL + '/' + this.profileID + '/' + 'update';
this.getFormControl('node_count').disable();
this.getFormControl('node_size').disable();
this.getFormControl('k8s_version').disable();
+ this.getFormControl('update').disable();
if (this.profileType === 'upgrade') {
this.getFormControl('nodeCount').disable();
this.getFormControl('nodeSize').disable();
this.getFormControl('k8sVersion').disable();
}
this.updateCluster();
+ } else if (this.profileType === 'update') {
+ this.clusterUrl = environment.K8SCREATECLUSTER_URL + '/' + this.profileID;
+ this.getFormControl('bootstrap').disable();
+ this.getFormControl('region_name').disable();
+ this.getFormControl('resource_group').disable();
+ this.getFormControl('nets').disable();
+ this.getFormControl('credentials').disable();
+ this.getFormControl('deployment_methods').disable();
+ this.getFormControl('vim_account').disable();
+ this.getFormControl('node_count').disable();
+ this.getFormControl('node_size').disable();
+ this.getFormControl('k8s_version').disable();
+ this.getFormControl('nodeCount').disable();
+ this.getFormControl('k8sVersion').disable();
+ this.getFormControl('nodeSize').disable();
+ this.getFormControl('name').disable();
+
+ this.editCluster();
}
}
});
}
+
+ /** Update cluster @public */
+ public editCluster(): void {
+ this.submitted = true;
+ this.sharedService.cleanForm(this.k8sclusterForm);
+ if (this.k8sclusterForm.invalid) {
+ return;
+ }
+ const modalData: MODALCLOSERESPONSEDATA = {
+ message: 'Done'
+ };
+ const apiURLHeader: APIURLHEADER = {
+ url: this.clusterUrl,
+ httpOptions: { headers: this.headers }
+ };
+ this.isLoadingResults = true;
+ if (this.k8sclusterForm.value.description === '') {
+ delete this.k8sclusterForm.value.description;
+ this.payload = {
+ name: this.k8sclusterForm.value.update
+ };
+ }
+ if (this.k8sclusterForm.value.update === '') {
+ delete this.k8sclusterForm.value.update;
+ this.payload = {
+ description: this.k8sclusterForm.value.description
+ };
+ }
+ if (this.k8sclusterForm.value.update !== '' && this.k8sclusterForm.value.description !== '') {
+ this.payload = {
+ name: this.k8sclusterForm.value.update,
+ description: this.k8sclusterForm.value.description
+ };
+ }
+ this.restService.patchResource(apiURLHeader, this.payload).subscribe((result: {}) => {
+ this.activeModal.close(modalData);
+ this.isLoadingResults = false;
+ this.notifierService.notify('success',
+ this.translateService.instant('PAGE.K8S.UPDATEDSUCCESSFULLY'));
+ }, (error: ERRORDATA) => {
+ this.restService.handleError(error, 'post');
+ this.isLoadingResults = false;
+ });
+ }
+
/** Nets file process @private */
public netsFile(files: FileList): void {
if (files && files.length === 1) {
name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' },
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' },
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
<i class="fas fa-times-circle text-danger"></i>
</button>
</div>
- <div class="modal-body modal-body-custom-height">
+ <div class="modal-body modal-body-custom-height" *ngIf="isAdd">
<div class="form-group row mb-3">
<label class="col-sm-12 col-form-label mandatory-label"
[ngClass]="{'text-danger': profileForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' |
</div>
</div>
</div>
+ <div class="modal-body modal-body-custom-height"*ngIf="isEdit">
+ <div class="form-group row mb-3">
+ <label class="col-sm-12 col-form-label mandatory-label"
+ [ngClass]="{'text-danger': profileForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' |
+ translate}}</label>
+ <label class="col-sm-4 col-form-label" for="name">{{'PAGE.K8S.NAME' | translate}}</label>
+ <div class="col-sm-8">
+ <input autocomplete="off" class="form-control" placeholder="{{'PAGE.K8S.NAME' | translate}}" type="text"
+ formControlName="updatename" id="name" [ngClass]="{ 'is-invalid': submitted && f.updatename.errors }">
+ </div>
+ </div>
+ <div class="form-group row mb-3">
+ <label class="col-sm-4 col-form-label" for="description">{{'PAGE.K8S.DESCRIPTION' | translate}}</label>
+ <div class="col-sm-8">
+ <textarea class="form-control" placeholder="{{'PAGE.K8S.DESCRIPTION' | translate}}" type="text"
+ formControlName="updatedescription" id="description"
+ [ngClass]="{ 'is-invalid': submitted && f.updatedescription.errors }"></textarea>
+ </div>
+ </div>
+ </div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" (click)="activeModal.close()">{{'CANCEL' | translate}}</button>
<button *ngIf="isAdd" type="submit" class="btn btn-primary">{{'CREATE' | translate}}</button>
* @file K8sInfraConfigAddComponent.ts.
*/
import { HttpHeaders } from '@angular/common/http';
-import { Component,Injector, Input, OnInit} from '@angular/core';
+import { Component, Injector, Input, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';
import { NotifierService } from 'angular-notifier';
import { APIURLHEADER, ERRORDATA, MODALCLOSERESPONSEDATA, TYPESECTION, URLPARAMS } from 'CommonModel';
import { environment } from 'environment';
-import { INFRACONFIGPAYLOAD} from 'K8sModel';
+import { INFRACONFIGPAYLOAD } from 'K8sModel';
import { RestService } from 'RestService';
import { SharedService, isNullOrUndefined } from 'SharedService';
/**
/** Input contains Modal dialog component Instance @public */
@Input() public profileDescription: string;
- /** check Add @public */
- public isAdd = false;
+ /** check Add @public */
+ public isAdd = false;
- /** check Edit @public */
- public isEdit = false;
+ /** check Edit @public */
+ public isEdit = false;
+
+ /** Edit Payload @public */
+ public payload: INFRACONFIGPAYLOAD;
/** FormBuilder instance added to the formBuilder @private */
private formBuilder: FormBuilder;
this.profileForm = this.formBuilder.group({
name: ['', [Validators.required]],
default: [null],
- description: ['', [Validators.required]]
+ description: ['', [Validators.required]],
+ updatename: [''],
+ updatedescription: ['']
});
}
};
this.isLoadingResults = true;
+ delete this.profileForm.value.updatename;
+ delete this.profileForm.value.updatedescription;
const payload: INFRACONFIGPAYLOAD = {
name: this.profileForm.value.name,
description: this.profileForm.value.description
url: this.profileUrl,
httpOptions: { headers: this.headers }
};
- const payload: INFRACONFIGPAYLOAD = {
- name: this.profileForm.value.name,
- description: this.profileForm.value.description
- };
+ delete this.profileForm.value.name;
+ delete this.profileForm.value.description;
+ if (this.profileForm.value.updatename === '') {
+ this.payload = {
+ description: this.profileForm.value.updatedescription
+ };
+ delete this.profileForm.value.updatename;
+ } else if (this.profileForm.value.updatedescription === '') {
+ this.payload = {
+ name: this.profileForm.value.updatename
+ };
+ delete this.profileForm.value.updatedescription;
+ } else {
+ this.payload = {
+ name: this.profileForm.value.updatenamename,
+ description: this.profileForm.value.updatedescription
+ };
+ }
- this.restService.patchResource(apiURLHeader, payload).subscribe((result: {}) => {
+ this.restService.patchResource(apiURLHeader, this.payload).subscribe((result: {}) => {
this.activeModal.close(modalData);
this.isLoadingResults = false;
this.notifierService.notify('success',
name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' },
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' },
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '15%' },
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
}
},
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
/** Fetching the data from server to Load in the smarttable @protected */
protected generateData(): void {
this.isLoadingResults = true;
- const tempURL: Observable<K8SCLUSTERDATA[]>[] = [];
- const apiUrl1: string = environment.K8SCLUSTER_URL;
- const apiUrl2: string = environment.K8SCREATECLUSTER_URL;
- const response1$: Observable<K8SCLUSTERDATA[]> = this.restService.getResource(apiUrl1).pipe(
- map((data: unknown) =>
- data as K8SCLUSTERDATA[]
- )
- );
- const response2$: Observable<K8SCLUSTERDATA[]> = this.restService.getResource(apiUrl2).pipe(
- map((data: unknown) =>
- data as K8SCLUSTERDATA[]
- )
- );
- tempURL.push(response1$, response2$);
- forkJoin(tempURL).subscribe(
- ([response1, response2]) => {
- if (!isNullOrUndefined(response1) && !isNullOrUndefined(response2)) {
- const combinedResponse: K8SCLUSTERDATA[] = [...response1, ...response2];
- const uniqueResponse = this.removeDuplicates(combinedResponse);
- this.k8sClusterData = [];
- uniqueResponse.forEach((clusterData: K8SCLUSTERDATA) => {
- const k8sClusterDataObj: K8SCLUSTERDATADISPLAY = this.generateK8sclusterData(clusterData);
- this.k8sClusterData.push(k8sClusterDataObj);
- });
- if (this.k8sClusterData.length > 0) {
- this.checkDataClass = 'dataTables_present';
- } else {
- this.checkDataClass = 'dataTables_empty';
- }
- this.dataSource.load(this.k8sClusterData).then((data: boolean) => {
- this.isLoadingResults = false;
- }).catch(() => {
- this.isLoadingResults = false;
- });
+ this.restService.getResource(environment.K8SCREATECLUSTER_URL).subscribe((k8sClusterDatas: K8SCLUSTERDATA[]) => {
+ if (!isNullOrUndefined(k8sClusterDatas)) {
+ this.k8sClusterData = [];
+ k8sClusterDatas.forEach((clusterData: K8SCLUSTERDATA) => {
+ const k8sClusterDataObj: K8SCLUSTERDATADISPLAY = this.generateK8sclusterData(clusterData);
+ this.k8sClusterData.push(k8sClusterDataObj);
+ });
+ if (this.k8sClusterData.length > 0) {
+ this.checkDataClass = 'dataTables_present';
+ } else {
+ this.checkDataClass = 'dataTables_empty';
}
- }, (error: ERRORDATA) => {
- this.restService.handleError(error, 'get');
- this.isLoadingResults = false;
- });
- }
-
- /** Removes duplicates based on 'name' and merges them if necessary */
- private removeDuplicates(response: K8SCLUSTERDATA[]): K8SCLUSTERDATA[] {
- const seenIds = new Set();
- const uniqueResponse: K8SCLUSTERDATA[] = [];
- response.forEach((obj) => {
- if (!seenIds.has(obj.name)) {
- uniqueResponse.push(obj);
- seenIds.add(obj.name);
- } else {
- const existingObj = uniqueResponse.find((o) => o.name === obj.name);
- Object.keys(obj).forEach((key) => {
- // eslint-disable-next-line security/detect-object-injection
- if (existingObj[key] !== obj[key]) {
- // eslint-disable-next-line security/detect-object-injection
- existingObj[key] = obj[key];
- }
+ this.dataSource.load(this.k8sClusterData).then((data: boolean) => {
+ this.isLoadingResults = false;
+ }).catch(() => {
+ this.isLoadingResults = false;
});
}
+ }, (error: ERRORDATA) => {
+ this.restService.handleError(error, 'get');
+ this.isLoadingResults = false;
});
- return uniqueResponse;
}
}
name: { title: this.translateService.instant('NAME'), width: '15%', sortDirection: 'asc' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '20%' },
state: {
- title: this.translateService.instant('STATE'), width: '15%', type: 'html',
+ title: this.translateService.instant('GITSTATE'), width: '15%', type: 'html',
filter: {
type: 'list',
config: {
public composeOKAPackage(): void {
// eslint-disable-next-line security/detect-non-literal-fs-filename
const modalRef: NgbModalRef = this.modalService.open(ComposePackages, { backdrop: 'static' });
- modalRef.componentInstance.params = { page: 'oka-packages' };
+ modalRef.componentInstance.params = { page: 'oka-packages', operationType: 'add' };
modalRef.result.then((result: MODALCLOSERESPONSEDATA) => {
if (result) {
this.sharedService.callData();
-->
<form [formGroup]="packagesForm" (ngSubmit)="createPackages()" autocomplete="off">
<div class="modal-header">
- <h4 class="modal-title" *ngIf="params.page === 'vnf-packages' || params.page === 'ns-packages'"
+ <h4 class="modal-title" *ngIf="params.page === 'vnf-package' || params.page === 'ns-package'"
id="modal-basic-title">{{'CREATEPACKAGE' | translate}}</h4>
<h4 class="modal-title" *ngIf="params.page === 'ns-config-template'" id="modal-basic-title">
{{'PAGE.NSCONFIGTEMPLATE.CREATENSCONFIGTEMPLATE' | translate}}</h4>
<label class="col-sm-12 col-form-label mandatory-label"
[ngClass]="{'text-danger': packagesForm.invalid === true && submitted === true}">{{'MANDATORYCHECK' |
translate}}</label>
- <label class="col-sm-6 col-form-label" *ngIf="!template else configtemplate">{{'PACKAGE' | translate}} {{'NAME' |
- translate}}*</label>
- <ng-template #configtemplate>
- <label class="col-sm-6 col-form-label">{{'NAME' | translate}}*</label>
- </ng-template>
+ <label class="col-sm-6 col-form-label" *ngIf="!template && !oka">{{'PACKAGE' | translate}} {{'NAME' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" *ngIf="!template && params.page === 'oka-packages'">{{'PACKAGE' | translate}} {{'NAME' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" *ngIf="!template && params.page === 'oka-packages-edit'">{{'PACKAGE' | translate}} {{'NAME' | translate}}</label>
+ <label class="col-sm-6 col-form-label" *ngIf="template">{{'NAME' | translate}}*</label>
<div class="col-sm-6">
<input type="text" class="form-control" placeholder="{{'NAME' | translate}}" formControlName="name" id="name"
[ngClass]="{ 'is-invalid': submitted && f.name.errors }" required>
</div>
</div>
<div class="form-group row mb-3" *ngIf="oka">
- <label class="col-sm-6 col-form-label" for="description">{{'PAGE.K8S.DESCRIPTION' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" for="profile_type"
+ *ngIf="params.page === 'oka-packages'">{{'PAGE.K8S.PROFILETYPE' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" for="profile_type"
+ *ngIf="params.page === 'oka-packages-edit'">{{'PAGE.K8S.PROFILETYPE' | translate}}</label>
+ <div class="col-sm-6">
+ <ng-select placeholder="{{'SELECT' | translate}} {{'TYPE' | translate}}" [items]="profileSelect"
+ bindLabel="title" bindValue="value" formControlName="profile_type" id="profile_type"
+ [ngClass]="{ 'is-invalid': submitted && f.profile_type.errors }" required>
+ </ng-select>
+ </div>
+ </div>
+ <div class="form-group row mb-3" *ngIf="oka">
+ <label class="col-sm-6 col-form-label" for="description"
+ *ngIf="params.page === 'oka-packages'">{{'PAGE.K8S.DESCRIPTION' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" for="description"
+ *ngIf="params.page === 'oka-packages-edit'">{{'PAGE.K8S.DESCRIPTION' | translate}}</label>
<div class="col-sm-6">
<textarea class="form-control" placeholder="{{'PAGE.K8S.DESCRIPTION' | translate}}" type="text"
formControlName="description" id="description" [ngClass]="{ 'is-invalid': submitted && f.description.errors }"
</div>
</div>
<div class="form-group row mb-3" *ngIf="oka">
- <label class="col-sm-6 col-form-label">{{'PACKAGE' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" *ngIf="params.page === 'oka-packages'">{{'PACKAGE' | translate}}*</label>
+ <label class="col-sm-6 col-form-label" *ngIf="params.page === 'oka-packages-edit'">{{'PACKAGE' | translate}}</label>
<div class="col-sm-6">
<label for="fileInput" class="custom-file-upload" *ngIf="this.params.page === 'oka-packages-edit'">
<input type="file" #fileInput class="fileupload custom-file-input" formControlName="package"
<div class="modal-footer">
<button type="button" class="btn btn-danger" (click)="activeModal.close()">{{'CANCEL' | translate}}</button>
<button
- *ngIf="params.page === 'ns-config-template' || params.page === 'oka-packages' || params.page === 'vnf-packages' || params.page === 'ns-packages'"
+ *ngIf="params.page === 'ns-config-template' || params.page === 'oka-packages' || params.page === 'vnf-package' || params.page === 'ns-package'"
type="submit" class="btn btn-primary">{{'CREATE' | translate}}</button>
<button *ngIf="params.page === 'ns-config-template-edit' || params.page === 'oka-packages-edit'" type="submit"
class="btn btn-primary">{{'Edit' | translate}}</button>
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';
import { NotifierService } from 'angular-notifier';
-import { APIURLHEADER, ERRORDATA, MODALCLOSERESPONSEDATA, URLPARAMS } from 'CommonModel';
+import { APIURLHEADER, ERRORDATA, MODALCLOSERESPONSEDATA, TYPESECTION, URLPARAMS } from 'CommonModel';
import { DataService } from 'DataService';
import { environment } from 'environment';
import * as jsyaml from 'js-yaml';
/** Contains selected file name @public */
public selectedFileName: string = 'Choose file...';
+ /** Contains all profile methods */
+ public profileSelect: TYPESECTION[] = [];
+
+ /** Contains all profile methods */
+ public operationType: string;
+
/** Element ref for fileInputConfig @public */
@ViewChild('fileInputConfig') fileInputConfig: ElementRef<HTMLInputElement>;
this.router = this.injector.get(Router);
this.translateService = this.injector.get(TranslateService);
this.sharedService = this.injector.get(SharedService);
+ this.profileSelect = [
+ {
+ title: 'Infra Config Profile',
+ value: 'infra_config_profiles'
+ },
+ {
+ title: 'Infra Controller Profile',
+ value: 'infra_controller_profiles'
+ }, {
+ title: 'App Profile',
+ value: 'app_profiles'
+ }, {
+ title: 'Resource Profile',
+ value: 'resource_profiles'
+ }
+ ];
}
/** convenience getter for easy access to form fields */
this.template = true;
this.oka = false;
this.getNsdPackageDetails();
+ this.getFormControl('profile_type').disable();
this.getFormControl('description').disable();
} else if (this.params.page === 'ns-config-template-edit') {
this.template = true;
this.oka = false;
this.getNsdPackageDetails();
+ this.getFormControl('profile_type').disable();
this.getFormControl('nsdId').disable();
this.getFormControl('description').disable();
} else if (this.params.page === 'oka-packages') {
this.template = false;
this.getFormControl('nsdId').disable();
this.getFormControl('config').disable();
+ this.getFormControl('profile_type').disable();
this.getFormControl('description').disable();
}
+ this.operationType = this.params.operationType;
+ this.setValidatorsForOperation();
}
/** initialize Forms @public */
name: ['', [Validators.required]],
nsdId: [null, [Validators.required]],
config: [null],
+ profile_type: [null],
description: ['', [Validators.required]],
package: ['']
});
}
+ /** Get NSD Package details @public */
+ public setValidatorsForOperation(): void {
+ if (this.params.page === 'oka-packages') {
+ this.packagesForm.get('name').setValidators([Validators.required]);
+ this.packagesForm.get('description').setValidators([Validators.required]);
+ this.packagesForm.get('package').setValidators([Validators.required]);
+ this.packagesForm.get('profile_type').setValidators([Validators.required]);
+ } else if (this.params.page === 'oka-packages-edit') {
+ this.packagesForm.get('profile_type').clearValidators();
+ this.packagesForm.get('name').clearValidators();
+ this.packagesForm.get('description').clearValidators();
+ this.packagesForm.get('package').clearValidators();
+ }
+ this.packagesForm.get('profile_type').updateValueAndValidity();
+ this.packagesForm.get('name').updateValueAndValidity();
+ this.packagesForm.get('description').updateValueAndValidity();
+ this.packagesForm.get('package').updateValueAndValidity();
+ }
+
/** Get NSD Package details @public */
public getNsdPackageDetails(): void {
this.package_name = nsdPackageData.name;
const package_file = nsdPackageData._admin.storage.zipfile;
this.selectedFileName = package_file;
- this.packagesForm.patchValue({ name: this.package_name, description: nsdPackageData.description });
+ this.packagesForm.patchValue({ name: this.package_name, description: nsdPackageData.description, profile_type: nsdPackageData.profile_type });
this.fileInput.nativeElement.value = null;
}, (error: ERRORDATA): void => {
this.restService.handleError(error, 'get');
public okaEdit(): void {
// eslint-disable-next-line security/detect-non-literal-fs-filename
const modalRef: NgbModalRef = this.modalService.open(ComposePackages, { backdrop: 'static' });
- modalRef.componentInstance.params = { id: this.okaID, page: 'oka-packages-edit' };
+ modalRef.componentInstance.params = { id: this.okaID, page: 'oka-packages-edit', operationType: 'edit' };
modalRef.result.then((result: MODALCLOSERESPONSEDATA) => {
if (result) {
this.sharedService.callData();
"OPERATIONALSTATUS": "Betriebs Status",
"OPERATIONALSTATE": "Betriebszustand",
"STATE": "Staat",
+ "GITSTATE": "Git-Status",
"CONFIGSTATUS": "Konfigurations Status",
"DETAILEDSTATUS": "Detaillierter Status",
"NSDNAME": "Nsd name",
"HORIZONTALSCALING": "Horizontale Skalierung",
"VERTICALSCALING": "Vertikale Skalierung",
"BOOTSTRAP": "Bootstrap",
- "BOOTSTRAPINFO": "Bereite dich auf GitOps vor"
+ "BOOTSTRAPINFO": "Bereite dich auf GitOps vor",
+ "UPDATECLUSTER": "Cluster aktualisieren"
},
"OSMREPO": {
"MENUOSMREPO": "OSM-Repositorys",
"OPERATIONALSTATUS": "Operational Status",
"OPERATIONALSTATE": "Operational State",
"STATE": "State",
+ "GITSTATE": "Git State",
"CONFIGSTATUS": "Config Status",
"DETAILEDSTATUS": "Detailed Status",
"NSDNAME": "Nsd name",
"HORIZONTALSCALING": "Horizontal Scaling",
"VERTICALSCALING": "Vertical Scaling",
"BOOTSTRAP": "Bootstrap",
- "BOOTSTRAPINFO": "Prepare for GitOps"
+ "BOOTSTRAPINFO": "Prepare for GitOps",
+ "UPDATECLUSTER": "Update Cluster"
},
"OSMREPO": {
"MENUOSMREPO": "OSM Repositories",
"OPERATIONALSTATE": "Estado operacional",
"CONFIGSTATUS": "Estado de configuración",
"STATE": "Estado",
+ "GITSTATE": "Estado de Git",
"DETAILEDSTATUS": "Estado detallado",
"NSDNAME": "Nombre nsd",
"NSTNAME": "Nst name",
"HORIZONTALSCALING": "Escalado Horizontal",
"VERTICALSCALING": "Escalado Vertical",
"BOOTSTRAP": "Bootstrap",
- "BOOTSTRAPINFO": "Prepárate para GitOps"
+ "BOOTSTRAPINFO": "Prepárate para GitOps",
+ "UPDATECLUSTER": "Actualizar clúster"
},
"OSMREPO": {
"MENUOSMREPO": "Repositorios OSM",
"OPERATIONALSTATUS": "Estado operacional",
"OPERATIONALSTATE": "Estado operacional",
"STATE": "Estado",
+ "GITSTATE": "Estado do Git",
"CONFIGSTATUS": "Status da configuração",
"DETAILEDSTATUS": "Status detalhado",
"NSDNAME": "Nome nsd",
"HORIZONTALSCALING": "Escalonamento Horizontal",
"VERTICALSCALING": "Escalonamento Vertical",
"BOOTSTRAP": "Bootstrap",
- "BOOTSTRAPINFO": "Prepare-se para GitOps"
+ "BOOTSTRAPINFO": "Prepare-se para GitOps",
+ "UPDATECLUSTER": "Atualizar cluster"
},
"OSMREPO": {
"MENUOSMREPO": "Repositórios OSM",
createdbyosm?: string;
bootstrap?: boolean;
key?: boolean;
+ operationType?: string;
}
/** Handle the Delete params */
export interface DELETEPARAMS {
created?: string;
bootstrap?: boolean;
key?: string;
+ node_count?: number;
+ node_size?: number;
}
/** Interface for K8SCLUSTERDATA */
export interface K8SREPODATA {
kdu?: [];
name?: string;
state?: string;
+ profile_type?: string;
}
/** Interface for DF */
export interface VNFCONFIG {
projects / osm / NG-UI.git / commitdiff