This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 88548ca DLAB-000 added missed parameters for GCP
88548ca is described below
commit 88548ca103e8fbb37a86c3f5136a50739f83fc27
Author: bhliva <bohdan_hl...@epam.com>
AuthorDate: Wed Sep 18 11:05:01 2019 +0300
DLAB-000 added missed parameters for GCP
---
.../java/com/epam/dlab/dto/gcp/GcpCloudSettings.java | 10 ++++++++++
.../dlab/backendapi/conf/CloudConfiguration.java | 1 +
.../com/epam/dlab/backendapi/dao/SettingsDAO.java | 20 ++++++++++++++++++++
.../dropwizard/listeners/MongoStartupListener.java | 14 +++++++++-----
.../epam/dlab/backendapi/util/RequestBuilder.java | 5 +++++
5 files changed, 45 insertions(+), 5 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
index 78471a7..35aade3 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
@@ -52,6 +52,16 @@ public class GcpCloudSettings extends CloudSettings {
protected String sbn;
@JsonProperty("conf_key_dir")
protected String confKeyDir;
+ @JsonProperty("gcp_project_id")
+ protected String projectId;
+ @JsonProperty("gcp_vpc_name")
+ protected String vpcName;
+ @JsonProperty("gcp_subnet_name")
+ protected String subnetName;
+ @JsonProperty("gcp_zone")
+ protected String zone;
+ @JsonProperty("gcp_region")
+ protected String region;
@Override
@JsonIgnore
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/CloudConfiguration.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/CloudConfiguration.java
index 2db4734..bdc6ba5 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/CloudConfiguration.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/CloudConfiguration.java
@@ -27,6 +27,7 @@ public class CloudConfiguration {
private final String datalakeTagName;
private final String azureClientId;
private final String peeringId;
+ private final String gcpProjectId;
@JsonProperty("ldap")
private final LdapConfig ldapConfig;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SettingsDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SettingsDAO.java
index 3c35109..ff58d4a 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SettingsDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SettingsDAO.java
@@ -298,22 +298,42 @@ public class SettingsDAO extends BaseDAO {
return getSetting(GCP_REGION);
}
+ public void setGcpRegion(String region) {
+ setSetting(GCP_REGION, region);
+ }
+
public String getGcpZone() {
return getSetting(GCP_ZONE);
}
+ public void setGcpZone(String zone) {
+ setSetting(GCP_ZONE, zone);
+ }
+
public String getGcpSubnetName() {
return getSetting(GCP_SUBNET_NAME);
}
+ public void setGcpSubnetName(String subnet) {
+ setSetting(GCP_SUBNET_NAME, subnet);
+ }
+
public String getGcpProjectId() {
return getSetting(GCP_PROJECT_ID);
}
+ public void setGcpProjectId(String projectId) {
+ setSetting(GCP_PROJECT_ID, projectId);
+ }
+
public String getGcpVpcName() {
return getSetting(GCP_VPC_NAME);
}
+ public void setGcpVpcName(String vpcName) {
+ setSetting(GCP_VPC_NAME, vpcName);
+ }
+
public void setMaxBudget(Long budget) {
setSetting(CONF_MAX_BUDGET, budget.toString());
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
index de98a28..01ef1e5 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
@@ -59,7 +59,8 @@ public class MongoStartupListener implements
ServerLifecycleListener {
settingsDAO.setSsnStorageAccountTagName(cloudConfiguration.getSsnStorageAccountTagName());
settingsDAO.setPeeringId(cloudConfiguration.getPeeringId());
- if (configuration.getCloudProvider() == CloudProvider.AWS) {
+ final CloudProvider cloudProvider =
configuration.getCloudProvider();
+ if (cloudProvider == CloudProvider.AWS) {
settingsDAO.setAwsZone(cloudConfiguration.getZone());
settingsDAO.setAwsRegion(cloudConfiguration.getRegion());
settingsDAO.setAwsVpcId(cloudConfiguration.getVpcId());
@@ -67,9 +68,7 @@ public class MongoStartupListener implements
ServerLifecycleListener {
settingsDAO.setAwsNotebookVpcId(cloudConfiguration.getNotebookVpcId());
settingsDAO.setAwsNotebookSubnetId(cloudConfiguration.getNotebookSubnetId());
settingsDAO.setAwsSecurityGroups(cloudConfiguration.getSecurityGroupIds());
- }
-
- if (configuration.getCloudProvider() == CloudProvider.AZURE) {
+ } else if (cloudProvider == CloudProvider.AZURE) {
settingsDAO.setAzureRegion(cloudConfiguration.getRegion());
settingsDAO.setAzureVpcName(cloudConfiguration.getVpcId());
settingsDAO.setAzureSubnetName(cloudConfiguration.getSubnetId());
@@ -79,7 +78,12 @@ public class MongoStartupListener implements
ServerLifecycleListener {
settingsDAO.setAzureDataLakeNameTag(cloudConfiguration.getDatalakeTagName());
settingsDAO.setSsnStorageAccountTagName(cloudConfiguration.getSsnStorageAccountTagName());
settingsDAO.setSharedStorageAccountTagName(cloudConfiguration.getSharedStorageAccountTagName());
-
+ } else if (cloudProvider == CloudProvider.GCP) {
+
settingsDAO.setGcpProjectId(cloudConfiguration.getGcpProjectId());
+
settingsDAO.setGcpRegion(cloudConfiguration.getRegion());
+ settingsDAO.setGcpZone(cloudConfiguration.getZone());
+
settingsDAO.setGcpSubnetName(cloudConfiguration.getSubnetId());
+
settingsDAO.setGcpVpcName(cloudConfiguration.getVpcId());
}
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index 8977e25..b273d74 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -120,6 +120,11 @@ public class RequestBuilder {
.azureIamUser(userInfo.getName()).build();
case GCP:
return GcpCloudSettings.builder()
+
.projectId(settingsDAO.getGcpProjectId())
+
.vpcName(settingsDAO.getGcpVpcName())
+
.subnetName(settingsDAO.getGcpSubnetName())
+ .zone(settingsDAO.getGcpZone())
+
.region(settingsDAO.getGcpRegion())
.ldapDn(settingsDAO.getLdapDn())
.ldapHost(settingsDAO.getLdapHost())
.ldapOu(settingsDAO.getLdapOu())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
