upgrade vfmodule when upgraded already service, vnf and brother vfmodule e2e

[vid.git] / vid-webpack-master / src / app / drawingBoard / service-planning / objectsToTree / objectToInstanceTree / objectToInstanceTree.service.spec.ts

diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
index 9add349..43c3d26 100644 (file)
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
@@ -11,7 +11,7 @@ import {ObjectToTreeService} from "../objectToTree.service";
 import {DrawingBoardModes} from "../../drawing-board.modes";
 import {DialogService} from "ng2-bootstrap-modal";
 import {VnfPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
-import {BasicControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/basic.control.generator";
+import {ControlGeneratorUtil} from "../../../../shared/components/genericForm/formControlsServices/control.generator.util.service";
 import {AaiService} from "../../../../shared/services/aaiService/aai.service";
 import {FeatureFlagsService} from "../../../../shared/services/featureFlag/feature-flags.service";
 import {VnfControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator";
@@ -22,17 +22,20 @@ import {IframeService} from "../../../../shared/utils/iframe.service";
 import {BasicPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/basic.popup.service";
 import {NetworkPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator";
-import {VfModulePopuopService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {VnfGroupPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service";
 import {VnfGroupControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator";
 import {DuplicateService} from "../../duplicate/duplicate.service";
-import {SdcUiComponentsModule, SdcUiServices} from "onap-ui-angular";
+import {SdcUiComponentsModule} from "onap-ui-angular";
 import {ErrorMsgService} from "../../../../shared/components/error-msg/error-msg.service";
 import {ComponentInfoService} from "../../component-info/component-info.service";
 import {NetworkStepService} from "../models/vrf/vrfModal/networkStep/network.step.service";
 import {VpnStepService} from "../models/vrf/vrfModal/vpnStep/vpn.step.service";
 import {VfModuleUpgradePopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service";
+import {SharedControllersService} from "../../../../shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service";
+import {ModalService} from "../../../../shared/components/customModal/services/modal.service";
+import {CreateDynamicComponentService} from "../../../../shared/components/customModal/services/create-dynamic-component.service";
 
 class MockAppStore<T> {
   getState() {
@@ -65,7 +68,8 @@ describe('Model Tree Generator service', () => {
         SharedTreeService,
         VnfPopupService,
         VnfGroupPopupService,
-        BasicControlGenerator,
+        ControlGeneratorUtil,
+        SharedControllersService,
         GenericFormService,
         FormBuilder,
         LogService,
@@ -73,7 +77,7 @@ describe('Model Tree Generator service', () => {
         BasicPopupService,
         NetworkPopupService,
         NetworkControlGenerator,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VfModuleControlGenerator,
         VnfGroupControlGenerator,
@@ -84,9 +88,11 @@ describe('Model Tree Generator service', () => {
         DialogService,
         ErrorMsgService,
         ComponentInfoService,
-        SdcUiServices.ModalService,
+        ModalService,
         NetworkStepService,
         VpnStepService,
+        ModalService,
+        CreateDynamicComponentService,
         { provide: NgRedux, useClass: MockAppStore },
         MockNgRedux]
     });
@@ -2255,9 +2261,10 @@ describe('Model Tree Generator service', () => {
           "modelInfo": {
             "modelType": "VF",
             "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-            "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+            "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
             "modelName": "2017-388_PASQUALE-vPE",
             "modelVersion": "4.0",
+            "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
             "modelCustomizationName": "2017-388_PASQUALE-vPE 0"
           }
         },
@@ -2460,7 +2467,6 @@ describe('Model Tree Generator service', () => {
           "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
           "platformName": "xxx1",
           "lineOfBusiness": "ONAP",
-          "uuid": "network-instance-model-version-id",
           "routeTarget": {
             "globalRouteTarget": "mock-global-1",
             "routeTargetRole": "mock-role-x"
@@ -2581,6 +2587,7 @@ describe('Model Tree Generator service', () => {
       {
         "action": 'None',
         "modelId": "afacccf6-397d-45d6-b5ae-94c39734b168",
+        "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
         "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
         "modelUniqueId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
         "missingData": true,
@@ -2590,6 +2597,7 @@ describe('Model Tree Generator service', () => {
         "inMaint": true,
         "name": "2017-388_PASQUALE-vPE 0",
         "modelName": "2017-388_PASQUALE-vPE 0",
+        "modelTypeName": "vnfs",
         "type": "VF",
         "parentType": '',
         "isEcompGeneratedNaming": false,
@@ -2617,6 +2625,7 @@ describe('Model Tree Generator service', () => {
         "parentType": '',
         "name": "2017-488_PASQUALE-vPE 0",
         "modelName": "2017-488_PASQUALE-vPE 0",
+        "modelTypeName": "vnfs",
         "type": "VF",
         "isEcompGeneratedNaming": false,
         "networkStoreKey": "2017-488_PASQUALE-vPE 0",
@@ -2631,6 +2640,7 @@ describe('Model Tree Generator service', () => {
           "parentType": 'VNF',
           "action": 'None',
           "modelId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+          "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
           "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
           "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
           "missingData": true,
@@ -2638,6 +2648,7 @@ describe('Model Tree Generator service', () => {
           "statusMessage": "Failed vfModel message",
           "name": "&lt;Automatically Assigned&gt;",
           "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+          "modelTypeName": "vfModules",
           "type": "VFmodule",
           "isEcompGeneratedNaming": false,
           "dynamicInputs": [],
@@ -2662,6 +2673,7 @@ describe('Model Tree Generator service', () => {
         "id": "o65b26t2thj",
         "name": "2017488_PASQUALEvPE",
         "modelName": "2017-488_PASQUALE-vPE 0",
+        "modelTypeName": "vnfs",
         "type": "VF",
         "isEcompGeneratedNaming": false,
         "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
@@ -2678,6 +2690,7 @@ describe('Model Tree Generator service', () => {
             "missingData": false,
             "name": "yoav",
             "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+            "modelTypeName": "vfModules",
             "type": "VFmodule",
             "isEcompGeneratedNaming": false,
             "typeName": "M",
@@ -2731,6 +2744,7 @@ describe('Model Tree Generator service', () => {
         "parentType": '',
         "action": 'None',
         "modelId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+        "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c",
         "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
         "modelUniqueId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
         "missingData": false,
@@ -2740,6 +2754,7 @@ describe('Model Tree Generator service', () => {
         "routeTargetRole": "mock-role-x",
         "statusMessage": "Network failed message",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0",
@@ -2759,6 +2774,7 @@ describe('Model Tree Generator service', () => {
         "id": "2mdxioxca9h",
         "name": "&lt;Automatically Assigned&gt;",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0:0001",
@@ -2773,6 +2789,7 @@ describe('Model Tree Generator service', () => {
         "id": "z7vd1gmpbs",
         "name": "ExtVL",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0_1",