1 files changed, 35 insertions, 43 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/ResourceRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/ResourceRequest.java
index 5db3c3f73d..a77c88ed3c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/ResourceRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/ResourceRequest.java
@@ -20,25 +20,28 @@
 
 package org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class ResourceRequest {
 
     @JsonProperty("resourceName")
     private String resourceName;
 
-    @JsonProperty("resourceDefId")
-    private String resourceDefId;
+    @JsonProperty("resourceInvariantUuid")
+    private String resourceInvariantUuid;
 
-    @JsonProperty("resourceId")
-    private String resourceId;
+    @JsonProperty("resourceUuid")
+    private String resourceUuid;
 
-    @JsonProperty("nsParameters")
-    private NsParameters nsParameters = null;
+    @JsonProperty("resourceCustomizationUuid")
+    private String resourceCustomizationUuid;
+
+    @JsonProperty("parameters")
+    private E2EParameters parameters;
 
     @JsonIgnore
     private Map<String, Object> additionalProperties = new HashMap<>();
@@ -57,54 +60,43 @@ public class ResourceRequest {
         this.resourceName = resourceName;
     }
 
-    /**
-     * @return Returns the resourceDefId.
-     */
-    public String getResourceDefId() {
-        return resourceDefId;
+    public Map<String, Object> getAdditionalProperties() {
+        return additionalProperties;
     }
 
-    /**
-     * @param resourceDefId The resourceDefId to set.
-     */
-    public void setResourceDefId(String resourceDefId) {
-        this.resourceDefId = resourceDefId;
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
     }
 
-    /**
-     * @return Returns the resourceId.
-     */
-    public String getResourceId() {
-        return resourceId;
+    public String getResourceInvariantUuid() {
+        return resourceInvariantUuid;
     }
 
-    /**
-     * @param resourceId The resourceId to set.
-     */
-    public void setResourceId(String resourceId) {
-        this.resourceId = resourceId;
+    public void setResourceInvariantUuid(String resourceInvariantUuid) {
+        this.resourceInvariantUuid = resourceInvariantUuid;
     }
 
-    /**
-     * @return Returns the nsParameters.
-     */
-    public NsParameters getNsParameters() {
-        return nsParameters;
+    public String getResourceUuid() {
+        return resourceUuid;
     }
 
-    /**
-     * @param nsParameters The nsParameters to set.
-     */
-    public void setNsParameters(NsParameters nsParameters) {
-        this.nsParameters = nsParameters;
+    public void setResourceUuid(String resourceUuid) {
+        this.resourceUuid = resourceUuid;
     }
 
-    public Map<String, Object> getAdditionalProperties() {
-        return additionalProperties;
+    public String getResourceCustomizationUuid() {
+        return resourceCustomizationUuid;
     }
 
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
+    public void setResourceCustomizationUuid(String resourceCustomizationUuid) {
+        this.resourceCustomizationUuid = resourceCustomizationUuid;
     }
 
+    public E2EParameters getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(E2EParameters parameters) {
+        this.parameters = parameters;
+    }
 }