From f792671ae247a931f34d902e9276202b5016ef9a Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Sun, 7 Jul 2019 19:23:03 +0300 Subject: Merge from ecomp 718fd196 - Modern UI Issue-ID: VID-378 Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f Signed-off-by: Ittay Stern --- .../jsons/defect710619/aaiServiceInstancesE2E.json | 1 + .../mocks/jsons/defect710619/aaiSubDetailsE2E.json | 180 ++++++++++++ ...aiSubViewEditForServiceWithSomeVFModuleE2E.json | 310 +++++++++++++++++++++ .../defect710619/expectedResumeWithVGResults.json | 67 +++++ .../mocks/jsons/defect710619/serviceE2E.json | 144 ++++++++++ 5 files changed, 702 insertions(+) create mode 100644 vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json create mode 100644 vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json create mode 100644 vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json create mode 100644 vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json create mode 100644 vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json (limited to 'vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619') diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json new file mode 100644 index 000000000..85175b0c2 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json @@ -0,0 +1 @@ +{"service-instances":[{"serviceInstanceId":"dedd680f-f3bd-46d8-97c7-b6fc28db9317","globalCustomerId":"e433710f-9217-458d-a79d-1c7aff376d89","serviceType":"TYLER SILVIA","serviceInstanceName":"SI_E2E_vCCF_6610SD_SVC","subscriberName":"SILVIA ROBBINS","aaiModelInvariantId":"5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d","aaiModelVersionId":"afe751ef-2687-4647-8474-aba4d64cc3a3","isPermitted":true}]} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json new file mode 100644 index 000000000..9a8fc8050 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json @@ -0,0 +1,180 @@ +{ + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494254832007", + "service-subscriptions": { + "service-subscription": [{ + "service-type": "LINDSEY", + "resource-version": "1506190376301", + "service-instances": { + "service-instance": [{ + "service-instance-id": "ec1e72f9-1503-4f91-9a9d-f02e6afe3e64", + "service-instance-name": "ap7134_544027_retest_1806", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1531404579331", + "orchestration-status": "Active", + "model-invariant-id": "20384767-da0d-4815-bb5b-8da1fb4f1995", + "model-version-id": "4b60252a-bf6c-40df-9db5-98b4c363fdf4" + }, + { + "service-instance-id": "e59b07d9-2e59-417d-ad0e-08337a409b7c", + "service-instance-name": "ap7134_spnup_7252018", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1532529555496", + "orchestration-status": "Active", + "model-invariant-id": "e0457621-4f61-4b30-beb5-7f27be4dc9c6", + "model-version-id": "b504896c-85e6-4c4a-adad-c9aaf49addc1" + }, { + "service-instance-id": "2468b69a-86b0-4756-a435-d974d01736c9", + "service-instance-name": "vson_bb389n_813", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1534130966388", + "orchestration-status": "Active", + "model-invariant-id": "e85bacdf-b8c0-4cdf-b1ba-eb55a9b14027", + "model-version-id": "d948e05b-9728-4915-9b4a-6833c3a32144" + }, { + "service-instance-id": "f14b959a-b1e2-4168-a9a4-0c2e23b5721c", + "service-instance-name": "vrar_bb389n_0705", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1530734584462", + "orchestration-status": "Active", + "model-invariant-id": "b66b71d8-a341-4351-a8bf-6346362a9e13", + "model-version-id": "6a0f035b-a90e-49cf-b6de-12d7540f51ae" + }, { + "service-instance-id": "9853dcaa-fb5e-48e6-866f-682a9da8f040", + "service-instance-name": "olson5bTFNET_CORE_Svc", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1547998014228", + "orchestration-status": "Active", + "model-invariant-id": "27a63d80-76b7-438d-86fb-29ad806bff2b", + "model-version-id": "bb3d8047-05d3-4ea0-a243-20038e53675c" + }, { + "service-instance-id": "bedd3b9d-b274-4a3b-8cb6-f17b98904720", + "service-instance-name": "vson_ap7134_vnf", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1531775345108", + "orchestration-status": "Active", + "model-invariant-id": "28a020b2-1ca4-45b3-aff9-9d4c21b2ff63", + "model-version-id": "0389f916-f78b-4707-b766-7efb7ff1a499" + }, { + "service-instance-id": "348ab22e-a8f7-4164-9cf2-e0a612c0b2bb", + "service-instance-name": "vson_72618_bb389n", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1532547746080", + "orchestration-status": "Active", + "model-invariant-id": "e0457621-4f61-4b30-beb5-7f27be4dc9c6", + "model-version-id": "2846371c-baf0-469e-8384-00473a4f8ddf" + }, { + "service-instance-id": "74b3aa0c-39b3-4b71-ade9-2a8c3c8dcd22", + "service-instance-name": "vnf_vson_spnup_ap7134", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1531837750994", + "orchestration-status": "Active", + "model-invariant-id": "28a020b2-1ca4-45b3-aff9-9d4c21b2ff63", + "model-version-id": "0389f916-f78b-4707-b766-7efb7ff1a499" + }, { + "service-instance-id": "de5127f9-3b0d-4ff6-a51d-01b4c8855848", + "service-instance-name": "olson5aTFNET_CORE_Svc", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1500478578807", + "orchestration-status": "Active", + "model-invariant-id": "137fb14d-ad74-4295-9d39-400b920f8727", + "model-version-id": "c0b2f779-9c5d-40dd-a30d-4b6d7599b52c" + }, { + "service-instance-id": "5238bcdf-9a64-4b9e-a4c5-fca0bcc7c466", + "service-instance-name": "spinup_ap7134_822018", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1533231684103", + "orchestration-status": "Active", + "model-invariant-id": "4b71a28a-7955-4d64-88cf-2e5426577c73", + "model-version-id": "087cec64-c2d3-402c-b645-a3c322255906" + }, { + "service-instance-id": "0e970d97-f5a5-4957-8c12-db63d9286fd1", + "service-instance-name": "vSON_ap7134_vnf_spnup", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1531841030174", + "orchestration-status": "Active", + "model-invariant-id": "28a020b2-1ca4-45b3-aff9-9d4c21b2ff63", + "model-version-id": "0389f916-f78b-4707-b766-7efb7ff1a499" + }, { + "service-instance-id": "e166a16b-b374-4bbd-bfb7-47edadc4a00a", + "service-instance-name": "ap7134_spnup_822018", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1533223911561", + "orchestration-status": "Active", + "model-invariant-id": "4b71a28a-7955-4d64-88cf-2e5426577c73", + "model-version-id": "087cec64-c2d3-402c-b645-a3c322255906" + }, { + "service-instance-id": "cbe1a45b-f7cb-4c5c-b81e-0d609895a290", + "service-instance-name": "vson_ap7134_Network_71118", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1531319680581", + "orchestration-status": "Active", + "model-invariant-id": "62acd6dc-cfa5-451f-b9ff-47319ee5fc92", + "model-version-id": "51c91dfc-479d-4ac0-aa07-44bbc4425b73" + } + ] + }, + "is-permitted": true + }, { + "service-type": "TSBC", + "resource-version": "1494254819433", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "dedd680f-f3bd-46d8-97c7-b6fc28db9317", + "service-instance-name": "SI_E2E_vCCF_6610SD_SVC", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1548785479902", + "orchestration-status": "Active", + "model-invariant-id": "5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d", + "model-version-id": "afe751ef-2687-4647-8474-aba4d64cc3a3" + } + ] + }, + "is-permitted": true + }, { + "service-type": "DARREN MCGEE", + "resource-version": "1520621552263", + "service-instances": { + "service-instance": [] + }, + "is-permitted": true + }, { + "service-type": "DARREN-MCGEE", + "resource-version": "1494254868313", + "service-instances": null, + "is-permitted": false + }, { + "service-type": "BVOIP", + "resource-version": "1495115903610", + "service-instances": { + "service-instance": [] + }, + "is-permitted": true + }, { + "service-type": "TYLER SILVIA", + "resource-version": "1537366571571", + "service-instances": { + "service-instance": [] + }, + "is-permitted": true + } + ] + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json new file mode 100644 index 000000000..2c427fdda --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json @@ -0,0 +1,310 @@ +{ + "inventory-response-item": [{ + "model-name": "E2E_vCCF_6610SD _SVC", + "service-instance": { + "service-instance-id": "dedd680f-f3bd-46d8-97c7-b6fc28db9317", + "service-instance-name": "SI_E2E_vCCF_6610SD_SVC" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [{ + "model-name": "E2E_vCCF_6610SD _VSP", + "generic-vnf": { + "vnf-id": "1d45e992-e282-4ba5-b17a-9ca6562169e3", + "vnf-name": "dpa2bccfx5992v", + "vnf-type": "E2E_vCCF_6610SD _SVC/E2E_vCCF_6610SD _VSP 0", + "service-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "prov-status": "PREPROV", + "equipment-role": "vCCF", + "orchestration-status": "Active", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1551298829859", + "model-invariant-id": "57437138-b11e-47b1-aaca-4578251ee173", + "model-version-id": "229ac49e-61de-43d9-ab1a-9e6951226efe", + "model-customization-id": "b80c20bb-35b5-4e16-9819-4d09692e9435", + "nf-type": "CDR-GENERATOR", + "nf-function": "VUSP-VCCF", + "nf-role": "vCCF", + "nf-naming-code": "ccfx", + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/dedd680f-f3bd-46d8-97c7-b6fc28db9317/service-data/vnfs/vnf/1d45e992-e282-4ba5-b17a-9ca6562169e3/vnf-data/vnf-topology/" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [{ + "volume-group": { + "volume-group-id": "2ca48b79-062a-4471-a731-4fe15c2d961d", + "volume-group-name": "dpa2bccfx5992_vol", + "heat-stack-id": "dpa2bccfx5992_vol/43e17f84-0d50-4f99-9f9d-7c27fc1b39d8", + "vnf-type": "E2E_vCCF_6610SD _SVC/E2E_vCCF_6610SD _VSP 0", + "orchestration-status": "Active", + "model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "vf-module-model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "resource-version": "1548831528407" + }, + "extra-properties": {} + }, { + "model-name": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "vf-module": { + "vf-module-id": "f1688a69-2792-4f1f-bc95-4864f4742e7b", + "vf-module-name": "dpa2bccfx5992v_base_module", + "orchestration-status": "Assigned", + "is-base-vf-module": true, + "automated-assignment": false, + "resource-version": "1551299087384", + "model-invariant-id": "4453a55f-13fa-44eb-a158-eb36e7803787", + "model-version-id": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "module-index": 0, + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/dedd680f-f3bd-46d8-97c7-b6fc28db9317/service-data/vnfs/vnf/1d45e992-e282-4ba5-b17a-9ca6562169e3/vnf-data/vf-modules/vf-module/f1688a69-2792-4f1f-bc95-4864f4742e7b/vf-module-data/vf-module-topology/" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [{ + "volume-group": { + "volume-group-id": "2ca48b79-062a-4471-a731-4fe15c2d961d", + "volume-group-name": "dpa2bccfx5992_vol", + "heat-stack-id": "dpa2bccfx5992_vol/43e17f84-0d50-4f99-9f9d-7c27fc1b39d8", + "vnf-type": "E2E_vCCF_6610SD _SVC/E2E_vCCF_6610SD _VSP 0", + "orchestration-status": "Active", + "model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "vf-module-model-customization-id": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "resource-version": "1548831528407" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "ca2a6247-8ed7-4b6e-ae60-1979c24db55d", + "vserver-name": "dpa2bccfx5992vm011", + "vserver-name2": "dpa2bccfx5992vm011", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/ca2a6247-8ed7-4b6e-ae60-1979c24db55d", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896212439" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "6354b5e7-e5eb-48b1-b770-8fb9de5ab21f", + "vserver-name": "dpa2bccfx5992vm005", + "vserver-name2": "dpa2bccfx5992vm005", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/6354b5e7-e5eb-48b1-b770-8fb9de5ab21f", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896353025" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "dafb62ad-36cf-4aa1-8286-337dc7232c05", + "vserver-name": "dpa2bccfx5992vm010", + "vserver-name2": "dpa2bccfx5992vm010", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/dafb62ad-36cf-4aa1-8286-337dc7232c05", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896347787" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "7c6e8a86-97d4-47d0-bbec-9046925f0a0c", + "vserver-name": "dpa2bccfx5992vm002", + "vserver-name2": "dpa2bccfx5992vm002", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/7c6e8a86-97d4-47d0-bbec-9046925f0a0c", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896385541" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "25d1e26b-fd12-4db7-85cf-900cef7af347", + "vserver-name": "dpa2bccfx5992vm003", + "vserver-name2": "dpa2bccfx5992vm003", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/25d1e26b-fd12-4db7-85cf-900cef7af347", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896421775" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "c6d36d19-3a31-46a1-98e7-e173807e4e57", + "vserver-name": "dpa2bccfx5992vm004", + "vserver-name2": "dpa2bccfx5992vm004", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/c6d36d19-3a31-46a1-98e7-e173807e4e57", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896345784" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "957e5f81-5b90-4a31-a3ff-0f34fdd9e487", + "vserver-name": "dpa2bccfx5992vm006", + "vserver-name2": "dpa2bccfx5992vm006", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/957e5f81-5b90-4a31-a3ff-0f34fdd9e487", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896285901" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "97f82bd5-1522-4c9d-8061-e362a3cbfdb8", + "vserver-name": "dpa2bccfx5992vm008", + "vserver-name2": "dpa2bccfx5992vm008", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/97f82bd5-1522-4c9d-8061-e362a3cbfdb8", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896282486" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "fd2f0db6-fcc5-46a1-8fd6-d9c4233f0e10", + "vserver-name": "dpa2bccfx5992vm001", + "vserver-name2": "dpa2bccfx5992vm001", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/fd2f0db6-fcc5-46a1-8fd6-d9c4233f0e10", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896275425" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "75bac4b9-dd19-40b1-848f-d3ce5ce109da", + "vserver-name": "dpa2bccfx5992vm007", + "vserver-name2": "dpa2bccfx5992vm007", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/75bac4b9-dd19-40b1-848f-d3ce5ce109da", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896218468" + }, + "extra-properties": {} + }, { + "vserver": { + "vserver-id": "f255dc26-7ffb-40a1-a37a-02f858ebbd52", + "vserver-name": "dpa2bccfx5992vm009", + "vserver-name2": "dpa2bccfx5992vm009", + "vserver-selflink": "https://comp.onap.org:8774/v2/b60da4f71c1d4b35b8113d4eca6deaa1/servers/f255dc26-7ffb-40a1-a37a-02f858ebbd52", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1550896341966" + }, + "extra-properties": {} + }, { + "l3-network": { + "network-id": "b90ea5aa-5079-470b-8e79-3e2dc1a4e502", + "network-name": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0", + "network-type": "CONTRAIL30_BASIC", + "network-role": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0", + "network-technology": "contrail", + "neutron-network-id": "4e996ec6-2c17-4881-b8c4-9225ec64678b", + "is-bound-to-vpn": true, + "service-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "network-role-instance": 0, + "resource-version": "1547969639781", + "orchestration-status": "Created", + "heat-stack-id": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0/9e260519-dde7-4b9a-9692-cef542089ed5", + "contrail-network-fqdn": "default-domain:Closed_Loop-23804-T-01-dpa2b:Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0", + "physical-network-name": "Not Aplicable", + "is-provider-network": false, + "is-shared-network": false, + "is-external-network": false, + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cd48e066-08f5-4134-9c83-34615d6bba5c/service-data/networks/network/b90ea5aa-5079-470b-8e79-3e2dc1a4e502/network-data/network-topology/" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [{ + "subnet": { + "subnet-id": "2eaceba4-58ae-4abc-b6a5-bb7f2248699d", + "subnet-name": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0_IPv6_Subnet1", + "neutron-subnet-id": "d342e7c9-62af-4e88-939d-65b032be8078", + "gateway-address": "2001:1890:1001:22D5:0:0:0:1", + "network-start-address": "2001:1890:1001:22D5::", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "2001:1890:1001:22D5:ffff:ffff:ffff:0", + "dhcp-end": "2001:1890:1001:22D5:ffff:ffff:ffff:fffe", + "ip-assignment-direction": "true", + "resource-version": "1517256523275" + }, + "extra-properties": {} + }, { + "subnet": { + "subnet-id": "124278b1-b77b-4bb3-aeca-83d1deb58409", + "subnet-name": "Control_Loop-23804-T-01-dpa2b_CORE-VIF-TSIG0_net_0_IPv4_Subnet1", + "neutron-subnet-id": "9edb7006-7936-4e9d-84e0-55eb04e6a9b1", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "25", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", + "ip-assignment-direction": "true", + "resource-version": "1517256523267" + }, + "extra-properties": {} + } + ] + } + }, { + "l3-network": { + "network-id": "16f9455e-05d9-42b4-a40c-f2a900cebbcf", + "network-name": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0", + "network-type": "CONTRAIL30_BASIC", + "network-role": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0", + "network-technology": "contrail", + "neutron-network-id": "26b26c1e-7903-478c-ad3d-9e27ef194456", + "is-bound-to-vpn": true, + "service-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "network-role-instance": 0, + "resource-version": "1547969631952", + "orchestration-status": "Created", + "heat-stack-id": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0/f161b66f-cb65-4e97-a386-1f2e6758cbed", + "contrail-network-fqdn": "default-domain:Closed_Loop-23804-T-01-dpa2b:Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0", + "physical-network-name": "Not Aplicable", + "is-provider-network": false, + "is-shared-network": false, + "is-external-network": false, + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cd48e066-08f5-4134-9c83-34615d6bba5c/service-data/networks/network/16f9455e-05d9-42b4-a40c-f2a900cebbcf/network-data/network-topology/" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [{ + "subnet": { + "subnet-id": "b09c8d09-a873-446e-ac12-ee55c15d4915", + "subnet-name": "Control_Loop-23804-T-01-dpa2b_CORE-NSD-TOAM0_net_0_IPv4_Subnet1", + "neutron-subnet-id": "3dfb5920-f438-473b-9273-2c10c57ca7e5", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "24", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", + "ip-assignment-direction": "true", + "resource-version": "1517256872855" + }, + "extra-properties": {} + } + ] + } + } + ] + } + } + ] + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json new file mode 100644 index 000000000..53cb341a1 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json @@ -0,0 +1,67 @@ +{ + "requestDetails": { + "requestInfo": { + "instanceName": "dpa2bccfx5992v_base_module", + "source": "VID", + "suppressRollback": false, + "requestorId": "us16807000" + }, + "modelInfo": { + "modelType": "vfModule", + "modelInvariantId": "4453a55f-13fa-44eb-a158-eb36e7803787", + "modelVersionId": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "modelName": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "modelVersion": "1", + "modelCustomizationId": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0" + }, + "requestParameters": { + "userParams": [], + "testApi": "VNF_API", + "usePreload": false + }, + "cloudConfiguration": { + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054" + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "dedd680f-f3bd-46d8-97c7-b6fc28db9317", + "modelInfo": { + "modelType": "service", + "modelName": "E2E_vCCF_6610SD _SVC", + "modelInvariantId": "5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d", + "modelVersion": "1.0", + "modelVersionId": "afe751ef-2687-4647-8474-aba4d64cc3a3" + } + } + }, { + "relatedInstance": { + "instanceId": "1d45e992-e282-4ba5-b17a-9ca6562169e3", + "modelInfo": { + "modelType": "vnf", + "modelName": "E2E_vCCF_6610SD _VSP", + "modelInvariantId": "57437138-b11e-47b1-aaca-4578251ee173", + "modelVersion": "1.0", + "modelVersionId": "229ac49e-61de-43d9-ab1a-9e6951226efe", + "modelCustomizationId": "b80c20bb-35b5-4e16-9819-4d09692e9435", + "modelCustomizationName": "E2E_vCCF_6610SD _VSP 0" + } + } + }, { + "relatedInstance": { + "instanceId": "2ca48b79-062a-4471-a731-4fe15c2d961d", + "modelInfo": { + "modelType": "volumeGroup", + "modelName": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "modelInvariantId": "4453a55f-13fa-44eb-a158-eb36e7803787", + "modelVersion": "1", + "modelVersionId": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "modelCustomizationId": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0" + } + } + } + ] + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json new file mode 100644 index 000000000..ea3fe0027 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json @@ -0,0 +1,144 @@ +{ + "service": { + "uuid": "afe751ef-2687-4647-8474-aba4d64cc3a3", + "invariantUuid": "5c3eb5cb-a3ef-4089-bdbe-3b5ebd20541d", + "name": "E2E_vCCF_6610SD _SVC", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L4+", + "serviceType": "", + "serviceRole": "", + "description": "vCCF for Soft Delete in DPA2b CL tenant", + "serviceEcompNaming": "true", + "instantiationType": "A-La-Carte", + "inputs": {}, + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy" + } + }, + "vnfs": { + "E2E_vCCF_6610SD _VSP 0": { + "uuid": "229ac49e-61de-43d9-ab1a-9e6951226efe", + "invariantUuid": "57437138-b11e-47b1-aaca-4578251ee173", + "description": "vCCF for SoftDelete in DPA2b CL tenant", + "name": "E2E_vCCF_6610SD _VSP", + "version": "1.0", + "customizationUuid": "b80c20bb-35b5-4e16-9819-4d09692e9435", + "inputs": {}, + "commands": {}, + "properties": { + "iox_flavor_name": "nd.c4r4d50", + "nf_naming": "{ecomp_generated_naming=true}", + "multi_stage_design": "false", + "nf_function": "VUSP-VCCF", + "nf_naming_code": "ccfx", + "app_volume_size_0": "130.0", + "ieccf_debug": "no", + "availability_zone_max_count": "1", + "app_flavor_name": "nd.c12r4d50", + "plt_pair_uuid": "573f433e25ba8", + "ecomp_generated_naming": "true", + "int_internal_subnet_cidr": "169.30.12.0/24", + "nf_type": "CDR-GENERATOR", + "plt_servicedata2_volume_size_0": "150.0", + "plt_servicedata1_volume_size_0": "70.0", + "iox_image_name": "USP_IECF-IO_30.3.3-mcas4.4.6.qcow2", + "nf_role": "vCCF", + "iox_pair_uuid": "573f433e284b4", + "plt_image_name": "USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2", + "app_image_name": "USP_IECF-APP_30.3.3-mcas4.4.6.qcow2", + "plt_flavor_name": "nd.c2r4d50" + }, + "type": "VF", + "modelCustomizationName": "E2E_vCCF_6610SD _VSP 0", + "vfModules": { + "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": { + "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787", + "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "description": null, + "name": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "version": "1", + "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vIECCF", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": { + "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787", + "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "description": null, + "name": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "version": "1", + "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vIECCF", + "baseModule": true + }, + "inputs": {} + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResources": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": { + "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": { + "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787", + "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "description": null, + "name": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "version": "1", + "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vIECCF", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "e2e_vccf_6610sd_vsp0..E2eVccf6610sdVsp..base_vIECCF..module-0": { + "uuid": "ce92010b-3520-49c7-b37f-9b10ce5a8009", + "invariantUuid": "4453a55f-13fa-44eb-a158-eb36e7803787", + "customizationUuid": "ed87e68b-1b32-4aae-8aea-d2725a5e5602", + "description": null, + "name": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "version": "1", + "modelCustomizationName": "E2eVccf6610sdVsp..base_vIECCF..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vIECCF", + "baseModule": true + }, + "inputs": {} + } + }, + "pnfs": {}, + "vnfGroups": {} +} -- cgit 1.2.3-korg