diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-12-01 13:14:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-01 13:14:49 +0000 |
| commit | b167cf459a0064310235c3f48918378202e4a41f (patch) | |
| tree | 60a9e64e8e4d8e01e324ba540b96789affc42f05 /vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts | |
| parent | 434c95a0731b5135a1067f76dfaac9a30878d6cb (diff) | |
| parent | a6f08e35c331cd50073b9875886b79c7645bae38 (diff) | |
Merge changes Ia06b7afe,I31b646b4
* changes:
remove FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD
remove FLAG_DEFAULT_VNF
Diffstat (limited to 'vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts')
| -rw-r--r-- | vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts index 3046b332a..a3cb475a0 100644 --- a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts +++ b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts @@ -186,7 +186,7 @@ export class DefaultDataGeneratorService { for (let networkUUID in serviceHierarchy.networks) { const isEcompGeneratedNaming = this.getIsEcompGeneratedNaming(serviceHierarchy.networks[networkUUID]); let min_vnf_instances_greater_than_0 = serviceHierarchy.networks[networkUUID].properties['min_instances'] && serviceHierarchy.networks[networkUUID].properties['min_instances'] > 0; - if(this.store.getState().global.flags['FLAG_DEFAULT_VNF'] && min_vnf_instances_greater_than_0) + if(min_vnf_instances_greater_than_0) { this.createNetworkInstanceReduxIfNotExist( serviceId, @@ -203,7 +203,7 @@ export class DefaultDataGeneratorService { for (let vnfGroupUUID in serviceHierarchy.vnfGroups) { const isEcompGeneratedNaming = this.getIsEcompGeneratedNaming(serviceHierarchy.vnfGroups[vnfGroupUUID]); let min_vnf_group_instances_greater_than_0 = serviceHierarchy.vnfGroups[vnfGroupUUID].properties['min_instances'] && serviceHierarchy.vnfGroups[vnfGroupUUID].properties['min_instances'] > 0; - if(this.store.getState().global.flags['FLAG_DEFAULT_VNF'] && min_vnf_group_instances_greater_than_0) + if(min_vnf_group_instances_greater_than_0) { this.createVnfGroupInstanceReduxIfNotExist( serviceId, @@ -244,7 +244,7 @@ export class DefaultDataGeneratorService { } let min_vnf_instances_greater_than_0 = serviceHierarchy.vnfs[vnfUUID].properties['min_instances'] && serviceHierarchy.vnfs[vnfUUID].properties['min_instances'] > 0; - if(this.store.getState().global.flags['FLAG_DEFAULT_VNF'] && min_vnf_instances_greater_than_0) + if(min_vnf_instances_greater_than_0) { this.createVNFInstanceReduxIfNotExist( serviceId, |