Commit 9a30a7da authored by Spiros Koulouzis's avatar Spiros Koulouzis

changed deploy message to list. The plan is to split the request into many...

changed deploy message to list. The plan is to split the request into many massages and consume them by many deployers 
parent dd4d4394
...@@ -141,12 +141,12 @@ public class DeployService { ...@@ -141,12 +141,12 @@ public class DeployService {
public DeployResponse deploySoftware(DeployRequest deployInfo) throws Exception { public DeployResponse deploySoftware(DeployRequest deployInfo) throws Exception {
try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) { try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) {
Message deployerInvokationMessage = buildDeployerMessage( Message deployerInvokationMessage = buildDeployerMessages(
deployInfo.getProvisionID(), deployInfo.getProvisionID(),
deployInfo.getManagerType().toLowerCase(), deployInfo.getManagerType().toLowerCase(),
deployInfo.getConfigurationID(), deployInfo.getConfigurationID(),
null, null,
null); null).get(0);
; ;
deployerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername()); deployerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
// Message response = MessageGenerator.generateArtificialMessage(System.getProperty("user.home") // Message response = MessageGenerator.generateArtificialMessage(System.getProperty("user.home")
...@@ -174,12 +174,12 @@ public class DeployService { ...@@ -174,12 +174,12 @@ public class DeployService {
} }
private Map<String, Object> getSwarmInfo(DeployResponse deployResp) throws JSONException, IOException, TimeoutException, InterruptedException { private Map<String, Object> getSwarmInfo(DeployResponse deployResp) throws JSONException, IOException, TimeoutException, InterruptedException {
Message deployerInvokationMessage = buildDeployerMessage( Message deployerInvokationMessage = buildDeployerMessages(
deployResp.getProvisionID(), deployResp.getProvisionID(),
"swarm_info", "swarm_info",
deployResp.getConfigurationID(), deployResp.getConfigurationID(),
null, null,
null); null).get(0);
Map<String, Object> info; Map<String, Object> info;
deployerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername()); deployerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) { try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) {
...@@ -192,13 +192,13 @@ public class DeployService { ...@@ -192,13 +192,13 @@ public class DeployService {
return info; return info;
} }
private Message buildDeployerMessage(String provisionID, String managerType, String configurationID, String serviceName, Integer numOfCont) throws JSONException { private List<Message> buildDeployerMessages(String provisionID, String managerType, String configurationID, String serviceName, Integer numOfCont) throws JSONException {
ProvisionResponse pro = provisionService.findOne(provisionID); ProvisionResponse pro = provisionService.findOne(provisionID);
if (pro == null) { if (pro == null) {
throw new NotFoundException(); throw new NotFoundException();
} }
List<String> loginKeysIDs = pro.getDeployerKeyPairIDs(); List<String> loginKeysIDs = pro.getDeployerKeyPairIDs();
List<Message> messages = new ArrayList<>();
// if (loginKeysIDs == null || loginKeysIDs.isEmpty()) { // if (loginKeysIDs == null || loginKeysIDs.isEmpty()) {
// List<String> cloudConfIDs = pro.getCloudCredentialsIDs(); // List<String> cloudConfIDs = pro.getCloudCredentialsIDs();
// CloudCredentials cCred = cloudCredentialsService.findOne(cloudConfIDs.get(0)); // CloudCredentials cCred = cloudCredentialsService.findOne(cloudConfIDs.get(0));
...@@ -242,7 +242,8 @@ public class DeployService { ...@@ -242,7 +242,8 @@ public class DeployService {
Message deployInvokationMessage = new Message(); Message deployInvokationMessage = new Message();
deployInvokationMessage.setParameters(parameters); deployInvokationMessage.setParameters(parameters);
deployInvokationMessage.setCreationDate(System.currentTimeMillis()); deployInvokationMessage.setCreationDate(System.currentTimeMillis());
return deployInvokationMessage; messages.add(deployInvokationMessage);
return messages;
} }
@PostAuthorize("(hasRole('ROLE_ADMIN'))") @PostAuthorize("(hasRole('ROLE_ADMIN'))")
...@@ -336,7 +337,8 @@ public class DeployService { ...@@ -336,7 +337,8 @@ public class DeployService {
throw new BadRequestException("Service name does not exist in this deployment"); throw new BadRequestException("Service name does not exist in this deployment");
} }
Message message = buildDeployerMessage(deployment.getProvisionID(), "scale", confID, scaleReq.getScaleTargetName(), scaleReq.getNumOfInstances()); Message message = buildDeployerMessages(deployment.getProvisionID(), "scale",
confID, scaleReq.getScaleTargetName(), scaleReq.getNumOfInstances()).get(0);
message.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername()); message.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) { try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) {
logger.info("Calling deployer"); logger.info("Calling deployer");
......
...@@ -153,7 +153,7 @@ public class KeyPairController { ...@@ -153,7 +153,7 @@ public class KeyPairController {
return null; return null;
} }
// localhost:8080/drip-api/user_key/ids
/** /**
* Gets the IDs of all the stored Key * Gets the IDs of all the stored Key
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment