implementing vm scaling. We hit null pointer exception at EGISEngine line 654

drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java

@@ -53,7 +53,7 @@ import nl.uva.sne.drip.api.exception.KeyException;
 import nl.uva.sne.drip.commons.utils.Converter;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ConfigurationRepresentation;
 import nl.uva.sne.drip.drip.commons.data.v1.external.KeyPair;
-import nl.uva.sne.drip.drip.commons.data.v1.external.ScaleDeploymetRequest;
+import nl.uva.sne.drip.drip.commons.data.v1.external.ScaleRequest;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ansible.AnsibleOutput;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ansible.AnsibleResult;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ansible.BenchmarkResult;
@@ -274,19 +274,19 @@ public class DeployService {
         return scaleParameter;
     }
 
-    public DeployResponse scale(ScaleDeploymetRequest scaleReq) throws IOException, TimeoutException, InterruptedException, JSONException, Exception {
+    public DeployResponse scale(ScaleRequest scaleReq) throws IOException, TimeoutException, InterruptedException, JSONException, Exception {
         //Deployer needs configurationID -> name_of_deployment
-        String deployId = scaleReq.getDeployID();
+        String deployId = scaleReq.getScaleTargetID();
         DeployResponse deployment = this.findOne(deployId);
         String confID = deployment.getConfigurationID();
         ConfigurationRepresentation configuration = configurationService.findOne(confID);
         Map<String, Object> map = configuration.getKeyValue();
         Map<String, Object> services = (Map<String, Object>) map.get("services");
-        if (!services.containsKey(scaleReq.getServiceName())) {
+        if (!services.containsKey(scaleReq.getScaleTargetName())) {
             throw new BadRequestException("Service name does not exist in this deployment");
         }
 
-        Message message = buildDeployerMessage(deployment.getProvisionID(), "scale", confID, scaleReq.getServiceName(), scaleReq.getNumOfInstances());
+        Message message = buildDeployerMessage(deployment.getProvisionID(), "scale", confID, scaleReq.getScaleTargetName(), scaleReq.getNumOfInstances());
 
         try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) {
             Message response = (deployer.call(message));

drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/DeployController.java

@@ -35,7 +35,6 @@ import nl.uva.sne.drip.api.service.DeployService;
 import nl.uva.sne.drip.api.service.UserService;
 import nl.uva.sne.drip.drip.commons.data.v1.external.DeployRequest;
 import nl.uva.sne.drip.drip.commons.data.v1.external.DeployResponse;
-import nl.uva.sne.drip.drip.commons.data.v1.external.ScaleDeploymetRequest;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ScaleRequest;
 import org.json.JSONException;
 import org.springframework.stereotype.Controller;
@@ -91,9 +90,8 @@ public class DeployController {
 
     @RequestMapping(value = "/scale", method = RequestMethod.POST)
     @RolesAllowed({UserService.USER, UserService.ADMIN})
-
     public @ResponseBody
-    String scaleDeployment(@RequestBody ScaleDeploymetRequest scaleRequest) {
+    String scaleDeployment(@RequestBody ScaleRequest scaleRequest) {
         try {
             return deployService.scale(scaleRequest).getId();
 

drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java

@@ -37,6 +37,7 @@ import nl.uva.sne.drip.api.exception.NotFoundException;
 import nl.uva.sne.drip.api.service.ProvisionService;
 import nl.uva.sne.drip.api.service.UserService;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ProvisionResponse;
+import nl.uva.sne.drip.drip.commons.data.v1.external.ScaleRequest;
 import org.json.JSONException;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -188,6 +189,19 @@ public class ProvisionController {
 
         return resp.getId();
     }
+        @RequestMapping(value = "/scale", method = RequestMethod.POST)
+    @RolesAllowed({UserService.USER, UserService.ADMIN})
+    public @ResponseBody
+    String scaleDeployment(@RequestBody ScaleRequest scaleRequest) {
+        try {
+            return provisionService.scale(scaleRequest).getId();
+        } catch (IOException | TimeoutException | JSONException ex) {
+            Logger.getLogger(ProvisionController.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (Exception ex) {
+            Logger.getLogger(ProvisionController.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return null;
+    }
 
     @RequestMapping(value = "/sample", method = RequestMethod.GET)
     @RolesAllowed({UserService.USER, UserService.ADMIN})