Merge changes Ib4430bf2,Icc0bdb9e,I2736b984

* changes:
  Merge from ecomp 718fd196 - Ext. Services Simulator
  Merge from ecomp 718fd196 - Integration Tests
  Merge from ecomp 718fd196 - Modern UI

1 files changed, 2 insertions, 2 deletions

diff --git a/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
index d4aef1937..404f390fb 100644
--- a/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
+++ b/vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
@@ -21,7 +21,7 @@ export class ViewEditResolver implements Resolve<Observable<boolean>> {
       let serviceModelApi = this._aaiService.getServiceModelById(serviceModeId);
       let serviceInstanceApi = this._aaiService.retrieveAndStoreServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType, serviceModeId);
       return forkJoin([serviceModelApi, serviceInstanceApi]).map(([serviceModel, serviceInstance ]) => {
-        this.setIsALaCarte(serviceInstance,serviceModel.service.instantiationType );
+        this.setIsALaCarte(serviceInstance,serviceModel.service.vidNotions.instantiationType );
         this.setTestApi(serviceInstance);
         this._store.dispatch(createServiceInstance( serviceInstance, serviceModeId));
           return true;
@@ -34,7 +34,7 @@ export class ViewEditResolver implements Resolve<Observable<boolean>> {
     }
   };
   setIsALaCarte = (service: any, instantiationType) => {
-    service.isALaCarte = instantiationType === 'A-La-Carte';
+    service.isALaCarte = instantiationType === 'ALaCarte';
   };
 
 }