This is an automated email from the ASF dual-hosted git repository. ykinash pushed a commit to branch DATALAB-2502 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit aa1da33df1378d7ef5d0aa67e16468575e942912 Author: KinashYurii <[email protected]> AuthorDate: Thu Jul 8 12:52:57 2021 +0300 [DATALAB-2502] -- removed pip2, added Java lib for GCP_DP,GCP_Tensor --- README.md | 14 ++++---------- .../config.xml | 3 +-- .../dataengine_install_additional_libs/config.xml | 3 +-- .../notebook_install_additional_libs/config.xml | 3 +-- .../dataengine_install_additional_libs/config.xml | 3 +-- .../notebook_install_additional_libs/config.xml | 3 +-- .../config.xml | 3 +-- .../dataengine_install_additional_libs/config.xml | 3 +-- .../notebook_install_additional_libs/config.xml | 3 +-- .../examples/test_libs/deeplearning/lib_groups.json | 1 - .../examples/test_libs/deeplearning/lib_list.json | 4 ---- .../examples/test_libs/jupyter/lib_groups.json | 1 - .../examples/test_libs/jupyter/lib_list.json | 4 ---- integration-tests/examples/test_libs/lib_groups.json | 1 - .../examples/test_libs/rstudio/lib_groups.json | 1 - .../examples/test_libs/rstudio/lib_list.json | 4 ---- .../examples/test_libs/tensor/lib_groups.json | 1 - .../examples/test_libs/tensor/lib_list.json | 4 ---- .../examples/test_libs/zeppelin/lib_groups.json | 1 - .../examples/test_libs/zeppelin/lib_list.json | 5 +---- .../main/java/com/epam/datalab/dto/LibraryGroups.java | 1 - .../mock_response/aws/notebook_lib_list_pkgs.json | 5 ----- .../mock_response/azure/notebook_lib_list_pkgs.json | 5 ----- .../mock_response/gcp/notebook_lib_list_pkgs.json | 5 ----- .../datalab/backendapi/domain/NotebookTemplate.java | 19 +++++++++---------- .../backendapi/service/impl/LibraryServiceImpl.java | 5 ++++- .../service/impl/LibraryServiceImplTest.java | 5 ++--- 27 files changed, 28 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index df52b48..7c24a2e 100644 --- a/README.md +++ b/README.md @@ -1171,7 +1171,6 @@ List of parameters for Notebook node to **get list** of available libraries: ``` { "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, - "pip2": {"requests": "N/A", "configparser": "N/A"}, "pip3": {"configparser": "N/A"}, "r_pkg": {"rmarkdown": "1.5"}, "others": {"Keras": "N/A"} @@ -1190,7 +1189,7 @@ List of parameters for Notebook node to **install** additional libraries: | notebook\_instance\_name | Name of the Notebook instance to terminate | | aws\_region | AWS region where infrastructure was deployed | | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| libs | List of additional libraries in JSON format with type (os_pkg/pip3/r_pkg/others)| | action | lib_install | **Example** of additional_libs parameter: @@ -1201,7 +1200,6 @@ List of parameters for Notebook node to **install** additional libraries: "libs": [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, {"group": "others", "name": "Keras"} @@ -1237,7 +1235,7 @@ List of parameters for Notebook node to **install** additional libraries: | notebook\_instance\_name | Name of the Notebook instance to terminate | | azure\_resource\_group\_name | Name of the resource group where all DataLab resources are being provisioned | | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| libs | List of additional libraries in JSON format with type (os_pkg/pip3/r_pkg/others)| | action | lib_install | </details> @@ -1269,7 +1267,7 @@ List of parameters for Notebook node to **install** additional libraries: | gcp\_project\_id | ID of GCP project | | gcp\_zone | GCP zone name | | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| libs | List of additional libraries in JSON format with type (os_pkg/pip3/r_pkg/others)| | action | lib_install | </details> @@ -1462,7 +1460,6 @@ List of parameters for Dataengine-service node to **get list** of available libr ``` { "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, - "pip2": {"requests": "N/A", "configparser": "N/A"}, "pip3": {"configparser": "N/A"}, "r_pkg": {"rmarkdown": "1.5"}, "others": {"Keras": "N/A"} @@ -1480,7 +1477,7 @@ List of parameters for Dataengine-service to **install** additional libraries: | computational\_id | Name of Dataengine-service | | aws\_region | AWS region where infrastructure was deployed | | application | Type of the notebook template (jupyter/rstudio/zeppelin/tensor/deeplearning) | -| libs | List of additional libraries in JSON format with type (os_pkg/pip2/pip3/r_pkg/others)| +| libs | List of additional libraries in JSON format with type (os_pkg/pip3/r_pkg/others)| | action | lib_install | **Example** of additional_libs parameter: @@ -1491,7 +1488,6 @@ List of parameters for Dataengine-service to **install** additional libraries: "libs": [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, {"group": "others", "name": "Keras"} @@ -1678,7 +1674,6 @@ List of parameters for Dataengine node to **get list** of available libraries: ``` { "os_pkg": {"htop": "2.0.1-1ubuntu1", "python-mysqldb": "1.3.7-1build2"}, - "pip2": {"requests": "N/A", "configparser": "N/A"}, "pip3": {"configparser": "N/A"}, "r_pkg": {"rmarkdown": "1.5"}, "others": {"Keras": "N/A"} @@ -1706,7 +1701,6 @@ List of parameters for Dataengine node to **install** additional libraries: "libs": [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, {"group": "others", "name": "Keras"} diff --git a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine-service_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine-service_install_additional_libs/config.xml index fdf7930..5c9c4b3 100644 --- a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine-service_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine-service_install_additional_libs/config.xml @@ -61,11 +61,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine_install_additional_libs/config.xml index 9b3600e..abc6599 100644 --- a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/dataengine_install_additional_libs/config.xml @@ -61,11 +61,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/notebook_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/notebook_install_additional_libs/config.xml index 52f5aae..719035d 100644 --- a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/notebook_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/notebook_install_additional_libs/config.xml @@ -65,11 +65,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/dataengine_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/dataengine_install_additional_libs/config.xml index 9b3600e..abc6599 100644 --- a/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/dataengine_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/dataengine_install_additional_libs/config.xml @@ -61,11 +61,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/notebook_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/notebook_install_additional_libs/config.xml index 52f5aae..719035d 100644 --- a/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/notebook_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/azure/jenkins_jobs/notebook_install_additional_libs/config.xml @@ -65,11 +65,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine-service_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine-service_install_additional_libs/config.xml index 703803e..5ddce0c 100644 --- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine-service_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine-service_install_additional_libs/config.xml @@ -65,11 +65,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine_install_additional_libs/config.xml index 9b3600e..abc6599 100644 --- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/dataengine_install_additional_libs/config.xml @@ -61,11 +61,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/notebook_install_additional_libs/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/notebook_install_additional_libs/config.xml index 52f5aae..719035d 100644 --- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/notebook_install_additional_libs/config.xml +++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/notebook_install_additional_libs/config.xml @@ -65,11 +65,10 @@ under the License. [ {"group": "os_pkg", "name": "nmap"}, {"group": "os_pkg", "name": "htop"}, - {"group": "pip2", "name": "requests"}, {"group": "pip3", "name": "configparser"}, {"group": "r_pkg", "name": "rmarkdown"}, ] - Types: for OS - os_pkg, for Python - pip2/pip3, for R - r_pkg + Types: for OS - os_pkg, for Python - pip3, for R - r_pkg NOTE: You need to escape each double quote. For Example: {\"group\": \"os_pkg\", \"name\": \"htop\"} </description> diff --git a/integration-tests/examples/test_libs/deeplearning/lib_groups.json b/integration-tests/examples/test_libs/deeplearning/lib_groups.json index 0e8d040..b77b8c2 100644 --- a/integration-tests/examples/test_libs/deeplearning/lib_groups.json +++ b/integration-tests/examples/test_libs/deeplearning/lib_groups.json @@ -1,5 +1,4 @@ [ - "pip2", "pip3", "others", "os_pkg" diff --git a/integration-tests/examples/test_libs/deeplearning/lib_list.json b/integration-tests/examples/test_libs/deeplearning/lib_list.json index 8e6d23d..d360bd8 100644 --- a/integration-tests/examples/test_libs/deeplearning/lib_list.json +++ b/integration-tests/examples/test_libs/deeplearning/lib_list.json @@ -8,10 +8,6 @@ "start_with": "gh" }, { - "group": "pip2", - "start_with": "sp" - }, - { "group": "pip3", "start_with": "sp" } diff --git a/integration-tests/examples/test_libs/jupyter/lib_groups.json b/integration-tests/examples/test_libs/jupyter/lib_groups.json index 821acb6..87e47a5 100644 --- a/integration-tests/examples/test_libs/jupyter/lib_groups.json +++ b/integration-tests/examples/test_libs/jupyter/lib_groups.json @@ -1,5 +1,4 @@ [ - "pip2", "pip3", "others", "os_pkg", diff --git a/integration-tests/examples/test_libs/jupyter/lib_list.json b/integration-tests/examples/test_libs/jupyter/lib_list.json index 7986430..5590429 100644 --- a/integration-tests/examples/test_libs/jupyter/lib_list.json +++ b/integration-tests/examples/test_libs/jupyter/lib_list.json @@ -12,10 +12,6 @@ "start_with": "sp" }, { - "group": "pip2", - "start_with": "sp" - }, - { "group": "pip3", "start_with": "sp" } diff --git a/integration-tests/examples/test_libs/lib_groups.json b/integration-tests/examples/test_libs/lib_groups.json index 9c4e5f0..5cd7bfe 100644 --- a/integration-tests/examples/test_libs/lib_groups.json +++ b/integration-tests/examples/test_libs/lib_groups.json @@ -1,5 +1,4 @@ [ - "pip2", "pip3", "os_pkg", "r_pkg" diff --git a/integration-tests/examples/test_libs/rstudio/lib_groups.json b/integration-tests/examples/test_libs/rstudio/lib_groups.json index 821acb6..87e47a5 100644 --- a/integration-tests/examples/test_libs/rstudio/lib_groups.json +++ b/integration-tests/examples/test_libs/rstudio/lib_groups.json @@ -1,5 +1,4 @@ [ - "pip2", "pip3", "others", "os_pkg", diff --git a/integration-tests/examples/test_libs/rstudio/lib_list.json b/integration-tests/examples/test_libs/rstudio/lib_list.json index 7986430..5590429 100644 --- a/integration-tests/examples/test_libs/rstudio/lib_list.json +++ b/integration-tests/examples/test_libs/rstudio/lib_list.json @@ -12,10 +12,6 @@ "start_with": "sp" }, { - "group": "pip2", - "start_with": "sp" - }, - { "group": "pip3", "start_with": "sp" } diff --git a/integration-tests/examples/test_libs/tensor/lib_groups.json b/integration-tests/examples/test_libs/tensor/lib_groups.json index 0e8d040..b77b8c2 100644 --- a/integration-tests/examples/test_libs/tensor/lib_groups.json +++ b/integration-tests/examples/test_libs/tensor/lib_groups.json @@ -1,5 +1,4 @@ [ - "pip2", "pip3", "others", "os_pkg" diff --git a/integration-tests/examples/test_libs/tensor/lib_list.json b/integration-tests/examples/test_libs/tensor/lib_list.json index 8e6d23d..d360bd8 100644 --- a/integration-tests/examples/test_libs/tensor/lib_list.json +++ b/integration-tests/examples/test_libs/tensor/lib_list.json @@ -8,10 +8,6 @@ "start_with": "gh" }, { - "group": "pip2", - "start_with": "sp" - }, - { "group": "pip3", "start_with": "sp" } diff --git a/integration-tests/examples/test_libs/zeppelin/lib_groups.json b/integration-tests/examples/test_libs/zeppelin/lib_groups.json index 821acb6..87e47a5 100644 --- a/integration-tests/examples/test_libs/zeppelin/lib_groups.json +++ b/integration-tests/examples/test_libs/zeppelin/lib_groups.json @@ -1,5 +1,4 @@ [ - "pip2", "pip3", "others", "os_pkg", diff --git a/integration-tests/examples/test_libs/zeppelin/lib_list.json b/integration-tests/examples/test_libs/zeppelin/lib_list.json index 7986430..b443274 100644 --- a/integration-tests/examples/test_libs/zeppelin/lib_list.json +++ b/integration-tests/examples/test_libs/zeppelin/lib_list.json @@ -11,10 +11,7 @@ "group": "r_pkg", "start_with": "sp" }, - { - "group": "pip2", - "start_with": "sp" - }, + { "group": "pip3", "start_with": "sp" diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/LibraryGroups.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/LibraryGroups.java index 39ff924..3bc772c 100644 --- a/services/datalab-model/src/main/java/com/epam/datalab/dto/LibraryGroups.java +++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/LibraryGroups.java @@ -21,7 +21,6 @@ package com.epam.datalab.dto; public enum LibraryGroups { GROUP_JAVA("java"), - GROUP_PIP2("pip2"), GROUP_PIP3("pip3"), GROUP_R_PKG("r_pkg"), GROUP_OS_PKG("os_pkg"), diff --git a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_lib_list_pkgs.json b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_lib_list_pkgs.json index b0816fc..acc4568 100644 --- a/services/provisioning-service/src/main/resources/mock_response/aws/notebook_lib_list_pkgs.json +++ b/services/provisioning-service/src/main/resources/mock_response/aws/notebook_lib_list_pkgs.json @@ -5,11 +5,6 @@ "pyvcf/xenial": "0.6.7-2build1", "pyxplot/xenial": "0.9.2-6build1" }, - "pip2": { - "requests": "N/A", - "configparser": "N/A", - "SparseAce": "N/A" - }, "pip3": { "configparser": "N/A", "sparkL": "N/A" diff --git a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_lib_list_pkgs.json b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_lib_list_pkgs.json index b0816fc..acc4568 100644 --- a/services/provisioning-service/src/main/resources/mock_response/azure/notebook_lib_list_pkgs.json +++ b/services/provisioning-service/src/main/resources/mock_response/azure/notebook_lib_list_pkgs.json @@ -5,11 +5,6 @@ "pyvcf/xenial": "0.6.7-2build1", "pyxplot/xenial": "0.9.2-6build1" }, - "pip2": { - "requests": "N/A", - "configparser": "N/A", - "SparseAce": "N/A" - }, "pip3": { "configparser": "N/A", "sparkL": "N/A" diff --git a/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_lib_list_pkgs.json b/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_lib_list_pkgs.json index b0816fc..acc4568 100644 --- a/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_lib_list_pkgs.json +++ b/services/provisioning-service/src/main/resources/mock_response/gcp/notebook_lib_list_pkgs.json @@ -5,11 +5,6 @@ "pyvcf/xenial": "0.6.7-2build1", "pyxplot/xenial": "0.9.2-6build1" }, - "pip2": { - "requests": "N/A", - "configparser": "N/A", - "SparseAce": "N/A" - }, "pip3": { "configparser": "N/A", "sparkL": "N/A" diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java index ffc4c60..294621e 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java @@ -19,6 +19,11 @@ package com.epam.datalab.backendapi.domain; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor public enum NotebookTemplate { JUPYTER("Jupyter notebook 6.1.6"), JUPYTER_LAB("JupyterLab 0.35.6"), @@ -26,15 +31,9 @@ public enum NotebookTemplate { DEEP_LEARNING("Deep Learning 2.4"), TENSOR("Jupyter with TensorFlow 2.3.2"), TENSOR_RSTUDIO("RStudio with TensorFlow 2.3.2"), - RSTUDIO("RStudio 1.4.1103"); - - private String name; - - NotebookTemplate(String name) { - this.name = name; - } + RSTUDIO("RStudio 1.4.1103"), + TENSOR_GCP("Jupyter with TensorFlow 2.1.0"), + DEEP_LEARNING_GCP("Deeplearning notebook"); - public String getName() { - return name; - } + private final String name; } diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java index b66123b..418bf23 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImpl.java @@ -158,7 +158,7 @@ public class LibraryServiceImpl implements LibraryService { public List<String> getExploratoryLibGroups(UserInfo userInfo, String projectName, String exploratoryName) { UserInstanceDTO userInstanceDTO = exploratoryDAO.fetchExploratoryFields(userInfo.getName(), projectName, exploratoryName); final String templateName = userInstanceDTO.getTemplateName(); - List<LibraryGroups> groups = new ArrayList<>(Arrays.asList(GROUP_PIP2, GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG)); + List<LibraryGroups> groups = new ArrayList<>(Arrays.asList(GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG)); if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN))) { groups.addAll(Arrays.asList(GROUP_R_PKG, GROUP_JAVA)); @@ -169,6 +169,9 @@ public class LibraryServiceImpl implements LibraryService { if (isTemplateGroup(templateName, Stream.of(RSTUDIO, TENSOR_RSTUDIO))) { groups.add(GROUP_R_PKG); } + if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING_GCP, TENSOR_GCP))) { + groups.add(GROUP_JAVA); + } return groups .stream() diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImplTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImplTest.java index 80c0327..af5dc5a 100644 --- a/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/service/impl/LibraryServiceImplTest.java @@ -79,7 +79,6 @@ public class LibraryServiceImplTest { private final String COMPUTATIONAL_NAME = "compName"; private static final String GROUP_JAVA = "java"; - private static final String GROUP_PIP2 = "pip2"; private static final String GROUP_PIP3 = "pip3"; private static final String GROUP_R_PKG = "r_pkg"; private static final String GROUP_OS_PKG = "os_pkg"; @@ -366,7 +365,7 @@ public class LibraryServiceImplTest { @Test public void getExploratoryJupyterLibGroups() { - List<Object> exploratoryGroups = Arrays.asList(GROUP_PIP2, GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG, GROUP_R_PKG, GROUP_JAVA); + List<Object> exploratoryGroups = Arrays.asList(GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG, GROUP_R_PKG, GROUP_JAVA); when(exploratoryDAO.fetchExploratoryFields(anyString(), anyString(), anyString())).thenReturn(getJupyterUserInstanceDtoForLibGroups()); List<String> exploratoryGroupsResult = libraryService.getExploratoryLibGroups(getUser(), PROJECT, EXPLORATORY_NAME); @@ -377,7 +376,7 @@ public class LibraryServiceImplTest { @Test public void getExploratoryRstudioLibGroups() { - List<Object> exploratoryGroups = Arrays.asList(GROUP_PIP2, GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG, GROUP_R_PKG); + List<Object> exploratoryGroups = Arrays.asList(GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG, GROUP_R_PKG); when(exploratoryDAO.fetchExploratoryFields(anyString(), anyString(), anyString())).thenReturn(getRstudioUserInstanceDtoForLibGroups()); List<String> exploratoryGroupsResult = libraryService.getExploratoryLibGroups(getUser(), PROJECT, EXPLORATORY_NAME); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
