This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1183
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5503abdb9cd2837b472079f9d2ea6b2b64699bfe
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Mon Nov 4 12:19:26 2019 +0200
[DLAB-1183] Added some values for edge(Billing)
---
.../com/epam/dlab/billing/gcp/service/BillingServiceImpl.java | 2 +-
.../java/com/epam/dlab/billing/gcp/util/BillingUtils.java | 4 ++--
.../java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 11 ++++++-----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
index 2a20206..e2ae138 100644
---
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
+++
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
@@ -121,7 +121,7 @@ public class BillingServiceImpl implements BillingService {
private Stream<BillingData> projectEdges(String projectName,
List<Project.Endpoint> endpoints) {
return endpoints
.stream()
- .flatMap(endpoint ->
edgeBillingDataStream(projectName, sbn, endpoint.getName()));
+ .flatMap(endpoint ->
edgeBillingDataStream(projectName.toLowerCase(), sbn, endpoint.getName()));
}
private BillingData getOrDefault(Map<String, BillingData>
billableResources, String tag) {
diff --git
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
index e60a03d..e049393 100644
---
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
+++
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
@@ -27,7 +27,7 @@ import java.util.stream.Stream;
public class BillingUtils {
private static final String EDGE_FORMAT = "%s-%s-%s-edge";
- private static final String EDGE_VOLUME_FORMAT =
"%s-%s-edge-volume-primary";
+ private static final String EDGE_VOLUME_FORMAT =
"%s-%s-%s-edge-volume-primary";
private static final String EDGE_BUCKET_FORMAT = "%s-%s-bucket";
private static final String VOLUME_PRIMARY_FORMAT = "%s-volume-primary";
private static final String VOLUME_SECONDARY_FORMAT =
"%s-volume-secondary";
@@ -37,7 +37,7 @@ public class BillingUtils {
public static Stream<BillingData> edgeBillingDataStream(String project,
String sbn, String endpoint) {
final String userEdgeId = String.format(EDGE_FORMAT, sbn,
project, endpoint);
- final String edgeVolumeId = String.format(EDGE_VOLUME_FORMAT,
sbn, project);
+ final String edgeVolumeId = String.format(EDGE_VOLUME_FORMAT,
sbn, project, endpoint);
final String edgeBucketId = String.format(EDGE_BUCKET_FORMAT,
sbn, project);
return Stream.of(
BillingData.builder().displayName("EDGE
node").user(SHARED_RESOURCE).project(project).dlabId(userEdgeId).resourceType(BillingData.ResourceType.EDGE).build(),
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
index 6ff46a8..980c452 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
@@ -242,8 +242,10 @@ public abstract class BaseBillingDAO<T extends
BillingFilter> extends BaseDAO im
StreamSupport.stream(getCollection(PROJECT_COLLECTION).find().spliterator(),
false)
.forEach(d -> ((List<Document>)
d.get("endpoints"))
- .forEach(endpoint ->
getEndpointShape(shapeNames, d.getString("name"), endpoint)
-
.ifPresent(shape -> shapes.put(shape.getShape(), shape))));
+ .forEach(endpoint ->
getEndpointShape(shapeNames, endpoint)
+
.ifPresent(shape -> shapes.put(String.format(EDGE_FORMAT, getServiceBaseName(),
+
d.getString("name").toLowerCase(),
+
endpoint.getString("name")), shape))));
getSsnShape(shapeNames)
.ifPresent(shape ->
shapes.put(getServiceBaseName() + "-ssn", shape));
@@ -428,11 +430,10 @@ public abstract class BaseBillingDAO<T extends
BillingFilter> extends BaseDAO im
return Optional.empty();
}
- private Optional<EndpointShape> getEndpointShape(List<String>
shapeNames, String projectName, Document endpoint) {
- String sbn = getServiceBaseName();
+ private Optional<EndpointShape> getEndpointShape(List<String>
shapeNames, Document endpoint) {
if (isShapeAcceptable(shapeNames, getSsnShape())) {
return Optional.of(EndpointShape.builder()
- .shape(String.format(EDGE_FORMAT, sbn,
projectName, endpoint.getString("name")))
+ .shape(StringUtils.EMPTY)
.status(UserInstanceStatus.of(endpoint.getString("status")))
.build());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
