aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/vnfs/build-artifacts/reference-dataform
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-03-06 12:11:34 -0800
committerPatrick Brady <patrick.brady@att.com>2019-03-06 12:12:36 -0800
commiteedac3e312c66499ca5ff9d72388c31b25813225 (patch)
tree4cc2f22a0a36ba97823b70fe27ed667383173f0a /src/app/vnfs/build-artifacts/reference-dataform
parent611c9da62c2e266f9facd97dc9f340ce311060a3 (diff)
Revert "multiple asible servers support"
Some functionality was accidentally removed This reverts commit 611c9da62c2e266f9facd97dc9f340ce311060a3. Change-Id: I1aefbbc0ede8cdda59acc8bdf7b047e506aad813 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1510
Diffstat (limited to 'src/app/vnfs/build-artifacts/reference-dataform')
-rw-r--r--src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.css5
-rw-r--r--src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.html100
-rw-r--r--src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.ts1489
-rw-r--r--src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.util.ts15
4 files changed, 778 insertions, 831 deletions
diff --git a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.css b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.css
index a795f2a..1b4c470 100644
--- a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.css
+++ b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.css
@@ -134,7 +134,4 @@ td {
.file {
visibility: hidden;
position: absolute;
-}
-
-.col-md-1point5 {width: 12%}
-.col-md-2point5 {width: 21%;}
+} \ No newline at end of file
diff --git a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.html b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.html
index 65847e1..564cd32 100644
--- a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.html
+++ b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.html
@@ -44,19 +44,18 @@ limitations under the License.
<span class="error-message" [hidden]="vnfParams?.vnfType || vnftype.valid || (vnftype.pristine && !userForm.submitted)">Required Field</span>
</div>
- <div class="col-lg-3 col-sm-6 col-md-3 col-xs-12" *ngIf="((displayVnfc=='true') || isVnfcType) && (referenceDataObject['action']=='Configure' || referenceDataObject['action']=='ConfigModify')">
- <label>VNFC Type</label> <label style="font-size:12px;">(NFC Function)</label>
+ <div class="col-lg-3 col-sm-6 col-md-3 col-xs-12" *ngIf="((displayVnfc=='true') || isVnfcType) && (referenceDataObject['action']=='Configure' || referenceDataObject['action']=='ConfigModify' || referenceDataObject['action']=='DistributeTraffic')">
+ <label>VNFC Type</label>
<input *ngIf="isVnfcType" type="text" class="form-control" readonly id="txtVnfcType" [(ngModel)]="referenceDataObject.scope['vnfc-type']" (blur)="setVnfcType($event.target.value)" (ngModelChange)="updateSessionValues($event,'vnfcType')" #vnfcType="ngModel"
name="vnfcType">
- <select *ngIf="isVnfcTypeList" class="form-control" id="vnfcType" (ngModelChange)="vnfcChanged($event,userForm)" [ngModel]="vnfcIdentifier" #deviceProtocol="ngModel" name="templateIdentifier">
+ <select *ngIf="isVnfcTypeList" class="form-control" id="vnfcType" (ngModelChange)="vnfcChanged($event,content,userForm)" [ngModel]="vnfcIdentifier" #deviceProtocol="ngModel" name="templateIdentifier">
<option [value]="val" *ngFor="let val of referenceDataObject.scope['vnfc-type-list']">{{val}}
</option>
</select>
<a *ngIf="isVnfcTypeList" style=" color: blue;" href="javascript:void(0)" (click)="vnfcModal.open()">Add New VNFC Type</a>
</div>
-
- <div class="col-lg-3 col-sm-6 col-md-3 col-xs-12" *ngIf="displayVnfc!='true' || (referenceDataObject['action']!='Configure' && referenceDataObject['action']!='ConfigModify')">
+ <div class="col-lg-3 col-sm-6 col-md-3 col-xs-12" *ngIf="displayVnfc!='true' || (referenceDataObject['action']!='Configure' && referenceDataObject['action']!='ConfigModify' && referenceDataObject['action']!='DistributeTraffic')">
</div>
<div class="col-lg-3 col-sm-6 col-md-3 col-xs-12">
<label>Device Protocol*</label>
@@ -73,19 +72,16 @@ limitations under the License.
<option [value]="val" *ngFor="let val of referenceDataObject['template-id-list']">{{val}}
</option>
</select>
- <!-- <span class="error-message" [hidden]="deviceProtocol.valid || (deviceProtocol.pristine && !userForm.submitted)">Required Field</span> -->
+ <!-- <span class="error-message" [hidden]="deviceProtocol.valid || (deviceProtocol.pristine && !userForm.submitted)">Required Field</span> -->
</div>
<div class="col-lg-3 col-sm-6 col-md-3 col-xs-12" *ngIf="referenceDataObject['action']== 'ConfigScaleOut'" style="margin-top: 30px">
<span *ngIf="referenceDataObject.action === 'ConfigScaleOut'"> <a style=" color: blue;"
href="javascript:void(0)"
- (click)="identifierModal.open()">Assign New Template Identifier</a></span>
+ (click)="showIdentifier()">Assign New Template Identifier</a></span>
</div>
-
-
</div>
-
<div class="col-12" *ngIf="!(referenceDataObject.action === 'OpenStack Actions')">
<div class="input-group">
<input id="inputFile" class="file" #myInput type='file' (change)="fileChange($event)">
@@ -141,7 +137,6 @@ limitations under the License.
<input type="text" class="form-control" id="txtIpaddress" [(ngModel)]="referenceDataObject['url']" name="contextUrl">
</div>
</div>
- <br/>
<div class="card-block" *ngIf="(referenceDataObject.action =='ConfigScaleOut' || referenceDataObject.action =='Configure'|| referenceDataObject.action =='' || referenceDataObject.action ==undefined)" style="border-top: 5px solid #6ab344;border-top-right-radius: 7px;border-top-left-radius: 7px;">
<div class="col-12">
<h5 style="margin-top: 0.5rem;font-family: Roboto"> VNFC Information
@@ -155,15 +150,15 @@ limitations under the License.
</div>
<div class="row" *ngIf="(( referenceDataObject.action =='ConfigScaleOut' ||referenceDataObject.action =='Configure'|| referenceDataObject.action =='' || referenceDataObject.action ==undefined ) && isCollapsedContent) ">
<div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
- <label style="font-size:12px;">VNFC Type (NFC Function)</label>
+ <label style="font-size:12px;">VNFC Type</label>
<input type="text" class="form-control" id="txtVnfcTypeInColl" [(ngModel)]="Sample['vnfc-type']" (blur)="checkVnfcTypeEqual(vnfcType.value)" #vnfcType="ngModel" name="samplevnfcType">
</div>
- <div class="col-lg-3 col-sm-6 col-md-3 col-xs-12">
- <label style="font-size:12px">VNFC Function Code (NFC Naming Code)</label>
+ <div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
+ <label style="font-size:12px">VNFC Function Code</label>
<input type="text" class="form-control" id="txtVnfcFunctionCode" [(ngModel)]="Sample['vnfc-function-code']" #vnfcFunctionCode="ngModel" name="samplevnfcFunctionCode">
</div>
<div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
- <label style="font-size:12px;">IPAddress V4 OAM VIP</label>
+ <label style="font-size:12px;">IPAddress V4</label>
<select class="form-control" id="cmbIpAddedBoo" [(ngModel)]="Sample['ipaddress-v4-oam-vip']" name="sampleIpaddress">
<option [value]="hasIp" *ngFor="let hasIp of ipAddressBoolean">{{hasIp}}
</option>
@@ -179,7 +174,7 @@ limitations under the License.
<label style="font-size:12px;">Group Notation Value</label>
<input type="text" class="form-control" [readonly]="disableGrpNotationValue" id="txtGroupValue" [(ngModel)]="Sample['group-notation-value']" name="sampleGroupValue">
</div>
- <div class="col-lg-1 col-sm-6 col-md-1 col-xs-12">
+ <div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
<button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent clear-btn" (click)="clearVnfcData()">Clear VNFC Info
</button>
</div>
@@ -203,29 +198,29 @@ limitations under the License.
</div>
</div>
<div *ngIf="referenceDataObject.vm?.length>0">
- <div class="row" *ngFor="let noOfvm of referenceDataObject.vm | vmFiltering:referenceDataObject?.action:templateIdentifier:vnfcIdentifier; trackBy:trackByFn;let j=index">
- <div *ngIf="((referenceDataObject.action =='ConfigScaleOut' || referenceDataObject.action =='Configure'|| referenceDataObject.action =='' || referenceDataObject.action ==undefined ))" class="col-12">
+ <div class="row" *ngFor="let noOfvm of referenceDataObject.vm | vmFiltering:referenceDataObject?.action:templateIdentifier; trackBy:trackByFn;let j=index">
+ <div *ngIf="((referenceDataObject.action =='ConfigScaleOut' || referenceDataObject.action =='Configure'|| referenceDataObject.action =='' || referenceDataObject.action ==undefined ))" class="col-12">
<div class="row" *ngFor="let item of noOfvm.vnfc;trackBy:trackByFn, let i=index">
<div class="col-md-12" *ngIf="i==0">
<h5 class="headlinesInBold">VM Number: {{j+1}}</h5>
</div>
- <div class="col-md-1point5">
+ <div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
<label style="font-size:12px;">VNFC Instance No.</label>
<input type="text" class="form-control" id="txtVmnumber" disabled='true' [(ngModel)]="item['vnfc-instance']" name="vmNumber{{j}}">
</div>
<div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
- <label style="font-size:12px;">VNFC Type (NFC Function)</label>
+ <label style="font-size:12px;">VNFC Type</label>
<input type="text" class="form-control" id="txtVnfcTypeInColl" required [(ngModel)]="item['vnfc-type']" #vnfcType="ngModel" name="vnfcType{{j}}">
<span class="error-message" [hidden]="vnfcType.valid || (vnfcType.pristine && !userForm.submitted)">Required Field</span>
</div>
- <div class="col-md-2point5">
- <label style="font-size:12px;">VNFC Function Code (NFC Naming Code)</label>
+ <div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
+ <label style="font-size:12px;">VNFC Function Code</label>
<input type="text" class="form-control" id="txtVnfcFunctionCode" required [(ngModel)]="item['vnfc-function-code']" #vnfcFunctionCode="ngModel" name="vnfcFunctionCode{{j}}">
<span class="error-message" [hidden]="vnfcFunctionCode.valid || (vnfcFunctionCode.pristine && !userForm.submitted)">Required Field</span>
</div>
<div class="col-lg-2 col-sm-6 col-md-2 col-xs-12">
- <label style="font-size:12px;">IPAddress V4 OAM VIP</label>
+ <label style="font-size:12px;">IPAddress V4</label>
<select class="form-control" id="cmbIpAddress" [(ngModel)]="item['ipaddress-v4-oam-vip']" name="ipaddress{{j}}">
<option [value]="hasIP" [selected]="item.ipAddressBoolean===hasIP"
*ngFor="let hasIP of ipAddressBoolean">{{hasIP}}
@@ -322,7 +317,7 @@ limitations under the License.
<modal-body>
<div>
<input pattern=".*[^ ].*" name="test" type="text" class="" (ngModelChange)="validateVnfcName($event)" [(ngModel)]="newVnfcType" placeholder="vnfctype">
- <span class="error-message">{{errorMessage}}</span>
+ <span class="error-message">{{errorMessage}}</span>
</div>
</modal-body>
<modal-footer [show-default-buttons]="false">
@@ -333,20 +328,45 @@ limitations under the License.
</modal-footer>
</modal>
-<!-- Modal for Template Identifier -->
-<modal #identifierModal>
- <modal-header [show-close]="true">
- <h4 class="modal-title">Enter New Template Identifier</h4>
- </modal-header>
- <modal-body>
- <div>
- <input pattern=".*[^ ].*" name="test" type="text" class="" [(ngModel)]="templateId" placeholder="identifier">
- </div>
- </modal-body>
- <modal-footer [show-default-buttons]="false">
- <div>
- <button class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" (click)="templateId=''" data-dismiss="modal">cancel</button>
- <button class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary" data-dismiss="modal" (click)="addToIdentDrp()">Add</button>
+<div id="identifierModal" class="modal fade" role="dialog">
+ <div class="modal-dialog">
+ <!-- Modal content-->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="android-more-button mdl-button mdl-js-button mdl-button--accent" data-dismiss="modal">&times;
+ </button>
+ <h4 class="modal-title">Enter New Template Identifier</h4>
+ </div>
+ <div class="modal-body">
+ <div>
+ <div>
+ <input pattern=".*[^ ].*" name="test" type="text" class="" [(ngModel)]="templateId" placeholder="identifier">
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <div>
+ <button class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" data-dismiss="modal" (click)="addToIdentDrp()">Add</button>
+ <button class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary" (click)="templateId=''" data-dismiss="modal">cancel</button>
+ </div>
+ </div>
</div>
- </modal-footer>
-</modal>
+ </div>
+</div>
+<ng-template #content let-c="close" let-d="dismiss">
+ <div class="modal-header">
+ <h6 class="modal-title">Save all changes for current action to APPC database.</h6>
+ <button type="button" class="close" aria-label="Close" (click)="d('Cross click')">
+ <span aria-hidden="true">&times;</span>
+ </button>
+ </div>
+ <div class="modal-body">
+ <p>Do you want to save the changes?</p>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" (click)="c('no')">No
+ </button>
+ <button type="button" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary" (click)="c('yes')">Yes
+ </button>
+ </div>
+</ng-template>
diff --git a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.ts b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.ts
index 0a3c090..17a23e2 100644
--- a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.ts
+++ b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.component.ts
@@ -3,7 +3,8 @@
===================================================================
Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
===================================================================
-
+Copyright (C) 2018 IBM.
+===================================================================
Unless otherwise specified, all software contained herein is licensed
under the Apache License, Version 2.0 (the License);
you may not use this software except in compliance with the License.
@@ -16,21 +17,18 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END============================================
*/
import * as XLSX from 'xlsx';
import * as _ from 'underscore';
-
import { ActivatedRoute, Router } from '@angular/router';
import { Component, OnInit, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
import { BuildDesignComponent } from '../build-artifacts.component';
import { HttpUtilService } from '../../../shared/services/httpUtil/http-util.service';
import { Location } from '@angular/common';
import { MappingEditorService } from '../../..//shared/services/mapping-editor.service';
+import { ModalComponent } from '../../../shared/modal/modal.component';
import { NgProgress } from 'ngx-progressbar';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { NotificationService } from '../../../shared/services/notification.service';
@@ -38,18 +36,16 @@ import { NotificationsService } from 'angular2-notifications';
import { ParamShareService } from '../../..//shared/services/paramShare.service';
import { environment } from '../../../../environments/environment';
import { saveAs } from 'file-saver';
-import { Jsonp } from '@angular/http';
import { ReferenceDataFormUtil } from './reference-dataform.util';
import { UtilityService } from '../../../shared/services/utilityService/utility.service';
-import { APIService } from "../../../shared/services/cdt.apicall";
-
+import { appConstants } from '../../../../constants/app-constants';
// Common Confirm Modal
import { DialogService } from 'ng2-bootstrap-modal';
import { ConfirmComponent } from "../../../shared/confirmModal/confirm.component";
-
declare var $: any;
type AOA = Array<Array<any>>;
+const REFERENCE_DATA: string = "reference_data";
@Component({
selector: 'reference-dataform',
@@ -58,7 +54,8 @@ type AOA = Array<Array<any>>;
providers: [ReferenceDataFormUtil]
})
export class ReferenceDataformComponent implements OnInit {
- public classNm= "ReferenceDataformComp";
+ public classNm = "ReferenceDataformCompon";
+ @ViewChild(ModalComponent) modalComponent: ModalComponent;
public showUploadStatus: boolean = false;
public fileUploaded: boolean = false;
public uploadedData: any;
@@ -89,8 +86,8 @@ export class ReferenceDataformComponent implements OnInit {
errorMessage = '';
invalid = true;
fileName: any;
- vnfcIdentifier;
- oldVnfcIdentifier: any
+ vnfcIdentifier = '';
+ oldVnfcIdentifier: any;
public uploadFileName: any;
public addVmClickedFlag: boolean = false;
public getExcelUploadStatus: boolean = false;
@@ -110,13 +107,13 @@ export class ReferenceDataformComponent implements OnInit {
identifierDrpValues: any = [];
//settings for the notifications.
options = {
- timeOut: 4500,
+ timeOut: 1000,
showProgressBar: true,
pauseOnHover: true,
clickToClose: true,
maxLength: 200
};
- //initializing this object to contain all the parameters to be captured later
+ //initializing this object to contain all the parameters to be captured
public referenceDataObject = {
action: '',
'action-level': 'vnf',
@@ -129,12 +126,31 @@ export class ReferenceDataformComponent implements OnInit {
'artifact-list': []
};
public refernceScopeObj = { sourceType: '', from: '', to: '' };
- public actions = ['', 'Configure', 'ConfigModify', 'ConfigBackup', 'ConfigRestore', 'GetRunningConfig', 'HealthCheck', 'StartApplication', 'StopApplication', 'QuiesceTraffic', 'ResumeTraffic', 'UpgradeBackout', 'UpgradeBackup', 'UpgradePostCheck', 'UpgradePreCheck', 'UpgradeSoftware', 'OpenStack Actions', 'ConfigScaleOut'];
- public groupAnotationValue = ['', 'Pair'];
- public groupAnotationType = ['', 'first-vnfc-name', 'fixed-value', 'relative-value'];
- public deviceProtocols = ['', 'ANSIBLE', 'CHEF', 'NETCONF-XML', 'REST', 'CLI', 'RESTCONF'];
- public deviceTemplates = ['', 'Y', 'N'];
- public sourceTypeColl = ['', 'vnfType', 'vnfcType'];
+ public actions = [appConstants.Actions.blank,
+ appConstants.Actions.configure,
+ appConstants.Actions.ConfigModify,
+ appConstants.Actions.configBackup,
+ appConstants.Actions.configRestore,
+ appConstants.Actions.getRunningConfig,
+ appConstants.Actions.healthCheck,
+ appConstants.Actions.startApplication,
+ appConstants.Actions.stopApplication,
+ appConstants.Actions.quiesceTraffic,
+ appConstants.Actions.resumeTraffic,
+ appConstants.Actions.distributeTraffic,
+ appConstants.Actions.upgradeBackout,
+ appConstants.Actions.upgradeBackup,
+ appConstants.Actions.upgradePostCheck,
+ appConstants.Actions.upgradePreCheck,
+ appConstants.Actions.upgradeSoftware,
+ appConstants.Actions.openStackActions,
+ appConstants.Actions.configScaleOut
+ ];
+ public groupAnotationValue = [appConstants.groupAnotationValue.blank, appConstants.groupAnotationValue.pair];
+ public groupAnotationType = [appConstants.groupAnotationType.blank, appConstants.groupAnotationType.firstVnfcName, appConstants.groupAnotationType.fixedValue, appConstants.groupAnotationType.relativeValue];
+ public deviceProtocols = [appConstants.DeviceProtocols.blank, appConstants.DeviceProtocols.ansible, appConstants.DeviceProtocols.chef, appConstants.DeviceProtocols.netconfXML, appConstants.DeviceProtocols.rest, appConstants.DeviceProtocols.cli, appConstants.DeviceProtocols.restConf];
+ public deviceTemplates = [appConstants.deviceTemplates.blank, appConstants.deviceTemplates.y, appConstants.deviceTemplates.n];
+ public sourceTypeColl = [appConstants.sourceTypeColl.blank, appConstants.sourceTypeColl.vnfType, appConstants.sourceTypeColl.vnfcType];
public ipAddressBoolean = ['', 'Y', 'N'];
public Sample: any = {
'vnfc-instance': '1',
@@ -170,64 +186,49 @@ export class ReferenceDataformComponent implements OnInit {
public firstArrayElement = [];
public remUploadedDataArray = [];
isConfigScaleOut = false
- isConfigOrConfigModify = false
- configScaleOutExist: boolean
+ isConfigureAction = false;
+ configScaleOutExist: boolean = true;
displayVnfc = 'false';
isVnfcType: boolean;
isVnfcTypeList: boolean = true;
- public referencDataTab = [
- {
-
- name: 'Reference Data',
- url: 'references',
- }];
- public allTabs = [
- {
- name: 'Reference Data',
- url: 'references',
- }, {
- name: 'Template',
- url: 'templates/myTemplates',
- }, {
- name: 'Parameter Definition',
- url: 'parameterDefinitions/create'
- }/*, {
- name: "Test",
- url: 'test',
- }*/
- ];
- public actionList = require('../../../../cdt.application.properties.json').Actions;
-
- public versionNoForApiCall = require('../../../../cdt.application.properties.json').versionNoForApiCall;
+ public actionList = {
+ "ConfigScaleOut": "ConfigScaleOut",
+ "Configure": "Configure"
+ };
+ public versionNoForApiCall = "0.0.1";
private displayVMBlock: boolean = true;
- constructor(
- private buildDesignComponent: BuildDesignComponent, private apiService: APIService, private utilityService: UtilityService, private httpUtils: HttpUtilService, private referenceDataFormUtil: ReferenceDataFormUtil, private route: Router, private location: Location, private activeRoutes: ActivatedRoute, private notificationService: NotificationService,
- private paramShareService: ParamShareService, private mappingEditorService: MappingEditorService, private modalService: NgbModal, private nService: NotificationsService, private ngProgress: NgProgress,
- private dialogService: DialogService)
- {
- console.log(this.classNm+
- ": new: start: tracelvl="+this.utilityService.getTracelvl() );
+ constructor (
+ private buildDesignComponent: BuildDesignComponent,
+ private httpUtils: HttpUtilService,
+ private route: Router,
+ private location: Location,
+ private activeRoutes: ActivatedRoute,
+ private notificationService: NotificationService,
+ private paramShareService: ParamShareService,
+ private mappingEditorService: MappingEditorService,
+ private modalService: NgbModal,
+ private nService: NotificationsService,
+ private ngProgress: NgProgress,
+ private utilityService: UtilityService,
+ private dialogService: DialogService,
+ private referenceDataFormUtil: ReferenceDataFormUtil) {
+ console.log(this.classNm + ": new: start.");
}
ngOnInit() {
- let methName= "ngOnInit";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": ngOnInit: start ");
- // this.handleVMBlockDisplay();
-
- //initializing the variables and checking for configscaleout fromm properties file
- this.configScaleOutExist = require('../../../../cdt.application.properties.json').displayConfigScaleout;
+ let methName = "ngOnInit";
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": " + methName + ": start.");
this.displayVnfc = sessionStorage.getItem("vnfcSelectionFlag");
if (this.configScaleOutExist) {
- this.actions = ['', 'Configure', 'ConfigModify', 'ConfigBackup', 'ConfigRestore', 'GetRunningConfig', 'HealthCheck', 'StartApplication', 'StopApplication', 'QuiesceTraffic', 'ResumeTraffic', 'UpgradeBackout', 'UpgradeBackup', 'UpgradePostCheck', 'UpgradePreCheck', 'UpgradeSoftware', 'OpenStack Actions', 'ConfigScaleOut'];
+ this.actions = ['', 'Configure', 'ConfigModify', 'ConfigBackup', 'ConfigRestore', 'GetRunningConfig', 'HealthCheck', 'StartApplication', 'StopApplication', 'QuiesceTraffic', 'ResumeTraffic', 'DistributeTraffic', 'UpgradeBackout', 'UpgradeBackup', 'UpgradePostCheck', 'UpgradePreCheck', 'UpgradeSoftware', 'OpenStack Actions', 'ConfigScaleOut'];
} else {
- this.actions = ['', 'Configure', 'ConfigModify', 'ConfigBackup', 'ConfigRestore', 'GetRunningConfig', 'HealthCheck', 'StartApplication', 'StopApplication', 'QuiesceTraffic', 'ResumeTraffic', 'UpgradeBackout', 'UpgradeBackup', 'UpgradePostCheck', 'UpgradePreCheck', 'UpgradeSoftware', 'OpenStack Actions'];
+ this.actions = ['', 'Configure', 'ConfigModify', 'ConfigBackup', 'ConfigRestore', 'GetRunningConfig', 'HealthCheck', 'StartApplication', 'StopApplication', 'QuiesceTraffic', 'ResumeTraffic', 'DistributeTraffic', 'UpgradeBackout', 'UpgradeBackup', 'UpgradePostCheck', 'UpgradePreCheck', 'UpgradeSoftware', 'OpenStack Actions'];
}
this.self = this;
let path = this.location.path;
this.title = 'Reference Data';
- // setting the structure for the reference data object
this.referenceDataObject = {
action: '',
'action-level': 'vnf',
@@ -239,57 +240,40 @@ export class ReferenceDataformComponent implements OnInit {
'port-number': '',
'artifact-list': []
};
- //getting the data from session data, calling get Artifact if the data is undefined
this.updateParams = sessionStorage.getItem('updateParams');
- //getting the data from the referencenameobjects if the nav is changed and assiging it to the cace data
let cacheData = this.mappingEditorService.referenceNameObjects;
-
- if (this.utilityService.checkNotNull(cacheData)) {
- //if cache data exists then assiging the data to the latest temp all data object.
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": ngOnInit: have cacheData.");
+ if (cacheData != undefined && cacheData != null && cacheData.length > 0) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": ngOnInit: have cacheData.");
this.tempAllData = cacheData;
- //calling the highligted method to highlight the selected actions in the action dropdown
- this.highlightSelectedActions(this.tempAllData)
- // getting the latest action that the user has selected and assiging it to the reference data object once the user toggles between tabs from reference
if (this.mappingEditorService.latestAction != undefined) {
- //adding the latest action to the screen
this.referenceDataObject = this.mappingEditorService.latestAction;
this.toggleIdentifier(this.referenceDataObject.action);
- //this.referenceDataObject['template-id-list'] = this.mappingEditorService.identifier
- //use these commented objects to be used in template and pd pages
- //this.templateIdentifier = this.mappingEditorService.identifier
- //adding the scope from referencedata obj to referencescopeobject
this.refernceScopeObj.sourceType = this.referenceDataObject['scopeType'];
- //assigning the latest action fetched to the old action from reference data object
this.oldAction = this.referenceDataObject.action;
- //this method is called with the action reterived and subsequent values are assigned to refdataobj for displaying
this.populateExistinAction(this.referenceDataObject.action);
this.displayHideVnfc();
}
} else if (this.updateParams != 'undefined') {
- //calls the get artifact() to reterive the values if cache data is not present
this.getArtifact();
}
- //getting the appdata & downloadDataObject from mapping editor service and assiging it.
var appData = this.mappingEditorService.appDataObject;
if (appData != null || appData != undefined) this.appData = appData;
var downloadData = this.mappingEditorService.downloadDataObject;
if (downloadData != null || downloadData != undefined) this.downloadData = downloadData;
-
if (sessionStorage.getItem('vnfParams')) {
this.vnfParams = JSON.parse(sessionStorage.getItem('vnfParams'));
}
if (this.vnfParams && this.vnfParams.vnfType) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": vnfParams.vnfType:["+
- this.vnfParams.vnfType+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": " + methName + ": vnfParams.vnfType:[" +
+ this.vnfParams.vnfType + "]");
this.referenceDataObject['scope']['vnf-type'] = this.vnfParams.vnfType;
}
if (this.vnfParams && this.vnfParams.vnfcType) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": vnfParams.vnfcType:["+
- this.vnfParams.vnfcType+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": " + methName + ": vnfParams.vnfcType:[" +
+ this.vnfParams.vnfcType + "]");
this.referenceDataObject['scope']['vnfc-type'] = this.vnfParams.vnfcType;
}
this.uploadedDataArray = [];
@@ -297,34 +281,23 @@ export class ReferenceDataformComponent implements OnInit {
this.firstArrayElement = [];
this.uploadFileName = '';
this.templateIdentifier = this.mappingEditorService.identifier
- // if (this.mappingEditorService.newObject) {
- // this.vnfcIdentifier = this.mappingEditorService.newObject.vnfc;
- // }
- // else {
- // this.vnfcIdentifier = '';
- // this.referenceDataObject['vnfcIdentifier'] = '';
- // }
this.oldVnfcIdentifier = this.vnfcIdentifier;
- if( this.utilityService.getTracelvl() > 1 )
- console.log( this.classNm+": "+methName+": displayVnfc:["+
- this.displayVnfc+"]");
- if( this.utilityService.getTracelvl() > 1 )
- console.log( this.classNm+": "+methName+": templateIdentifier:["+
- this.templateIdentifier+"]");
+ if (this.utilityService.getTracelvl() > 1)
+ console.log(this.classNm + ": " + methName + ": displayVnfc:[" +
+ this.displayVnfc + "]");
+ if (this.utilityService.getTracelvl() > 1)
+ console.log(this.classNm + ": " + methName + ": templateIdentifier:[" +
+ this.templateIdentifier + "]");
// Enable or Block Template and PD Tabs
this.buildDesignComponent.getRefData(
- { ...this.referenceDataObject, displayVnfc: this.displayVnfc },
- { reqField: this.templateIdentifier });
+ { ...this.referenceDataObject, displayVnfc: this.displayVnfc },
+ { reqField: this.templateIdentifier });
//.. configure some drop-downs
- this.configDrp(this.referenceDataObject.action);
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": finish.");
+ this.configDrp(this.referenceDataObject.action)
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": " + methName + ": finish.");
}
- //setting the value to display or hide the template identifier dropdown in the screen
toggleIdentifier(data) {
if (data == 'ConfigScaleOut') {
this.isConfigScaleOut = true
@@ -336,42 +309,64 @@ export class ReferenceDataformComponent implements OnInit {
//to retrive the data from appc and assign it to the vaiables, if no data display the message reterived from the API
getArtifact() {
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": getArtifact: start...");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": getArtifact: start.");
try {
- // setting the isVnfcTypeList & isVnfcType to false initially
- this.isVnfcTypeList = false;
- this.isVnfcType = false
let data = this.utilityService.createPayloadForRetrieve(true, '', '', '');
this.ngProgress.start();
- let serviceCall = this.apiService.callGetArtifactsApi(data);
- serviceCall.subscribe(resp => {
- //getting the response and assigining it to the variables used and end the progress bar aftr the data is fetched.
+ this.httpUtils.post({
+ url: environment.getDesigns,
+ data: data
+ }).subscribe(resp => {
+ if (this.utilityService.getTracelvl() > 1)
+ console.log(this.classNm + ": getArtifact: got response ...");
if (resp.output.data.block != undefined) {
- this.nService.success('Status', 'data fetched ');
+ if (this.utilityService.getTracelvl() > 1)
+ console.log(this.classNm +
+ ": getArtifact: output.data.block not empty.");
+ this.nService.success(appConstants.notifications.titles.status, appConstants.messages.datafetched);
let artifactInfo = JSON.parse(resp.output.data.block).artifactInfo[0];
- let referenceDataAll = JSON.parse(artifactInfo['artifact-content'])['reference_data'];
let reference_data = JSON.parse(artifactInfo['artifact-content'])['reference_data'][0];
this.referenceDataObject = reference_data;
this.toggleIdentifier(this.referenceDataObject.action);
- if (this.referenceDataObject.action == 'ConfigScaleOut') {
- this.groupAnotationType = ['', 'first-vnfc-name', 'fixed-value', 'relative-value', 'existing-group-name'];
+ if (this.referenceDataObject.action == appConstants.Actions.configScaleOut) {
+ this.groupAnotationType = [appConstants.groupAnotationType.blank, appConstants.groupAnotationType.firstVnfcName, appConstants.groupAnotationType.fixedValue, appConstants.groupAnotationType.relativeValue, appConstants.groupAnotationType.existingGroupName];
}
- this.highlightSelectedActions(referenceDataAll)
-
//chck vnfc or vnfcTypeList
this.displayHideVnfc();
-
// Enable or Block Template and PD Tabs
- this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc });
-
+ this.buildDesignComponent.getRefData(
+ { ...this.referenceDataObject, displayVnfc: this.displayVnfc });
this.refernceScopeObj.sourceType = this.referenceDataObject['scopeType'];
this.mappingEditorService.getReferenceList().push(JSON.parse(artifactInfo['artifact-content']));
this.tempAllData = JSON.parse(artifactInfo['artifact-content'])['reference_data'];
this.oldAction = this.referenceDataObject.action;
this.oldVnfcIdentifier = this.vnfcIdentifier;
-
- this.processReferenceDataAfterRetrieval();
+ if (this.referenceDataObject.action === appConstants.Actions.openStackActions) {
+ this.deviceProtocols = [appConstants.DeviceProtocols.blank, appConstants.DeviceProtocols.openStack];
+ this.buildDesignComponent.tabs = [
+ {
+ name: 'Reference Data',
+ url: 'references',
+ }];
+ }
+ else {
+ this.buildDesignComponent.tabs = [
+ {
+ name: 'Reference Data',
+ url: 'references',
+ }, {
+ name: 'Template',
+ url: 'templates/myTemplates',
+ }, {
+ name: 'Parameter Definition',
+ url: 'parameterDefinitions/create'
+ }/*, {
+ name: "Test",
+ url: 'test',
+ }*/
+ ];
+ }
this.getArtifactsOpenStack();
} else {
this.nService.success('Status', 'Sorry !!! I dont have any artifact Named : ' + (JSON.parse(sessionStorage.getItem('updateParams')))['artifact-name']);
@@ -388,19 +383,19 @@ export class ReferenceDataformComponent implements OnInit {
}
displayHideVnfc() {
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": displayHideVnfc: start...");
- if( this.utilityService.getTracelvl() > 1 ) {
- if( this.referenceDataObject.scope['vnfc-type-list'] ) {
- console.log( this.classNm+
- ": displayHideVnfc: refDataObj.scope.vnfc-type-list.length="+
- this.referenceDataObject.scope['vnfc-type-list'].length );
- } else {
- console.log( this.classNm+
- ": displayHideVnfc: refDataObj.scope.vnfc-type-list not defined");
- };
- console.log( this.classNm+": displayHideVnfc: scope.vnfc-type:["+
- this.referenceDataObject.scope['vnfc-type']+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": displayHideVnfc: start...");
+ if (this.utilityService.getTracelvl() > 1) {
+ if (this.referenceDataObject.scope['vnfc-type-list']) {
+ console.log(this.classNm +
+ ": displayHideVnfc: refDataObj.scope.vnfc-type-list.length=" +
+ this.referenceDataObject.scope['vnfc-type-list'].length);
+ } else {
+ console.log(this.classNm +
+ ": displayHideVnfc: refDataObj.scope.vnfc-type-list not defined");
+ };
+ console.log(this.classNm + ": displayHideVnfc: scope.vnfc-type:[" +
+ this.referenceDataObject.scope['vnfc-type'] + "]");
};
if (this.referenceDataObject.scope['vnfc-type-list'] == undefined && (this.referenceDataObject.scope['vnfc-type'] != undefined || this.referenceDataObject.scope['vnfc-type'] != "")) {
this.isVnfcType = true
@@ -411,20 +406,20 @@ export class ReferenceDataformComponent implements OnInit {
this.isVnfcType = false
this.displayVnfc = 'true'
this.isVnfcTypeList = true
- if(!this.mappingEditorService.newObject || !this.mappingEditorService.newObject.vnfc) {
+ if (!this.mappingEditorService.newObject.vnfc) {
this.vnfcIdentifier = this.referenceDataObject.scope['vnfc-type-list'][0];
// this.mappingEditorService.newObject.vnfc = this.vnfcIdentifier;
+ // this.referenceDataObject['vnfcIdentifier'] = this.vnfcIdentifier;
+
} else {
this.vnfcIdentifier = this.mappingEditorService.newObject.vnfc;
}
- this.referenceDataObject['vnfcIdentifier'] = this.vnfcIdentifier;
- //this.vnfcChanged(this.vnfcIdentifier, FormData);
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": displayHideVnfc: vnfcIdentifier:["+
- this.vnfcIdentifier+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": displayHideVnfc: vnfcIdentifier:[" +
+ this.vnfcIdentifier + "]");
}
if (this.referenceDataObject.scope['vnfc-type-list'] != undefined && this.referenceDataObject.scope['vnfc-type-list'].length == 0 && this.referenceDataObject.scope['vnfc-type'] != undefined && this.referenceDataObject.scope['vnfc-type'].length == 0) {
- if(this.displayVnfc == 'true') {
+ if (this.displayVnfc == 'true') {
this.isVnfcType = false
this.displayVnfc = 'true'
this.isVnfcTypeList = true
@@ -439,14 +434,17 @@ export class ReferenceDataformComponent implements OnInit {
this.displayVnfc = 'false'
this.isVnfcTypeList = false
}
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": displayHideVnfc: finish. isVnfcType:["+
- this.isVnfcType+" displayVnfc:["+this.displayVnfc+"] isVnfcTypeList:["+
- this.isVnfcTypeList+"]");
+ if (this.utilityService.getTracelvl() > 1)
+ console.log(this.classNm + ": displayHideVnfc: finish. isVnfcType:[" +
+ this.isVnfcType + " displayVnfc:[" + this.displayVnfc + "] isVnfcTypeList:[" +
+ this.isVnfcTypeList + "]");
}
- //reinitializing the required values. when changing to template or pd sending the values to mapping service
+ //reinitializing the required values
ngOnDestroy() {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": ngOnDestroy: start:" +
+ " vnfcIdentifier:[" + this.vnfcIdentifier + "]");
let referenceObject = this.prepareReferenceObject();
this.mappingEditorService.changeNavAppData(this.appData);
this.mappingEditorService.changeNavDownloadData(this.downloadData);
@@ -455,7 +453,7 @@ export class ReferenceDataformComponent implements OnInit {
this.firstArrayElement = [];
this.uploadFileName = '';
}
- // vaidating the number
+
numberValidation(event: any) {
if (this.numberTest.test(event) && event != 0) {
this.numberOfVmTest = true;
@@ -466,8 +464,8 @@ export class ReferenceDataformComponent implements OnInit {
}
// update my vnf pop up session values
updateSessionValues(event: any, type: string) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": updateSessionValues: type:["+type+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": updateSessionValues: type:[" + type + "]");
if (type === 'action') {
sessionStorage.setItem('action', event);
}
@@ -475,10 +473,8 @@ export class ReferenceDataformComponent implements OnInit {
sessionStorage.setItem('vnfType', event);
}
}
- // adding vnfc data for each vm
+
addVnfcData(vmNumber: number) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": addVnfcData: start: vmNumber="+ vmNumber);
var newObj = {
'vnfc-instance': this.referenceDataObject.vm[vmNumber].vnfc.length + 1,
'vnfc-type': this.vnfcTypeData,
@@ -489,10 +485,11 @@ export class ReferenceDataformComponent implements OnInit {
};
this.referenceDataObject.vm[vmNumber].vnfc.push(newObj);
}
+
//validating the vnf and vnfc data in the pop up
validateVnfcName(name) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": validateVnfcName: start: name:["+name+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": validateVnfcName: start: name:[" + name + "]");
if (!name.trim() || name.length < 1) {
this.errorMessage = '';
this.invalid = true;
@@ -511,7 +508,6 @@ export class ReferenceDataformComponent implements OnInit {
}
}
-
//to remove the VM's created by the user
removeFeature(vmNumber: any, index: any, templateId) {
if (this.referenceDataObject.action == "Configure") {
@@ -520,8 +516,6 @@ export class ReferenceDataformComponent implements OnInit {
if (arrIndex >= vmNumber) {
obj["vm-instance"] = obj["vm-instance"] - 1
}
- // obj["vm-instance"] = arrIndex+1
-
})
} else {
let data = this.referenceDataObject.vm.filter(obj => {
@@ -542,7 +536,6 @@ export class ReferenceDataformComponent implements OnInit {
}
}
- //utility function while adding VM to check index
findVmindex(data, vmNumber, templateId) {
return this.referenceDataObject.vm.findIndex(obj => {
let x = obj['vm-instance'] == (vmNumber + 1) && templateId == obj['template-id']//true
@@ -551,50 +544,19 @@ export class ReferenceDataformComponent implements OnInit {
}
- //add new VM's to the configure and configmodify.
+ //add new VM's to the configure
addVms() {
let arr = [];
-
let mberOFVm = Number(this.refernceScopeObj.from);
- let key
- if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
- key = "vnfcType-id"
- } else if (this.referenceDataObject.action == 'ConfigScaleOut') {
- key = "template-id"
- }
- if (this.referenceDataObject.action == 'ConfigScaleOut' || this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
- let existingVmsLength = this.referenceDataObject.vm.map(obj => {
- if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
- return obj["vnfcType-id"] == this.templateIdentifier
- } else if (this.referenceDataObject.action == 'ConfigScaleOut') {
- return obj["template-id"] == this.templateIdentifier
- }
+ if (this.referenceDataObject.action == 'ConfigScaleOut') {
+ let existingVmsLength = this.referenceDataObject.vm.filter(obj => {
+ return obj['template-id'] == this.templateIdentifier
}).length;
- //mberOFVm = existingVmsLength + mberOFVm;
+ mberOFVm = existingVmsLength + mberOFVm;
let index = 0;
- let identifierValue
- if (this.referenceDataObject.action == 'ConfigScaleOut') {
- identifierValue = this.templateIdentifier
- } else if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
- identifierValue = this.vnfcIdentifier
- }
-
- for (var i = 0; i < mberOFVm; i++) {
- if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
-
- if (identifierValue && identifierValue != "") {
- this.referenceDataObject.vm.push({ 'vnfcType-id': identifierValue, 'vm-instance': (existingVmsLength + index + 1), vnfc: [Object.assign({}, this.Sample)] });
- } else {
- this.referenceDataObject.vm.push({ 'vm-instance': (existingVmsLength + index + 1), vnfc: [Object.assign({}, this.Sample)] });
- }
-
- } else if (this.referenceDataObject.action == 'ConfigScaleOut') {
- if (identifierValue && identifierValue != "") {
- this.referenceDataObject.vm.push({ 'template-id': identifierValue, 'vm-instance': (existingVmsLength + index + 1), vnfc: [Object.assign({}, this.Sample)] });
- }
-
- }
+ for (var i = (existingVmsLength); i < mberOFVm; i++) {
+ this.referenceDataObject.vm.push({ 'template-id': this.templateIdentifier, 'vm-instance': (existingVmsLength + index + 1), vnfc: [Object.assign({}, this.Sample)] });
index++;
}
@@ -611,43 +573,25 @@ export class ReferenceDataformComponent implements OnInit {
}
}
- //preparing reference obj with required business use cases
+ //Reference object to create reference data
prepareReferenceObject(isSaving?: any) {
- let methName= "prepareReferenceObject";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": start: isSaving:["+
- isSaving+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": prepareReferenceObject: start.");
let scopeName = this.resetParamsOnVnfcType();
- let extension = this.referenceDataFormUtil.decideExtension(this.referenceDataObject);
+ let extension = this.decideExtension(this.referenceDataObject);
this.prepareArtifactList(scopeName, extension);
-
if (this.referenceDataObject.action === 'OpenStack Actions') {
this.referenceDataObject['template'] = 'N';
this.referenceDataObject['artifact-list'] = [];
this.referenceDataObject['firstRowVmSpreadSheet'] = this.firstArrayElement;
}
- else{
- this.referenceDataObject['firstRowVmSpreadSheet']=undefined;
- }
- //ditaching the object from the form and processing pfurther
+ //detaching the object from the form and processing further
let newObj = $.extend(true, {}, this.referenceDataObject);
let action = this.referenceDataObject.action;
- // if (action=="ConfigScaleOut"){
- // this.referenceDataObject.action="true";
- // }
- //preparing Obj for save/download
newObj = this.deleteVmsforNonActions(newObj, action)
-
- if (newObj['device-protocol'] != 'REST') {
- delete newObj['url']
- }
this.pushOrReplaceTempData(newObj, action);
this.addAllActionObj(newObj, scopeName);
this.resetTempData()
-
-
- //rmove context url
- //if()
//saving data to service
this.mappingEditorService.getReferenceList().push(JSON.parse(JSON.stringify(this.referenceDataObject)));
this.buildDesignComponent.updateAccessUpdatePages(this.referenceDataObject.action, this.mappingEditorService.getReferenceList());
@@ -657,65 +601,74 @@ export class ReferenceDataformComponent implements OnInit {
return { totlaRefDtaa: this.tempAllData, scopeName: scopeName };
}
- // utility function to check element existence
public checkIfelementExistsInArray(element, array) {
+ //// console.log("Element==" + element)
var result: boolean = false;
array.forEach(function (item) {
+ // // console.log("Item==" + item)
if (element === item) {
+ // console.log('Element==' + element + 'Item==' + item);
result = true;
}
}
);
return result;
}
- // when uploading the file
+
upload(evt: any) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": upload: start.");
/* wire up file reader */
const target: DataTransfer = <DataTransfer>(evt.target);
this.uploadFileName = evt.target.files[0].name;
var fileExtension = this.uploadFileName.substr(this.uploadFileName.lastIndexOf('.') + 1);
if (target.files.length != 1) {
- throw new Error('Cannot upload multiple files on the entry');
+ console.log(this.classNm + ": upload: Error: got no file !");
+ throw new Error(appConstants.errors.multipleFileUploadError);
}
+ console.log(this.classNm + ": upload: filename:[" + evt.target.files[0].name + "]");
if (fileExtension.toUpperCase() === 'XLS' || fileExtension.toUpperCase() === 'XLSX') {
const reader = new FileReader();
reader.onload = (e: any) => {
/* read workbook */
const bstr = e.target.result;
+ // // console.log("print 1---" + bstr);
const wb = XLSX.read(bstr, { type: 'binary' });
+ // // console.log("print 2---" + JSON.stringify(wb));
/* grab first sheet */
const wsname = wb.SheetNames[0];
+ // // console.log("Name:---" + wsname);
const ws = wb.Sheets[wsname];
/* save data */
- this.firstArrayElement = []
+
let arrData = (<AOA>(XLSX.utils.sheet_to_json(ws, { header: 1 })));
this.uploadedDataArray = arrData;
- for (var i = 0; i < arrData[0].length; i++) {
- this.firstArrayElement.push(arrData[0][i].replace(/[\n\r]+/g, ''))
- }
+ this.firstArrayElement = arrData[0];
var remUploadedDataArray = arrData;
remUploadedDataArray.shift();
this.remUploadedDataArray = remUploadedDataArray;
if (arrData != null) {
this.getExcelUploadStatus = true;
- this.nService.success('Success', 'Vm capabilities data uploaded successfully');
+ this.nService.success(appConstants.notifications.titles.success, appConstants.messages.vmDataUploadSuccess);
}
else {
- this.nService.success('Error', 'Empty Vm capabilities file uploaded');
+ this.nService.success(appConstants.notifications.titles.error, appConstants.messages.emptyVmUpload);
}
};
reader.readAsBinaryString(target.files[0]);
}
else {
- this.nService.error('Error', 'Incorrect VM capabilities file uploaded');
+ this.nService.error(appConstants.notifications.titles.error, appConstants.messages.incorrectVmUpload);
}
}
addVmCapabilitiesData() {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": addVmCapabilitiesData: start.");
for (var i = 0; i < this.uploadedDataArray.length; i++) {
var vnfcFuncCodeArray = [];
var data = this.uploadedDataArray[i];
@@ -723,7 +676,6 @@ export class ReferenceDataformComponent implements OnInit {
if (data[j] != undefined) {
if (data[j].toUpperCase() === 'Y') {
vnfcFuncCodeArray.push(this.firstArrayElement[j]);
- //vnfcFuncCodeArray.push({name:this.firstArrayElement[j]});
}
}
}
@@ -734,7 +686,7 @@ export class ReferenceDataformComponent implements OnInit {
'action-level': 'vm',
'scope': {
'vnf-type': this.referenceDataObject['scope']['vnf-type'], //need to confirm what should be this value
- 'vnfc-type-list': null
+ 'vnfc-type': null
},
'vnfc-function-code-list': vnfcFuncCodeArray,
'template': 'N',
@@ -747,76 +699,88 @@ export class ReferenceDataformComponent implements OnInit {
}
}
- //download the templae pd and reference file with all the actions added.
+ //download template
save(form: any, isValid: boolean) {
- // will show error message
- this.showValidationErrors(this.referenceDataObject);
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": save: start: referenceDataObject.action:[" +
+ this.referenceDataObject.action + "]");
+ if (this.referenceDataObject.action === '') {
+ this.nService.error(appConstants.notifications.titles.error, appConstants.errors.noActionError);
+ return;
+ }
+ if (this.referenceDataObject['device-protocol'] === '') {
+ this.nService.error(appConstants.notifications.titles.error, appConstants.errors.noDeviceProtocolError);
+ return;
+ }
if (isValid) {
let referenceObject = this.prepareReferenceObject();
- let removedKeysArray = []
- this.tempAllData.forEach((data, index) => {
- if (data.action) {
- removedKeysArray.push(JSON.parse(JSON.stringify(this.deleteUnwantedKeys(data))))
- }
- });
- this.tempAllData = removedKeysArray;
- /* var tempAllData = this.tempAllData;
- tempAllData=this.removeParamFileNameBeforeSave(tempAllData)*/
-
- //tempAllData["artifact_list"]=newArtifactList;
let theJSON = JSON.stringify({ 'reference_data': this.tempAllData }, null, '\t');
let uri = 'data:application/json;charset=UTF-8,' + encodeURIComponent(theJSON);
this.downloadData.reference = theJSON;
- let referenceFileName = 'reference_AllAction_' + this.referenceDataObject.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V.json';
- this.utilityService.downloadArtifactToPc(theJSON, 'json', referenceFileName, 100);
this.validateTempAllData();
+ var blob = new Blob([theJSON], {
+ type: 'text/plain'
+ });
+ let fileName = 'reference_AllAction_' + referenceObject.scopeName + '_' + '0.0.1V.json';
+ this.downloadFile(blob, fileName, 100)
var templateData = JSON.stringify(this.downloadData.template.templateData);
- var templateFileName = this.downloadData.template.templateFileName;
- if (templateFileName != null || templateFileName != '') {
- var fileExtensionArr = templateFileName.split('.');
- }
- var nameValueFileName = this.downloadData.template.nameValueFileName;
- let pdFileName = this.downloadData.pd.pdFileName;
var nameValueData = JSON.stringify(this.downloadData.template.nameValueData);
var pdData = this.downloadData.pd.pdData;
- if (templateData != '{}' && templateData != null && templateData != undefined) this.utilityService.downloadArtifactToPc(this.downloadData.template.templateData, fileExtensionArr[1], templateFileName, 130);
- if (nameValueData != '{}' && nameValueData != null && nameValueData != undefined) this.utilityService.downloadArtifactToPc(this.downloadData.template.nameValueData, 'json', nameValueFileName, 160);
- if (pdData != '' && pdData != null && pdData != undefined) this.utilityService.downloadArtifactToPc(pdData, 'yaml', pdFileName, 180);
+ if (templateData != '{}' && templateData != null && templateData != undefined) this.downloadTemplate();
+ if (nameValueData != '{}' && nameValueData != null && nameValueData != undefined) this.downloadNameValue();
+ if (pdData != '' && pdData != null && pdData != undefined) this.downloadPd();
}
}
+ downloadFile(blob, fileName, delay) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": downloadFile: start.");
+ setTimeout(() => {
+ saveAs(blob, fileName);
+ }, delay)
+ }
+
+ downloadTemplate() {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": downloadTemplate: start.");
+ var fileName = this.downloadData.template.templateFileName;
+ console.log(this.classNm + ": downloadTemplate: fileName:[" + fileName + "]");
+ var theJSON = this.downloadData.template.templateData;
+ if (fileName != null || fileName != '') {
+ var fileExtensionArr = fileName.split('.');
+ var blob = new Blob([theJSON], {
+ type: 'text/' + fileExtensionArr[1]
+ });
+ this.downloadFile(blob, fileName, 130)
+ }
+ }
+
+ downloadNameValue() {
+ var fileName = this.downloadData.template.nameValueFileName;
+ var theJSON = this.downloadData.template.nameValueData;
+ var blob = new Blob([theJSON], {
+ type: 'text/json'
+ });
+
+ this.downloadFile(blob, fileName, 160)
+ }
+
+ downloadPd() {
+ let fileName = this.downloadData.pd.pdFileName;
+ let theJSON = this.downloadData.pd.pdData;
+ var blob = new Blob([theJSON], {
+ type: 'text/plain'
+ });
+
+ this.downloadFile(blob, fileName, 180)
+ }
- /* removeParamFileNameBeforeSave(tempAllData)
- {
- var newArtifactList = [];
- var element={};
- for (var i = 0; i < tempAllData.length; i++) {
- if (this.checkIfelementExistsInArray(tempAllData[i].action,this.actions)) {
- var artifactList = tempAllData[i]["artifact-list"]
-
- for (var j = 0; j < artifactList.length; j++) {
- if (artifactList[j]["artifact-type"] != "param_values") {
- element = artifactList[j];
- newArtifactList.push(element);
- }
- }
- tempAllData[i]["artifact-list"] = newArtifactList
- newArtifactList = [];
- element={};
- }
- }
- return tempAllData;
- }*/
// save the values to the cache, on action change without download
- validateDataAndSaveToAppc( valid, form, event) {
- let methName= "validateDataAndSaveToAppc";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": start: valid:["+valid+"]");
+ validateDataAndSaveToAppc(valid, form, event) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": validateDataAndSaveToAppc: start: valid:" + valid);
// will show error message
this.showValidationErrors(this.referenceDataObject);
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
try {
form._submitted = true;
if (valid) {
@@ -846,18 +810,18 @@ export class ReferenceDataformComponent implements OnInit {
this.nService.warn('status', 'unable to save the artifact');
}
}
+
//this method saves reference, template, param and PD data to APPC
saveToAppc() {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": saveToAppc: start: vnf-type:["+
- this.referenceDataObject.scope['vnf-type']+"]");
- let theJSON = JSON.stringify( this.tempAllData );
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": saveToAppc: tempAllData:["+theJSON+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": saveToAppc: start: vnf-type:[" +
+ this.referenceDataObject.scope['vnf-type'] + "]");
+ let theJSON = JSON.stringify(this.tempAllData);
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": saveToAppc: tempAllData:[" + theJSON + "]");
let fileName = 'reference_AllAction_' + this.referenceDataObject.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V.json';
- /*var tempAllData=this.removeParamFileNameBeforeSave(this.tempAllData);
- this.tempAllData=tempAllData;*/
- this.saveReferenceDataToAppc(JSON.stringify({ reference_data: this.tempAllData }), this.tempAllData[this.tempAllData.length - 1], fileName);
+ this.saveReferenceDataToAppc(
+ JSON.stringify({ reference_data: this.tempAllData }), this.referenceDataObject.scope['vnf-type'], fileName);
var templateData = JSON.stringify(this.appData.template.templateData);
var nameValueData = JSON.stringify(this.appData.template.nameValueData);
@@ -869,6 +833,8 @@ export class ReferenceDataformComponent implements OnInit {
// valaidation of template data
validateTempAllData() {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": validateTempAllData: start.");
if (this.tempAllData) {
var updatedData = [];
this.tempAllData.forEach(data => {
@@ -880,12 +846,14 @@ export class ReferenceDataformComponent implements OnInit {
}
}
- //preparig and send the data to the API.
- saveReferenceDataToAppc(artifactData, dataJson, fileName) {
+ //.. prepare and send the data to the API.
+ saveReferenceDataToAppc(artifactData, vnf_type, fileName) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": saveReferenceDataToAppc: start: vnf_type:[" +
+ vnf_type + "]");
let data = [];
let slashedPayload = this.referenceDataFormUtil.appendSlashes(artifactData);
-
- let payload = this.utilityService.createPayLoadForSave("reference_data", dataJson['scope']['vnf-type'], "AllAction", fileName, this.versionNoForApiCall, slashedPayload);
+ let payload = this.utilityService.createPayLoadForSave("reference_data", vnf_type, "AllAction", fileName, this.versionNoForApiCall, slashedPayload);
this.ngProgress.start();
this.httpUtils.post({
url: environment.getDesigns,
@@ -909,8 +877,9 @@ export class ReferenceDataformComponent implements OnInit {
this.ngProgress.done();
}, 3500);
}
- // if no data present in the session, fetching data from API
+
retriveFromAppc() {
+ console.log(this.classNm + ": retriveFromAppc: start.");
if (sessionStorage.getItem('updateParams') != 'undefined') {
this.getArtifact();
this.noCacheData = false;
@@ -919,11 +888,22 @@ export class ReferenceDataformComponent implements OnInit {
}
}
+ cloneMessage(servermessage) {
+ var clone = {};
+ for (var key in servermessage) {
+ if (servermessage.hasOwnProperty(key)) //ensure not adding inherited props
+ clone[key] = servermessage[key];
+ }
+ return clone;
+ }
+
public showUpload() {
this.selectedUploadType = this.uploadTypes[0].value;
};
- // used when user uploads a file using upload file
+
public fileChange(input) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": fileChange: start.");
this.fileName = input.target.files[0].name.replace(/C:\\fakepath\\/i, '');
this.fileUploaded = true;
this.disableRetrieve = true;
@@ -945,7 +925,6 @@ export class ReferenceDataformComponent implements OnInit {
return;
}
}
-
this.displayVnfc = 'false';
this.isVnfcType = false;
this.isVnfcTypeList = false;
@@ -955,37 +934,55 @@ export class ReferenceDataformComponent implements OnInit {
this.displayVnfc = 'true';
this.isVnfcTypeList = true;
this.vnfcIdentifier = obj.scope['vnfc-type-list'][0];
-
}
}
- this.oldAction=obj.action;
+ this.oldAction = obj.action;
this.tempAllData = JSON.parse(JSON.stringify(jsonObject));
- //check vnfc tyoe list for old files
- // if (this.referenceDataObject.scope['vnfc-type-list'] == undefined) {
- // this.tempAllData = []
- // this.referenceDataObject = {
- // action: '',
- // 'action-level': 'vnf',
- // scope: { 'vnf-type': '', 'vnfc-type-list': [] },
- // 'template': 'Y',
- // vm: [],
- // 'device-protocol': '',
- // 'user-name': '',
- // 'port-number': '',
- // 'artifact-list': []
- // }
- // this.nService.error('Error', 'Incorrect file format');
- // return
- // }
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": fileChange: read & parsed.");
this.notificationService.notifySuccessMessage('Reference Data file successfully uploaded..');
- this.highlightSelectedActions(jsonObject)
+ if (jsonObject instanceof Array) {
+ this.referenceDataObject = jsonObject[0];
+ jsonObject.forEach(obj => {
+ this.selectedActions.push(obj.action);
+ });
+ } else {
+ this.referenceDataObject = jsonObject;
+
+ this.selectedActions.push(jsonObject.action);
+ }
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": fileChange: " +
+ "referenceDataObject.action:[" +
+ this.referenceDataObject.action + "]");
this.toggleIdentifier(this.referenceDataObject.action)
- this.populateExistinAction(this.referenceDataObject.action)
this.configDrp(this.referenceDataObject.action)
-
-
- this.processReferenceDataAfterRetrieval();
-
+ if (this.referenceDataObject.action === 'OpenStack Actions') {
+ this.deviceProtocols = ['', 'OpenStack'];
+ this.buildDesignComponent.tabs = [
+ {
+ type: 'dropdown',
+ name: 'Reference Data',
+ url: 'references',
+ }];
+ }
+ else {
+ this.buildDesignComponent.tabs = [
+ {
+ name: 'Reference Data',
+ url: 'references',
+ }, {
+ name: 'Template',
+ url: 'templates/myTemplates',
+ }, {
+ name: 'Parameter Definition',
+ url: 'parameterDefinitions/create'
+ } /*, {
+ name: "Test",
+ url: 'test',
+ }*/
+ ];
+ }
this.getArtifactsOpenStack();
if (this.referenceDataObject.template == null) {
this.referenceDataObject.template = 'Y';
@@ -993,37 +990,27 @@ export class ReferenceDataformComponent implements OnInit {
if (this.referenceDataObject['action-level'] == null) {
this.referenceDataObject['action-level'] = 'VNF';
}
-
-
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": fileChange: displayVnfc:[" +
+ this.displayVnfc + "]");
// Enable or Block Template and PD Tabs
- this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc });
+ this.buildDesignComponent.getRefData(
+ { ...this.referenceDataObject, displayVnfc: this.displayVnfc });
} catch (e) {
- this.nService.error('Error', 'Incorrect file format');
+ this.nService.error(appConstants.notifications.titles.error, appConstants.messages.incorrectFileFormat);
}
}
this.hideModal = true;
});
} else {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": fileChange: Error: Failed to read file!");
this.notificationService.notifyErrorMessage('Failed to read file..');
}
-
- }
-
- // Highlights selected action on new file upload and on existing VNF
- public highlightSelectedActions(jsonObject) {
- if (jsonObject instanceof Array) {
- this.referenceDataObject = jsonObject[0];
- jsonObject.forEach(obj => {
- this.selectedActions.push(obj.action);
- });
- } else {
- this.referenceDataObject = jsonObject;
-
- this.selectedActions.push(jsonObject.action);
- }
}
public readFile(file, reader, callback) {
+ console.log(this.classNm + ": readFile: start.");
// Set a callback funtion to fire after the file is fully loaded
reader.onload = () => {
// callback with the results
@@ -1037,8 +1024,9 @@ export class ReferenceDataformComponent implements OnInit {
fileChangeEvent(fileInput: any) {
let obj: any = fileInput.target.files;
}
- //resetting the values
+
clearVnfcData() {
+ console.log(this.classNm + ": clearVnfcData: start.");
this.Sample = {
'vnfc-instance': '1',
'vnfc-function-code': '',
@@ -1061,9 +1049,10 @@ export class ReferenceDataformComponent implements OnInit {
// this.referenceDataObject.scope['vnfc-type'] = '';
// }
// }
- // resetting the form
+
resetForm() {
- console.log( this.classNm+": resetForm: start.");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": resetForm: start.");
this.referenceDataObject['action-level'] = 'vnf';
this.referenceDataObject.template = 'Y';
this.referenceDataObject['device-protocol'] = '';
@@ -1075,12 +1064,8 @@ export class ReferenceDataformComponent implements OnInit {
// this method gets called with the action as parameter and the respective action details are fetched and assigned to the current page
populateExistinAction(data) {
- let methName= "populateExistinAction";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": start: data:["+data+"]");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": populateExistinAction: start.");
let existAction = this.tempAllData.findIndex(obj => {
return obj.action == data;
});
@@ -1091,11 +1076,12 @@ export class ReferenceDataformComponent implements OnInit {
this.referenceDataObject.scope['vnfc-type-list'] = obj['scope']['vnfc-type-list'];
this.referenceDataObject['device-protocol'] = obj['device-protocol'];
this.refernceScopeObj['sourceType'] = obj['scopeType'];
- if(obj['scope']['vnfc-type-list'] != undefined && obj['scope']['vnfc-type-list'].length >0) {
+ if (obj['scope']['vnfc-type-list'] != undefined && obj['scope']['vnfc-type-list'].length > 0) {
this.referenceDataObject['vnfcIdentifier'] = obj['scope']['vnfc-type-list'][0];
}
} else {
- console.log( this.classNm+": populateExistinAction: action not found");
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": populateExistinAction: action not found");
this.resetForm();
this.referenceDataObject.action = data;
}
@@ -1108,6 +1094,7 @@ export class ReferenceDataformComponent implements OnInit {
case 'UpgradeBackout':
case 'ResumeTraffic':
case 'QuiesceTraffic':
+ case 'DistributeTraffic':
case 'UpgradeBackup':
case 'UpgradePostCheck':
case 'UpgradePreCheck':
@@ -1133,38 +1120,38 @@ export class ReferenceDataformComponent implements OnInit {
}
}
- //Modal pop up for action change with values entered.
- actionChange( data, userForm) {
- let methName= "actionChange";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": start: data:["+data+"]"+
- " userForm.valid:["+userForm.valid+"]");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
+ //Modal pop up for action change with values entered.
+ actionChange(data, userForm) {
+ var methName = "actionChange";
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": " + methName + ": start: data:[" + data + "]" +
+ " userForm.valid:[" + userForm.valid + "]");
this.disableGrpNotationValue = false
if (data == null) {
- console.log( this.classNm+": "+methName+": data == null");
+ console.log(this.classNm + ": " + methName + ": data == null");
return;
}
- if((userForm.valid) && this.oldAction != '' && this.oldAction != undefined) {
+ if ((userForm.valid) && this.oldAction != '' && this.oldAction != undefined) {
this.actionChanged = true;
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+
- ": userForm valid and oldAction defined");
+ console.log(this.classNm + ": " + methName +
+ ": userForm valid and oldAction defined");
// Calling common Confirmation Modal
let disposable = this.dialogService.addDialog(ConfirmComponent)
- .subscribe((isConfirmed)=>{
+ .subscribe((isConfirmed) => {
//We get dialog result
- if(isConfirmed) {
+ console.log(this.classNm + ": " + methName + ": isConfirmed:[" +
+ isConfirmed + "]");
+ if (isConfirmed) {
// User clicked on Yes
this.currentAction = this.referenceDataObject.action;
+ console.log(this.classNm + ": " + methName +
+ ": clicked on Yes: currentAction:[" + this.currentAction +
+ "] oldAction:[" + this.oldAction + "]");
this.referenceDataObject.action = this.oldAction;
$('#saveToAppc').click();//make sure the save all is done before the tempall obj is saved form the API
this.toggleIdentifier(data)
this.oldAction = this.currentAction;// this.referenceDataObject.action + '';
- this.referenceDataObject.action = this.currentAction
-
+ this.referenceDataObject.action = this.currentAction;
this.populateExistinAction(data);
if (this.oldAction === 'OpenStack Actions') {
@@ -1186,6 +1173,8 @@ export class ReferenceDataformComponent implements OnInit {
// User clicked on No
this.toggleIdentifier(data)
this.currentAction = this.referenceDataObject.action;
+ console.log(this.classNm + ": " + methName +
+ ": clicked on No: currentAction:[" + this.currentAction + "]");
this.populateExistinAction(data);
this.resetVmsForScaleout(data);
this.oldAction = this.referenceDataObject.action + '';
@@ -1194,27 +1183,27 @@ export class ReferenceDataformComponent implements OnInit {
this.refernceScopeObj.from = '';
}
- if (this.referenceDataObject.action === 'Configure' || this.referenceDataObject.action === 'ConfigModify') {
- this.isConfigOrConfigModify = true;
+ if (this.referenceDataObject.action === 'Configure' || this.referenceDataObject.action === 'ConfigModify' || this.referenceDataObject.action === 'DistributeTraffic') {
+ this.isConfigureAction = true;
} else {
- this.isConfigOrConfigModify = false;
+ this.isConfigureAction = false;
delete this.mappingEditorService.newObject['vnfc'];
}
-
+
// Enable or Block Template and PD Tabs
if (this.currentAction == 'ConfigScaleOut' && this.templateIdentifier && this.templateIdentifier != '') {
// let referenceDataObjectTemp = this.referenceDataObject;
// referenceDataObjectTemp['template-id'] = this.templateIdentifier;
// this.buildDesignComponent.getRefData(referenceDataObjectTemp);
this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc }, { reqField: this.templateIdentifier });
-
+
} else {
this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc });
- }
+ }
});
} else {
- console.log( this.classNm+": "+methName+
- ": userForm Not valid or oldAction not defined");
+ console.log(this.classNm + ": " + methName +
+ ": userForm Not valid or oldAction not defined");
this.actionChanged = true;
this.currentAction = this.referenceDataObject.action;
this.oldAction = this.referenceDataObject.action + '';
@@ -1223,7 +1212,7 @@ export class ReferenceDataformComponent implements OnInit {
this.toggleIdentifier(data);
// Enable or Block Template and PD Tabs
- if(this.currentAction == 'ConfigScaleOut' && this.templateIdentifier) {
+ if (this.currentAction == 'ConfigScaleOut' && this.templateIdentifier) {
// let referenceDataObjectTemp = this.referenceDataObject;
// referenceDataObjectTemp['template-id'] = this.templateIdentifier;
// this.buildDesignComponent.getRefData(referenceDataObjectTemp);
@@ -1232,61 +1221,74 @@ export class ReferenceDataformComponent implements OnInit {
this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc });
}
}
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
this.configDrp(data)
}
configDrp(data) {
- console.log( this.classNm+": configDrp: start: data:["+data+"]");
+ console.log(this.classNm + ": configDrp: start: data:[" + data + "]");
if (data == 'ConfigScaleOut') {
this.groupAnotationType = ['', 'first-vnfc-name', 'fixed-value', 'relative-value', 'existing-group-name'];
} else {
this.groupAnotationType = ['', 'first-vnfc-name', 'fixed-value', 'relative-value'];
}
if (data == 'OpenStack Actions') {
- this.buildDesignComponent.tabs = this.referencDataTab;
+ this.buildDesignComponent.tabs = [
+ {
+ type: 'dropdown',
+ name: 'Reference Data',
+ url: 'references',
+ }];
}
else {
- this.buildDesignComponent.tabs = this.allTabs;
+ this.buildDesignComponent.tabs = [
+ {
+ name: 'Reference Data',
+ url: 'references',
+ }, {
+ name: 'Template',
+ url: 'templates/myTemplates',
+ }, {
+ name: 'Parameter Definition',
+ url: 'parameterDefinitions/create'
+ }/*, {
+ name: "Test",
+ url: 'test',
+ }*/
+ ];
}
- if (data == 'Configure' || data == 'ConfigModify') {
+ if (data == 'Configure' || data == 'ConfigModify' || data == 'DistributeTraffic') {
this.nonConfigureAction = false;
} else {
this.nonConfigureAction = true;
}
}
- // removing and adding the url key based on the protocol selected
+
deviceProtocolChange() {
- let methName= "deviceProtocolChange";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": start.");
+ console.log(this.classNm + ": deviceProtocolChange: start.");
if (this.referenceDataObject['device-protocol'] == 'REST') {
} else {
delete this.referenceDataObject['context-url']
}
// Enable or Block Template and PD Tabs
- this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc }, {reqField: this.templateIdentifier})
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
+ this.buildDesignComponent.getRefData(
+ { ...this.referenceDataObject, displayVnfc: this.displayVnfc },
+ { reqField: this.templateIdentifier });
}
// used to call or trigger save object on template Identifier changes
idChange(data, userForm) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": idChange: start: data:["+data+"]");
+ console.log(this.classNm + ": idChange: start: data:[" + data + "]");
if (data == null) {
return;
}
-
// Enable or Block Template and PD Tabs
// let referenceDataObjectTemp = this.referenceDataObject;
// referenceDataObjectTemp['template-id'] = data;
// this.buildDesignComponent.getRefData(referenceDataObjectTemp);
- this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc }, { reqField: data });
+ this.buildDesignComponent.getRefData(
+ { ...this.referenceDataObject, displayVnfc: this.displayVnfc },
+ { reqField: data });
if ((userForm.valid)) {
this.currentAction = "ConfigScaleOut"
@@ -1294,95 +1296,78 @@ export class ReferenceDataformComponent implements OnInit {
let referenceObject = this.prepareReferenceObject();
this.actionChanged = true;
if (this.templateIdentifier) {
- // Calling common Confirmation Modal
- let disposable = this.dialogService.addDialog(ConfirmComponent)
- .subscribe((isConfirmed)=>{
- //We get dialog result
- if(isConfirmed) {
- // User clicked on Yes
- this.validateTempAllData();
- this.saveToAppc();
- this.clearCache();
- this.clearVnfcData();
- this.refernceScopeObj.from = '';
- }
- else {
- // User clicked on No
- this.clearCache();
- this.refernceScopeObj.from = '';
- }
- });
+ // Calling common Confirmation Modal
+ let disposable = this.dialogService.addDialog(ConfirmComponent)
+ .subscribe((isConfirmed) => {
+ //We get dialog result
+ if (isConfirmed) {
+ // User clicked on Yes
+ this.validateTempAllData();
+ this.saveToAppc();
+ this.clearCache();
+ this.clearVnfcData();
+ this.refernceScopeObj.from = '';
+ }
+ else {
+ // User clicked on No
+ this.clearCache();
+ this.refernceScopeObj.from = '';
+ }
+ });
}
} else {
- this.oldtemplateIdentifier = this.templateIdentifier
+ this.oldtemplateIdentifier = this.templateIdentifier;
}
-
- // if (this.referenceDataObject.action == 'ConfigScaleOut' && data ) {
- // let referenceDataObjectTemp = this.referenceDataObject;
- // referenceDataObjectTemp['selectedTemplateId'] = data;
- // this.buildDesignComponent.getRefData(referenceDataObjectTemp);
- // } else {
- // this.buildDesignComponent.getRefData(this.referenceDataObject);
- // }
}
// used to call or trigger save object on multiple VNFC's changes
- vnfcChanged( data, userForm) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": vnfcChanged: new vnfcIdentifier:["+data+"]");
- if( this.utilityService.getTracelvl() > 1 )
- console.log( this.classNm+": vnfcChanged: oldVnfcIdentifier:["+
- this.oldVnfcIdentifier+"]");
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": vnfcChanged: scope.vnfc-type:["+
- this.referenceDataObject.scope['vnfc-type']+"]");
+ vnfcChanged(data, userForm) {
+ console.log(this.classNm + ": vnfcChanged: new vnfcIdentifier:[" + data + "]");
+ console.log(this.classNm + ": vnfcChanged: oldVnfcIdentifier:[" +
+ this.oldVnfcIdentifier + "]");
+ console.log(this.classNm + ": vnfcChanged: scope.vnfc-type:[" +
+ this.referenceDataObject.scope['vnfc-type'] + "]");
this.vnfcIdentifier = data;
- //this.clearCache();
+ this.clearCache();
if (data == null) {
return;
}
-
+ //.. populate VNFC Type in Sample field
+ this.setVnfcTypeInSample(this.vnfcIdentifier);
// Enable or Block Template and PD Tabs
let referenceDataObjectTemp = this.referenceDataObject;
referenceDataObjectTemp['vnfcIdentifier'] = data;
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+
- ": vnfcChanged: displayVnfc:["+this.displayVnfc+"]");
- //this.buildDesignComponent.getRefData(referenceDataObjectTemp);
- this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc }, { reqField: data });
-
-
- console.log( this.classNm+
- ": vnfcChanged: userForm.valid:["+userForm.valid+"]");
+ console.log(this.classNm +
+ ": vnfcChanged: displayVnfc:[" + this.displayVnfc + "]");
+ this.buildDesignComponent.getRefData(
+ { ...this.referenceDataObject, displayVnfc: this.displayVnfc },
+ { reqField: data });
+ console.log(this.classNm +
+ ": vnfcChanged: userForm.valid:[" + userForm.valid + "]");
if ((userForm.valid) && this.oldVnfcIdentifier != '' && this.oldVnfcIdentifier != undefined) {
this.currentAction = this.referenceDataObject.action
this.oldVnfcIdentifier = this.vnfcIdentifier
let referenceObject = this.prepareReferenceObject();
this.actionChanged = true;
if (this.vnfcIdentifier) {
- // Calling common Confirmation Modal
- let disposable = this.dialogService.addDialog(ConfirmComponent)
- .subscribe((isConfirmed)=>{
- //We get dialog result
- if(isConfirmed) {
- // User clicked on Yes
- this.validateTempAllData();
- this.saveToAppc();
- this.clearCache();
- this.clearVnfcData()
- this.refernceScopeObj.from = '';
- //.. populate VNFC Type in Sample field
- this.setVnfcTypeInSample( this.vnfcIdentifier );
- }
- else {
- // User clicked on No
- this.clearCache();
- this.clearVnfcData()
- this.refernceScopeObj.from = '';
- //.. populate VNFC Type in Sample field
- this.setVnfcTypeInSample( this.vnfcIdentifier );
- }
- });
+ // Calling common Confirmation Modal
+ let disposable = this.dialogService.addDialog(ConfirmComponent)
+ .subscribe((isConfirmed) => {
+ //We get dialog result
+ if (isConfirmed) {
+ // User clicked on Yes
+ this.validateTempAllData();
+ this.saveToAppc();
+ this.clearCache();
+ this.clearVnfcData()
+ this.refernceScopeObj.from = '';
+ }
+ else {
+ // User clicked on No
+ this.clearCache();
+ this.refernceScopeObj.from = '';
+ }
+ });
}
} else {
if (data != null) {
@@ -1391,9 +1376,8 @@ export class ReferenceDataformComponent implements OnInit {
}
}
- clearCache()
- //needed for the the clearing template cache.
- {
+ clearCache() {
+ console.log(this.classNm + ": clearCache: start.");
// get the value and save the userid and persist it.
this.clearTemplateCache();
this.clearPdCache();
@@ -1414,6 +1398,74 @@ export class ReferenceDataformComponent implements OnInit {
this.paramShareService.setSessionParamData(undefined);
}
+ saveTemp() {
+ console.log(this.classNm + ": saveTemp: start.");
+ this
+ .httpUtils
+ .post(
+ { url: environment.getDesigns, data: this.appData.template.templateData })
+ .subscribe(resp => {
+ if (resp.output.status.code === '400' && resp.output.status.message === 'success') {
+ this.nService.success('Status', 'Successfully uploaded the Template Data');
+ }
+ if (resp.output.status.code === '401') {
+ this.nService.warn('Status', 'Error in saving the Template to Appc');
+
+ }
+ },
+ (err) => this.nService.error('Status', 'Error Connecting to the APPC Network'));
+ }
+
+ saveNameValue() {
+ console.log(this.classNm + ": saveNameValue: start.");
+ this
+ .httpUtils
+ .post(
+ {
+ url: environment.getDesigns, data: this.appData.template.nameValueData
+ })
+ .subscribe(resp => {
+ if (resp.output.status.code === '400' && resp.output.status.message === 'success') {
+ this.nService.success('Status', 'Successfully uploaded the Name Value Pairs');
+ }
+ if (resp.output.status.code === '401') {
+ this.nService.warn('Status', 'Error in saving the Name value pairs to Appc');
+ }
+ },
+ error => {
+ this.nService.error('Status', 'Error Connecting to the APPC Network');
+ return false;
+ });
+ }
+
+ savePd() {
+ this
+ .httpUtils
+ .post(
+ {
+ url: environment.getDesigns, data: this.appData.pd
+ })
+ .subscribe(resp => {
+ if (resp.output.status.code === '400' && resp.output.status.message === 'success') {
+ this.nService.success('Status', 'Successfully uploaded PD file');
+ }
+ if (resp.output.status.code === '401') {
+ this.nService.warn('Status', 'Error in saving the PD to Appc');
+ }
+ },
+ error => {
+ this.nService.error('Status', 'Error Connecting to the APPC Network');
+ return false;
+ });
+ }
+
+ openModel(toShow: any, message: any, title: any) {
+ console.log(this.classNm + ": openModel: start: title:[" + title + "]");
+ this.modalComponent.isShow = toShow;
+ this.modalComponent.message = message;
+ this.modalComponent.title = title;
+ }
+
browseOption() {
$('#inputFile').trigger('click');
}
@@ -1422,13 +1474,9 @@ export class ReferenceDataformComponent implements OnInit {
$('#excelInputFile').trigger('click');
}
- /* showIdentifier() {
- $('#identifierModal').modal();
- }
-
- showVnfcPopup() {
- $('#vnfcModal').modal();
- }*/
+ showIdentifier() {
+ $('#identifierModal').modal();
+ }
addToIdentDrp() {
if (!(this.referenceDataObject['template-id-list'])) {
@@ -1437,48 +1485,49 @@ export class ReferenceDataformComponent implements OnInit {
if (!(this.referenceDataObject['template-id-list'].indexOf(this.templateId.trim()) > -1)) {
this.referenceDataObject['template-id-list'].push(this.templateId.trim());
}
-
- // Changing newVnfcType value to blank otherwise it will show previous value in text box of popup
- this.templateId = ''
+ // Changing value to blank otherwise it will show previous value in text box of popup
+ this.templateId = '';
}
+
// adds the vnfc to the vnfc dropdown list
addVnfc() {
- var newVnfcTypeV= this.newVnfcType.trim();
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+
- ": addVnfc: start: newVnfcTypeV:["+newVnfcTypeV+"]");
+ var newVnfcTypeV = this.newVnfcType.trim();
+ console.log(this.classNm +
+ ": addVnfc: start: newVnfcTypeV:[" + newVnfcTypeV + "]");
if (!(this.referenceDataObject.scope['vnfc-type-list'])) {
this.referenceDataObject.scope['vnfc-type-list'] = [];
- this.vnfcIdentifier = newVnfcTypeV;
- } else {
- this.vnfcIdentifier = newVnfcTypeV;
+ // this.vnfcIdentifier = newVnfcTypeV;
+ } else if (this.referenceDataObject.scope['vnfc-type-list'].length == 0) {
+ // this.vnfcIdentifier = newVnfcTypeV;
}
- //this.referenceDataObject['vnfcIdentifier'] = this.vnfcIdentifier;
+ this.vnfcIdentifier = newVnfcTypeV;
+ console.log(this.classNm +
+ ": addVnfc: vnfcIdentifier:[" + this.vnfcIdentifier + "]");
if (!(this.referenceDataObject.scope['vnfc-type-list'].indexOf(newVnfcTypeV) > -1)) {
this.referenceDataObject.scope['vnfc-type-list'].push(newVnfcTypeV);
}
this.tempAllData.forEach(obj => {
- if (obj.action == "Configure" || obj.action == "ConfigModify") {
+ if (obj.action == "Configure" || obj.action == "ConfigModify" || obj.action == "DistributeTraffic") {
obj.scope['vnfc-type-list'] = this.referenceDataObject.scope['vnfc-type-list']
}
this.resetArtifactList(obj);
});
- //this.buildDesignComponent.getRefData({ ...this.referenceDataObject, displayVnfc: this.displayVnfc });
- this.setVnfcTypeInSample( newVnfcTypeV );
- let userForm = {valid: true};
- this.vnfcChanged(this.newVnfcType, userForm)
+ console.log(this.classNm + ": addVnfc: scope vnfc-type:[" +
+ this.referenceDataObject.scope['vnfc-type'] + "]");
+ this.setVnfcTypeInSample(newVnfcTypeV);
// Changing newVnfcType value to blank otherwise it will show previous value in text box of popup
this.newVnfcType = ''
}
resetVms() {
+ console.log(this.classNm + ": resetVms: start.");
this.referenceDataObject.vm = [];
}
dataModified() {
// this.referenceDataObject.vm = this.referenceDataObject.vm;
}
- // used to show and hide the group notation value in VNFC information
+
resetGroupNotation() {
if (this.Sample['group-notation-type'] == "existing-group-name") {
this.Sample['group-notation-value'] = ""
@@ -1505,121 +1554,98 @@ export class ReferenceDataformComponent implements OnInit {
}
resetParamsOnVnfcType() {
- let scopeName: any;
- let vnfcTypeList = this.referenceDataObject.scope['vnfc-type-list']
- let vnfcType = this.referenceDataObject.scope['vnfc-type']
- let vnfType = this.referenceDataObject.scope['vnf-type'];
- //called only if only vnf is there
- if ((this.referenceDataFormUtil.nullCheckForVnfcTypeList(vnfcTypeList)) && (this.referenceDataFormUtil.nullCheckForVnfcType(vnfcType))
- ) {
- scopeName = vnfType;
+ console.log(this.classNm + ": resetParamsOnVnfcType: start:\n " +
+ "ref.DataObject.scope vnfc-type:[" +
+ this.referenceDataObject.scope['vnfc-type'] + "]");
+ let scopeName = '';
+ //if only vnf is there
+ if (this.referenceDataObject.scope['vnfc-type'] == '' || this.referenceDataObject.scope['vnfc-type'] == null || this.referenceDataObject.scope['vnfc-type'] == 'null') {
+ scopeName = this.referenceDataObject.scope['vnf-type'];
this.referenceDataObject.scope['vnfc-type'] = '';
this.referenceDataObject['action-level'] = 'vnf';
this.referenceDataObject['scopeType'] = 'vnf-type';
- scopeName = scopeName.replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '');
}
//if VNFC is entered set action level & Scope type to VNFC for configure and configure modify, and default the values to vnf and vnf type for all other actions
else {
- if (this.referenceDataFormUtil.nullCheckForVnfcTypeList(vnfcTypeList)) {
- scopeName = vnfcType ? vnfcType : "";
- } else {
- // scopeName = this.referenceDataObject.scope['vnfc-type-list'];
- }
-
- if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
- this.referenceDataObject['action-level'] = 'vnf';
+ scopeName = this.referenceDataObject.scope['vnfc-type'];
+ if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify' || this.referenceDataObject.action == 'DistributeTraffic') {
+ this.referenceDataObject['action-level'] = 'vnfc';
this.referenceDataObject['scopeType'] = 'vnfc-type';
} else {
this.referenceDataObject['action-level'] = 'vnf';
this.referenceDataObject['scopeType'] = 'vnf-type';
}
}
- this.referenceDataObject.scope['vnfc-type'] = this.referenceDataObject.scope['vnfc-type'] ? this.referenceDataObject.scope['vnfc-type'] : "";
+ //replacing / with _ and removing spaces in the scopeName
+ if (scopeName) {
+ scopeName = scopeName.replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '');
+ }
+ console.log(this.classNm + ": resetParamsOnVnfcType: return scopeName:[" +
+ scopeName + "]");
return scopeName
}
- //used to form the structure of the reference file
+ decideExtension(obj) {
+ //marking the extension based on the device-protocol selected by the user
+ let extension = '.json';
+ switch (obj['device-protocol']) {
+ case 'ANSIBLE':
+ case 'CHEF':
+ case 'CLI':
+ extension = '.json';
+ break;
+ case 'NETCONF-XML':
+ case 'REST':
+ extension = '.xml';
+ break;
+ }
+ return extension;
+ }
prepareArtifactList(scopeName, extension) {
+ console.log(this.classNm + ": prepareArtifactList: start: scopeName:[" +
+ scopeName + "] extension:[" + extension + "]");
this.referenceDataObject['artifact-list'] = [];
- let configTemplate
- let pdTemplate
- let paramValue
- let vnf = this.referenceDataObject.scope['vnf-type']
- if (this.referenceDataObject.action == 'Configure' || this.referenceDataObject.action == 'ConfigModify') {
- let vnfcTypeList = this.referenceDataObject.scope['vnfc-type-list'];
- let pd_fileName
- let config_template_fileName
-
- let param_fileName
- if (vnfcTypeList && vnfcTypeList.length > 0) {
-
-
- for (var x = 0; x < vnfcTypeList.length; x++) {
+ //preparing the artifact list array file names along with extension
+ let config_template_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V' + extension;
+ let pd_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V.yaml';
+ let reference_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V.json';
+ let configTemplate = {
+ 'artifact-name': 'template_' + config_template_fileName,
+ 'artifact-type': 'config_template'
+ };
+ let pdTemplate = {
+ 'artifact-name': 'pd_' + pd_fileName,
+ 'artifact-type': 'parameter_definitions'
+ };
+ if (this.referenceDataObject.action != 'ConfigScaleOut') {
+ this.referenceDataObject['artifact-list'].push(configTemplate,
+ pdTemplate
+ );
+ } else {
+ let identifiers = this.referenceDataObject['template-id-list'];
+ if (identifiers) {
+ for (var x = 0; x < identifiers.length; x++) {
//for replacing spaces and "/" with "_"
- let type = vnfcTypeList[x].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '');
- pd_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, type, '.yaml')
- config_template_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, type, extension)
- param_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, type, '.json')
- configTemplate = this.referenceDataFormUtil.createConfigTemplate(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplate(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValue(param_fileName);
-
+ identifiers[x] = identifiers[x].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '');
+ pd_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V_' + identifiers[x] + '.yaml';
+ config_template_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V_' + identifiers[x] + extension;
+
+ configTemplate = {
+ 'artifact-name': 'template_' + config_template_fileName,
+ 'artifact-type': 'config_template'
+ };
+ pdTemplate = {
+ 'artifact-name': 'pd_' + pd_fileName,
+ 'artifact-type': 'parameter_definitions'
+ };
this.referenceDataObject['artifact-list'].push(configTemplate,
- pdTemplate, paramValue
+ pdTemplate
);
}
- } else if (scopeName) {
- pd_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V.yaml';
- config_template_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V' + extension;
- param_fileName = this.referenceDataObject.action + '_' + scopeName + '_' + '0.0.1V.json';
- configTemplate = this.referenceDataFormUtil.createConfigTemplate(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplate(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValue(param_fileName);
- this.referenceDataObject['artifact-list'].push(configTemplate,
- pdTemplate, paramValue
- );
}
- } else {
-
- //preparing the artifact list array file names along with extension
- let config_template_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, '', extension);
- let pd_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, '', '.yaml');
- let reference_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, '', '.json');
- let param_fileName = this.referenceDataFormUtil.createArtifactName(this.referenceDataObject.action, vnf, '', '.json');
- configTemplate = this.referenceDataFormUtil.createConfigTemplate(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplate(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValue(param_fileName);
- if (this.referenceDataObject.action != 'ConfigScaleOut') {
-
- this.referenceDataObject['artifact-list'].push(configTemplate,
- pdTemplate, paramValue
- );
-
- } else {
-
- let identifiers = this.referenceDataObject['template-id-list'];
- if (identifiers) {
- for (var x = 0; x < identifiers.length; x++) {
- //for replacing spaces and "/" with "_"
- let type = identifiers[x].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '');
- pd_fileName = this.referenceDataFormUtil.createArtifactNameForIdentifiers(this.referenceDataObject.action, this.referenceDataObject.scope["vnf-type"], type, '.yaml');
- config_template_fileName = this.referenceDataFormUtil.createArtifactNameForIdentifiers(this.referenceDataObject.action, this.referenceDataObject.scope["vnf-type"], type, extension);
- param_fileName = this.referenceDataFormUtil.createArtifactNameForIdentifiers(this.referenceDataObject.action, this.referenceDataObject.scope["vnf-type"], type, '.json');
- configTemplate = this.referenceDataFormUtil.createConfigTemplate(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplate(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValue(param_fileName);
-
- this.referenceDataObject['artifact-list'].push(configTemplate,
- pdTemplate, paramValue
- );
- }
- }
-
- }
}
}
- // used to remove the added vms for actions other than configure & scaleout
deleteVmsforNonActions(newObj, action) {
let configureObject = (action == 'Configure');
let ConfigScaleOut = (action == 'ConfigScaleOut');
@@ -1637,78 +1663,26 @@ export class ReferenceDataformComponent implements OnInit {
}
return newObj
}
- // used to replace the data in tempall obj and form the artifact names
pushOrReplaceTempData(newObj, action) {
- let configTemplate
- let pdTemplate
- let paramValue
- if (newObj.action == "Configure" || newObj.action == "ConfigModify") {
- let extension = this.referenceDataFormUtil.decideExtension(this.referenceDataObject);
- let pd_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + (newObj['vnfcIdentifier'] ? (newObj['vnfcIdentifier'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_') : "") + '0.0.1V.yaml';
- let config_template_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + (newObj['vnfcIdentifier'] ? (newObj['vnfcIdentifier'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_') : "") + '0.0.1V' + extension;
- let param_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + (newObj['vnfcIdentifier'] ? (newObj['vnfcIdentifier'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_') : "") + '0.0.1V.json';
- configTemplate = this.referenceDataFormUtil.createConfigTemplateForPushReplaceData(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplateForPushReplaceData(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValueForPushReplaceData(param_fileName);
- let idValue = ""
- if (newObj.scope['vnfc-type']) {
- idValue = newObj.scope['vnfc-type']
- } else if (this.vnfcIdentifier) {
- idValue = this.vnfcIdentifier
+ console.log(this.classNm + ": pushOrReplaceTempData: start: action:[" +
+ action + "]\n newObj.scope vnfc-type:[" + newObj.scope['vnfc-type'] + "]");
+ if (newObj.scope['vnfc-type'] == undefined ||
+ newObj.scope['vnfc-type'] == null ||
+ newObj.scope['vnfc-type'].length < 1) {
+ console.log(this.classNm + ": pushOrReplaceTempData: scope vnfc-type" +
+ " is empty.\n vnfcIdentifier:[" + this.vnfcIdentifier + "]");
+ if (this.vnfcIdentifier != null && this.vnfcIdentifier != undefined &&
+ this.vnfcIdentifier.length > 0) {
+ newObj.scope['vnfc-type'] = this.vnfcIdentifier;
}
-
- let arr = [configTemplate, pdTemplate, paramValue]
- this.mappingEditorService.selectedObj({
- action: newObj.action,
- vnf: newObj.scope['vnf-type'] ? newObj.scope['vnf-type'] : "",
- vnfc: idValue,
- protocol: newObj['device-protocol'] ? newObj['device-protocol'] : "",
- param_artifact: paramValue['param_artifact'],
- pd_artifact: pdTemplate['pd_artifact'],
- template_artifact: configTemplate['template_artifact']
- });
- } else if (newObj.action == "ConfigScaleOut") {
- let extension = this.referenceDataFormUtil.decideExtension(newObj);
- let pd_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_0.0.1V' + '_' + (this.templateIdentifier ? (this.templateIdentifier.replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '')) : "") + ".yaml";
- let config_template_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V_' + (this.templateIdentifier ? (this.templateIdentifier.replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '') : "") + extension;
- let param_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V_' + (this.templateIdentifier ? (this.templateIdentifier.replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '') : "") + '.json';
- configTemplate = this.referenceDataFormUtil.createConfigTemplateForPushReplaceData(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplateForPushReplaceData(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValueForPushReplaceData(param_fileName);
- let arr = [configTemplate, pdTemplate, paramValue]
- this.mappingEditorService.selectedObj({
- action: newObj.action,
- vnf: newObj.scope['vnf-type'] ? newObj.scope['vnf-type'] : "",
- //vnfc: newObj['vnfcIdentifier'] ? newObj['vnfcIdentifier'] : "",
- protocol: newObj['device-protocol'] ? newObj['device-protocol'] : "",
- templateId: this.templateIdentifier,
- param_artifact: paramValue['param_artifact'],
- pd_artifact: pdTemplate['pd_artifact'],
- template_artifact: configTemplate['template_artifact']
- });
- }
- else {
- let extension = this.referenceDataFormUtil.decideExtension(newObj);
- let pd_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V.yaml';
- let config_template_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V' + extension;
- let param_fileName = this.referenceDataObject.action + '_' + newObj.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '') + '_' + '0.0.1V.json';
- configTemplate = this.referenceDataFormUtil.createConfigTemplateForPushReplaceData(config_template_fileName);
- pdTemplate = this.referenceDataFormUtil.createPdTemplateForPushReplaceData(pd_fileName);
- paramValue = this.referenceDataFormUtil.createParamValueForPushReplaceData(param_fileName);
- let arr = [configTemplate, pdTemplate, paramValue]
- this.mappingEditorService.selectedObj({
- action: newObj.action,
- vnf: newObj.scope['vnf-type'] ? newObj.scope['vnf-type'] : "",
- protocol: newObj['device-protocol'] ? newObj['device-protocol'] : "",
- param_artifact: paramValue['param_artifact'],
- pd_artifact: pdTemplate['pd_artifact'],
- template_artifact: configTemplate['template_artifact']
- });
- }
-
+ };
let actionObjIndex = this.tempAllData.findIndex(obj => {
return obj['action'] == action;
});
+ if (newObj.action != 'HealthCheck') {
+ delete newObj['url'];
+ }
+
if (actionObjIndex > -1) {
this.tempAllData[actionObjIndex] = newObj;
this.mappingEditorService.saveLatestAction(this.tempAllData[actionObjIndex]);
@@ -1721,10 +1695,8 @@ export class ReferenceDataformComponent implements OnInit {
}
} else {
if (newObj.action != '') {
-
this.tempAllData.push(newObj);
this.mappingEditorService.saveLatestAction(newObj);
-
if (newObj.action == "ConfigScaleOut") {
this.mappingEditorService.saveLatestIdentifier(this.templateIdentifier);
}
@@ -1734,9 +1706,12 @@ export class ReferenceDataformComponent implements OnInit {
}
}
}
+
}
+
// removes the unwanted keys added in the artifact for vnfc level actions
deleteUnwantedKeys(newObj) {
+ console.log(this.classNm + ": deleteUnwantedKeys: start.");
newObj = JSON.parse(JSON.stringify(newObj))
delete newObj['template-id']
delete newObj['vnfcIdentifier']
@@ -1746,28 +1721,25 @@ export class ReferenceDataformComponent implements OnInit {
if (newObj.action != 'HealthCheck') {
delete newObj['url'];
}
- if (newObj.action != "Configure" && newObj.action != "ConfigModify") {
+ if (newObj.action != "Configure" && newObj.action != "ConfigModify" && newObj.action != "DistributeTraffic") {
newObj.scope['vnfc-type-list'] = [];
}
return newObj
}
addAllActionObj(newObj, scopeName) {
-
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": addAllActionObj: start.");
//Creating all action block to allow mulitple actions at once
let allAction = {
action: 'AllAction',
'action-level': 'vnf',
scope: newObj.scope,
- 'artifact-list': []
+ 'artifact-list': [{
+ 'artifact-name': 'reference_AllAction' + '_' + scopeName + '_' + '0.0.1V.json',
+ 'artifact-type': 'reference_template'
+ }]
};
- let vnfType = this.referenceDataObject.scope['vnf-type'].replace(/ /g, '').replace(new RegExp('/', 'g'), '_').replace(/ /g, '');
-
- allAction['artifact-list'].push({
- 'artifact-name': 'reference_AllAction' + '_' + vnfType + '_' + '0.0.1V.json',
- 'artifact-type': 'reference_template'
- })
-
let allActionIndex = this.tempAllData.findIndex(obj => {
return obj['action'] == 'AllAction';
});
@@ -1779,18 +1751,12 @@ export class ReferenceDataformComponent implements OnInit {
}
resetTempData() {
- let methName= "resetTempData";
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": start.");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": tempAllData:["+
- JSON.stringify(this.tempAllData)+"]");
- if (this.utilityService.checkNotNull(this.uploadedDataArray)) {
-
- if (this.utilityService.checkNotNull(this.tempAllData)) {
+ if (this.utilityService.getTracelvl() > 0)
+ console.log(this.classNm + ": resetTempData: start.");
+ if (this.uploadedDataArray && this.uploadedDataArray != undefined && this.uploadedDataArray.length != 0) {
+ if (this.tempAllData && this.tempAllData != undefined) {
for (var i = 0; i < this.tempAllData.length; i++) {
var result = false;
-
if (this.tempAllData[i].action === 'AllAction') {
result = true;
}
@@ -1809,27 +1775,26 @@ export class ReferenceDataformComponent implements OnInit {
}
trackByFn(index, item) {
- return index; // or item.id
+ return index;
}
+
getArtifactsOpenStack() {
+ console.log(this.classNm + ": getArtifactsOpenStack: start: " +
+ "tempAllData length=" + this.tempAllData.length);
var array = []
var vnfcFunctionCodeArrayList = [];
var vnfcSetArray = [];
- // var vnfcSet = new Set();
for (var i = 0; i < this.tempAllData.length; i++) {
if (!this.checkIfelementExistsInArray(this.tempAllData[i].action, this.actions) && (this.tempAllData[i].action != 'AllAction')) {
var vnfcFunctionCodeArray = this.tempAllData[i]["vnfc-function-code-list"]
- // vnfcSet.add("Actions")
- /* for (var j = 0; j < vnfcFunctionCodeArray.length; j++) {
- vnfcSet.add(vnfcFunctionCodeArray[j])
- }*/
vnfcFunctionCodeArrayList.push([this.tempAllData[i].action].concat(this.tempAllData[i]["vnfc-function-code-list"]))
}
if (this.tempAllData[i].action === 'OpenStack Actions') {
vnfcSetArray = this.tempAllData[i]['firstRowVmSpreadSheet']
}
}
-
+ console.log(this.classNm + ": getArtifactsOpenStack: vnfcSetArray length=" +
+ vnfcSetArray.length);
if (vnfcSetArray) {
let vnfcSetArrayLen = vnfcSetArray.length;
@@ -1852,6 +1817,54 @@ export class ReferenceDataformComponent implements OnInit {
}
}
+ /**
+ * Handles the display of VM block based on the action change
+ */
+ handleVMBlockDisplay() {
+ switch (this.referenceDataObject.action) {
+ case this.actionList.ConfigScaleOut:
+ case this.actionList.Configure:
+ case undefined:
+ case '':
+ this.displayVMBlock = true;
+ break;
+ default:
+ this.displayVMBlock = false;
+ }
+ }
+
+ //.. check VNFC Type equality in Upper Selection vs entered in Sample field
+ checkVnfcTypeEqual(vnfctp: string) {
+ var methName = "checkVnfcTypeEqual";
+ console.log(this.classNm + ": " + methName + ": vnfctp:[" + vnfctp + "]");
+ console.log(this.classNm + ": " + methName + ": vnfcIdentifier:[" +
+ this.vnfcIdentifier + "]");
+ console.log(this.classNm + ": " + methName + ": Sample[vnfc-type]:[" +
+ this.Sample['vnfc-type'] + "]");
+ if (vnfctp != null && vnfctp.length > 0) {
+ if (this.vnfcIdentifier != null && this.vnfcIdentifier.length > 0) {
+ console.log(
+ this.classNm + ": " + methName + ": compare non empty VNFC Types...");
+ if (vnfctp != this.vnfcIdentifier) {
+ console.log(this.classNm + ": " + methName + ": Non-match WARNING !");
+ //.. display in pop-up
+ this.nService.warn('WARNING',
+ "The specified VNFC Types don't match." +
+ " Can cause discrepancy in the artifacts.", this.options);
+ } else {
+ console.log(this.classNm + ": checkVnfcTypeEqual: VNFC Types're equal.");
+ };
+ };
+ };
+ };
+
+ //.. populating VNFC Type in Sample fields
+ setVnfcTypeInSample(vnfctp: string) {
+ // if( this.utilityService.getTracelvl() > 0 )
+ console.log(this.classNm + ": setVnfcTypeInSample: vnfctp:[" + vnfctp + "]");
+ this.Sample['vnfc-type'] = vnfctp;
+ };
+
// Common method to show validation errors
private showValidationErrors(referenceDataObject) {
if (this.referenceDataObject.action === '') {
@@ -1866,16 +1879,10 @@ export class ReferenceDataformComponent implements OnInit {
if (referenceDataObject.action === 'ConfigScaleOut' && !this.templateIdentifier) {
this.nService.error('Error', 'Select a valid Template Identifier');
}
-
- // if ((referenceDataObject.action === 'Configure' || referenceDataObject.action === 'ConfigModify') && !this.vnfcIdentifier && this.displayVnfc != 'false') {
- // this.nService.error('Error', 'Select a valid Vnfc Type');
- // return;
- // }
}
resetArtifactList(obj) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": resetArtifactList: start...");
+ console.log(this.classNm + ": resetArtifactList: start...");
let vnfcTypeList = obj.scope['vnfc-type-list'];
let vnf = this.referenceDataObject.scope['vnf-type']
let pd_fileName
@@ -1913,86 +1920,4 @@ export class ReferenceDataformComponent implements OnInit {
);
}
}
-
- /**
- * Handles the display of VM block based on the action change
- */
- handleVMBlockDisplay() {
- switch (this.referenceDataObject.action) {
- case this.actionList.ConfigScaleOut:
- case this.actionList.Configure:
- case undefined:
- case '':
- this.displayVMBlock = true;
- break;
- default:
- this.displayVMBlock = false;
- }
- }
-
- //.. check VNFC Type equality in Upper Selection vs entered in Sample field
- checkVnfcTypeEqual( vnfctp: string ) {
- var methName= "checkVnfcTypeEqual";
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": "+methName+": vnfctp:["+vnfctp+"]");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": vnfcIdentifier:["+
- this.vnfcIdentifier+"]");
- if( this.utilityService.getTracelvl() > 1 )
- console.log( this.classNm+": "+methName+": Sample[vnfc-type]:["+
- this.Sample['vnfc-type']+"]");
- if( vnfctp != null && vnfctp.length > 0 ) {
- if( this.vnfcIdentifier != null && this.vnfcIdentifier.length > 0 ) {
- console.log(
- this.classNm+": "+methName+": compare non empty VNFC Types...");
- if( vnfctp != this.vnfcIdentifier ) {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": "+methName+": Non-match WARNING !");
- //.. display in pop-up
- this.nService.warn( 'WARNING',
- "The specified VNFC Types don't match."+
- " Can cause discrepancy in the artifacts.", this.options );
- } else {
- if( this.utilityService.getTracelvl() > 0 )
- console.log(this.classNm+": checkVnfcTypeEqual: VNFC Types're equal.");
- };
- };
- };
- };
-
- //.. populating VNFC Type in Sample fields
- setVnfcTypeInSample( vnfctp: string ) {
- //clear vnfc information samples
- this.clearVnfcData();
-
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": setVnfcTypeInSample: vnfctp:["+vnfctp+"]");
- this.Sample['vnfc-type']= vnfctp;
- };
-
- /**
- * Procesess reference data after retrieval from appc or after a reference file has been uploaded from PC.
- */
- processReferenceDataAfterRetrieval() {
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": processReferenceDataAfterRetr: start...");
- if (this.referenceDataObject.action === 'OpenStack Actions') {
- this.deviceProtocols = ['', 'OpenStack'];
- this.buildDesignComponent.tabs = this.referencDataTab;
- } else {
- this.buildDesignComponent.tabs = this.allTabs;
- }
- if( this.utilityService.getTracelvl() > 1 )
- console.log( this.classNm+": processReferenceDataAfterRetr: done.");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": vnfcIdentifier:["+this.vnfcIdentifier+"]");
- if( this.utilityService.getTracelvl() > 1 )
- console.log( this.classNm+": oldVnfcIdentifier:["+
- this.oldVnfcIdentifier+"]");
- if( this.utilityService.getTracelvl() > 0 )
- console.log( this.classNm+": refDataObj.scope.vnfc-type:["+
- this.referenceDataObject.scope['vnfc-type']+"]");
- this.setVnfcTypeInSample( this.vnfcIdentifier );
- }
-
}
diff --git a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.util.ts b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.util.ts
index bb564b7..00e014c 100644
--- a/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.util.ts
+++ b/src/app/vnfs/build-artifacts/reference-dataform/reference-dataform.util.ts
@@ -26,7 +26,7 @@ import {Observable} from 'rxjs';
import {UtilityService} from '../../../shared/services/utilityService/utility.service';
import { environment } from '../../../../environments/environment';
import { HttpUtilService } from '../../../shared/services/httpUtil/http-util.service';
-import {APIService} from "../../../shared/services/cdt.apicall";
+//import {APIService} from "../../../shared/services/cdt.apicall";
@Injectable()
export class ReferenceDataFormUtil {
@@ -35,7 +35,9 @@ export class ReferenceDataFormUtil {
private failureMessage = 'There is no artifact saved in APPC for the selected action!';
private response: Observable<Object>;
- constructor(private notificationService: NotificationsService, private utilityService:UtilityService, private apiService: APIService) {
+ constructor(
+ private notificationService: NotificationsService, private utilityService:UtilityService, private httpUtils: HttpUtilService
+ ) {
}
checkResult(result: any) {
@@ -152,10 +154,13 @@ export class ReferenceDataFormUtil {
return paramValue;
}
- handleApiData(data,artifactType)
+ handleApiData(payloadData,artifactType)
{
- this.response = this.apiService.callGetArtifactsApi(data);
- this.response.subscribe(response => {
+ this.response =
+ this.httpUtils.post({
+ url: environment.getDesigns,
+ data: payloadData });
+ this.response.subscribe( response => {
this.utilityService.processApiSubscribe(response, this.utilityService.putAction, artifactType)
},
error => this.utilityService.processApiError());