1 files changed, 61 insertions, 21 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
index 60c7ef216e..72f143dcc0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,7 @@ package org.openecomp.mso.db.catalog.beans;
 
 import java.sql.Timestamp;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Map;
 
 import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
@@ -31,30 +32,35 @@ public class VnfResource extends MavenLikeVersioning {
 
     private int id;
     private String vnfType;
-    
+
     private String orchestrationMode = null;
     private String description = null;
     private Integer templateId;
     private Integer environmentId = null;
-    
+
     private Map <String, HeatFiles> heatFiles;
-    
+
     private String asdcUuid;
 
-    private Timestamp created;    
-    
+    private Timestamp created;
+
     private String aicVersionMin = null;
     private String aicVersionMax = null;
-        
+
     private String modelInvariantUuid = null;
     private String modelVersion = null;
 
     private String modelCustomizationName = null;
-    
+
     private String modelName = null;
     private String serviceModelInvariantUUID = null;
-    
+	private String modelCustomizationUuid = null;
+
+	private ArrayList<VfModule> vfModules;
+
     public VnfResource () {
+		super();
+		this.vfModules = new ArrayList<VfModule>();
     }
 
     public int getId () {
@@ -104,7 +110,7 @@ public class VnfResource extends MavenLikeVersioning {
     public void setEnvironmentId (Integer environmentId) {
         this.environmentId = environmentId;
     }
-    
+
     public Map <String, HeatFiles> getHeatFiles () {
         return this.heatFiles;
     }
@@ -120,7 +126,7 @@ public class VnfResource extends MavenLikeVersioning {
 	public void setAsdcUuid(String asdcUuidp) {
 		this.asdcUuid = asdcUuidp;
 	}
-    
+
 	public Timestamp getCreated() {
 		return created;
 	}
@@ -128,38 +134,38 @@ public class VnfResource extends MavenLikeVersioning {
 	public void setCreated(Timestamp created) {
 		this.created = created;
 	}
-	
+
 	public String getAicVersionMin() {
 		return this.aicVersionMin;
 	}
-	
+
 	public void setAicVersionMin(String aicVersionMin) {
 		this.aicVersionMin = aicVersionMin;
 	}
-	
+
 	public String getAicVersionMax() {
 		return this.aicVersionMax;
 	}
-	
+
 	public void setAicVersionMax(String aicVersionMax) {
 		this.aicVersionMax = aicVersionMax;
 	}
-	
+
 	public String getModelInvariantUuid() {
 		return this.modelInvariantUuid;
 	}
-	
+
 	public void setModelInvariantUuid(String modelInvariantUuid) {
 		this.modelInvariantUuid = modelInvariantUuid;
 	}
-	
+
 	public String getModelVersion() {
 		return this.modelVersion;
 	}
 	public void setModelVersion(String modelVersion) {
 		this.modelVersion = modelVersion;
 	}
-	
+
 	public String getModelCustomizationName() {
 		return modelCustomizationName;
 	}
@@ -184,6 +190,29 @@ public class VnfResource extends MavenLikeVersioning {
 		this.serviceModelInvariantUUID = serviceModelInvariantUUID;
 	}
 
+	public String getModelCustomizationUuid() {
+		return this.modelCustomizationUuid;
+	}
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
+
+	public ArrayList<VfModule> getVfModules() {
+		return this.vfModules;
+	}
+	public void setVfModules(ArrayList<VfModule> vfModules) {
+		this.vfModules = vfModules;
+	}
+	public void addVfModule(VfModule vfm) {
+		if (vfm != null) {
+			if (this.vfModules != null) {
+				this.vfModules.add(vfm);
+			} else {
+				this.vfModules = new ArrayList<VfModule>();
+				this.vfModules.add(vfm);
+			}
+		}
+	}
 	@Override
 	public String toString () {
 		StringBuffer buf = new StringBuffer();
@@ -214,11 +243,22 @@ public class VnfResource extends MavenLikeVersioning {
         buf.append(this.modelName);
         buf.append(",serviceModelInvariantUUID=");
         buf.append(this.serviceModelInvariantUUID);
-        
+		buf.append(",modelCustomizationUuid=");
+		buf.append(this.modelCustomizationUuid);
+
 		if (created != null) {
 			buf.append(",created=");
 			buf.append(DateFormat.getInstance().format(created));
 		}
+		if (this.vfModules != null && this.vfModules.size() > 0) {
+			buf.append("VfModules:");
+			int i=0;
+			for (VfModule vfm : this.vfModules) {
+				buf.append("vfModule[" + i++ + "]:" + vfm.toString());
+			}
+		} else {
+			buf.append("VfModules: NONE");
+		}
 		return buf.toString();
     }