aboutsummaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/shared
diff options
context:
space:
mode:
authorAmir Skalka <amir.skalka@intl.att.com>2019-11-18 10:29:49 +0200
committerIttay Stern <ittay.stern@att.com>2019-11-18 15:50:14 +0200
commit4c2de1c9790b3312201494462699f982f711fbd3 (patch)
tree513bb7fec5d551108584b2a17eb80c2408d4dab7 /vid-webpack-master/src/app/shared
parentf886b56f7a0a105a1d0dc8edd5539348d606eb49 (diff)
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 <amir.skalka@intl.att.com> Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/shared')
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts3
1 files changed, 3 insertions, 0 deletions
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;
}