This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1467
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1467 by this push:
     new 549e5ef  Added conf_cloud_provider parameter
     new f4dfe74  Merge remote-tracking branch 'origin/DLAB-1467' into DLAB-1467
549e5ef is described below

commit 549e5efdaef2cce813ae12efef0eef9efc927854
Author: Oleh Fuks <[email protected]>
AuthorDate: Fri Feb 7 13:59:04 2020 +0200

    Added conf_cloud_provider parameter
---
 .../src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java       | 2 ++
 .../java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java     | 1 +
 2 files changed, 3 insertions(+)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
index 21a3261..23af25c 100644
--- 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
+++ 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
@@ -40,6 +40,8 @@ public class AzureCloudSettings extends CloudSettings {
     protected String sbn;
     @JsonProperty("conf_os_family")
     protected String os;
+    @JsonProperty("conf_cloud_provider")
+    protected String cloud;
     @JsonProperty("azure_vpc_name")
     private String azureVpcName;
     @JsonProperty("azure_subnet_name")
diff --git 
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
 
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
index 9447e5d..a0028f9 100644
--- 
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
+++ 
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
@@ -95,6 +95,7 @@ public class CommandBuilder {
                                .azureIamUser(settings.getIamUser())
                                .sbn(cloudConfiguration.getServiceBaseName())
                                .os(cloudConfiguration.getOs())
+                               .cloud(conf.getCloudProvider().getName())
                                
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
                                
.stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
                                .stepCertsRootCA(stepCerts.getRootCA())


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to