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 1ba9a23..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
@@ -2261,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"
           }
         },
@@ -2466,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"
@@ -2587,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,
@@ -2596,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,
@@ -2623,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",
@@ -2637,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,
@@ -2644,6 +2648,7 @@ describe('Model Tree Generator service', () => {
           "statusMessage": "Failed vfModel message",
           "name": "<Automatically Assigned>",
           "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+          "modelTypeName": "vfModules",
           "type": "VFmodule",
           "isEcompGeneratedNaming": false,
           "dynamicInputs": [],
@@ -2668,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",
@@ -2684,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",
@@ -2737,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,
@@ -2746,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",
@@ -2765,6 +2774,7 @@ describe('Model Tree Generator service', () => {
         "id": "2mdxioxca9h",
         "name": "<Automatically Assigned>",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0:0001",
@@ -2779,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",