2 files changed, 4 insertions, 3 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.ts
index c18b20d7e..1d44a9e5e 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.ts
@@ -38,7 +38,7 @@ export class BasicPopupService {
         return new VNFModel(rawModel, flags);
       }
       case 'vfModules' : {
-        return new VfModule(rawModel);
+        return new VfModule(rawModel, flags);
       }
       case 'networks' : {
         return new NetworkModel(rawModel, flags);
diff --git a/vid-webpack-master/src/app/shared/models/vfModule.ts b/vid-webpack-master/src/app/shared/models/vfModule.ts
index c75202124..8f92ba428 100644
--- a/vid-webpack-master/src/app/shared/models/vfModule.ts
+++ b/vid-webpack-master/src/app/shared/models/vfModule.ts
@@ -1,4 +1,5 @@
 import {NodeModel, NodeModelResponseInterface} from "./nodeModel";
+import {Utils} from "../utils/utils";
 
 
 export interface Properties{
@@ -23,7 +24,7 @@ export class VfModule extends NodeModel {
   modelCustomizationName: string;
   volumeGroupAllowed : boolean;
 
-  constructor(vf?: VFModuleResponseInterface) {
+  constructor(vf?: VFModuleResponseInterface, flags?: { [key: string]: boolean }) {
     super(vf);
     if(vf){
       this.customizationUuid = vf.customizationUuid;
@@ -32,7 +33,7 @@ export class VfModule extends NodeModel {
     }
     if (vf && vf.properties) {
       this.min = vf.properties.minCountInstances;
-      this.max = vf.properties.maxCountInstances;
+      this.max = Utils.getMaxVfModule(vf.properties, flags);
       this.initial = vf.properties.initialCount;
       this.rollbackOnFailure = true
     }