Skip to content

C
CONF
Commit 889d2274 authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

fix user null bug

parent 6b9c84d5
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 43 deletions
drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
View file @ 889d2274
...@@ -138,9 +138,12 @@ public class Consumer extends DefaultConsumer { ...@@ -138,9 +138,12 @@ public class Consumer extends DefaultConsumer {
case "kill_topology": case "kill_topology":
jo = new JSONObject(messageStr); jo = new JSONObject(messageStr);
return killTopology(jo.getJSONArray("parameters"), tempInputDirPath); return killTopology(jo.getJSONArray("parameters"), tempInputDirPath);
case "scale_topology": case "scale_topology_up":
jo = new JSONObject(messageStr); jo = new JSONObject(messageStr);
return scaleTopology(jo.getJSONArray("parameters"), tempInputDirPath); return scaleTopologyUp(jo.getJSONArray("parameters"), tempInputDirPath);
case "scale_topology_down":
jo = new JSONObject(messageStr);
return scaleTopologyDown(jo.getJSONArray("parameters"), tempInputDirPath);
} }
} }
} }
...@@ -302,7 +305,7 @@ public class Consumer extends DefaultConsumer { ...@@ -302,7 +305,7 @@ public class Consumer extends DefaultConsumer {
return response; return response;
} }
private Message scaleTopology(JSONArray parameters, String tempInputDirPath) throws IOException, JSONException, Exception { private Message scaleTopologyUp(JSONArray parameters, String tempInputDirPath) throws IOException, JSONException, Exception {
TEngine tEngine = new TEngine(); TEngine tEngine = new TEngine();
TopologyAnalysisMain tam; TopologyAnalysisMain tam;
...@@ -363,7 +366,79 @@ public class Consumer extends DefaultConsumer { ...@@ -363,7 +366,79 @@ public class Consumer extends DefaultConsumer {
} }
tEngine.autoScal(tam.wholeTopology, userCredential, userDatabase, nameOfScalingTopology, true, scalDCs); tEngine.autoScal(tam.wholeTopology, userCredential, userDatabase, nameOfScalingTopology, true, scalDCs);
return buildTopologuResponse(tam, tempInputDirPath, userPublicKeyName, userPrivateName); return buildTopologuResponse(tam, tempInputDirPath, null, null);
} catch (Throwable ex) {
ObjectMapper mapper = new ObjectMapper();
mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
return mapper.readValue(generateExeptionResponse(ex), Message.class
);
}
}
private Message scaleTopologyDown(JSONArray parameters, String tempInputDirPath) throws IOException, JSONException, Exception {
TEngine tEngine = new TEngine();
TopologyAnalysisMain tam;
File topologyFile = MessageParsing.getTopologies(parameters, tempInputDirPath, 0).get(0);
File mainTopologyFile = new File(tempInputDirPath + "topology_main.yml");
String topTopologyLoadingPath = mainTopologyFile.getAbsolutePath();
List<File> topologyFiles = MessageParsing.getTopologies(parameters, tempInputDirPath, 1);
File clusterDir = new File(tempInputDirPath + File.separator + "clusterKeyPair");
clusterDir.mkdir();
List<File> public_deployer_key = MessageParsing.getSSHKeys(parameters, clusterDir.getAbsolutePath(), "id_rsa.pub", "public_deployer_key");
List<File> private_deployer_key = MessageParsing.getSSHKeys(parameters, clusterDir.getAbsolutePath(), "id_rsa", "private_deployer_key");
Map<String, Object> map = MessageParsing.ymlStream2Map(new FileInputStream(topTopologyLoadingPath));
String userPublicKeyName = ((String) map.get("publicKeyPath")).split("@")[1].replaceAll("\"", "");
String userPrivateName = FilenameUtils.removeExtension(userPublicKeyName);
List<File> public_user_key = MessageParsing.getSSHKeys(parameters, tempInputDirPath + File.separator, userPublicKeyName, "public_user_key");
List<File> private_user_key = MessageParsing.getSSHKeys(parameters, tempInputDirPath + File.separator, "id_rsa", "private_user_key");
FileUtils.moveFile(private_user_key.get(0), new File(private_user_key.get(0).getParent() + File.separator + userPrivateName));
List<File> public_cloud_key = MessageParsing.getSSHKeys(parameters, tempInputDirPath + File.separator, "name.pub", "public_cloud_key");
List<File> private_cloud_key = MessageParsing.getSSHKeys(parameters, tempInputDirPath + File.separator, "id_rsa", "private_cloud_key");
UserCredential userCredential = getUserCredential(parameters, tempInputDirPath);
UserDatabase userDatabase = getUserDB();
tam = new TopologyAnalysisMain(topTopologyLoadingPath);
if (!tam.fullLoadWholeTopology()) {
throw new Exception("sth wrong!");
}
ArrayList<SSHKeyPair> sshKeyPairs = userCredential.
loadSSHKeyPairFromFile(tempInputDirPath);
if (sshKeyPairs == null) {
throw new NullPointerException("ssh key pairs are null");
}
if (sshKeyPairs.isEmpty()) {
throw new IOException("No ssh key pair is loaded!");
} else if (!userCredential.initial(sshKeyPairs, tam.wholeTopology)) {
throw new IOException("ssh key pair initilaziation error");
}
Message response = new Message();
MessageParameter scaleInfo = MessageParsing.getScaleInfo(parameters);
String nameOfScalingTopology = scaleInfo.getValue();
String cloudProvider = scaleInfo.getAttributes().get("cloud_provider");
String cloudDomain = scaleInfo.getAttributes().get("domain");
Integer numOfInst = Integer.valueOf(scaleInfo.getAttributes().get("number_of_instances"));
try {
ArrayList<ScalingRequest> scalDCs = new ArrayList<>();
for (int i = 0; i < numOfInst; i++) {
ScalingRequest scalReq = new ScalingRequest();
scalReq.cloudProvider = cloudProvider;
scalReq.domain = cloudDomain;
scalReq.satisfied = false;
scalDCs.add(scalReq);
}
tEngine.autoScal(tam.wholeTopology, userCredential, userDatabase, nameOfScalingTopology, false, scalDCs);
return buildTopologuResponse(tam, tempInputDirPath, null, null);
} catch (Throwable ex) { } catch (Throwable ex) {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true); mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
...@@ -407,7 +482,8 @@ public class Consumer extends DefaultConsumer { ...@@ -407,7 +482,8 @@ public class Consumer extends DefaultConsumer {
return userCredential; return userCredential;
} }
private Message buildTopologuResponse(TopologyAnalysisMain tam, String tempInputDirPath, String userPublicKeyName, String userPrivateName) throws IOException { private Message buildTopologuResponse(TopologyAnalysisMain tam,
String tempInputDirPath, String userPublicKeyName, String userPrivateName) throws IOException {
String topologyUserName = tam.wholeTopology.userName; String topologyUserName = tam.wholeTopology.userName;
String charset = "UTF-8"; String charset = "UTF-8";
...@@ -450,46 +526,51 @@ public class Consumer extends DefaultConsumer { ...@@ -450,46 +526,51 @@ public class Consumer extends DefaultConsumer {
} }
} }
param = new MessageParameter(); if (userPublicKeyName != null) {
param.setEncoding(charset); param = new MessageParameter();
param.setName("public_user_key"); param.setEncoding(charset);
byte[] bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + userPublicKeyName)); param.setName("public_user_key");
param.setValue(new String(bytes, charset)); byte[] bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + userPublicKeyName));
Map<String, String> attributes = new HashMap<>(); param.setValue(new String(bytes, charset));
attributes.put("name", userPublicKeyName); Map<String, String> attributes = new HashMap<>();
param.setAttributes(attributes); attributes.put("name", userPublicKeyName);
responseParameters.add(param); param.setAttributes(attributes);
responseParameters.add(param);
}
param = new MessageParameter(); if (userPrivateName != null) {
param.setEncoding(charset); param = new MessageParameter();
param.setName("private_user_key"); param.setEncoding(charset);
bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + userPrivateName)); param.setName("private_user_key");
param.setValue(new String(bytes, charset)); byte[] bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + userPrivateName));
attributes = new HashMap<>(); param.setValue(new String(bytes, charset));
attributes.put("name", userPrivateName); Map<String, String> attributes = new HashMap<>();
attributes.put("name", userPrivateName);
// attributes.put("username", sub.userName); // attributes.put("username", sub.userName);
param.setAttributes(attributes); param.setAttributes(attributes);
responseParameters.add(param); responseParameters.add(param);
param = new MessageParameter(); param = new MessageParameter();
param.setEncoding(charset); param.setEncoding(charset);
param.setName("private_deployer_key"); param.setName("private_deployer_key");
bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + "clusterKeyPair" + File.separator + "id_rsa")); bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + "clusterKeyPair" + File.separator + "id_rsa"));
param.setValue(new String(bytes, charset)); param.setValue(new String(bytes, charset));
attributes = new HashMap<>(); attributes = new HashMap<>();
attributes.put("name", "id_rsa"); attributes.put("name", "id_rsa");
param.setAttributes(attributes); param.setAttributes(attributes);
responseParameters.add(param); responseParameters.add(param);
param = new MessageParameter(); param = new MessageParameter();
param.setEncoding(charset); param.setEncoding(charset);
param.setName("public_deployer_key"); param.setName("public_deployer_key");
bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + "clusterKeyPair" + File.separator + "id_rsa.pub")); bytes = Files.readAllBytes(Paths.get(tempInputDirPath + File.separator + "clusterKeyPair" + File.separator + "id_rsa.pub"));
param.setValue(new String(bytes, charset)); param.setValue(new String(bytes, charset));
attributes = new HashMap<>(); attributes = new HashMap<>();
attributes.put("name", "id_rsa.pub"); attributes.put("name", "id_rsa.pub");
param.setAttributes(attributes); param.setAttributes(attributes);
responseParameters.add(param); responseParameters.add(param);
}
File dir = new File(tempInputDirPath); File dir = new File(tempInputDirPath);
for (File d : dir.listFiles()) { for (File d : dir.listFiles()) {
...@@ -501,9 +582,9 @@ public class Consumer extends DefaultConsumer { ...@@ -501,9 +582,9 @@ public class Consumer extends DefaultConsumer {
if (!publicKey.exists()) { if (!publicKey.exists()) {
publicKey = new File(d.getAbsolutePath() + File.separator + "id_rsa.pub"); publicKey = new File(d.getAbsolutePath() + File.separator + "id_rsa.pub");
} }
bytes = Files.readAllBytes(Paths.get(publicKey.getAbsolutePath())); byte[] bytes = Files.readAllBytes(Paths.get(publicKey.getAbsolutePath()));
param.setValue(new String(bytes, charset)); param.setValue(new String(bytes, charset));
attributes = new HashMap<>(); Map<String, String> attributes = new HashMap<>();
attributes.put("name", publicKey.getName()); attributes.put("name", publicKey.getName());
attributes.put("key_pair_id", d.getName()); attributes.put("key_pair_id", d.getName());
param.setAttributes(attributes); param.setAttributes(attributes);
......
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