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, 10 insertions, 7 deletions

diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
index 3241f11d9..a5e37fcab 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
@@ -1,14 +1,15 @@
 import {VnfInstance} from "../../../models/vnfInstance";
 import {
   CreateVnfInstanceAction,
-  DeleteActionVnfInstanceAction, RemoveVnfInstanceAction,
-  UndoDeleteActionVnfInstanceAction, UpdateVnfPosition,
+  RemoveVnfInstanceAction,
+  UpdateVnfPosition,
   VNFActions
 } from "./vnf.actions";
 import {vnfReducer} from "./vnf.reducers";
 import {ServiceInstanceActions} from "../../../models/serviceInstanceActions";
+import {ActionOnFirstLevel} from "../firstLevel/firstLevel.actions";
 
-describe('networkReducer', () => {
+describe('vnfReducer', () => {
   test('#UPDATE_VNF_POSITION', () => {
     let vnfInstance: VnfInstance = new VnfInstance();
     vnfInstance.isMissingData = false;
@@ -70,9 +71,10 @@ describe('networkReducer', () => {
             }
           }
         }},
-      <DeleteActionVnfInstanceAction>{
+      <ActionOnFirstLevel>{
         type: VNFActions.DELETE_ACTION_VNF_INSTANCE,
-        vnfStoreKey: 'vnfStoreKey',
+        firstLevelName: 'vnfs',
+        storeKey: 'vnfStoreKey',
         serviceId: 'serviceModelId'
       }).serviceInstance['serviceModelId'].vnfs['vnfStoreKey'];
 
@@ -91,9 +93,10 @@ describe('networkReducer', () => {
             }
           }
         }},
-      <UndoDeleteActionVnfInstanceAction>{
+      <ActionOnFirstLevel>{
         type: VNFActions.UNDO_DELETE_ACTION_VNF_INSTANCE,
-        vnfStoreKey: 'vnfStoreKey',
+        storeKey: 'vnfStoreKey',
+        firstLevelName: 'vnfs',
         serviceId: 'serviceModelId'
       }).serviceInstance['serviceModelId'].vnfs['vnfStoreKey'];