1 files changed, 22 insertions, 2 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java
index 979a72e7..b043327a 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java
@@ -150,6 +150,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
     "reportDescr",
     "numDashCols",
     "dashboardLayoutHTML",
+    "dashboardLayoutJSON",
     "dbInfo",
     "dbType",
     "chartType",
@@ -193,6 +194,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
     "comment",
     "dataSourceList",
     "formFieldList",
+    "formFieldGroupsJSON",
     "javascriptList",
     "semaphoreList",
     "dashboardOptions",
@@ -225,6 +227,7 @@ public class CustomReportType {
     protected String reportDescr;
     protected String numDashCols;
     protected String dashboardLayoutHTML;
+    protected String dashboardLayoutJSON;
     protected String dbInfo;
     protected String dbType;
     @XmlElement(required = true)
@@ -281,6 +284,7 @@ public class CustomReportType {
     protected String comment;
     protected DataSourceList dataSourceList;
     protected FormFieldList formFieldList;
+    protected String formFieldGroupsJSON;
     protected JavascriptList javascriptList;
     protected SemaphoreList semaphoreList;
     protected String dashboardOptions;
@@ -410,7 +414,15 @@ public class CustomReportType {
         this.dashboardLayoutHTML = value;
     }
 
-    /**
+    public String getDashboardLayoutJSON() {
+		return dashboardLayoutJSON;
+	}
+
+	public void setDashboardLayoutJSON(String dashboardLayoutJSON) {
+		this.dashboardLayoutJSON = dashboardLayoutJSON;
+	}
+
+	/**
      * Gets the value of the dbInfo property.
      * 
      * @return
@@ -1426,7 +1438,15 @@ public class CustomReportType {
         this.formFieldList = value;
     }
 
-    /**
+    public String getFormFieldGroupsJSON() {
+		return formFieldGroupsJSON;
+	}
+
+	public void setFormFieldGroupsJSON(String formFieldGroupsJSON) {
+		this.formFieldGroupsJSON = formFieldGroupsJSON;
+	}
+
+	/**
      * Gets the value of the javascriptList property.
      * 
      * @return