Merge "Adding unlimited max value to VNF, NETWORK"

2 files changed, 13 insertions, 13 deletions

diff --git a/vid-webpack-master/src/app/shared/models/networkModel.ts b/vid-webpack-master/src/app/shared/models/networkModel.ts
index 03f118eb7..b4879a59d 100644
--- a/vid-webpack-master/src/app/shared/models/networkModel.ts
+++ b/vid-webpack-master/src/app/shared/models/networkModel.ts
@@ -2,29 +2,30 @@ import {
   Level1Model, Level1ModelProperties,
   Level1ModelResponseInterface
 } from "./nodeModel";
-import {VfcInstanceGroupMap} from "./vfcInstanceGroupMap";
+import {Utils} from "../utils/utils";
 
 
-export interface NetworkProperties extends Level1ModelProperties{
+export interface NetworkProperties extends Level1ModelProperties {
   ecomp_generated_naming: string;
   network_role: string;
 }
 
-export interface NetworkModelResponseInterface extends Level1ModelResponseInterface{
+export interface NetworkModelResponseInterface extends Level1ModelResponseInterface {
   properties: NetworkProperties;
 }
 
-export class NetworkModel extends Level1Model{
+export class NetworkModel extends Level1Model {
 
   roles: string[] = [];
   properties: NetworkProperties;
 
-  constructor(networkJson?: NetworkModelResponseInterface){
+  constructor(networkJson?: NetworkModelResponseInterface, flags?: { [key: string]: boolean }) {
     super(networkJson);
-    if(networkJson && networkJson.properties){
+    if (networkJson && networkJson.properties) {
       this.properties = networkJson.properties;
       // expecting network_role to be a comma-saparated list
       this.roles = networkJson.properties.network_role ? networkJson.properties.network_role.split(',') : [];
+      this.max = Utils.getMaxFirstLevel(this.properties, flags);
     }
   }
 
diff --git a/vid-webpack-master/src/app/shared/models/vnfModel.ts b/vid-webpack-master/src/app/shared/models/vnfModel.ts
index 8389606b6..220dc0fc5 100644
--- a/vid-webpack-master/src/app/shared/models/vnfModel.ts
+++ b/vid-webpack-master/src/app/shared/models/vnfModel.ts
@@ -3,25 +3,24 @@ import {
   Level1ModelProperties,
   Level1ModelResponseInterface
 } from "./nodeModel";
+import {Utils} from "../utils/utils";
 
-
-
-export interface VnfProperties extends Level1ModelProperties{
+export interface VnfProperties extends Level1ModelProperties {
   ecomp_generated_naming: string;
 }
 
-export interface VNFModelResponseInterface extends Level1ModelResponseInterface{
+export interface VNFModelResponseInterface extends Level1ModelResponseInterface {
   properties: VnfProperties;
 }
 
-export class VNFModel extends Level1Model{
+export class VNFModel extends Level1Model {
   properties: VnfProperties;
 
-  constructor(vnfJson?: VNFModelResponseInterface) {
+  constructor(vnfJson?: VNFModelResponseInterface, flags?: { [key: string]: boolean }) {
     super(vnfJson);
     if (vnfJson) {
       this.properties = vnfJson.properties;
+      this.max = Utils.getMaxFirstLevel(this.properties, flags);
     }
   }
-
 }