Fix for Penetration test _ Session and cookie management

[vid.git] / vid-webpack-master / src / app / shared / services / aaiService / aai.service.ts

diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
index d421fe8..2829a89 100644 (file)
--- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
+++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
@@ -4,7 +4,7 @@ import {Injectable} from '@angular/core';
 import * as _ from 'lodash';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/do';
-import {of} from "rxjs";
+import {Observable, of} from "rxjs";
 
 import {AicZone} from "../../models/aicZone";
 import {CategoryParams} from "../../models/categoryParams";
@@ -37,14 +37,11 @@ import {
   updateSubscribers,
   updateUserId
 } from "../../storeUtil/utils/general/general.actions";
-import {
-  updateModel,
-  createServiceInstance,
-} from "../../storeUtil/utils/service/service.actions";
+import {createServiceInstance, updateModel,} from "../../storeUtil/utils/service/service.actions";
 import {FeatureFlagsService, Features} from "../featureFlag/feature-flags.service";
 import {VnfMember} from "../../models/VnfMember";
 import {setOptionalMembersVnfGroupInstance} from "../../storeUtil/utils/vnfGroup/vnfGroup.actions";
-import {Observable} from "rxjs";import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
+import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
 import {VPNModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/vpnStep/vpn.step.model";
 import {ModelInfo} from "../../models/modelInfo";
 
@@ -54,8 +51,14 @@ export class AaiService {
 
   }
 
+  sdncPreload(): Observable<boolean> {
+    let pathQuery: string = Constants.Path.PRE_LOAD;
+    return this.http.post<boolean>(pathQuery, {})
+  }
+
   getServiceModelById = (serviceModelId: string): Observable<any> => {
     if (_.has(this.store.getState().service.serviceHierarchy, serviceModelId)) {
+      this.initializePnfModelCustomizationName(this.store.getState().service.serviceHierarchy[serviceModelId]);
       return of(<any> JSON.parse(JSON.stringify(this.store.getState().service.serviceHierarchy[serviceModelId])));
     }
     let pathQuery: string = Constants.Path.SERVICES_PATH + serviceModelId;
@@ -66,11 +69,8 @@ export class AaiService {
   };
 
   retrieveServiceLatestUpdateableVersion = (modelInvariantId: string): Observable<ModelInfo> => {
-    if (this.featureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE)){
-      let pathQuery: string = Constants.Path.SERVICE_LATEST_VERSION + modelInvariantId;
-      return this.http.get<ModelInfo>(pathQuery)
-    }
-    return;
+    let pathQuery: string = Constants.Path.SERVICE_LATEST_VERSION + modelInvariantId;
+    return this.http.get<ModelInfo>(pathQuery)
   };
 
   getUserId = (): Observable<any> => {
@@ -322,6 +322,15 @@ export class AaiService {
     return result;
   }
 
+  initializePnfModelCustomizationName(serviceHierarchy) : void {
+    let pnfs = serviceHierarchy.pnfs;
+    for (let pnf in pnfs) {
+      if (!pnfs[pnf].modelCustomizationName){
+        pnfs[pnf].modelCustomizationName = pnf;
+      }
+    }
+  }
+
   loadMockMembers(): any {
     return [
       {