diff options
5 files changed, 5 insertions, 138 deletions
diff --git a/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java index 721c9ead6..828562041 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java @@ -83,7 +83,7 @@ public class InstantiationTemplatesApiTest extends AsyncInstantiationBase { @Test public void templateTopology_givenDeployFromEditedTemplateCypressE2E_getTemplateTopologyDataIsEquivalentToOriginalTemplate() throws IOException { templateTopology_givenDeploy_templateTopologyIsEquivalent( - fileAsJsonNode("asyncInstantiation/templates__instance_from_template__set_without_modify.json"), + fileAsJsonNode("asyncInstantiation/templates__instance_from_template__set_without_modify1.json"), fileAsJsonNode("asyncInstantiation/templates__instance_template.json")); } diff --git a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify.json b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify.json deleted file mode 100644 index 5a327fdd7..000000000 --- a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify.json +++ /dev/null @@ -1,132 +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": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriptionServiceType": "TYLER SILVIA", - "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "WayneHolland", - "tenantName": null, - "aicZoneId": null, - "aicZoneName": null, - "projectName": "WATKINS", - "subscriberName": "SILVIA ROBBINS", - "rollbackOnFailure": "true", - "isALaCarte": true, - "testApi": "GR_API", - "trackById": "36601560-f8e3-4020-bdef-3e4709c51e84", - "existingVNFCounterMap": { - "024a417d-ca46-40bf-95ce-809c6a269011": 1 - }, - "existingVRFCounterMap": {}, - "existingVnfGroupCounterMap": {}, - "existingNetworksCounterMap": {}, - "existingNames": { - }, - "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": "e433710f-9217-458d-a79d-1c7aff376d89", - "instanceName": "hvf6arlba007", - "action": "Create", - "platformName": "xxx1", - "lcpCloudRegionId": "hvf6", - "tenantId": "4914ab0ab3a743e58f0eefdacc1dde77", - "instanceParams": [ - {} - ], - "rollbackOnFailure": true, - "instanceId": null, - "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": "hvf6arlba007_lba_Base_01", - "action": "Create", - "lcpCloudRegionId": "hvf6", - "tenantId": "4914ab0ab3a743e58f0eefdacc1dde77", - "instanceParams": [ - {} - ], - "rollbackOnFailure": true, - "trackById": "ea2879a6-10bc-4697-90d7-7bc3e71da0fd", - "isFailed": false - } - }, - "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": "my_hvf6arlba007_lba_dj_01", - "action": "Create", - "lcpCloudRegionId": "hvf6", - "tenantId": "4914ab0ab3a743e58f0eefdacc1dde77", - "instanceParams": [ - {} - ], - "rollbackOnFailure": true, - "trackById": "b134410e-3bc0-478e-883e-1b6bdf8a28df", - "isFailed": false, - "volumeGroupName": "my_special_hvf6arlba007_lba_dj_01_vol", - "sdncPreLoad": true - } - } - }, - "trackById": "1d2848a0-3573-4d29-b3dd-60bb263260ea", - "isFailed": false, - "statusMessage": null, - "position": null, - "lineOfBusiness": "zzz1" - } - }, - "networks": {}, - "vrfs": {}, - "vnfGroups": {}, - "instanceParams": [ - {} - ], - "pause": false, - "bulkSize": 1, - "instanceId": null, - "isFailed": false, - "statusMessage": null, - "vidNotions": { - "instantiationUI": "anyAlacarteWhichNotExcluded", - "modelCategory": "5G Fabric Configuration", - "viewEditUI": "legacy", - "instantiationType": "ALaCarte" - }, - "position": null -} diff --git a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json index 7288c4e16..7814b6554 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json +++ b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json @@ -58,7 +58,7 @@ "subscriptionServiceType": "TYLER SILVIA", "tenantId": null, "tenantName": null, - "testApi": "VNF_API", + "testApi": "GR_API", "trackById": "36601560-f8e3-4020-bdef-3e4709c51e84", "uuid": "6cfeeb18-c2b0-49df-987a-da47493c8e38", "version": "1.0", @@ -93,8 +93,7 @@ "modelVersionId": "21ae311e-432f-4c54-b855-446d0b8ded72", "uuid": "21ae311e-432f-4c54-b855-446d0b8ded72" }, - "platformName": [ - ], + "platformName": "xxx1", "position": null, "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", "rollbackOnFailure": true, 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 01a0be0c7..3c53d262f 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts @@ -4,7 +4,7 @@ describe('Drawing Board: Instantiation Templates', function () { beforeEach(() => { cy.clearSessionStorage(); - cy.setTestApiParamToVNF(); + cy.setTestApiParamToGR(); cy.initAAIMock(); cy.initGetAAISubDetails(); cy.initVidMock(); diff --git a/vid-webpack-master/src/app/shared/components/formControls/component/multiselect/multiselect.formControl.component.ts b/vid-webpack-master/src/app/shared/components/formControls/component/multiselect/multiselect.formControl.component.ts index 26a55e9d2..cf062f0e0 100644 --- a/vid-webpack-master/src/app/shared/components/formControls/component/multiselect/multiselect.formControl.component.ts +++ b/vid-webpack-master/src/app/shared/components/formControls/component/multiselect/multiselect.formControl.component.ts @@ -35,7 +35,7 @@ export class MultiselectFormControlComponent implements OnChanges{ this.options = options; this._multiselectFormControlService.convertSelectedItems(this.data).then((res)=> { this.selectedItems = res; - this.form.controls[this.data.controlName].setValue(this.selectedItems); + this.data.onChange(this.selectedItems ,this.form); }) }); } |