aboutsummaryrefslogtreecommitdiffstats
path: root/vid-webpack-master
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-12-07 20:05:38 +0200
committerIttay Stern <ittay.stern@att.com>2019-12-09 12:26:47 +0000
commit57e44972ab82fcd166eb6c0a3a948bd2c4287661 (patch)
tree83830688d00c12a1bf9f12233820b079a7a3fe3a /vid-webpack-master
parent6d937099efa1cb30eb16470005c7e05c1f29f729 (diff)
Change ServiceInstance's top-level rollbackOnFailure serialization to String
This will satisfy a new test: Template Topology API test: Deploy Cypress -> getTemplateTopology returns the same template Also updating templates__instance_template.json with actual "templateTopology" endpoint fields. Issue-ID: VID-724 Change-Id: I1160656c9a58ab2678ca6f2529688463fbd60a91 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master')
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts4
-rw-r--r--vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json117
2 files changed, 2 insertions, 119 deletions
diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
index 253352729..8eb70b1fe 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
@@ -30,7 +30,7 @@ describe('Drawing Board: Instantiation Templates', function () {
.as('serviceModel');
cy.route(`**/asyncInstantiation/${templateTopologyEndpoint}/${templateUuid}`,
- 'fixture:../support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json')
+ 'fixture:../../../vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json')
.as('templateTopology');
// When...
@@ -48,7 +48,7 @@ describe('Drawing Board: Instantiation Templates', function () {
// Then...
cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
- cy.readFile('cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json').then((expectedResult) => {
+ cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json').then((expectedResult) => {
convertRollbackOnFailureValueFromStringToBoolean(expectedResult);
cy.deepCompare(xhr.request.body, expectedResult);
});
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json
deleted file mode 100644
index 10ddc7384..000000000
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "action": "Create",
- "instanceName": "vProbe_NC_Service_DG_new_SI",
- "productFamilyId": null,
- "lcpCloudRegionId": null,
- "tenantId": null,
- "modelInfo": {
- "modelInvariantId": "90a32d31-8a01-4de2-a91f-7e2414d6f5aa",
- "modelVersionId": "6cfeeb18-c2b0-49df-987a-da47493c8e38",
- "modelName": "vProbe_NC_Service",
- "modelType": "service",
- "modelVersion": "1.0"
- },
- "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "subscriptionServiceType": "Emanuel",
- "owningEntityId": "10c645f5-9924-4b89-bec0-b17cf49d3cad",
- "owningEntityName": "EMANUEL-CORE",
- "tenantName": null,
- "aicZoneId": null,
- "aicZoneName": null,
- "projectName": "Kennedy",
- "subscriberName": "Emanuel",
- "rollbackOnFailure": "true",
- "isALaCarte": true,
- "testApi": "GR_API",
- "trackById": "36601560-f8e3-4020-bdef-3e4709c51e84",
- "existingVNFCounterMap": {"024a417d-ca46-40bf-95ce-809c6a269011": 1},
- "vnfs": {
- "vProbe_NC_VNF 0": {
- "modelInfo": {
- "modelCustomizationName": "vProbe_NC_VNF 0",
- "modelCustomizationId": "024a417d-ca46-40bf-95ce-809c6a269011",
- "modelInvariantId": "a6a96924-b9c5-4c85-ae18-cbfca848095e",
- "modelVersionId": "21ae311e-432f-4c54-b855-446d0b8ded72",
- "modelName": "vProbe_NC_VNF",
- "modelType": "vnf",
- "modelVersion": "1.0"
- },
- "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "instanceName": "zolson57arlba007",
- "action": "Create",
- "platformName": "NETWORK-CLOUD",
- "lcpCloudRegionId": "olson57a",
- "tenantId": "dcb28ad99c7341748830c9dc307f85eb",
- "instanceParams": [
- {}
- ],
- "rollbackOnFailure": true,
- "vfModules": {
- "vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0": {
- "vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg": {
- "modelInfo": {
- "modelCustomizationName": "VprobeNcVnf..FE_base_module..module-0",
- "modelCustomizationId": "4d0818cf-eaa9-4a3f-89c2-639953089e14",
- "modelInvariantId": "29b6fa3c-aeb3-4103-b3f7-6f98e097b005",
- "modelVersionId": "c5b26cc1-a66f-4b69-aa23-6abc7c647c88",
- "modelName": "VprobeNcVnf..FE_base_module..module-0",
- "modelType": "vfModule",
- "modelVersion": "1"
- },
- "instanceName": "zolson57arlba007_lba_Base_01",
- "action": "Create",
- "lcpCloudRegionId": "olson57a",
- "tenantId": "dcb28ad99c7341748830c9dc307f85eb",
- "instanceParams": [
- {}
- ],
- "rollbackOnFailure": true,
- "trackById": "ea2879a6-10bc-4697-90d7-7bc3e71da0fd"
- }
- },
- "vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1": {
- "vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi": {
- "modelInfo": {
- "modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
- "modelCustomizationId": "9b99d340-a80b-45ef-9ff1-993fa3e4c001",
- "modelInvariantId": "1bcc4824-6c1a-4b51-af7c-076b7fc14d05",
- "modelVersionId": "c09e4530-8fd8-418f-9483-2f57ce927b05",
- "modelName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
- "modelType": "vfModule",
- "modelVersion": "1"
- },
- "instanceName": "zolson57arlba007_lba_dj_01",
- "action": "Create",
- "lcpCloudRegionId": "olson57a",
- "tenantId": "dcb28ad99c7341748830c9dc307f85eb",
- "instanceParams": [
- {}
- ],
- "rollbackOnFailure": true,
- "trackById": "b134410e-3bc0-478e-883e-1b6bdf8a28df",
- "volumeGroupInstanceName": "zolson57arlba007_lba_dj_01_vol",
- "usePreload": true
- }
- }
- },
- "trackById": "1d2848a0-3573-4d29-b3dd-60bb263260ea",
- "position": null,
- "lineOfBusiness": "EMANUEL-CONSUMER"
- }
- },
- "networks": {},
- "vrfs": {},
- "vnfGroups": {},
- "instanceParams": [
- {}
- ],
- "pause": false,
- "bulkSize": 1,
- "vidNotions": {
- "instantiationUI": "anyAlacarteWhichNotExcluded",
- "modelCategory": "5G Fabric Configuration",
- "viewEditUI": "legacy",
- "instantiationType": "ALaCarte"
- },
- "position": null
-}