You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/03/24 19:14:14 UTC

[incubator-datalab] branch develop updated: Revert "Merge pull request #1116 from apache/DATALAB-2232"

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

ykinash pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 211f9a9  Revert "Merge pull request #1116 from apache/DATALAB-2232"
211f9a9 is described below

commit 211f9a982a69a06b353e88b7b19d5b9ef9fcaa15
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Mar 24 21:13:14 2021 +0200

    Revert "Merge pull request #1116 from apache/DATALAB-2232"
    
    This reverts commit 13c57a4e2ebc19d9038e5744b8bcbc3e358ab056, reversing
    changes made to 4c1b49cea809bcde25a13569ba6fa5a662360efa.
---
 .../src/general/files/aws/jupyter_description.json |   4 -
 .../general/files/azure/jupyter_description.json   |   4 -
 .../files/gcp/dataengine-service_description.json  |   6 +-
 .../src/general/files/gcp/jupyter_description.json |   4 -
 .../DynamicChangePropertiesException.java          |  19 ---
 .../java/com/epam/datalab/dto/UserInstanceDTO.java |  21 ----
 .../computational/UserComputationalResource.java   |  11 --
 .../gcp/computational/ComputationalCreateGcp.java  |  46 --------
 .../computational/GcpComputationalResource.java    |  38 ++----
 .../dto/imagemetadata/ComputationalGPU.java        |  40 -------
 .../imagemetadata/ComputationalMetadataDTO.java    |   5 -
 .../dto/imagemetadata/ExploratoryMetadataDTO.java  |   3 -
 .../datalab/model/exploratory/Exploratory.java     |   4 -
 .../DynamicChangePropertiesExceptionMapper.java    |  20 ----
 .../datalab/backendapi/core/DockerWarmuper.java    |  39 +++----
 .../handlers/ExploratoryCallbackHandler.java       |   1 -
 .../handlers/dao/FileSystemCallbackHandlerDao.java |   2 -
 .../backendapi/resources/EnvironmentResource.java  |   2 +-
 .../backendapi/resources/ExploratoryResource.java  |   6 +-
 .../resources/InfrastructureTemplateResource.java  |   2 +-
 .../resources/dto/ComputationalCreateFormDTO.java  |   2 -
 .../resources/dto/ExploratoryCreateFormDTO.java    | 115 +++++++++++++++++--
 .../backendapi/resources/dto/UserResourceInfo.java |   9 --
 .../dto/gcp/GcpComputationalCreateForm.java        |  17 ---
 .../resources/gcp/ComputationalResourceGcp.java    |  13 ++-
 .../datalab/backendapi/service/TagService.java     |   3 +-
 .../datalab/backendapi/service/TagServiceImpl.java |   6 +-
 .../service/impl/ComputationalServiceImpl.java     |  43 +++++--
 .../service/impl/EnvironmentServiceImpl.java       | 127 +++++++++++----------
 .../service/impl/ExploratoryServiceImpl.java       |  61 +++++++---
 .../impl/InfrastructureInfoServiceImpl.java        |   1 -
 .../impl/InfrastructureTemplateServiceImpl.java    |   1 +
 .../datalab/backendapi/util/RequestBuilder.java    |   4 -
 .../resources/InfrastructureInfoResourceTest.java  |  12 +-
 .../backendapi/service/TagServiceImplTest.java     |   6 +-
 35 files changed, 309 insertions(+), 388 deletions(-)

diff --git a/infrastructure-provisioning/src/general/files/aws/jupyter_description.json b/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
index 6f9496d..50dd357 100644
--- a/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
@@ -25,9 +25,5 @@
       "version": "jupyter_notebook-6.0.2",
       "vendor": "AWS"
     }
-  ],
-  "gpu_types": [
-    {"Size": "S",  "Gpu_type": "nvidia-tesla-t4"},
-    {"Size": "M",  "Gpu_type": "nvidia-tesla-v100"}
   ]
 }
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/azure/jupyter_description.json b/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
index d3897f0..7b14870 100644
--- a/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
@@ -21,9 +21,5 @@
       "version": "jupyter_notebook-6.0.2",
       "vendor": "Azure"
     }
-  ],
-  "gpu_types": [
-    {"Size": "S",  "Gpu_type": "nvidia-tesla-t4"},
-    {"Size": "M",  "Gpu_type": "nvidia-tesla-v100"}
   ]
 }
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
index 535d616..789ac05 100644
--- a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
@@ -26,9 +26,5 @@
   "templates":
   [
     {"version":"1.4", "applications": [{"Name":"Hadoop", "Version": "2.10.0"}, {"Name":"Spark", "Version": "2.4.5"}, {"Name":"Hive", "Version": "2.3.6"}]}
-  ],
-  "gpu_types": [
-          {"Size": "S",  "Gpu_type": "nvidia-tesla-t4"},
-          {"Size": "M",  "Gpu_type": "nvidia-tesla-v100"}
-      ]
+  ]
 }
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
index 4c759bb..a94ba57 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyter_description.json
@@ -29,9 +29,5 @@
       "version": "jupyter_notebook-6.0.2",
       "vendor": "GCP"
     }
-  ],
-  "gpu_types": [
-    {"Size": "S",  "Gpu_type": "nvidia-tesla-t4"},
-    {"Size": "M",  "Gpu_type": "nvidia-tesla-v100"}
   ]
 }
\ No newline at end of file
diff --git a/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java b/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
index a43e520..68550ae 100644
--- a/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
+++ b/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
@@ -1,22 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 package com.epam.datalab.exceptions;
 
 public class DynamicChangePropertiesException extends DatalabException {
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java
index bfa00f7..45607f1 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/UserInstanceDTO.java
@@ -86,12 +86,6 @@ public class UserInstanceDTO {
     private List<ClusterConfig> clusterConfig;
     @JsonProperty
     private Map<String, String> tags;
-    @JsonProperty("gpu_enabled")
-    private boolean enabledGPU = false;
-    @JsonProperty("gpuType")
-    private String gpuType;
-    @JsonProperty("gpuCount")
-    private String gpuCount;
 
     /**
      * Sets the user login name.
@@ -197,19 +191,4 @@ public class UserInstanceDTO {
         setTags(tags);
         return this;
     }
-
-    public UserInstanceDTO withGPUType(String gpuType) {
-        setGpuType(gpuType);
-        return this;
-    }
-
-    public UserInstanceDTO withGPUEnabled(boolean gpuEnabled) {
-        setEnabledGPU(gpuEnabled);
-        return this;
-    }
-
-    public UserInstanceDTO withGPUCount(String gpuCount) {
-        setGpuCount(gpuCount);
-        return this;
-    }
 }
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java
index b5c8b13..8a52ece 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/computational/UserComputationalResource.java
@@ -72,20 +72,9 @@ public class UserComputationalResource {
     @JsonProperty("emr_version")
     private String awsClusterVersion;
     private int totalInstanceCount;
-    @JsonProperty("masterGPUType")
-    private  String masterGPUType;
-    @JsonProperty("slaveGPUType")
-    private  String slaveGPUType;
-    @JsonProperty("masterGPUCount")
-    private  String masterGPUCount;
-    @JsonProperty("slaveGPUCount")
-    private  String slaveGPUCount;
-    private  boolean enabledGPU;
-
     protected List<ClusterConfig> config;
     private Map<String, String> tags;
 
-
     public UserComputationalResource(String computationalName, String computationalId, String imageName,
                                      String templateName, String status, Date uptime, SchedulerJobDTO schedulerData,
                                      boolean reuploadKeyRequired, List<ResourceURL> resourceUrl,
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java
index b4b169f..7cbcfac 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java
@@ -38,14 +38,6 @@ public class ComputationalCreateGcp extends ComputationalBase<ComputationalCreat
     private String version;
     @JsonProperty("conf_shared_image_enabled")
     private String sharedImageEnabled;
-    @JsonProperty("masterGPUType")
-    private String masterGPUType;
-    @JsonProperty("slaveGPUType")
-    private String slaveGPUType;
-    @JsonProperty("masterGPUCount")
-    private String masterGPUCount;
-    @JsonProperty("slaveGPUCount")
-    private String slaveGPUCount;
 
     public ComputationalCreateGcp withMasterInstanceCount(String masterInstanceCount) {
         this.masterInstanceCount = masterInstanceCount;
@@ -77,28 +69,6 @@ public class ComputationalCreateGcp extends ComputationalBase<ComputationalCreat
         return this;
     }
 
-    public ComputationalCreateGcp withMasterGPUType(String masterGPUType) {
-        this.masterGPUType = masterGPUType;
-        return this;
-    }
-
-    public ComputationalCreateGcp withSlaveGPUType(String slaveGPUType) {
-        this.slaveGPUType = slaveGPUType;
-        return this;
-    }
-
-    public ComputationalCreateGcp withMasterGPUCount(String masterGPUCount) {
-        this.masterGPUCount = masterGPUCount;
-        return this;
-    }
-
-    public ComputationalCreateGcp withSlaveGPUCount(String slaveGPUCount) {
-        this.slaveGPUCount = slaveGPUCount;
-        return this;
-    }
-
-
-
     public String getSharedImageEnabled() {
         return sharedImageEnabled;
     }
@@ -127,20 +97,4 @@ public class ComputationalCreateGcp extends ComputationalBase<ComputationalCreat
     public String toString() {
         return toStringHelper(this).toString();
     }
-
-    public String getSlaveGPUCount() {
-        return slaveGPUCount;
-    }
-
-    public String getMasterGPUCount() {
-        return masterGPUCount;
-    }
-
-    public String getSlaveGPUType() {
-        return slaveGPUType;
-    }
-
-    public String getMasterGPUType() {
-        return masterGPUType;
-    }
 }
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
index 70e9a9e..21f7672 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/GcpComputationalResource.java
@@ -42,28 +42,19 @@ import java.util.Map;
 public class GcpComputationalResource extends UserComputationalResource {
 
     @JsonProperty("instance_id")
-    private final String instanceId;
+    private String instanceId;
     @JsonProperty("master_node_shape")
-    private final String masterShape;
+    private String masterShape;
     @JsonProperty("slave_node_shape")
-    private final String slaveShape;
+    private String slaveShape;
     @JsonProperty("total_slave_instance_number")
-    private final String slaveNumber;
+    private String slaveNumber;
     @JsonProperty("total_master_instance_number")
-    private final String masterNumber;
+    private String masterNumber;
     @JsonProperty("total_preemptible_number")
-    private final String preemptibleNumber;
+    private String preemptibleNumber;
     @JsonProperty("dataproc_version")
-    private final String version;
-    @JsonProperty("masterGPUType")
-    private final String masterGPUType;
-    @JsonProperty("slaveGPUType")
-    private final String slaveGPUType;
-    @JsonProperty("masterGPUCount")
-    private final String masterGPUCount;
-    @JsonProperty("slaveGPUCount")
-    private final String slaveGPUCount;
-    private final Boolean enabledGPU;
+    private String version;
 
     @Builder
     public GcpComputationalResource(String computationalName, String computationalId, String imageName,
@@ -72,9 +63,7 @@ public class GcpComputationalResource extends UserComputationalResource {
                                     String instanceId, String masterShape, String slaveShape, String slaveNumber,
                                     String masterNumber, String preemptibleNumber, String version,
                                     List<ResourceURL> resourceURL, LocalDateTime lastActivity,
-                                    Map<String, String> tags, int totalInstanceCount,
-                                    String masterGPUCount, String masterGPUType, String slaveGPUCount,
-                                    String slaveGPUType, Boolean enabledGPU) {
+                                    Map<String, String> tags, int totalInstanceCount) {
         super(computationalName, computationalId, imageName, templateName, status, uptime, schedulerJobData,
                 reuploadKeyRequired, resourceURL, lastActivity, tags, totalInstanceCount);
         this.instanceId = instanceId;
@@ -84,16 +73,5 @@ public class GcpComputationalResource extends UserComputationalResource {
         this.masterNumber = masterNumber;
         this.version = version;
         this.preemptibleNumber = preemptibleNumber;
-        this.masterGPUCount = masterGPUCount;
-        this.masterGPUType = masterGPUType;
-        this.slaveGPUCount = slaveGPUCount;
-        this.slaveGPUType = slaveGPUType;
-        this.enabledGPU = enabledGPU;
-        super.setMasterGPUCount(masterGPUCount);
-        super.setSlaveGPUCount(slaveGPUCount);
-        super.setMasterGPUType(masterGPUType);
-        super.setSlaveGPUType(slaveGPUType);
-        super.setEnabledGPU(enabledGPU);
-
     }
 }
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalGPU.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalGPU.java
deleted file mode 100644
index 43b050e..0000000
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalGPU.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.epam.datalab.dto.imagemetadata;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public class ComputationalGPU {
-
-    @JsonProperty("Size")
-    private String size;
-    @JsonProperty("Gpu_type")
-    private String gpuType;
-}
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
index 8b62fe5..626e70e 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
@@ -20,7 +20,6 @@
 package com.epam.datalab.dto.imagemetadata;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -45,11 +44,7 @@ public class ComputationalMetadataDTO extends ImageMetadataDTO {
     @JsonProperty("request_id")
     private String requestId;
     @JsonProperty(value = "computation_resources_shapes")
-    @JsonUnwrapped
     private Map<String, List<ComputationalResourceShapeDto>> computationResourceShapes;
-    //GPU
-    @JsonProperty("gpu_types")
-    private List<ComputationalGPU> computationGPU;
 
     public ComputationalMetadataDTO(String imageName) {
         this.image = imageName;
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
index 74fa55f..3c961c2 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
@@ -40,9 +40,6 @@ public class ExploratoryMetadataDTO extends ImageMetadataDTO {
     private HashMap<String, List<ComputationalResourceShapeDto>> exploratoryEnvironmentShapes;
     @JsonProperty("request_id")
     private String requestId;
-    //GPU
-    @JsonProperty("gpu_types")
-    private List<ComputationalGPU> computationGPU;
 
     public ExploratoryMetadataDTO(String imageName) {
         this.image = imageName;
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
index 49913c1..176e6a9 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
@@ -20,7 +20,6 @@
 package com.epam.datalab.model.exploratory;
 
 import com.epam.datalab.dto.aws.computational.ClusterConfig;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 import lombok.Data;
 
@@ -39,7 +38,4 @@ public class Exploratory {
     private final String project;
     private final String exploratoryTag;
     private final List<ClusterConfig> clusterConfig;
-    private Boolean enabledGPU;
-    private String gpuType;
-    private String gpuCount;
 }
diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
index b4ab320..6408b16 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
@@ -1,23 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
 package com.epam.datalab.rest.mappers;
 
 import com.epam.datalab.exceptions.DynamicChangePropertiesException;
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java
index ce9d51f..3ed6399 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/DockerWarmuper.java
@@ -89,26 +89,6 @@ public class DockerWarmuper implements Managed, DockerCommands, MetadataHolder {
         }
     }
 
-    @Override
-    public void stop() throws Exception {
-        //do nothing
-    }
-
-    @Override
-    public String getResourceType() {
-        return Directories.NOTEBOOK_LOG_DIRECTORY;
-    }
-
-    public Map<String, String> getUuids() {
-        return Collections.unmodifiableMap(imageList);
-    }
-
-    public Set<ImageMetadataDTO> getMetadata(ImageType type) {
-        return metadataDTOs.stream()
-                .filter(m -> m.getImageType().equals(type))
-                .collect(Collectors.toSet());
-    }
-
     public class DockerFileHandlerCallback implements FileHandlerCallback {
         private final String uuid;
 
@@ -170,4 +150,23 @@ public class DockerWarmuper implements Managed, DockerCommands, MetadataHolder {
         LOGGER.debug("caching metadata for image {}: {}", image, metadata);
         metadataDTOs.add(metadata);
     }
+
+    @Override
+    public void stop() throws Exception {
+        //do nothing
+    }
+
+    public Map<String, String> getUuids() {
+        return Collections.unmodifiableMap(imageList);
+    }
+
+    public Set<ImageMetadataDTO> getMetadata(ImageType type) {
+        return metadataDTOs.stream().filter(m -> m.getImageType().equals(type))
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public String getResourceType() {
+        return Directories.NOTEBOOK_LOG_DIRECTORY;
+    }
 }
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ExploratoryCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ExploratoryCallbackHandler.java
index d56616e..8bdabe1 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ExploratoryCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ExploratoryCallbackHandler.java
@@ -29,7 +29,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
-import lombok.NoArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/dao/FileSystemCallbackHandlerDao.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/dao/FileSystemCallbackHandlerDao.java
index 2270029..6e39555 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/dao/FileSystemCallbackHandlerDao.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/dao/FileSystemCallbackHandlerDao.java
@@ -26,7 +26,6 @@ import com.epam.datalab.util.FileUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
@@ -44,7 +43,6 @@ import static java.util.stream.Collectors.toList;
 
 @Singleton
 @Slf4j
-@NoArgsConstructor
 public class FileSystemCallbackHandlerDao implements CallbackHandlerDao {
 
     @Inject
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java
index c271fca..b4b1418 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java
@@ -41,7 +41,7 @@ import javax.ws.rs.core.Response;
 @RolesAllowed("environment/*")
 public class EnvironmentResource {
 
-    private final EnvironmentService environmentService;
+    private EnvironmentService environmentService;
 
     @Inject
     public EnvironmentResource(EnvironmentService environmentService) {
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
index edde577..f9896b7 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
@@ -56,7 +56,7 @@ import java.util.List;
 @Slf4j
 public class ExploratoryResource implements ExploratoryAPI {
 
-    private final ExploratoryService exploratoryService;
+    private ExploratoryService exploratoryService;
 
     @Inject
     public ExploratoryResource(ExploratoryService exploratoryService) {
@@ -87,6 +87,7 @@ public class ExploratoryResource implements ExploratoryAPI {
         }
         String uuid = exploratoryService.create(userInfo, getExploratory(formDTO), formDTO.getProject(), formDTO.getName());
         return Response.ok(uuid).build();
+
     }
 
 
@@ -169,9 +170,6 @@ public class ExploratoryResource implements ExploratoryAPI {
                 .endpoint(formDTO.getEndpoint())
                 .project(formDTO.getProject())
                 .exploratoryTag(formDTO.getExploratoryTag())
-                .enabledGPU(formDTO.getEnabledGPU())
-                .gpuCount(formDTO.getGpuCount())
-                .gpuType(formDTO.getGpuType())
                 .build();
     }
 }
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/InfrastructureTemplateResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/InfrastructureTemplateResource.java
index 559adb4..4109b91 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/InfrastructureTemplateResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/InfrastructureTemplateResource.java
@@ -42,7 +42,7 @@ import javax.ws.rs.core.MediaType;
 @Produces(MediaType.APPLICATION_JSON)
 public class InfrastructureTemplateResource implements DockerAPI {
 
-    private final InfrastructureTemplateService infrastructureTemplateService;
+    private InfrastructureTemplateService infrastructureTemplateService;
 
     @Inject
     public InfrastructureTemplateResource(InfrastructureTemplateService infrastructureTemplateService) {
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ComputationalCreateFormDTO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ComputationalCreateFormDTO.java
index da6c310..f4520ba 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ComputationalCreateFormDTO.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ComputationalCreateFormDTO.java
@@ -61,6 +61,4 @@ public class ComputationalCreateFormDTO {
     @Valid
     private List<ClusterConfig> config;
 
-    @JsonProperty("gpu_tag")
-    protected boolean gpuTag = false;
 }
\ No newline at end of file
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
index 8440ac5..d703563 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
@@ -22,7 +22,6 @@ package com.epam.datalab.backendapi.resources.dto;
 import com.epam.datalab.dto.aws.computational.ClusterConfig;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
-import lombok.Data;
 import org.hibernate.validator.constraints.NotBlank;
 
 import java.util.List;
@@ -30,7 +29,6 @@ import java.util.List;
 /**
  * Stores info about new exploratory.
  */
-@Data
 public class ExploratoryCreateFormDTO {
     @NotBlank
     @JsonProperty
@@ -68,12 +66,113 @@ public class ExploratoryCreateFormDTO {
     @JsonProperty("cluster_config")
     private List<ClusterConfig> clusterConfig;
 
-    @JsonProperty("gpu_enabled")
-    private Boolean enabledGPU;
-    @JsonProperty("gpuType")
-    private String gpuType;
-    @JsonProperty("gpuCount")
-    private String gpuCount;
+    /**
+     * Returns the image name of notebook.
+     */
+    public String getImage() {
+        return image;
+    }
+
+    /**
+     * Sets the image name of notebook.
+     */
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    /**
+     * Returns name of template.
+     */
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    /**
+     * Sets name of template.
+     */
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    /**
+     * Returns name of notebook.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets name of notebook.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns name of shape.
+     */
+    public String getShape() {
+        return shape;
+    }
+
+    /**
+     * Sets name of shape.
+     */
+    public void setShape(String shape) {
+        this.shape = shape;
+    }
+
+    /**
+     * Returns version.
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets version.
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * Returns image name from which notebook should be created
+     */
+    public String getImageName() {
+        return imageName;
+    }
+
+    /**
+     * Sets image name from which notebook should be created
+     */
+    public void setImageName(String imageName) {
+        this.imageName = imageName;
+    }
+
+    public List<ClusterConfig> getClusterConfig() {
+        return clusterConfig;
+    }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    public String getEndpoint() {
+        return endpoint;
+    }
+
+    public void setEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public String getExploratoryTag() {
+        return exploratoryTag;
+    }
 
     @Override
     public String toString() {
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/UserResourceInfo.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/UserResourceInfo.java
index 86d3e6d..135fbaa 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/UserResourceInfo.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/UserResourceInfo.java
@@ -27,7 +27,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 @Data
 @Builder
@@ -55,12 +54,4 @@ public class UserResourceInfo {
     private String cloudProvider;
     @JsonProperty("exploratory_urls")
     private List<ResourceURL> exploratoryUrls;
-    @JsonProperty("gpu_enabled")
-    private Boolean gpuEnabled;
-    @JsonProperty("gpu_type")
-    private String gpuType;
-    @JsonProperty("gpu_count")
-    private String gpuCount;
-    @JsonProperty
-    private Map<String, String> tags;
 }
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java
index 27cd3c1..df0bfd3 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java
@@ -22,11 +22,9 @@ package com.epam.datalab.backendapi.resources.dto.gcp;
 import com.epam.datalab.backendapi.resources.dto.ComputationalCreateFormDTO;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.hibernate.validator.constraints.NotBlank;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
 public class GcpComputationalCreateForm extends ComputationalCreateFormDTO {
@@ -49,21 +47,6 @@ public class GcpComputationalCreateForm extends ComputationalCreateFormDTO {
     @JsonProperty("dataproc_slave_instance_type")
     private String slaveInstanceType;
 
-    @JsonProperty("gpu_enabled")
-    private Boolean enabledGPU;
-
-    @JsonProperty("masterGPUType")
-    private String masterGPUType;
-
-    @JsonProperty("slaveGPUType")
-    private String slaveGPUType;
-
-    @JsonProperty("masterGPUCount")
-    private String masterGPUCount;
-
-    @JsonProperty("slaveGPUCount")
-    private String slaveGPUCount;
-
     @NotBlank
     @JsonProperty("dataproc_version")
     private String version;
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
index d623c8f..28470e4 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
@@ -39,7 +39,13 @@ import lombok.extern.slf4j.Slf4j;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -101,11 +107,6 @@ public class ComputationalResourceGcp implements ComputationalAPI {
                     .masterNumber(form.getMasterInstanceCount())
                     .preemptibleNumber(form.getPreemptibleCount())
                     .version(form.getVersion())
-                    .masterGPUCount(form.getMasterGPUCount())
-                    .masterGPUType(form.getMasterGPUType())
-                    .slaveGPUCount(form.getSlaveGPUCount())
-                    .slaveGPUType(form.getSlaveGPUType())
-                    .enabledGPU(form.getEnabledGPU())
                     .totalInstanceCount(Integer.parseInt(form.getMasterInstanceCount()) + Integer.parseInt(form.getSlaveInstanceCount()))
                     .build();
             boolean resourceAdded = computationalService.createDataEngineService(userInfo, form.getName(), form, gcpComputationalResource,
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagService.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagService.java
index 8359cc6..e003e02 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagService.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagService.java
@@ -25,6 +25,5 @@ import java.util.Map;
 
 @FunctionalInterface
 public interface TagService {
-    Map<String, String> getResourceTags(UserInfo userInfo, String endpoint, String project, String customTag
-            , boolean gpuEnabled);
+    Map<String, String> getResourceTags(UserInfo userInfo, String endpoint, String project, String customTag);
 }
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagServiceImpl.java
index 891b599..1990dfa 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/TagServiceImpl.java
@@ -30,16 +30,12 @@ import java.util.Optional;
 public class TagServiceImpl implements TagService {
 
     @Override
-    public Map<String, String> getResourceTags(UserInfo userInfo, String endpoint, String project,
-                                               String customTag, boolean gpuEnabled) {
+    public Map<String, String> getResourceTags(UserInfo userInfo, String endpoint, String project, String customTag) {
         Map<String, String> tags = new HashMap<>();
         tags.put("user_tag", userInfo.getName());
         tags.put("endpoint_tag", endpoint);
         tags.put("project_tag", project);
         Optional.ofNullable(customTag).ifPresent(t -> tags.put("custom_tag", t));
-        if (gpuEnabled) {
-            tags.put("gpu_tag", "gpu");
-        }
         return tags;
     }
 }
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java
index de80e1d..245f4c4 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ComputationalServiceImpl.java
@@ -21,7 +21,12 @@ package com.epam.datalab.backendapi.service.impl;
 
 
 import com.epam.datalab.auth.UserInfo;
-import com.epam.datalab.backendapi.annotation.*;
+import com.epam.datalab.backendapi.annotation.Audit;
+import com.epam.datalab.backendapi.annotation.BudgetLimited;
+import com.epam.datalab.backendapi.annotation.Info;
+import com.epam.datalab.backendapi.annotation.Project;
+import com.epam.datalab.backendapi.annotation.ResourceName;
+import com.epam.datalab.backendapi.annotation.User;
 import com.epam.datalab.backendapi.dao.ComputationalDAO;
 import com.epam.datalab.backendapi.dao.ExploratoryDAO;
 import com.epam.datalab.backendapi.domain.EndpointDTO;
@@ -30,7 +35,11 @@ import com.epam.datalab.backendapi.domain.RequestId;
 import com.epam.datalab.backendapi.resources.dto.ComputationalCreateFormDTO;
 import com.epam.datalab.backendapi.resources.dto.ComputationalTemplatesDTO;
 import com.epam.datalab.backendapi.resources.dto.SparkStandaloneClusterCreateForm;
-import com.epam.datalab.backendapi.service.*;
+import com.epam.datalab.backendapi.service.ComputationalService;
+import com.epam.datalab.backendapi.service.EndpointService;
+import com.epam.datalab.backendapi.service.InfrastructureTemplateService;
+import com.epam.datalab.backendapi.service.ProjectService;
+import com.epam.datalab.backendapi.service.TagService;
 import com.epam.datalab.backendapi.util.RequestBuilder;
 import com.epam.datalab.constants.ServiceConsts;
 import com.epam.datalab.dto.UserInstanceDTO;
@@ -39,7 +48,11 @@ import com.epam.datalab.dto.aws.computational.ClusterConfig;
 import com.epam.datalab.dto.base.DataEngineType;
 import com.epam.datalab.dto.base.computational.ComputationalBase;
 import com.epam.datalab.dto.base.computational.FullComputationalTemplate;
-import com.epam.datalab.dto.computational.*;
+import com.epam.datalab.dto.computational.ComputationalClusterConfigDTO;
+import com.epam.datalab.dto.computational.ComputationalStatusDTO;
+import com.epam.datalab.dto.computational.ComputationalTerminateDTO;
+import com.epam.datalab.dto.computational.SparkStandaloneClusterResource;
+import com.epam.datalab.dto.computational.UserComputationalResource;
 import com.epam.datalab.exceptions.DatalabException;
 import com.epam.datalab.exceptions.ResourceNotFoundException;
 import com.epam.datalab.rest.client.RESTService;
@@ -49,12 +62,26 @@ import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static com.epam.datalab.backendapi.domain.AuditActionEnum.*;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.CREATE;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.RECONFIGURE;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.START;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.STOP;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.TERMINATE;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.UPDATE;
 import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.COMPUTE;
-import static com.epam.datalab.dto.UserInstanceStatus.*;
+import static com.epam.datalab.dto.UserInstanceStatus.CREATING;
+import static com.epam.datalab.dto.UserInstanceStatus.FAILED;
+import static com.epam.datalab.dto.UserInstanceStatus.RECONFIGURING;
+import static com.epam.datalab.dto.UserInstanceStatus.STARTING;
+import static com.epam.datalab.dto.UserInstanceStatus.STOPPING;
+import static com.epam.datalab.dto.UserInstanceStatus.TERMINATING;
 import static com.epam.datalab.dto.base.DataEngineType.CLOUD_SERVICE;
 import static com.epam.datalab.dto.base.DataEngineType.SPARK_STANDALONE;
 import static com.epam.datalab.rest.contracts.ComputationalAPI.COMPUTATIONAL_CREATE_CLOUD_SPECIFIC;
@@ -135,7 +162,7 @@ public class ComputationalServiceImpl implements ComputationalService {
                 exploratoryDAO.fetchExploratoryFields(userInfo.getName(), project, form.getNotebookName());
         final SparkStandaloneClusterResource compResource = createInitialComputationalResource(form);
         compResource.setTags(tagService.getResourceTags(userInfo, instance.getEndpoint(), project,
-                form.getCustomTag(), false));
+                form.getCustomTag()));
         if (computationalDAO.addComputational(userInfo.getName(), form.getNotebookName(), project, compResource)) {
             try {
                 EndpointDTO endpointDTO = endpointService.get(instance.getEndpoint());
@@ -198,7 +225,7 @@ public class ComputationalServiceImpl implements ComputationalService {
         final UserInstanceDTO instance = exploratoryDAO.fetchExploratoryFields(userInfo.getName(), project, formDTO
                 .getNotebookName());
         final Map<String, String> tags = tagService.getResourceTags(userInfo, instance.getEndpoint(), project,
-                formDTO.getCustomTag(), formDTO.isGpuTag());
+                formDTO.getCustomTag());
         computationalResource.setTags(tags);
         boolean isAdded = computationalDAO.addComputational(userInfo.getName(), formDTO.getNotebookName(), project,
                 computationalResource);
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java
index d1f41fb..19e1cd3 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/EnvironmentServiceImpl.java
@@ -30,7 +30,11 @@ import com.epam.datalab.backendapi.domain.OdahuDTO;
 import com.epam.datalab.backendapi.domain.ProjectDTO;
 import com.epam.datalab.backendapi.resources.dto.UserDTO;
 import com.epam.datalab.backendapi.resources.dto.UserResourceInfo;
-import com.epam.datalab.backendapi.service.*;
+import com.epam.datalab.backendapi.service.ComputationalService;
+import com.epam.datalab.backendapi.service.EnvironmentService;
+import com.epam.datalab.backendapi.service.ExploratoryService;
+import com.epam.datalab.backendapi.service.ProjectService;
+import com.epam.datalab.backendapi.service.SecurityService;
 import com.epam.datalab.dto.UserInstanceDTO;
 import com.epam.datalab.dto.UserInstanceStatus;
 import com.epam.datalab.dto.status.EnvResource;
@@ -41,13 +45,20 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.epam.datalab.backendapi.resources.dto.UserDTO.Status.ACTIVE;
 import static com.epam.datalab.backendapi.resources.dto.UserDTO.Status.NOT_ACTIVE;
-import static com.epam.datalab.dto.UserInstanceStatus.*;
+import static com.epam.datalab.dto.UserInstanceStatus.CREATING;
+import static com.epam.datalab.dto.UserInstanceStatus.CREATING_IMAGE;
+import static com.epam.datalab.dto.UserInstanceStatus.RUNNING;
+import static com.epam.datalab.dto.UserInstanceStatus.STARTING;
 import static com.epam.datalab.rest.contracts.ComputationalAPI.AUDIT_MESSAGE;
 
 @Singleton
@@ -91,19 +102,19 @@ public class EnvironmentServiceImpl implements EnvironmentService {
         final Stream<UserDTO> notActiveUsersStream = notActiveUsers
                 .stream()
                 .map(u -> toUserDTO(u, NOT_ACTIVE));
-        return Stream.concat(activeUsersStream, notActiveUsersStream)
-                .collect(Collectors.toList());
+	    return Stream.concat(activeUsersStream, notActiveUsersStream)
+			    .collect(Collectors.toList());
     }
 
     @Override
     public List<UserResourceInfo> getAllEnv(UserInfo user) {
         log.debug("Getting all user's environment...");
         List<UserInstanceDTO> expList = exploratoryDAO.getInstances();
-        return projectService.getProjects(user)
-                .stream()
-                .map(projectDTO -> getProjectEnv(projectDTO, expList))
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+	    return projectService.getProjects(user)
+			    .stream()
+			    .map(projectDTO -> getProjectEnv(projectDTO, expList))
+			    .flatMap(Collection::stream)
+			    .collect(Collectors.toList());
     }
 
     @Override
@@ -214,29 +225,29 @@ public class EnvironmentServiceImpl implements EnvironmentService {
     }
 
     private List<UserResourceInfo> getProjectEnv(ProjectDTO projectDTO, List<UserInstanceDTO> allInstances) {
-        final Stream<UserResourceInfo> userResources = allInstances
-                .stream()
-                .filter(instance -> instance.getProject().equals(projectDTO.getName()))
-                .map(this::toUserResourceInfo);
+	    final Stream<UserResourceInfo> userResources = allInstances
+			    .stream()
+			    .filter(instance -> instance.getProject().equals(projectDTO.getName()))
+			    .map(this::toUserResourceInfo);
 
-        Stream<UserResourceInfo> odahuResources = projectDTO.getOdahu()
-                .stream()
-                .map(this::toUserResourceInfo);
+	    Stream<UserResourceInfo> odahuResources = projectDTO.getOdahu()
+			    .stream()
+			    .map(this::toUserResourceInfo);
 
-        if (projectDTO.getEndpoints() != null) {
-            final Stream<UserResourceInfo> edges = projectDTO.getEndpoints()
-                    .stream()
-                    .map(e -> UserResourceInfo.builder()
-                            .resourceType(ResourceEnum.EDGE_NODE)
-                            .resourceStatus(e.getStatus().toString())
-                            .project(projectDTO.getName())
-                            .endpoint(e.getName())
-                            .ip(e.getEdgeInfo() != null ? e.getEdgeInfo().getPublicIp() : null)
-                            .build());
-            return Stream.concat(edges, Stream.concat(odahuResources, userResources))
-                    .collect(Collectors.toList());
-        } else {
-            return userResources.collect(Collectors.toList());
+	    if (projectDTO.getEndpoints() != null) {
+		    final Stream<UserResourceInfo> edges = projectDTO.getEndpoints()
+				    .stream()
+				    .map(e -> UserResourceInfo.builder()
+						    .resourceType(ResourceEnum.EDGE_NODE)
+						    .resourceStatus(e.getStatus().toString())
+						    .project(projectDTO.getName())
+						    .endpoint(e.getName())
+						    .ip(e.getEdgeInfo() != null ? e.getEdgeInfo().getPublicIp() : null)
+						    .build());
+		    return Stream.concat(edges, Stream.concat(odahuResources, userResources))
+				    .collect(Collectors.toList());
+	    } else {
+		    return userResources.collect(Collectors.toList());
         }
     }
 
@@ -244,37 +255,33 @@ public class EnvironmentServiceImpl implements EnvironmentService {
         return UserResourceInfo.builder()
                 .resourceType(ResourceEnum.NOTEBOOK)
                 .resourceName(userInstance.getExploratoryName())
-                .resourceShape(userInstance.getShape())
-                .resourceStatus(userInstance.getStatus())
-                .computationalResources(userInstance.getResources())
-                .user(userInstance.getUser())
-                .project(userInstance.getProject())
-                .endpoint(userInstance.getEndpoint())
-                .cloudProvider(userInstance.getCloudProvider())
-                .exploratoryUrls(userInstance.getResourceUrl())
-                .gpuCount(userInstance.getGpuCount())
-                .gpuEnabled(userInstance.isEnabledGPU())
-                .gpuType(userInstance.getGpuType())
-                .tags(userInstance.getTags())
-                .build();
+		        .resourceShape(userInstance.getShape())
+		        .resourceStatus(userInstance.getStatus())
+		        .computationalResources(userInstance.getResources())
+		        .user(userInstance.getUser())
+		        .project(userInstance.getProject())
+		        .endpoint(userInstance.getEndpoint())
+		        .cloudProvider(userInstance.getCloudProvider())
+		        .exploratoryUrls(userInstance.getResourceUrl())
+		        .build();
     }
 
-    private UserResourceInfo toUserResourceInfo(OdahuDTO odahuDTO) {
-        return UserResourceInfo.builder()
-                .resourceType(ResourceEnum.ODAHU)
-                .resourceName(odahuDTO.getName())
-                .resourceStatus(odahuDTO.getStatus().toString())
-                .project(odahuDTO.getProject())
-                .build();
-    }
+	private UserResourceInfo toUserResourceInfo(OdahuDTO odahuDTO) {
+		return UserResourceInfo.builder()
+				.resourceType(ResourceEnum.ODAHU)
+				.resourceName(odahuDTO.getName())
+				.resourceStatus(odahuDTO.getStatus().toString())
+				.project(odahuDTO.getProject())
+				.build();
+	}
 
-    private void checkProjectResourceConditions(String project, String action) {
-        final List<UserInstanceDTO> userInstances = exploratoryDAO.fetchProjectExploratoriesWhereStatusIn(project,
-                Arrays.asList(CREATING, STARTING, CREATING_IMAGE), CREATING, STARTING, CREATING_IMAGE);
+	private void checkProjectResourceConditions(String project, String action) {
+		final List<UserInstanceDTO> userInstances = exploratoryDAO.fetchProjectExploratoriesWhereStatusIn(project,
+				Arrays.asList(CREATING, STARTING, CREATING_IMAGE), CREATING, STARTING, CREATING_IMAGE);
 
-        if (!userInstances.isEmpty()) {
-            log.error(String.format(ERROR_MSG_FORMAT, action));
-            throw new ResourceConflictException(String.format(ERROR_MSG_FORMAT, action));
-        }
-    }
+		if (!userInstances.isEmpty()) {
+			log.error(String.format(ERROR_MSG_FORMAT, action));
+			throw new ResourceConflictException(String.format(ERROR_MSG_FORMAT, action));
+		}
+	}
 }
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
index ffeca52..72f0801 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -20,15 +20,29 @@
 package com.epam.datalab.backendapi.service.impl;
 
 import com.epam.datalab.auth.UserInfo;
-import com.epam.datalab.backendapi.annotation.*;
+import com.epam.datalab.backendapi.annotation.Audit;
+import com.epam.datalab.backendapi.annotation.BudgetLimited;
+import com.epam.datalab.backendapi.annotation.Info;
+import com.epam.datalab.backendapi.annotation.Project;
+import com.epam.datalab.backendapi.annotation.ResourceName;
+import com.epam.datalab.backendapi.annotation.User;
 import com.epam.datalab.backendapi.conf.SelfServiceApplicationConfiguration;
 import com.epam.datalab.backendapi.dao.ComputationalDAO;
 import com.epam.datalab.backendapi.dao.ExploratoryDAO;
 import com.epam.datalab.backendapi.dao.GitCredsDAO;
 import com.epam.datalab.backendapi.dao.ImageExploratoryDAO;
-import com.epam.datalab.backendapi.domain.*;
+import com.epam.datalab.backendapi.domain.AuditActionEnum;
+import com.epam.datalab.backendapi.domain.AuditDTO;
+import com.epam.datalab.backendapi.domain.AuditResourceTypeEnum;
+import com.epam.datalab.backendapi.domain.EndpointDTO;
+import com.epam.datalab.backendapi.domain.ProjectDTO;
+import com.epam.datalab.backendapi.domain.RequestId;
 import com.epam.datalab.backendapi.resources.dto.ExploratoryCreatePopUp;
-import com.epam.datalab.backendapi.service.*;
+import com.epam.datalab.backendapi.service.AuditService;
+import com.epam.datalab.backendapi.service.EndpointService;
+import com.epam.datalab.backendapi.service.ExploratoryService;
+import com.epam.datalab.backendapi.service.ProjectService;
+import com.epam.datalab.backendapi.service.TagService;
 import com.epam.datalab.backendapi.util.RequestBuilder;
 import com.epam.datalab.cloud.CloudProvider;
 import com.epam.datalab.constants.ServiceConsts;
@@ -37,7 +51,12 @@ import com.epam.datalab.dto.UserInstanceDTO;
 import com.epam.datalab.dto.UserInstanceStatus;
 import com.epam.datalab.dto.aws.computational.ClusterConfig;
 import com.epam.datalab.dto.base.DataEngineType;
-import com.epam.datalab.dto.exploratory.*;
+import com.epam.datalab.dto.exploratory.ExploratoryActionDTO;
+import com.epam.datalab.dto.exploratory.ExploratoryGitCredsDTO;
+import com.epam.datalab.dto.exploratory.ExploratoryReconfigureSparkClusterActionDTO;
+import com.epam.datalab.dto.exploratory.ExploratoryStatusDTO;
+import com.epam.datalab.dto.exploratory.LibInstallDTO;
+import com.epam.datalab.dto.exploratory.LibStatus;
 import com.epam.datalab.exceptions.DatalabException;
 import com.epam.datalab.model.exploratory.Exploratory;
 import com.epam.datalab.model.library.Library;
@@ -48,13 +67,33 @@ import com.google.inject.name.Named;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.epam.datalab.backendapi.domain.AuditActionEnum.*;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.CREATE;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.RECONFIGURE;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.START;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.STOP;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.TERMINATE;
+import static com.epam.datalab.backendapi.domain.AuditActionEnum.UPDATE;
 import static com.epam.datalab.backendapi.domain.AuditResourceTypeEnum.NOTEBOOK;
-import static com.epam.datalab.dto.UserInstanceStatus.*;
-import static com.epam.datalab.rest.contracts.ExploratoryAPI.*;
+import static com.epam.datalab.dto.UserInstanceStatus.CREATING;
+import static com.epam.datalab.dto.UserInstanceStatus.FAILED;
+import static com.epam.datalab.dto.UserInstanceStatus.RUNNING;
+import static com.epam.datalab.dto.UserInstanceStatus.STARTING;
+import static com.epam.datalab.dto.UserInstanceStatus.STOPPED;
+import static com.epam.datalab.dto.UserInstanceStatus.STOPPING;
+import static com.epam.datalab.dto.UserInstanceStatus.TERMINATED;
+import static com.epam.datalab.dto.UserInstanceStatus.TERMINATING;
+import static com.epam.datalab.rest.contracts.ExploratoryAPI.EXPLORATORY_CREATE;
+import static com.epam.datalab.rest.contracts.ExploratoryAPI.EXPLORATORY_RECONFIGURE_SPARK;
+import static com.epam.datalab.rest.contracts.ExploratoryAPI.EXPLORATORY_START;
+import static com.epam.datalab.rest.contracts.ExploratoryAPI.EXPLORATORY_STOP;
+import static com.epam.datalab.rest.contracts.ExploratoryAPI.EXPLORATORY_TERMINATE;
 
 @Slf4j
 @Singleton
@@ -404,11 +443,7 @@ public class ExploratoryServiceImpl implements ExploratoryService {
                 .withEndpoint(exploratory.getEndpoint())
                 .withCloudProvider(cloudProvider.toString())
                 .withTags(tagService.getResourceTags(userInfo, exploratory.getEndpoint(), project,
-                        exploratory.getExploratoryTag(), exploratory.getEnabledGPU()))
-                .withGPUCount(exploratory.getGpuCount())
-                .withGPUEnabled(exploratory.getEnabledGPU())
-                .withGPUType(exploratory.getGpuType());
-
+                        exploratory.getExploratoryTag()));
         if (StringUtils.isNotBlank(exploratory.getImageName())) {
             final List<LibInstallDTO> libInstallDtoList = getImageRelatedLibraries(userInfo, exploratory.getImageName(),
                     project, exploratory.getEndpoint());
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
index d758fd4..b7ad081 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java
@@ -21,7 +21,6 @@ package com.epam.datalab.backendapi.service.impl;
 
 import com.epam.datalab.auth.UserInfo;
 import com.epam.datalab.backendapi.conf.SelfServiceApplicationConfiguration;
-import com.epam.datalab.backendapi.dao.ComputationalDAO;
 import com.epam.datalab.backendapi.dao.ExploratoryDAO;
 import com.epam.datalab.backendapi.domain.BillingReport;
 import com.epam.datalab.backendapi.domain.EndpointDTO;
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
index aeefa38..de4e6e5 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
@@ -110,6 +110,7 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
                     provisioningService.get(endpointDTO.getUrl() + DOCKER_COMPUTATIONAL,
                             user.getAccessToken(), ComputationalMetadataDTO[]
                                     .class);
+
             final Set<String> roles = userGroupDao.getUserGroups(user.getName());
 
             return Arrays.stream(array)
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
index a2fb984..04804ff 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
@@ -375,10 +375,6 @@ public class RequestBuilder {
                         .withMasterInstanceType(gcpForm.getMasterInstanceType())
                         .withSlaveInstanceType(gcpForm.getSlaveInstanceType())
                         .withVersion(gcpForm.getVersion())
-                        .withMasterGPUCount(gcpForm.getMasterGPUCount())
-                        .withMasterGPUType(gcpForm.getMasterGPUType())
-                        .withSlaveGPUCount(gcpForm.getSlaveGPUCount())
-                        .withSlaveGPUType(gcpForm.getSlaveGPUType())
                         .withSharedImageEnabled(String.valueOf(projectDTO.isSharedImageEnabled()));
                 break;
 
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/InfrastructureInfoResourceTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/InfrastructureInfoResourceTest.java
index 1688fca..52b09b3 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/InfrastructureInfoResourceTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/InfrastructureInfoResourceTest.java
@@ -23,9 +23,7 @@ import com.epam.datalab.auth.UserInfo;
 import com.epam.datalab.backendapi.resources.dto.HealthStatusPageDTO;
 import com.epam.datalab.backendapi.service.InfrastructureInfoService;
 import com.epam.datalab.dto.InfrastructureMetaInfoDTO;
-import com.epam.datalab.dto.imagemetadata.ComputationalMetadataDTO;
 import com.epam.datalab.exceptions.DatalabException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dropwizard.auth.AuthenticationException;
 import io.dropwizard.testing.junit.ResourceTestRule;
 import org.apache.http.HttpStatus;
@@ -36,11 +34,17 @@ import org.junit.Test;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.io.*;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.refEq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 public class InfrastructureInfoResourceTest extends TestBase {
 
diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/TagServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/TagServiceImplTest.java
index 996a21b..652d193 100644
--- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/TagServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/TagServiceImplTest.java
@@ -37,16 +37,14 @@ public class TagServiceImplTest extends TestBase {
 
     @Test
     public void getResourceTags() {
-        Map<String, String> actualResourceTags = tagService.getResourceTags(getUserInfo(), ENDPOINT, PROJECT, CUSTOM_TAG,
-                false);
+        Map<String, String> actualResourceTags = tagService.getResourceTags(getUserInfo(), ENDPOINT, PROJECT, CUSTOM_TAG);
 
         assertEquals("maps of tags are not equals", getExpectedResourceTags(), actualResourceTags);
     }
 
     @Test
     public void getResourceTagsWithNullCustomTag() {
-        Map<String, String> actualResourceTags = tagService.getResourceTags(getUserInfo(), ENDPOINT, PROJECT, null
-                , false);
+        Map<String, String> actualResourceTags = tagService.getResourceTags(getUserInfo(), ENDPOINT, PROJECT, null);
 
         assertEquals("maps of tags are not equals", getExpectedResourceTagsWithNullCustomTag(), actualResourceTags);
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org