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, 4 insertions, 2 deletions

diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
index 9d21d359c..c6d3da52a 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
@@ -2,9 +2,10 @@ import {Action} from "redux";
 import {
   AddServiceAction,
   ChangeServiceDirty,
-  ServiceActions,
   CreateServiceInstanceAction,
-  UpdateServiceModelAction, UpdateServiceInstanceAction
+  ServiceActions,
+  UpdateServiceInstanceAction,
+  UpdateServiceModelAction
 } from "./service.actions";
 import {ServiceInstance} from "../../../models/serviceInstance";
 import {ServiceState} from "../main.reducer";
@@ -34,6 +35,7 @@ export function serviceReducer(state: ServiceState, action: Action) : ServiceSta
         const currentInstaceName = state.serviceInstance[uuid] ? serviceInstance.instanceName : null;
 
         newState.serviceInstance[uuid] = Object.assign(serviceInstance, updateServiceInstanceAction.serviceInstance);
+        newState.serviceInstance[uuid].vidNotions = _.get(state,`serviceHierarchy[${uuid}].service.vidNotions`);
         if (!_.isNil(updateServiceInstanceAction.serviceInstance)) {
           updateUniqueNames(currentInstaceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
         }