From 4c2de1c9790b3312201494462699f982f711fbd3 Mon Sep 17 00:00:00 2001 From: Amir Skalka Date: Mon, 18 Nov 2019 10:29:49 +0200 Subject: Adjust NewServiceInstanceTest by new logic + revert state-check in getDefaultVolumeGroupName * Change expected behaviour of tests to match new business of VG naming process; See shouldVGNameBeVisible() in vfModule.control.generator.ts * Fix Cypress tests `volume group should change on instance`. Issue-ID: VID-700 Change-Id: I18faf49a4a31f4b8f389dbcda53c55a1a8066c90 Signed-off-by: Amir Skalka Signed-off-by: Ittay Stern --- .../vfModuleGenerator/vfModule.control.generator.ts | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vid-webpack-master/src/app/shared/components/genericForm') diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts index d939a3d17..7b72d3bfa 100644 --- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts +++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts @@ -163,6 +163,9 @@ export class VfModuleControlGenerator { } getDefaultVolumeGroupName(instance: any, isEcompGeneratedNaming: boolean): string { + if ((!_.isNil(instance) && instance.volumeGroupName)) { + return instance.volumeGroupName; + } if (isEcompGeneratedNaming) { return null; } -- cgit 1.2.3-korg