From 94d27e23ae4d38352dc7d7cd3a2acf3a62a7a6ec Mon Sep 17 00:00:00 2001 From: Alexey Sandler Date: Sun, 5 Apr 2020 09:59:35 +0300 Subject: Add another Network to the new view/edit screen Issue-ID: VID-802 Signed-off-by: Alexey Sandler Change-Id: Ie0e1dcd28f78307ec526c375c1bf4c655ec09ffe Signed-off-by: Alexey Sandler --- ...k_exists_add_another_network_expected_bulk.json | 111 +++++++++++++++++++++ .../upgrade_vfmodule_e2e__fe_input_cypress.json | 2 +- ...ted_to_current_model_e2e__fe_input_cypress.json | 2 +- 3 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 vid-app-common/src/test/resources/payload_jsons/Network/one_network_exists_add_another_network_expected_bulk.json (limited to 'vid-app-common') diff --git a/vid-app-common/src/test/resources/payload_jsons/Network/one_network_exists_add_another_network_expected_bulk.json b/vid-app-common/src/test/resources/payload_jsons/Network/one_network_exists_add_another_network_expected_bulk.json new file mode 100644 index 000000000..4eb7b6699 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/Network/one_network_exists_add_another_network_expected_bulk.json @@ -0,0 +1,111 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": {}, + "vrfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "oam_protected_net_svc1": "" + }, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": { + "23c382c9-9405-4780-8794-e57eb015883d": 2 + }, + "networks": { + "ca61e4c9-982b-4d5f-b9eb-eaaf1cf23b9e": { + "action": "None", + "instanceName": "GRP-29576-T-E2E-16-SDN_oam_protected_net_2", + "instanceId": "ca61e4c9-982b-4d5f-b9eb-eaaf1cf23b9e", + "orchStatus": "Active", + "lcpCloudRegionId": "olson59a", + "tenantId": "11981b4f7fc4426d905edb1487b53bff", + "cloudOwner": "irma-aic", + "modelInfo": { + "modelCustomizationName": "OVS Provider", + "modelCustomizationId": "23c382c9-9405-4780-8794-e57eb015883d", + "modelInvariantId": "ffb9e45c-e674-4289-aad3-00040ad746e4", + "modelVersionId": "01f4c475-3f89-4f00-a2f4-39a873dba0ae", + "modelName": "NETWORK_CLOUD_PROVIDER_NETWORK", + "modelType": "network", + "modelVersion": "1.0" + }, + "instanceType": "NEUTRON-PROVIDER", + "inMaint": false, + "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae", + "originalName": "OVS Provider", + "trackById": "ca61e4c9-982b-4d5f-b9eb-eaaf1cf23b9e", + "role": "oam_protected_net_2", + "physicalName": "oam", + "serviceName": "oam_protected_net_svc1", + "serviceUUID": "ce2821fc-3b28-4759-9613-1e514d7563c0", + "tenantName": "GRP-29576-T-E2E-16-SDN", + "boundToVpn": false + }, + "OVS Provider": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "OVS Provider", + "isMissingData": false, + "trackById": "2x6cwn1aml8", + "networkStoreKey": "OVS Provider", + "instanceName": "NETWORK_CLOUD_PROVIDER_NETWORK", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "hvf6", + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + {} + ], + "modelInfo": { + "modelInvariantId": "ffb9e45c-e674-4289-aad3-00040ad746e4", + "modelVersionId": "01f4c475-3f89-4f00-a2f4-39a873dba0ae", + "modelName": "NETWORK_CLOUD_PROVIDER_NETWORK", + "modelVersion": "1.0", + "modelCustomizationId": "23c382c9-9405-4780-8794-e57eb015883d", + "modelCustomizationName": "OVS Provider", + "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae", + "modelUniqueId": "23c382c9-9405-4780-8794-e57eb015883d" + }, + "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae" + } + }, + "vnfGroups": {}, + "bulkSize": 1, + "instanceName": "oam_protected_net_svc1", + "instanceId": "ce2821fc-3b28-4759-9613-1e514d7563c0", + "orchStatus": "Active", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "8c364754-4c76-4abc-b8f3-88da5f67d588", + "modelVersionId": "f93e72e1-77fc-4f54-b207-298d766d0886", + "modelName": "oam_protected_net NC OVS network 1", + "modelType": "service", + "modelVersion": "2.0" + }, + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriptionServiceType": "Emanuel", + "owningEntityId": null, + "owningEntityName": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "collectionResources": {}, + "testApi": "GR_API", + "vidNotions": { + "instantiationUI": "anyAlacarteWhichNotExcluded", + "modelCategory": "5G Provider Network", + "viewEditUI": "legacy", + "instantiationType": "ALaCarte" + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json index dc9d82c9a..c6f8b6f10 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json @@ -1,6 +1,6 @@ { "action": "None_Upgrade", - "isDirty": false, + "isDirty": true, "vnfs": { "d520268f-7489-4662-be59-f81495b3a069": { "action": "None_Upgrade", diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json index 842d6946d..5ecd78868 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json @@ -24,7 +24,7 @@ "instanceParams": [ ], "isALaCarte": true, - "isDirty": false, + "isDirty": true, "lcpCloudRegionId": null, "modelInfo": { "modelInvariantId": "dd5a69b7-c50c-4dde-adc2-966b79bb8fd6", -- cgit 1.2.3-korg