You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/04/15 13:32:15 UTC
[incubator-dlab] branch DLAB-1571 updated: added shape for
dataengine service
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1571 by this push:
new 2708765 added shape for dataengine service
2708765 is described below
commit 270876529ca8db8b47cbabce80304a15943f389b
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Apr 15 16:31:56 2020 +0300
added shape for dataengine service
---
.../com/epam/dlab/dto/computational/UserComputationalResource.java | 2 ++
.../src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
index 56da2f6..9f8c021 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/computational/UserComputationalResource.java
@@ -59,6 +59,8 @@ public class UserComputationalResource {
private LocalDateTime lastActivity;
@JsonProperty("master_node_shape")
private String masterNodeShape;
+ @JsonProperty("slave_node_shape")
+ private String slaveNodeShape;
@JsonProperty("dataengine_instance_shape")
private String dataengineShape;
@JsonProperty("dataengine_instance_count")
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
index a0ec1c9..f971d1e 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java
@@ -69,7 +69,7 @@ public class BillingUtils {
private static final String IMAGE_NAME = "Image";
private static final String DATAENGINE_NAME_FORMAT = "%d x %s";
- private static final String DATAENGINE_SERVICE_NAME_FORMAT = "Master: %s%sSlave: %d x %s";
+ private static final String DATAENGINE_SERVICE_NAME_FORMAT = "Master: %s%sSlave: %s";
public static Stream<BillingReportLine> edgeBillingDataStream(String project, String sbn, String endpoint) {
final String userEdgeId = String.format(EDGE_FORMAT, sbn, project, endpoint).toLowerCase();
@@ -159,7 +159,7 @@ public class BillingUtils {
public static String getComputationalShape(UserComputationalResource resource) {
return DataEngineType.fromDockerImageName(resource.getImageName()) == DataEngineType.SPARK_STANDALONE ?
String.format(DATAENGINE_NAME_FORMAT, resource.getDataengineInstanceCount(), resource.getDataengineShape()) :
- String.format(DATAENGINE_SERVICE_NAME_FORMAT, resource.getMasterNodeShape(), System.lineSeparator(), null, null);
+ String.format(DATAENGINE_SERVICE_NAME_FORMAT, resource.getMasterNodeShape(), System.lineSeparator(), resource.getSlaveNodeShape());
}
private static Stream<BillingReportLine> standardImageBillingDataStream(String sbn, String endpoint) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org