Skip to content

C
CONF
Commit 2d9ace00 authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

added DB type

parent 3e0d607a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2479 additions and 714 deletions
drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/ToscaHelper.java
View file @ 2d9ace00
......@@ -26,11 +26,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import nl.uva.sne.drip.model.NodeTemplate;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.sure_tosca.DefaultApi;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import nl.uva.sne.drip.sure.tosca.client.DefaultApi;
import org.apache.commons.io.FileUtils;
import nl.uva.sne.drip.sure_tosca.client.ApiException;
import nl.uva.sne.drip.sure_tosca.client.Configuration;
import nl.uva.sne.drip.sure.tosca.client.ApiException;
import nl.uva.sne.drip.sure.tosca.client.Configuration;
/**
*
......@@ -101,8 +101,4 @@ public class ToscaHelper {
}
public String getVMType(NodeTemplate vm, String provider) {
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormSubMembers.java deleted 100644 → 0
View file @ 3e0d607a
package nl.uva.sne.drip.model;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.validation.annotation.Validated;
/**
* CloudsStormSubMembers
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
public class CloudsStormSubMembers {
@JsonProperty("vmName")
private String vmName = null;
@JsonProperty("address")
private String address = null;
public CloudsStormSubMembers vmName(String vmName) {
this.vmName = vmName;
return this;
}
/**
* Get vmName
*
* @return vmName
*
*/
@ApiModelProperty(value = "")
public String getVmName() {
return vmName;
}
public void setVmName(String vmName) {
this.vmName = vmName;
}
public CloudsStormSubMembers address(String address) {
this.address = address;
return this;
}
/**
* Get address
*
* @return address
*
*/
@ApiModelProperty(value = "")
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormSubMembers cloudsStormSubMembers = (CloudsStormSubMembers) o;
return Objects.equals(this.vmName, cloudsStormSubMembers.vmName)
&& Objects.equals(this.address, cloudsStormSubMembers.address);
}
@Override
public int hashCode() {
return Objects.hash(vmName, address);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormSubMembers {\n");
sb.append(" vmName: ").append(toIndentedString(vmName)).append("\n");
sb.append(" address: ").append(toIndentedString(address)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormSubTopology.java deleted 100644 → 0
View file @ 3e0d607a
package nl.uva.sne.drip.model;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.validation.annotation.Validated;
/**
* CloudsStormSubTopology
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
public class CloudsStormSubTopology {
@JsonProperty("topology")
private String topology = null;
@JsonProperty("cloudProvider")
private String cloudProvider = null;
@JsonProperty("domain")
private String domain = null;
@JsonProperty("status")
private String status = null;
public CloudsStormSubTopology topology(String topology) {
this.topology = topology;
return this;
}
/**
* Get topology
*
* @return topology
*
*/
@ApiModelProperty(value = "")
public String getTopology() {
return topology;
}
public void setTopology(String topology) {
this.topology = topology;
}
public CloudsStormSubTopology cloudProvider(String cloudProvider) {
this.cloudProvider = cloudProvider;
return this;
}
/**
* Get cloudProvider
*
* @return cloudProvider
*
*/
@ApiModelProperty(value = "")
public String getCloudProvider() {
return cloudProvider;
}
public void setCloudProvider(String cloudProvider) {
this.cloudProvider = cloudProvider;
}
public CloudsStormSubTopology domain(String domain) {
this.domain = domain;
return this;
}
/**
* Get domain
*
* @return domain
*
*/
@ApiModelProperty(value = "")
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
public CloudsStormSubTopology status(String status) {
this.status = status;
return this;
}
/**
* Get status
*
* @return status
*
*/
@ApiModelProperty(value = "")
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormSubTopology cloudsStormSubTopology = (CloudsStormSubTopology) o;
return Objects.equals(this.topology, cloudsStormSubTopology.topology)
&& Objects.equals(this.cloudProvider, cloudsStormSubTopology.cloudProvider)
&& Objects.equals(this.domain, cloudsStormSubTopology.domain)
&& Objects.equals(this.status, cloudsStormSubTopology.status);
}
@Override
public int hashCode() {
return Objects.hash(topology, cloudProvider, domain, status);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormSubTopology {\n");
sb.append(" topology: ").append(toIndentedString(topology)).append("\n");
sb.append(" cloudProvider: ").append(toIndentedString(cloudProvider)).append("\n");
sb.append(" domain: ").append(toIndentedString(domain)).append("\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormSubnets.java deleted 100644 → 0
View file @ 3e0d607a
package nl.uva.sne.drip.model;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
/**
* CloudsStormSubnets
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
public class CloudsStormSubnets {
@JsonProperty("name")
private String name = null;
@JsonProperty("subnet")
private String subnet = null;
@JsonProperty("netmask")
private String netmask = null;
@JsonProperty("members")
@Valid
private List<CloudsStormSubMembers> members = null;
public CloudsStormSubnets name(String name) {
this.name = name;
return this;
}
/**
* Get name
*
* @return name
*
*/
@ApiModelProperty(value = "")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public CloudsStormSubnets subnet(String subnet) {
this.subnet = subnet;
return this;
}
/**
* Get subnet
*
* @return subnet
*
*/
@ApiModelProperty(value = "")
public String getSubnet() {
return subnet;
}
public void setSubnet(String subnet) {
this.subnet = subnet;
}
public CloudsStormSubnets netmask(String netmask) {
this.netmask = netmask;
return this;
}
/**
* Get netmask
*
* @return netmask
*
*/
@ApiModelProperty(value = "")
public String getNetmask() {
return netmask;
}
public void setNetmask(String netmask) {
this.netmask = netmask;
}
public CloudsStormSubnets members(List<CloudsStormSubMembers> members) {
this.members = members;
return this;
}
public CloudsStormSubnets addMembersItem(CloudsStormSubMembers membersItem) {
if (this.members == null) {
this.members = new ArrayList<CloudsStormSubMembers>();
}
this.members.add(membersItem);
return this;
}
/**
* Get members
*
* @return members
*
*/
@ApiModelProperty(value = "")
@Valid
public List<CloudsStormSubMembers> getMembers() {
return members;
}
public void setMembers(List<CloudsStormSubMembers> members) {
this.members = members;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormSubnets cloudsStormSubnets = (CloudsStormSubnets) o;
return Objects.equals(this.name, cloudsStormSubnets.name)
&& Objects.equals(this.subnet, cloudsStormSubnets.subnet)
&& Objects.equals(this.netmask, cloudsStormSubnets.netmask)
&& Objects.equals(this.members, cloudsStormSubnets.members);
}
@Override
public int hashCode() {
return Objects.hash(name, subnet, netmask, members);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormSubnets {\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" subnet: ").append(toIndentedString(subnet)).append("\n");
sb.append(" netmask: ").append(toIndentedString(netmask)).append("\n");
sb.append(" members: ").append(toIndentedString(members)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormTopTopology.java deleted 100644 → 0
View file @ 3e0d607a
package nl.uva.sne.drip.model;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
/**
* CloudsStormTopTopology
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
public class CloudsStormTopTopology {
@JsonProperty("userName")
private String userName = null;
@JsonProperty("publicKeyPath")
private String publicKeyPath = null;
@JsonProperty("topologies")
@Valid
private List<CloudsStormSubTopology> topologies = null;
@JsonProperty("subnets")
@Valid
private List<CloudsStormSubnets> subnets = null;
public CloudsStormTopTopology userName(String userName) {
this.userName = userName;
return this;
}
/**
* Get userName
*
* @return userName
*
*/
@ApiModelProperty(value = "")
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public CloudsStormTopTopology publicKeyPath(String publicKeyPath) {
this.publicKeyPath = publicKeyPath;
return this;
}
/**
* Get publicKeyPath
*
* @return publicKeyPath
*
*/
@ApiModelProperty(value = "")
public String getPublicKeyPath() {
return publicKeyPath;
}
public void setPublicKeyPath(String publicKeyPath) {
this.publicKeyPath = publicKeyPath;
}
public CloudsStormTopTopology topologies(List<CloudsStormSubTopology> topologies) {
this.topologies = topologies;
return this;
}
public CloudsStormTopTopology addTopologiesItem(CloudsStormSubTopology topologiesItem) {
if (this.topologies == null) {
this.topologies = new ArrayList<CloudsStormSubTopology>();
}
this.topologies.add(topologiesItem);
return this;
}
/**
* Get topologies
*
* @return topologies
*
*/
@ApiModelProperty(value = "")
@Valid
public List<CloudsStormSubTopology> getTopologies() {
return topologies;
}
public void setTopologies(List<CloudsStormSubTopology> topologies) {
this.topologies = topologies;
}
public CloudsStormTopTopology subnets(List<CloudsStormSubnets> subnets) {
this.subnets = subnets;
return this;
}
public CloudsStormTopTopology addSubnetsItem(CloudsStormSubnets subnetsItem) {
if (this.subnets == null) {
this.subnets = new ArrayList<CloudsStormSubnets>();
}
this.subnets.add(subnetsItem);
return this;
}
/**
* Get subnets
*
* @return subnets
*
*/
@ApiModelProperty(value = "")
@Valid
public List<CloudsStormSubnets> getSubnets() {
return subnets;
}
public void setSubnets(List<CloudsStormSubnets> subnets) {
this.subnets = subnets;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormTopTopology cloudsStormTopTopology = (CloudsStormTopTopology) o;
return Objects.equals(this.userName, cloudsStormTopTopology.userName)
&& Objects.equals(this.publicKeyPath, cloudsStormTopTopology.publicKeyPath)
&& Objects.equals(this.topologies, cloudsStormTopTopology.topologies)
&& Objects.equals(this.subnets, cloudsStormTopTopology.subnets);
}
@Override
public int hashCode() {
return Objects.hash(userName, publicKeyPath, topologies, subnets);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormTopTopology {\n");
sb.append(" userName: ").append(toIndentedString(userName)).append("\n");
sb.append(" publicKeyPath: ").append(toIndentedString(publicKeyPath)).append("\n");
sb.append(" topologies: ").append(toIndentedString(topologies)).append("\n");
sb.append(" subnets: ").append(toIndentedString(subnets)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/Message.java
View file @ 2d9ace00
......@@ -15,6 +15,7 @@
*/
package nl.uva.sne.drip.model;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.io.Serializable;
import java.util.List;
......
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudDB.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* CloudDB
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class CloudDB {
@JsonProperty("cloudProvider")
private String cloudProvider = null;
@JsonProperty("dbInfoFile")
private String dbInfoFile = null;
public CloudDB cloudProvider(String cloudProvider) {
this.cloudProvider = cloudProvider;
return this;
}
/**
* Get cloudProvider
* @return cloudProvider
**/
@ApiModelProperty(value = "")
public String getCloudProvider() {
return cloudProvider;
}
public void setCloudProvider(String cloudProvider) {
this.cloudProvider = cloudProvider;
}
public CloudDB dbInfoFile(String dbInfoFile) {
this.dbInfoFile = dbInfoFile;
return this;
}
/**
* Get dbInfoFile
* @return dbInfoFile
**/
@ApiModelProperty(value = "")
public String getDbInfoFile() {
return dbInfoFile;
}
public void setDbInfoFile(String dbInfoFile) {
this.dbInfoFile = dbInfoFile;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudDB cloudDB = (CloudDB) o;
return Objects.equals(this.cloudProvider, cloudDB.cloudProvider) &&
Objects.equals(this.dbInfoFile, cloudDB.dbInfoFile);
}
@Override
public int hashCode() {
return Objects.hash(cloudProvider, dbInfoFile);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudDB {\n");
sb.append(" cloudProvider: ").append(toIndentedString(cloudProvider)).append("\n");
sb.append(" dbInfoFile: ").append(toIndentedString(dbInfoFile)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormSubMembers.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* CloudsStormSubMembers
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class CloudsStormSubMembers {
@JsonProperty("vmName")
private String vmName = null;
@JsonProperty("address")
private String address = null;
public CloudsStormSubMembers vmName(String vmName) {
this.vmName = vmName;
return this;
}
/**
* Get vmName
* @return vmName
**/
@ApiModelProperty(value = "")
public String getVmName() {
return vmName;
}
public void setVmName(String vmName) {
this.vmName = vmName;
}
public CloudsStormSubMembers address(String address) {
this.address = address;
return this;
}
/**
* Get address
* @return address
**/
@ApiModelProperty(value = "")
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormSubMembers cloudsStormSubMembers = (CloudsStormSubMembers) o;
return Objects.equals(this.vmName, cloudsStormSubMembers.vmName) &&
Objects.equals(this.address, cloudsStormSubMembers.address);
}
@Override
public int hashCode() {
return Objects.hash(vmName, address);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormSubMembers {\n");
sb.append(" vmName: ").append(toIndentedString(vmName)).append("\n");
sb.append(" address: ").append(toIndentedString(address)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormSubTopology.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* CloudsStormSubTopology
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class CloudsStormSubTopology {
@JsonProperty("topology")
private String topology = null;
@JsonProperty("cloudProvider")
private String cloudProvider = null;
@JsonProperty("domain")
private String domain = null;
@JsonProperty("status")
private String status = null;
public CloudsStormSubTopology topology(String topology) {
this.topology = topology;
return this;
}
/**
* Get topology
* @return topology
**/
@ApiModelProperty(value = "")
public String getTopology() {
return topology;
}
public void setTopology(String topology) {
this.topology = topology;
}
public CloudsStormSubTopology cloudProvider(String cloudProvider) {
this.cloudProvider = cloudProvider;
return this;
}
/**
* Get cloudProvider
* @return cloudProvider
**/
@ApiModelProperty(value = "")
public String getCloudProvider() {
return cloudProvider;
}
public void setCloudProvider(String cloudProvider) {
this.cloudProvider = cloudProvider;
}
public CloudsStormSubTopology domain(String domain) {
this.domain = domain;
return this;
}
/**
* Get domain
* @return domain
**/
@ApiModelProperty(value = "")
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
public CloudsStormSubTopology status(String status) {
this.status = status;
return this;
}
/**
* Get status
* @return status
**/
@ApiModelProperty(value = "")
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormSubTopology cloudsStormSubTopology = (CloudsStormSubTopology) o;
return Objects.equals(this.topology, cloudsStormSubTopology.topology) &&
Objects.equals(this.cloudProvider, cloudsStormSubTopology.cloudProvider) &&
Objects.equals(this.domain, cloudsStormSubTopology.domain) &&
Objects.equals(this.status, cloudsStormSubTopology.status);
}
@Override
public int hashCode() {
return Objects.hash(topology, cloudProvider, domain, status);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormSubTopology {\n");
sb.append(" topology: ").append(toIndentedString(topology)).append("\n");
sb.append(" cloudProvider: ").append(toIndentedString(cloudProvider)).append("\n");
sb.append(" domain: ").append(toIndentedString(domain)).append("\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormSubnets.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import nl.uva.sne.drip.model.cloud.storm.CloudsStormSubMembers;
import java.util.ArrayList;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* CloudsStormSubnets
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class CloudsStormSubnets {
@JsonProperty("name")
private String name = null;
@JsonProperty("subnet")
private String subnet = null;
@JsonProperty("netmask")
private String netmask = null;
@JsonProperty("members")
@Valid
private List<CloudsStormSubMembers> members = null;
public CloudsStormSubnets name(String name) {
this.name = name;
return this;
}
/**
* Get name
* @return name
**/
@ApiModelProperty(value = "")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public CloudsStormSubnets subnet(String subnet) {
this.subnet = subnet;
return this;
}
/**
* Get subnet
* @return subnet
**/
@ApiModelProperty(value = "")
public String getSubnet() {
return subnet;
}
public void setSubnet(String subnet) {
this.subnet = subnet;
}
public CloudsStormSubnets netmask(String netmask) {
this.netmask = netmask;
return this;
}
/**
* Get netmask
* @return netmask
**/
@ApiModelProperty(value = "")
public String getNetmask() {
return netmask;
}
public void setNetmask(String netmask) {
this.netmask = netmask;
}
public CloudsStormSubnets members(List<CloudsStormSubMembers> members) {
this.members = members;
return this;
}
public CloudsStormSubnets addMembersItem(CloudsStormSubMembers membersItem) {
if (this.members == null) {
this.members = new ArrayList<CloudsStormSubMembers>();
}
this.members.add(membersItem);
return this;
}
/**
* Get members
* @return members
**/
@ApiModelProperty(value = "")
@Valid
public List<CloudsStormSubMembers> getMembers() {
return members;
}
public void setMembers(List<CloudsStormSubMembers> members) {
this.members = members;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormSubnets cloudsStormSubnets = (CloudsStormSubnets) o;
return Objects.equals(this.name, cloudsStormSubnets.name) &&
Objects.equals(this.subnet, cloudsStormSubnets.subnet) &&
Objects.equals(this.netmask, cloudsStormSubnets.netmask) &&
Objects.equals(this.members, cloudsStormSubnets.members);
}
@Override
public int hashCode() {
return Objects.hash(name, subnet, netmask, members);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormSubnets {\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" subnet: ").append(toIndentedString(subnet)).append("\n");
sb.append(" netmask: ").append(toIndentedString(netmask)).append("\n");
sb.append(" members: ").append(toIndentedString(members)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormTopTopology.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import nl.uva.sne.drip.model.cloud.storm.CloudsStormSubTopology;
import nl.uva.sne.drip.model.cloud.storm.CloudsStormSubnets;
import java.util.ArrayList;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* CloudsStormTopTopology
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class CloudsStormTopTopology {
@JsonProperty("userName")
private String userName = null;
@JsonProperty("publicKeyPath")
private String publicKeyPath = null;
@JsonProperty("topologies")
@Valid
private List<CloudsStormSubTopology> topologies = null;
@JsonProperty("subnets")
@Valid
private List<CloudsStormSubnets> subnets = null;
public CloudsStormTopTopology userName(String userName) {
this.userName = userName;
return this;
}
/**
* Get userName
* @return userName
**/
@ApiModelProperty(value = "")
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public CloudsStormTopTopology publicKeyPath(String publicKeyPath) {
this.publicKeyPath = publicKeyPath;
return this;
}
/**
* Get publicKeyPath
* @return publicKeyPath
**/
@ApiModelProperty(value = "")
public String getPublicKeyPath() {
return publicKeyPath;
}
public void setPublicKeyPath(String publicKeyPath) {
this.publicKeyPath = publicKeyPath;
}
public CloudsStormTopTopology topologies(List<CloudsStormSubTopology> topologies) {
this.topologies = topologies;
return this;
}
public CloudsStormTopTopology addTopologiesItem(CloudsStormSubTopology topologiesItem) {
if (this.topologies == null) {
this.topologies = new ArrayList<CloudsStormSubTopology>();
}
this.topologies.add(topologiesItem);
return this;
}
/**
* Get topologies
* @return topologies
**/
@ApiModelProperty(value = "")
@Valid
public List<CloudsStormSubTopology> getTopologies() {
return topologies;
}
public void setTopologies(List<CloudsStormSubTopology> topologies) {
this.topologies = topologies;
}
public CloudsStormTopTopology subnets(List<CloudsStormSubnets> subnets) {
this.subnets = subnets;
return this;
}
public CloudsStormTopTopology addSubnetsItem(CloudsStormSubnets subnetsItem) {
if (this.subnets == null) {
this.subnets = new ArrayList<CloudsStormSubnets>();
}
this.subnets.add(subnetsItem);
return this;
}
/**
* Get subnets
* @return subnets
**/
@ApiModelProperty(value = "")
@Valid
public List<CloudsStormSubnets> getSubnets() {
return subnets;
}
public void setSubnets(List<CloudsStormSubnets> subnets) {
this.subnets = subnets;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
CloudsStormTopTopology cloudsStormTopTopology = (CloudsStormTopTopology) o;
return Objects.equals(this.userName, cloudsStormTopTopology.userName) &&
Objects.equals(this.publicKeyPath, cloudsStormTopTopology.publicKeyPath) &&
Objects.equals(this.topologies, cloudsStormTopTopology.topologies) &&
Objects.equals(this.subnets, cloudsStormTopTopology.subnets);
}
@Override
public int hashCode() {
return Objects.hash(userName, publicKeyPath, topologies, subnets);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class CloudsStormTopTopology {\n");
sb.append(" userName: ").append(toIndentedString(userName)).append("\n");
sb.append(" publicKeyPath: ").append(toIndentedString(publicKeyPath)).append("\n");
sb.append(" topologies: ").append(toIndentedString(topologies)).append("\n");
sb.append(" subnets: ").append(toIndentedString(subnets)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/CloudsStormVM.java → drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormVM.java
View file @ 2d9ace00
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package nl.uva.sne.drip.model;
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.google.gson.annotations.SerializedName;
......
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/DBInfo.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import nl.uva.sne.drip.model.cloud.storm.DCMetaInfo;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* DBInfo
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class DBInfo {
@JsonProperty("GlobalEntry")
private String globalEntry = null;
@JsonProperty("DCMetaInfo")
private DCMetaInfo dcMetaInfo = null;
public DBInfo globalEntry(String globalEntry) {
this.globalEntry = globalEntry;
return this;
}
/**
* Get globalEntry
* @return globalEntry
**/
@ApiModelProperty(value = "")
public String getGlobalEntry() {
return globalEntry;
}
public void setGlobalEntry(String globalEntry) {
this.globalEntry = globalEntry;
}
public DBInfo dcMetaInfo(DCMetaInfo dcMetaInfo) {
this.dcMetaInfo = dcMetaInfo;
return this;
}
/**
* Get dcMetaInfo
* @return dcMetaInfo
**/
@ApiModelProperty(value = "")
@Valid
public DCMetaInfo getDcMetaInfo() {
return dcMetaInfo;
}
public void setDcMetaInfo(DCMetaInfo dcMetaInfo) {
this.dcMetaInfo = dcMetaInfo;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
DBInfo dbInfo = (DBInfo) o;
return Objects.equals(this.globalEntry, dbInfo.globalEntry) &&
Objects.equals(this.dcMetaInfo, dbInfo.dcMetaInfo);
}
@Override
public int hashCode() {
return Objects.hash(globalEntry, dcMetaInfo);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class DBInfo {\n");
sb.append(" globalEntry: ").append(toIndentedString(globalEntry)).append("\n");
sb.append(" dcMetaInfo: ").append(toIndentedString(dcMetaInfo)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/DCMetaInfo.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import nl.uva.sne.drip.model.cloud.storm.VMMetaInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* DCMetaInfo
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class DCMetaInfo {
@JsonProperty("domain")
private String domain = null;
@JsonProperty("endpoint")
private String endpoint = null;
@JsonProperty("country")
private String country = null;
@JsonProperty("longitude")
private String longitude = null;
@JsonProperty("latitude")
private String latitude = null;
@JsonProperty("availability")
private String availability = null;
@JsonProperty("VMMetaInfo")
private VMMetaInfo vmMetaInfo = null;
@JsonProperty("extraInfo")
@Valid
private Map<String, Object> extraInfo = null;
public DCMetaInfo domain(String domain) {
this.domain = domain;
return this;
}
/**
* Get domain
* @return domain
**/
@ApiModelProperty(value = "")
public String getDomain() {
return domain;
}
public void setDomain(String domain) {
this.domain = domain;
}
public DCMetaInfo endpoint(String endpoint) {
this.endpoint = endpoint;
return this;
}
/**
* Get endpoint
* @return endpoint
**/
@ApiModelProperty(value = "")
public String getEndpoint() {
return endpoint;
}
public void setEndpoint(String endpoint) {
this.endpoint = endpoint;
}
public DCMetaInfo country(String country) {
this.country = country;
return this;
}
/**
* Get country
* @return country
**/
@ApiModelProperty(value = "")
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public DCMetaInfo longitude(String longitude) {
this.longitude = longitude;
return this;
}
/**
* Get longitude
* @return longitude
**/
@ApiModelProperty(value = "")
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public DCMetaInfo latitude(String latitude) {
this.latitude = latitude;
return this;
}
/**
* Get latitude
* @return latitude
**/
@ApiModelProperty(value = "")
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public DCMetaInfo availability(String availability) {
this.availability = availability;
return this;
}
/**
* Get availability
* @return availability
**/
@ApiModelProperty(value = "")
public String getAvailability() {
return availability;
}
public void setAvailability(String availability) {
this.availability = availability;
}
public DCMetaInfo vmMetaInfo(VMMetaInfo vmMetaInfo) {
this.vmMetaInfo = vmMetaInfo;
return this;
}
/**
* Get vmMetaInfo
* @return vmMetaInfo
**/
@ApiModelProperty(value = "")
@Valid
public VMMetaInfo getVmMetaInfo() {
return vmMetaInfo;
}
public void setVmMetaInfo(VMMetaInfo vmMetaInfo) {
this.vmMetaInfo = vmMetaInfo;
}
public DCMetaInfo extraInfo(Map<String, Object> extraInfo) {
this.extraInfo = extraInfo;
return this;
}
public DCMetaInfo putExtraInfoItem(String key, Object extraInfoItem) {
if (this.extraInfo == null) {
this.extraInfo = new HashMap<String, Object>();
}
this.extraInfo.put(key, extraInfoItem);
return this;
}
/**
* Get extraInfo
* @return extraInfo
**/
@ApiModelProperty(value = "")
public Map<String, Object> getExtraInfo() {
return extraInfo;
}
public void setExtraInfo(Map<String, Object> extraInfo) {
this.extraInfo = extraInfo;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
DCMetaInfo dcMetaInfo = (DCMetaInfo) o;
return Objects.equals(this.domain, dcMetaInfo.domain) &&
Objects.equals(this.endpoint, dcMetaInfo.endpoint) &&
Objects.equals(this.country, dcMetaInfo.country) &&
Objects.equals(this.longitude, dcMetaInfo.longitude) &&
Objects.equals(this.latitude, dcMetaInfo.latitude) &&
Objects.equals(this.availability, dcMetaInfo.availability) &&
Objects.equals(this.vmMetaInfo, dcMetaInfo.vmMetaInfo) &&
Objects.equals(this.extraInfo, dcMetaInfo.extraInfo);
}
@Override
public int hashCode() {
return Objects.hash(domain, endpoint, country, longitude, latitude, availability, vmMetaInfo, extraInfo);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class DCMetaInfo {\n");
sb.append(" domain: ").append(toIndentedString(domain)).append("\n");
sb.append(" endpoint: ").append(toIndentedString(endpoint)).append("\n");
sb.append(" country: ").append(toIndentedString(country)).append("\n");
sb.append(" longitude: ").append(toIndentedString(longitude)).append("\n");
sb.append(" latitude: ").append(toIndentedString(latitude)).append("\n");
sb.append(" availability: ").append(toIndentedString(availability)).append("\n");
sb.append(" vmMetaInfo: ").append(toIndentedString(vmMetaInfo)).append("\n");
sb.append(" extraInfo: ").append(toIndentedString(extraInfo)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/VMMetaInfo.java 0 → 100644
View file @ 2d9ace00
package nl.uva.sne.drip.model.cloud.storm;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
/**
* VMMetaInfo
*/
@Validated
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
public class VMMetaInfo {
@JsonProperty("OS")
private String OS = null;
@JsonProperty("CPU")
private String CPU = null;
@JsonProperty("MEM")
private String MEM = null;
@JsonProperty("Price")
private String price = null;
@JsonProperty("DefaultSSHAccount")
private String defaultSSHAccount = null;
@JsonProperty("availability")
private String availability = null;
@JsonProperty("extraInfo")
@Valid
private Map<String, Object> extraInfo = null;
public VMMetaInfo OS(String OS) {
this.OS = OS;
return this;
}
/**
* Get OS
* @return OS
**/
@ApiModelProperty(value = "")
public String getOS() {
return OS;
}
public void setOS(String OS) {
this.OS = OS;
}
public VMMetaInfo CPU(String CPU) {
this.CPU = CPU;
return this;
}
/**
* Get CPU
* @return CPU
**/
@ApiModelProperty(value = "")
public String getCPU() {
return CPU;
}
public void setCPU(String CPU) {
this.CPU = CPU;
}
public VMMetaInfo MEM(String MEM) {
this.MEM = MEM;
return this;
}
/**
* Get MEM
* @return MEM
**/
@ApiModelProperty(value = "")
public String getMEM() {
return MEM;
}
public void setMEM(String MEM) {
this.MEM = MEM;
}
public VMMetaInfo price(String price) {
this.price = price;
return this;
}
/**
* Get price
* @return price
**/
@ApiModelProperty(value = "")
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public VMMetaInfo defaultSSHAccount(String defaultSSHAccount) {
this.defaultSSHAccount = defaultSSHAccount;
return this;
}
/**
* Get defaultSSHAccount
* @return defaultSSHAccount
**/
@ApiModelProperty(value = "")
public String getDefaultSSHAccount() {
return defaultSSHAccount;
}
public void setDefaultSSHAccount(String defaultSSHAccount) {
this.defaultSSHAccount = defaultSSHAccount;
}
public VMMetaInfo availability(String availability) {
this.availability = availability;
return this;
}
/**
* Get availability
* @return availability
**/
@ApiModelProperty(value = "")
public String getAvailability() {
return availability;
}
public void setAvailability(String availability) {
this.availability = availability;
}
public VMMetaInfo extraInfo(Map<String, Object> extraInfo) {
this.extraInfo = extraInfo;
return this;
}
public VMMetaInfo putExtraInfoItem(String key, Object extraInfoItem) {
if (this.extraInfo == null) {
this.extraInfo = new HashMap<String, Object>();
}
this.extraInfo.put(key, extraInfoItem);
return this;
}
/**
* Get extraInfo
* @return extraInfo
**/
@ApiModelProperty(value = "")
public Map<String, Object> getExtraInfo() {
return extraInfo;
}
public void setExtraInfo(Map<String, Object> extraInfo) {
this.extraInfo = extraInfo;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
VMMetaInfo vmMetaInfo = (VMMetaInfo) o;
return Objects.equals(this.OS, vmMetaInfo.OS) &&
Objects.equals(this.CPU, vmMetaInfo.CPU) &&
Objects.equals(this.MEM, vmMetaInfo.MEM) &&
Objects.equals(this.price, vmMetaInfo.price) &&
Objects.equals(this.defaultSSHAccount, vmMetaInfo.defaultSSHAccount) &&
Objects.equals(this.availability, vmMetaInfo.availability) &&
Objects.equals(this.extraInfo, vmMetaInfo.extraInfo);
}
@Override
public int hashCode() {
return Objects.hash(OS, CPU, MEM, price, defaultSSHAccount, availability, extraInfo);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class VMMetaInfo {\n");
sb.append(" OS: ").append(toIndentedString(OS)).append("\n");
sb.append(" CPU: ").append(toIndentedString(CPU)).append("\n");
sb.append(" MEM: ").append(toIndentedString(MEM)).append("\n");
sb.append(" price: ").append(toIndentedString(price)).append("\n");
sb.append(" defaultSSHAccount: ").append(toIndentedString(defaultSSHAccount)).append("\n");
sb.append(" availability: ").append(toIndentedString(availability)).append("\n");
sb.append(" extraInfo: ").append(toIndentedString(extraInfo)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/Credentials.java → drip-commons/src/main/java/nl/uva/sne/drip/model/tosca/Credentials.java
View file @ 2d9ace00
package nl.uva.sne.drip.model;
package nl.uva.sne.drip.model.tosca;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.Objects;
......
drip-commons/src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java → drip-commons/src/main/java/nl/uva/sne/drip/model/tosca/TopologyTemplate.java
View file @ 2d9ace00
package nl.uva.sne.drip.model;
package nl.uva.sne.drip.model.tosca;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -9,6 +9,7 @@ import java.util.List;
import java.util.Map;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import nl.uva.sne.drip.model.NodeTemplate;
/**
* TopologyTemplate
......
drip-commons/src/main/java/nl/uva/sne/drip/model/ToscaTemplate.java → drip-commons/src/main/java/nl/uva/sne/drip/model/tosca/ToscaTemplate.java
View file @ 2d9ace00
package nl.uva.sne.drip.model;
package nl.uva.sne.drip.model.tosca;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.Objects;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/auth/ApiKeyAuth.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/auth/ApiKeyAuth.java
View file @ 2d9ace00
......@@ -9,11 +9,11 @@
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package nl.uva.sne.drip.sure_tosca.auth;
package nl.uva.sne.drip.sure.tosca.auth;
import java.util.Map;
import java.util.List;
import nl.uva.sne.drip.sure_tosca.client.Pair;
import nl.uva.sne.drip.sure.tosca.client.Pair;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-12-09T20:19:44.689Z")
public class ApiKeyAuth implements Authentication {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/auth/Authentication.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/auth/Authentication.java
View file @ 2d9ace00
......@@ -9,11 +9,11 @@
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package nl.uva.sne.drip.sure_tosca.auth;
package nl.uva.sne.drip.sure.tosca.auth;
import java.util.Map;
import java.util.List;
import nl.uva.sne.drip.sure_tosca.client.Pair;
import nl.uva.sne.drip.sure.tosca.client.Pair;
public interface Authentication {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/auth/HttpBasicAuth.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/auth/HttpBasicAuth.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.auth;
package nl.uva.sne.drip.sure.tosca.auth;
......@@ -20,7 +20,7 @@ import com.squareup.okhttp.Credentials;
import java.util.Map;
import java.util.List;
import nl.uva.sne.drip.sure_tosca.client.Pair;
import nl.uva.sne.drip.sure.tosca.client.Pair;
public class HttpBasicAuth implements Authentication {
private String username;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/auth/OAuth.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/auth/OAuth.java
View file @ 2d9ace00
......@@ -11,13 +11,13 @@
*/
package nl.uva.sne.drip.sure_tosca.auth;
package nl.uva.sne.drip.sure.tosca.auth;
import java.util.Map;
import java.util.List;
import nl.uva.sne.drip.sure_tosca.client.Pair;
import nl.uva.sne.drip.sure.tosca.client.Pair;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-12-09T20:19:44.689Z")
public class OAuth implements Authentication {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/auth/OAuthFlow.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/auth/OAuthFlow.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.auth;
package nl.uva.sne.drip.sure.tosca.auth;
public enum OAuthFlow {
accessCode, implicit, password, application
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ApiCallback.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/ApiCallback.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import java.io.IOException;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ApiClient.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/ApiClient.java
View file @ 2d9ace00
......@@ -9,7 +9,7 @@
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.squareup.okhttp.*;
......@@ -46,10 +46,10 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import nl.uva.sne.drip.sure_tosca.auth.Authentication;
import nl.uva.sne.drip.sure_tosca.auth.HttpBasicAuth;
import nl.uva.sne.drip.sure_tosca.auth.ApiKeyAuth;
import nl.uva.sne.drip.sure_tosca.auth.OAuth;
import nl.uva.sne.drip.sure.tosca.auth.Authentication;
import nl.uva.sne.drip.sure.tosca.auth.HttpBasicAuth;
import nl.uva.sne.drip.sure.tosca.auth.ApiKeyAuth;
import nl.uva.sne.drip.sure.tosca.auth.OAuth;
public class ApiClient {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ApiException.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/ApiException.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import java.util.Map;
import java.util.List;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ApiResponse.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/ApiResponse.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import java.util.List;
import java.util.Map;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/Configuration.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/Configuration.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-12-09T20:19:44.689Z")
public class Configuration {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/DefaultApi.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/DefaultApi.java
View file @ 2d9ace00
......@@ -9,7 +9,7 @@
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package nl.uva.sne.drip.sure_tosca;
package nl.uva.sne.drip.sure.tosca.client;
import com.google.gson.reflect.TypeToken;
......@@ -23,16 +23,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import nl.uva.sne.drip.model.NodeTemplate;
import nl.uva.sne.drip.model.TopologyTemplate;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.sure_tosca.client.ApiCallback;
import nl.uva.sne.drip.sure_tosca.client.ApiClient;
import nl.uva.sne.drip.sure_tosca.client.ApiException;
import nl.uva.sne.drip.sure_tosca.client.ApiResponse;
import nl.uva.sne.drip.sure_tosca.client.Configuration;
import nl.uva.sne.drip.sure_tosca.client.Pair;
import nl.uva.sne.drip.sure_tosca.client.ProgressRequestBody;
import nl.uva.sne.drip.sure_tosca.client.ProgressResponseBody;
import nl.uva.sne.drip.model.tosca.TopologyTemplate;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import nl.uva.sne.drip.sure.tosca.client.ApiCallback;
import nl.uva.sne.drip.sure.tosca.client.ApiClient;
import nl.uva.sne.drip.sure.tosca.client.ApiException;
import nl.uva.sne.drip.sure.tosca.client.ApiResponse;
import nl.uva.sne.drip.sure.tosca.client.Configuration;
import nl.uva.sne.drip.sure.tosca.client.Pair;
import nl.uva.sne.drip.sure.tosca.client.ProgressRequestBody;
import nl.uva.sne.drip.sure.tosca.client.ProgressResponseBody;
public class DefaultApi {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/GzipRequestInterceptor.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/GzipRequestInterceptor.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import com.squareup.okhttp.*;
import okio.Buffer;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/JSON.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/JSON.java
View file @ 2d9ace00
......@@ -9,7 +9,7 @@
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/Pair.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/Pair.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-12-09T20:19:44.689Z")
public class Pair {
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ProgressRequestBody.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/ProgressRequestBody.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.RequestBody;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ProgressResponseBody.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/ProgressResponseBody.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.ResponseBody;
......
drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/StringUtil.java → drip-commons/src/main/java/nl/uva/sne/drip/sure/tosca/client/StringUtil.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
package nl.uva.sne.drip.sure.tosca.client;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-12-09T20:19:44.689Z")
public class StringUtil {
......
drip-commons/src/test/java/nl/uva/sne/drip/commons/utils/ToscaHelperTest.java
View file @ 2d9ace00
......@@ -36,14 +36,14 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import nl.uva.sne.drip.model.NodeTemplate;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
import nl.uva.sne.drip.sure_tosca.client.ApiException;
import nl.uva.sne.drip.sure.tosca.client.ApiException;
/**
*
......@@ -105,7 +105,7 @@ public class ToscaHelperTest {
/**
* Test of getProvisionInterfaceDefinitions method, of class ToscaHelper.
*
* @throws nl.uva.sne.drip.sure_tosca.client.ApiException
* @throws nl.uva.sne.drip.sure.tosca.client.ApiException
*/
@Test
public void testGetProvisionInterfaceDefinitions() throws ApiException {
......@@ -124,7 +124,7 @@ public class ToscaHelperTest {
/**
* Test of getVMTopologyTemplates method, of class ToscaHelper.
*
* @throws nl.uva.sne.drip.sure_tosca.client.ApiException
* @throws nl.uva.sne.drip.sure.tosca.client.ApiException
*/
@Test
public void testGetVMTopologyTemplates() throws ApiException {
......
drip-commons/src/test/java/nl/uva/sne/drip/sure_tosca/client/DefaultApiTest.java
View file @ 2d9ace00
......@@ -11,6 +11,7 @@
*/
package nl.uva.sne.drip.sure_tosca.client;
import nl.uva.sne.drip.sure.tosca.client.ApiException;
import java.io.File;
import org.junit.Test;
......
drip-manager/src/main/java/nl/uva/sne/drip/api/CredentialApi.java
View file @ 2d9ace00
......@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import javax.validation.Valid;
import java.util.List;
import nl.uva.sne.drip.model.Credentials;
import nl.uva.sne.drip.model.tosca.Credentials;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
......
drip-manager/src/main/java/nl/uva/sne/drip/api/CredentialApiController.java
View file @ 2d9ace00
package nl.uva.sne.drip.api;
import nl.uva.sne.drip.model.Credentials;
import nl.uva.sne.drip.model.tosca.Credentials;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.*;
import org.slf4j.Logger;
......
drip-manager/src/main/java/nl/uva/sne/drip/dao/CredentialDAO.java
View file @ 2d9ace00
......@@ -5,7 +5,7 @@
*/
package nl.uva.sne.drip.dao;
import nl.uva.sne.drip.model.Credentials;
import nl.uva.sne.drip.model.tosca.Credentials;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.stereotype.Repository;
......
drip-manager/src/main/java/nl/uva/sne/drip/dao/ToscaTemplateDAO.java
View file @ 2d9ace00
......@@ -5,7 +5,7 @@
*/
package nl.uva.sne.drip.dao;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import nl.uva.sne.drip.model.User;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.stereotype.Repository;
......
drip-manager/src/main/java/nl/uva/sne/drip/service/CredentialService.java
View file @ 2d9ace00
......@@ -11,7 +11,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import nl.uva.sne.drip.dao.CredentialDAO;
import nl.uva.sne.drip.model.Credentials;
import nl.uva.sne.drip.model.tosca.Credentials;
/**
*
......
drip-manager/src/main/java/nl/uva/sne/drip/service/DRIPService.java
View file @ 2d9ace00
......@@ -10,7 +10,7 @@ import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
import nl.uva.sne.drip.model.Message;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import nl.uva.sne.drip.rpc.DRIPCaller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
drip-manager/src/main/java/nl/uva/sne/drip/service/ToscaTemplateService.java
View file @ 2d9ace00
......@@ -14,7 +14,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import nl.uva.sne.drip.dao.ToscaTemplateDAO;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
......
drip-manager/src/test/java/nl/uva/sne/drip/service/ServiceTests.java
View file @ 2d9ace00
......@@ -36,7 +36,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import nl.uva.sne.drip.Swagger2SpringBoot;
import nl.uva.sne.drip.configuration.MongoConfig;
import nl.uva.sne.drip.model.Credentials;
import nl.uva.sne.drip.model.tosca.Credentials;
import org.junit.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
......
drip-provisioner/etc/EC2.yml 0 → 100644
View file @ 2d9ace00
DCMetaInfo:
- domain: "Virginia"
endpoint: "ec2.us-east-1.amazonaws.com"
country: USA
longitude: "78.65 W"
latitude: "37.43 N"
availability: null
VMMetaInfo:
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 0.5
VMType: "t2.nano"
Price: 0.0058
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-33e4bc49"
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 1
VMType: "t2.micro"
Price: 0.0116
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-33e4bc49"
- OS: "Ubuntu 14.04"
CPU: 2
MEM: 4
VMType: "t2.medium"
Price: 0.0464
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-33e4bc49"
- OS: "Ubuntu 16.04"
CPU: 1
MEM: 0.5
VMType: "t2.nano"
Price: 0.0058
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-41e0b93b"
- OS: "Ubuntu 16.04"
CPU: 1
MEM: 1
VMType: "t2.micro"
Price: 0.0116
DefaultSSHAccount: "ubuntu"
- OS: "Ubuntu 16.04"
CPU: 2
MEM: 4
VMType: "t2.medium"
Price: 0.0464
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-41e0b93b"
- domain: "California"
endpoint: "ec2.us-west-1.amazonaws.com"
country: USA
longitude: "119.42 W"
latitude: "36.78 N"
availability: null
VMMetaInfo:
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 0.5
VMType: "t2.nano"
Price: 0.0069
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-915f5cf1"
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 1
VMType: "t2.micro"
Price: 0.0138
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-915f5cf1"
- OS: "Ubuntu 14.04"
CPU: 2
MEM: 4
VMType: "t2.medium"
Price: 0.0552
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-915f5cf1"
- OS: "Ubuntu 16.04"
CPU: 1
MEM: 0.5
VMType: "t2.nano"
Price: 0.0069
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-79aeae19"
- OS: "Ubuntu 16.04"
CPU: 1
MEM: 1
VMType: "t2.micro"
Price: 0.0138
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-79aeae19"
- OS: "Ubuntu 16.04"
CPU: 2
MEM: 4
VMType: "t2.medium"
Price: 0.0552
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-79aeae19"
- domain: "Ohio"
endpoint: "ec2.us-east-2.amazonaws.com"
country: USA
longitude: "82.90 W"
latitude: "40.42 N"
availability: null
VMMetaInfo:
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 0.5
VMType: "t2.nano"
Price: 0.0058
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-f0f8d695"
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 1
VMType: "t2.micro"
Price: 0.0116
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-f0f8d695"
- OS: "Ubuntu 14.04"
CPU: 2
MEM: 4
VMType: "t2.medium"
Price: 0.0464
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-f0f8d695"
- OS: "Ubuntu 16.04"
CPU: 1
MEM: 0.5
VMType: "t2.nano"
Price: 0.0058
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-2581aa40"
- OS: "Ubuntu 16.04"
CPU: 1
MEM: 1
VMType: "t2.micro"
Price: 0.0116
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-2581aa40"
- OS: "Ubuntu 16.04"
CPU: 2
MEM: 4
VMType: "t2.medium"
Price: 0.0464
DefaultSSHAccount: "ubuntu"
extraInfo:
AMI: "ami-2581aa40"
drip-provisioner/etc/EGI.yml 0 → 100644
View file @ 2d9ace00
DCMetaInfo:
- domain: "CESNET"
endpoint: "https://carach5.ics.muni.cz:11443"
country: CZE
longitude: "15.47 E"
latitude: "49.82 N"
availability: null
VMMetaInfo:
- OS: "Ubuntu 14.04"
CPU: 2
MEM: 2
VMType: "medium"
Price: null
DefaultSSHAccount: "ubuntu"
extraInfo:
OS_OCCI_ID: "http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218"
RES_OCCI_ID: "http://fedcloud.egi.eu/occi/compute/flavour/1.0#medium"
- OS: "Ubuntu 14.04"
CPU: 8
MEM: 8
VMType: "extra_large"
Price: null
DefaultSSHAccount: "ubuntu"
extraInfo:
OS_OCCI_ID: "http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218"
RES_OCCI_ID: "http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#extra_large"
- OS: "Ubuntu 14.04"
CPU: 1
MEM: 1
VMType: "small"
Price: null
DefaultSSHAccount: "ubuntu"
extraInfo:
OS_OCCI_ID: "http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218"
RES_OCCI_ID: "http://fedcloud.egi.eu/occi/compute/flavour/1.0#small"
drip-provisioner/etc/EGI_Domain_Info deleted 100644 → 0
View file @ 3e0d607a
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 14.04&&medium&&http://fedcloud.egi.eu/occi/compute/flavour/1.0#medium&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 14.04&&extra_large&&http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#extra_large&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_38d42ca1_f4e9_5b5c_98de_37eb2d26301a_warg_default_shared_218&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 16.04&&medium&&http://fedcloud.egi.eu/occi/compute/flavour/1.0#medium&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_8df7ba00_8467_57aa_bf1e_05754a2a73bf_warg_default_shared_219&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 16.04&&0#mem_large&&http://fedcloud.egi.eu/occi/compute/flavour/1.0#mem_large&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_8df7ba00_8467_57aa_bf1e_05754a2a73bf_warg_default_shared_219&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 16.04&&extra_large&&http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#extra_large&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_8df7ba00_8467_57aa_bf1e_05754a2a73bf_warg_default_shared_219&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 16.04&&small&&http://fedcloud.egi.eu/occi/compute/flavour/1.0#small&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_8df7ba00_8467_57aa_bf1e_05754a2a73bf_warg_default_shared_219&&ubuntu
CESNET&&https://carach5.ics.muni.cz:11443&&ubuntu 16.04&&mammoth&&http://schemas.fedcloud.egi.eu/occi/infrastructure/resource_tpl#mammoth&&http://occi.carach5.ics.muni.cz/occi/infrastructure/os_tpl#uuid_8df7ba00_8467_57aa_bf1e_05754a2a73bf_warg_default_shared_219&&ubuntu
\ No newline at end of file
drip-provisioner/etc/ExoGENI.yml 0 → 100644
View file @ 2d9ace00
This diff is collapsed.
drip-provisioner/etc/OS_Domain_AMI deleted 100644 → 0
View file @ 3e0d607a
Ubuntu 14.04&&Virginia&&ami-33e4bc49
Ubuntu 14.04&&California&&ami-915f5cf1
Ubuntu 16.04&&Virginia&&ami-41e0b93b
Ubuntu 16.04&&California&&ami-79aeae19
Ubuntu 16.04&&Ohio&&ami-2581aa40
Ubuntu 14.04&&Ohio&&ami-f0f8d695
Ubuntu 16.04&&Frankfurt&&ami-af79ebc0
drip-provisioner/etc/db.yml 0 → 100644
View file @ 2d9ace00
cloudDBs:
- cloudProvider: "EC2"
dbInfoFile: EC2.yml
- cloudProvider: "ExoGENI"
dbInfoFile: ExoGENI.yml
- cloudProvider: "EGI"
dbInfoFile: EGI.yml
drip-provisioner/etc/domains deleted 100644 → 0
View file @ 3e0d607a
Virginia&&ec2.us-east-1.amazonaws.com
Ohio&&ec2.us-east-2.amazonaws.com
California&&ec2.us-west-1.amazonaws.com
Oregon&&ec2.us-west-2.amazonaws.com
Ireland&&ec2.eu-west-1.amazonaws.com
Frankfurt&&ec2.eu-central-1.amazonaws.com
Tokyo&&ec2.ap-northeast-1.amazonaws.com
Seoul&&ec2.ap-northeast-2.amazonaws.com
Singapore&&ec2.ap-southeast-1.amazonaws.com
Sydney&&ec2.ap-southeast-2.amazonaws.com
Mumbai&&ec2.ap-south-1.amazonaws.com
SanPaulo&&ec2.sa-east-1.amazonaws.com
\ No newline at end of file
drip-provisioner/etc/provisioner.properties deleted 100644 → 0
View file @ 3e0d607a
rabbitmq.host=127.0.0.1
domain.info.path=/home/alogo/workspace/DRIP/drip-provisioner/etc
trusted.certificates.folder=/home/alogo/.globus/certificates
\ No newline at end of file
drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java
View file @ 2d9ace00
......@@ -6,6 +6,10 @@
package nl.uva.sne.drip.provisioner;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.KeyPair;
......@@ -15,13 +19,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import nl.uva.sne.drip.commons.utils.ToscaHelper;
import nl.uva.sne.drip.model.CloudsStormSubTopology;
import nl.uva.sne.drip.model.CloudsStormTopTopology;
import nl.uva.sne.drip.model.CloudsStormVM;
import nl.uva.sne.drip.model.cloud.storm.CloudsStormVM;
import nl.uva.sne.drip.model.NodeTemplate;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.sure_tosca.client.ApiException;
import nl.uva.sne.drip.model.cloud.storm.CloudsStormSubTopology;
import nl.uva.sne.drip.model.cloud.storm.CloudsStormTopTopology;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import nl.uva.sne.drip.sure.tosca.client.ApiException;
import org.apache.commons.io.FilenameUtils;
/**
......@@ -34,10 +39,16 @@ class CloudStormService {
private String tempInputDirPath;
private final ToscaTemplate toscaTemplate;
private final ToscaHelper helper;
private final String cloudStormDBPath;
private final ObjectMapper objectMapper;
CloudStormService(String sureToscaBasePath, ToscaTemplate toscaTemplate) throws IOException, JsonProcessingException, ApiException {
CloudStormService(Properties properties, ToscaTemplate toscaTemplate) throws IOException, JsonProcessingException, ApiException {
this.toscaTemplate = toscaTemplate;
this.cloudStormDBPath = properties.getProperty("cloud.storm.db.path");
String sureToscaBasePath = properties.getProperty("sure-tosca.base.path");
this.helper = new ToscaHelper(toscaTemplate, sureToscaBasePath);
this.objectMapper = new ObjectMapper(new YAMLFactory().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
}
public ToscaTemplate execute() throws FileNotFoundException, JSchException, IOException, ApiException {
......@@ -101,7 +112,7 @@ class CloudStormService {
for (NodeTemplate vm : vmTemplates) {
CloudsStormVM cloudsStormVM = new CloudsStormVM();
String vmType = helper.getVMType(vm,provider);
String vmType = getVMType(vm, provider);
cloudsStormVM.setNodeType(vmType);
}
i++;
......@@ -109,4 +120,9 @@ class CloudStormService {
return cloudsStormSubTopologies;
}
private String getVMType(NodeTemplate vm, String provider) {
nl.uva.sne.drip.model.cloud.storm.CloudDB
objectMapper.readValue(new File(cloudStormDBPath), DB)
}
}
drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/Consumer.java
View file @ 2d9ace00
......@@ -26,12 +26,13 @@ import com.rabbitmq.client.Envelope;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
import nl.uva.sne.drip.model.Message;
import nl.uva.sne.drip.model.ToscaTemplate;
import nl.uva.sne.drip.sure_tosca.client.ApiException;
import nl.uva.sne.drip.model.tosca.ToscaTemplate;
import nl.uva.sne.drip.sure.tosca.client.ApiException;
/**
*
......@@ -45,11 +46,11 @@ public class Consumer extends DefaultConsumer {
private final Channel channel;
private final Logger logger;
private final ObjectMapper objectMapper;
private final String sureToscaBasePath;
private final Properties properties;
public Consumer(Channel channel, String sureToscaBasePath) throws IOException, TimeoutException {
public Consumer(Channel channel, Properties properties) throws IOException, TimeoutException {
super(channel);
this.sureToscaBasePath = sureToscaBasePath;
this.properties = properties;
this.channel = channel;
logger = Logger.getLogger(Consumer.class.getName());
this.objectMapper = new ObjectMapper();
......@@ -73,7 +74,7 @@ public class Consumer extends DefaultConsumer {
throw new FileNotFoundException("Could not create input directory: " + tempInputDir.getAbsolutePath());
}
CloudStormService service = new CloudStormService(sureToscaBasePath, message.getToscaTemplate());
CloudStormService service = new CloudStormService(this.properties, message.getToscaTemplate());
ToscaTemplate toscaTemplate = service.execute();
Message responceMessage = new Message();
......
drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/RPCServer.java
View file @ 2d9ace00
......@@ -70,7 +70,7 @@ public class RPCServer {
//We define the queue name
channel.queueDeclare(prop.getProperty("message.broker.queue.provisioner", "provisioner"), false, false, false, null);
DefaultConsumer c;
c = new nl.uva.sne.drip.provisioner.Consumer(channel,prop.getProperty("sure-tosca.base.path"));
c = new nl.uva.sne.drip.provisioner.Consumer(channel,prop);
//Start listening for messages
channel.basicConsume(prop.getProperty("message.broker.queue.provisioner", "provisioner"), false, c);
......
drip-provisioner/src/main/resources/application.properies
View file @ 2d9ace00
......@@ -5,3 +5,4 @@ message.broker.queue.provisioner=provisioner
message.broker.queue.planner=planner
message.broker.queue.deployer=deployer
sure-tosca.base.path=http://localhost:8081/tosca-sure/1.0.0
cloud.storm.db.path=etc/
\ No newline at end of file
openAPI/schema/CloudStorm/DB.yml
View file @ 2d9ace00
......@@ -2,5 +2,6 @@
type: "object"
properties:
cloudDBs:
type: "array"
items: $ref: "https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudStorm/CloudDB.yml#/CloudDB"
type: array
items:
$ref: "https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudStorm/CloudDB.yml#/CloudDB"
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