You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/03/12 11:36:58 UTC
[incubator-dlab] branch DLAB-1615 updated (ac6b3a7 -> d16f579)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1615
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
omit ac6b3a7 [DLAB-1615]: Added some billing values on UI
add a72d83d [DLAB-1546]: added name convention changes
add d1d33c1 [DLAB-1546]: added name convention changes
add 1a91f08 [DLAB-1546]: added name convention changes
add 438ef06 [DLAB-1546]: added name convention changes
add 4eccb95 [DLAB-1546]: added name convention changes
add d43e92f [DLAB-1546]: added name convention changes
add a319ef9 [DLAB-1546]: added name convention changes
add 88b7c21 [DLAB-1546]: added name convention changes
add e22fed8 [DLAB-1546]: added name convention changes
add 054af0f [DLAB-1546]: added name convention changes
add dcef057 [DLAB-1546]: added name convention changes
add e8dc4ad [DLAB-1546]: added name convention changes
add a4798b1 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add 4bf39e9 [DLAB-1546]: added name convention changes
add faa4f12 [DLAB-1546]: added name convention changes
add feba37c [DLAB-1546]: added name convention changes
add c098a7a [DLAB-1546]: added name convention changes
add 2ef159f [DLAB-1546]: added name convention changes
add 52b6642 [DLAB-1546]: added name convention changes
add 30389c9 [DLAB-1546]: added name convention changes
add 881bb4e [DLAB-1546]: added name convention changes
add defd3d5 [DLAB-1546]: added name convention changes
add eb4f7f7 [DLAB-1546]: added name convention changes
add d609425 [DLAB-1546]: added name convention changes
add 812c8c8 [DLAB-1546]: added name convention changes
add 5375125 [DLAB-1546]: added name convention changes
add 0d58ec2 [DLAB-1546]: added name convention changes
add 1cf6c14 [DLAB-1546]: added name convention changes
add e7399ab [DLAB-1546]: added name convention changes
add 7465e6d [DLAB-1546]: added name convention changes
add 66778c7 [DLAB-1546]: added name convention changes
add 0742f2c [DLAB-1546]: added name convention changes
add 40fdff7 [DLAB-1546]: added name convention changes
add bbea296 [DLAB-1546]: added name convention changes
add 749b31d [DLAB-1546]: added name convention changes
add fa9bafb [DLAB-1546]: added name convention changes
add bdda302 [DLAB-1546]: added name convention changes
add 5c64fa1 Added endpoint name while stopping dataengine
add 77ac1ef Added endpoint name for some action
add d37f095 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add dbd4a08 [DLAB-1546]: added name convention changes
add 866c6d9 Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 71520e1 [DLAB-1546]: added name convention changes
add 78ee925 [DLAB-1546]: added name convention changes
add 93d85d0 [DLAB-1546]: added name convention changes
add ee708a2 [DLAB-1546]: added name convention changes
add 790de25 [DLAB-1546]: added name convention changes
add 8dca3f4 [DLAB-1546]: added name convention changes
add 557ac99 [DLAB-1546]: added name convention changes
add 323087b [DLAB-1546]: added name convention changes
add e7aeca5 [DLAB-1546]: added name convention changes
add a3112d0 [DLAB-1546]: added name convention changes
add 8f04434 [DLAB-1546]: added name convention changes
add 87d4897 [DLAB-1546]: added name convention changes
add cad6bee [DLAB-1546]: added name convention changes
add e7b0448 [DLAB-1546]: added name convention changes
add 1910739 [DLAB-1546]: added name convention changes
add 8b2f231 [DLAB-1546]: added name convention changes
add 538862f [DLAB-1546]: added name convention changes
add a946003 [DLAB-1546]: added name convention changes
add a1c7dc9 [DLAB-1546]: added name convention changes
add 1bfc7b6 [DLAB-1604] Make Cluster name unique per project
add 865f70e Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 7bfdc29 [DLAB-1546]: added name convention changes
add 21e893b Made cluster name unique per project
add 3819859 Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 3e5b854 Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 6ebf686 [DLAB-1546]: added name convention changes
add 30045cd [DLAB-1609]: Conveyed 'Resource Type' value to UI (#635)
add f778f0c [DlAB-1520] Filter the projects with terminated nodes (#633)
add a7c9a81 DLAB-1539 added check if custom tag is defined
add 1a0355b [DLAB-1539]: changed if statement for custom tag
add 96f901f [DLAB-1539]: changed how additional labels are assigned
add 1e1d4fa Merge pull request #636 from apache/DLAB-1539
add 23ec629 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add 4d38f8a [DLAB-1546]: added name convention changes
add a01a871 [DLAB-1546]: added name convention changes
add 83eda03 [DLAB-1546]: added name convention changes
add cce0632 [DLAB-1546]: added name convention changes
add 908dde5 [DLAB-1546]: added name convention changes
add ab54d3d [DLAB-1546]: added name convention changes
add 5f36ea7 [DLAB-1546]: added name convention changes
add 5b16989 [DLAB-1546]: added name convention changes
add bfd561e [DLAB-1546]: added name convention changes
add 1127431 [DLAB-1546]: added name convention changes
add 29ba942 [DLAB-1612]: added replacement of uppercase letters and underscores in additional tags
add da9034c [DLAB-1612]: changed formatting
add 30887f7 [DLAB-1612]: changed formatting and removed unnecessary if statement
add 64c9828 Merge pull request #637 from apache/DLAB-1612
add c6d35ee [DLAB-1615]: Added some billing values on UI (#640)
add 71c38dc [DLAB-1524] The endpoints field verification (#639)
add 01927e5 [DLAB-1541] Added project name as a unique part of the exploratory
add 349897e [DLAB-1541]: Changed routes on UI
add 08f1dc3 [DLAB-1541] Fixed bugs with libs and comp resource statuses
add 6695fe7 [DLAB-1586] Stopping/starting/terminating statuses of notebook conveyed to DLab UI
add b04499f [DLAB-1585]: Fixed creation computational resources with the same name for second project
add 082e5f4 Merge remote-tracking branch 'origin/DLAB-1541' into DLAB-1541
add 37f9cdf Merge branch 'DLAB-1541' into develop
add 6c04b0d Fixed tests
add e2aa6f9 [DLAB-384]: Grouped roles (#642)
add df0024a Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add d2ba8b7 Merge pull request #643 from apache/DLAB-1546
add cfe31ee fixed issue with edge node creation
add b875ef8 Merge pull request #644 from apache/azure-edge-fix
add c320d80 [DLAB-1555] The warning message is adjusted (#641)
add d8dda87 [DLAB-1622]: Fixed issue with storage and container name in Azure
add c532673 Merge pull request #645 from apache/DLAB-1622
add b214643 Dlab 1618 (#646)
add 152dde0 [DLAB-1618]: Adjusted role page according to requirements (#648)
new d16f579 [DLAB-1615]: Added service value to billing Azure
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ac6b3a7)
\
N -- N -- N refs/heads/DLAB-1615 (d16f579)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../scripts/configure_deep_learning_node.py | 4 +-
infrastructure-provisioning/src/edge/fabfile.py | 76 --
.../src/general/lib/aws/actions_lib.py | 60 +-
.../src/general/lib/azure/actions_lib.py | 45 +-
.../src/general/lib/gcp/actions_lib.py | 14 +-
.../src/general/lib/gcp/meta_lib.py | 19 +-
.../src/general/lib/os/fab.py | 15 +-
.../scripts/aws/common_create_notebook_image.py | 48 +-
.../general/scripts/aws/common_create_policy.py | 14 +-
.../general/scripts/aws/common_create_subnet.py | 2 +-
.../scripts/aws/common_download_git_certfile.py | 2 +-
...common_notebook_configure_dataengine-service.py | 109 ++-
.../aws/common_notebook_configure_dataengine.py | 73 +-
.../general/scripts/aws/common_prepare_notebook.py | 173 ++--
.../general/scripts/aws/common_start_notebook.py | 39 +-
.../general/scripts/aws/common_stop_notebook.py | 44 +-
.../scripts/aws/common_terminate_notebook.py | 35 +-
.../scripts/aws/common_terminate_notebook_image.py | 17 +-
.../scripts/aws/dataengine-service_configure.py | 198 ++--
.../scripts/aws/dataengine-service_prepare.py | 257 +++---
.../scripts/aws/dataengine-service_terminate.py | 35 +-
.../general/scripts/aws/dataengine_configure.py | 254 +++---
.../src/general/scripts/aws/dataengine_prepare.py | 156 ++--
.../src/general/scripts/aws/dataengine_start.py | 44 +-
.../src/general/scripts/aws/dataengine_stop.py | 28 +-
.../general/scripts/aws/dataengine_terminate.py | 39 +-
.../general/scripts/aws/deeplearning_configure.py | 318 +++----
.../src/general/scripts/aws/edge_configure.py | 278 +++---
.../src/general/scripts/aws/edge_start.py | 31 +-
.../src/general/scripts/aws/edge_status.py | 23 +-
.../src/general/scripts/aws/edge_stop.py | 26 +-
.../src/general/scripts/aws/jupyter_configure.py | 316 +++----
.../general/scripts/aws/jupyterlab_configure.py | 306 ++++---
.../src/general/scripts/aws/project_prepare.py | 432 ++++-----
.../src/general/scripts/aws/project_terminate.py | 111 ++-
.../src/general/scripts/aws/rstudio_configure.py | 314 +++----
.../src/general/scripts/aws/ssn_configure.py | 428 ++++-----
.../src/general/scripts/aws/ssn_prepare.py | 713 ++++++++-------
.../src/general/scripts/aws/ssn_terminate.py | 33 +-
.../scripts/aws/ssn_terminate_aws_resources.py | 100 ++-
.../scripts/aws/tensor-rstudio_configure.py | 338 +++----
.../src/general/scripts/aws/tensor_configure.py | 324 +++----
.../src/general/scripts/aws/zeppelin_configure.py | 326 +++----
.../scripts/azure/common_create_instance.py | 2 +-
.../scripts/azure/common_create_notebook_image.py | 78 +-
.../scripts/azure/common_download_git_certfile.py | 6 +-
.../azure/common_notebook_configure_dataengine.py | 84 +-
.../scripts/azure/common_prepare_notebook.py | 103 ++-
.../general/scripts/azure/common_start_notebook.py | 53 +-
.../general/scripts/azure/common_stop_notebook.py | 43 +-
.../scripts/azure/common_terminate_notebook.py | 41 +-
.../azure/common_terminate_notebook_image.py | 18 +-
.../general/scripts/azure/dataengine_configure.py | 224 ++---
.../general/scripts/azure/dataengine_prepare.py | 103 +--
.../src/general/scripts/azure/dataengine_start.py | 52 +-
.../src/general/scripts/azure/dataengine_stop.py | 44 +-
.../general/scripts/azure/dataengine_terminate.py | 48 +-
.../scripts/azure/deeplearning_configure.py | 173 ++--
.../src/general/scripts/azure/edge_configure.py | 357 +++-----
.../src/general/scripts/azure/edge_prepare.py | 6 +-
.../src/general/scripts/azure/edge_start.py | 36 +-
.../src/general/scripts/azure/edge_status.py | 23 +-
.../src/general/scripts/azure/edge_stop.py | 26 +-
.../src/general/scripts/azure/edge_terminate.py | 86 +-
.../src/general/scripts/azure/jupyter_configure.py | 204 ++---
.../general/scripts/azure/jupyterlab_configure.py | 185 ++--
.../src/general/scripts/azure/project_prepare.py | 364 ++++----
.../src/general/scripts/azure/project_terminate.py | 93 +-
.../src/general/scripts/azure/rstudio_configure.py | 183 ++--
.../src/general/scripts/azure/ssn_configure.py | 227 ++---
.../src/general/scripts/azure/ssn_prepare.py | 170 ++--
.../src/general/scripts/azure/ssn_terminate.py | 93 +-
.../src/general/scripts/azure/tensor_configure.py | 181 ++--
.../general/scripts/azure/zeppelin_configure.py | 187 ++--
...common_notebook_configure_dataengine-service.py | 93 +-
.../gcp/common_notebook_configure_dataengine.py | 84 +-
.../general/scripts/gcp/common_prepare_notebook.py | 274 +++---
.../general/scripts/gcp/common_start_notebook.py | 30 +-
.../general/scripts/gcp/common_stop_notebook.py | 48 +-
.../scripts/gcp/common_terminate_notebook.py | 42 +-
.../scripts/gcp/dataengine-service_configure.py | 142 +--
.../scripts/gcp/dataengine-service_create.py | 2 +-
.../scripts/gcp/dataengine-service_prepare.py | 172 ++--
.../scripts/gcp/dataengine-service_terminate.py | 43 +-
.../general/scripts/gcp/dataengine_configure.py | 199 ++---
.../src/general/scripts/gcp/dataengine_prepare.py | 297 +++---
.../src/general/scripts/gcp/dataengine_start.py | 57 +-
.../src/general/scripts/gcp/dataengine_stop.py | 47 +-
.../general/scripts/gcp/dataengine_terminate.py | 53 +-
.../general/scripts/gcp/deeplearning_configure.py | 288 +++---
.../src/general/scripts/gcp/edge_configure.py | 331 ++++---
.../src/general/scripts/gcp/edge_start.py | 35 +-
.../src/general/scripts/gcp/edge_stop.py | 28 +-
.../src/general/scripts/gcp/edge_terminate.py | 92 +-
.../src/general/scripts/gcp/jupyter_configure.py | 262 +++---
.../general/scripts/gcp/jupyterlab_configure.py | 299 +++----
.../src/general/scripts/gcp/project_prepare.py | 442 ++++-----
.../src/general/scripts/gcp/project_terminate.py | 109 ++-
.../src/general/scripts/gcp/rstudio_configure.py | 275 +++---
.../src/general/scripts/gcp/ssn_configure.py | 212 ++---
.../src/general/scripts/gcp/ssn_prepare.py | 229 ++---
.../src/general/scripts/gcp/ssn_terminate.py | 28 +-
.../src/general/scripts/gcp/superset_configure.py | 303 ++++---
.../scripts/gcp/tensor-rstudio_configure.py | 287 +++---
.../src/general/scripts/gcp/tensor_configure.py | 277 +++---
.../src/general/scripts/gcp/zeppelin_configure.py | 261 +++---
.../general/scripts/os/common_clean_instance.py | 24 +-
.../general/scripts/os/dataengine_install_libs.py | 2 +-
.../src/general/scripts/os/dataengine_list_libs.py | 2 +-
.../scripts/os/dataengine_reconfigure_spark.py | 2 +-
.../src/general/scripts/os/notebook_git_creds.py | 4 +-
.../scripts/os/notebook_inactivity_check.py | 4 +-
.../general/scripts/os/notebook_install_libs.py | 4 +-
.../src/general/scripts/os/notebook_list_libs.py | 4 +-
.../scripts/os/notebook_reconfigure_spark.py | 2 +-
.../src/general/templates/os/renew_certificates.sh | 2 +-
.../src/jupyter/scripts/configure_jupyter_node.py | 4 +-
.../scripts/configure_jupyterlab_node.py | 4 +-
infrastructure-provisioning/src/project/fabfile.py | 7 -
.../src/rstudio/scripts/configure_rstudio_node.py | 4 +-
.../superset/scripts/configure_superset_node.py | 4 +-
.../scripts/configure_tensor-rstudio_node.py | 4 +-
.../src/tensor/scripts/configure_tensor_node.py | 4 +-
.../zeppelin/scripts/configure_zeppelin_node.py | 4 +-
.../aws/computational_resources/modules/ami/ami.tf | 2 +-
.../computational_resources/modules/common/iam.tf | 2 +-
.../modules/common/network.tf | 4 +-
.../modules/data_engine/instance.tf | 4 +-
.../modules/emr/instance.tf | 2 +-
.../modules/notebook/instance.tf | 2 +-
.../terraform/aws/endpoint/main/bucket.tf | 37 +
.../terraform/aws/endpoint/main/iam.tf | 2 +-
.../terraform/aws/endpoint/main/instance.tf | 2 +-
.../terraform/aws/endpoint/main/network.tf | 18 +-
.../terraform/aws/project/main/iam.tf | 4 +-
.../terraform/aws/project/main/instance.tf | 2 +-
.../terraform/aws/project/main/network.tf | 8 +-
.../aws/ssn-k8s/main/auto_scaling_groups.tf | 8 +-
.../terraform/aws/ssn-k8s/main/lb.tf | 6 +-
.../terraform/aws/ssn-k8s/main/role_policy.tf | 2 +-
.../terraform/aws/ssn-k8s/main/s3.tf | 2 +-
.../terraform/aws/ssn-k8s/main/security_groups.tf | 2 +-
.../terraform/aws/ssn-k8s/main/vpc.tf | 18 +-
.../modules/data_engine/instance.tf | 4 +-
.../modules/notebook/instance.tf | 4 +-
.../terraform/azure/endpoint/main/bucket.tf | 53 ++
.../terraform/azure/endpoint/main/instance.tf | 4 +-
.../terraform/azure/endpoint/main/main.tf | 7 +-
.../terraform/azure/endpoint/main/network.tf | 10 +-
.../terraform/azure/endpoint/main/outputs.tf | 8 +
.../terraform/azure/project/main/instance.tf | 2 +-
.../terraform/bin/deploy/endpoint_fab.py | 3 +-
infrastructure-provisioning/terraform/bin/dlab.py | 4 +-
.../terraform/gcp/endpoint/main/bucket.tf | 36 +
.../terraform/gcp/endpoint/main/network.tf | 4 +-
.../terraform/gcp/ssn-gke/main/modules/gke/gke.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/gke/vpc.tf | 4 +-
.../dlab/automation/cloud/aws/AmazonHelper.java | 2 +-
.../java/com/epam/dlab/dto/StatusEnvBaseDTO.java | 14 +
.../handlers/ComputationalCallbackHandler.java | 5 +-
.../ComputationalConfigureCallbackHandler.java | 1 +
.../handlers/ExploratoryCallbackHandler.java | 8 +-
.../handlers/LibInstallCallbackHandler.java | 5 +-
.../resources/base/ExploratoryService.java | 2 +-
.../aws/dataengine-service_configure.json | 2 +-
.../resources/mock_response/aws/edge_create.json | 2 +-
.../mock_response/aws/notebook_start.json | 2 +-
.../resources/mock_response/aws/notebook_stop.json | 2 +-
.../mock_response/aws/notebook_terminate.json | 2 +-
.../azure/dataengine-service_configure.json | 2 +-
.../resources/mock_response/azure/edge_create.json | 2 +-
.../mock_response/azure/notebook_start.json | 2 +-
.../mock_response/azure/notebook_stop.json | 2 +-
.../mock_response/azure/notebook_terminate.json | 2 +-
.../gcp/dataengine-service_configure.json | 2 +-
.../core/commands/CommandExecutorMockTest.java | 2 +-
.../epam/dlab/backendapi/dao/ComputationalDAO.java | 182 ++--
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 74 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 158 +---
.../dlab/backendapi/dao/ExploratoryLibDAO.java | 60 +-
.../com/epam/dlab/backendapi/dao/IndexCreator.java | 7 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 36 +-
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 2 +
.../dlab/backendapi/domain/CreateProjectDTO.java | 2 +-
.../epam/dlab/backendapi/domain/EndpointDTO.java | 6 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java | 2 +-
.../backendapi/resources/EnvironmentResource.java | 64 +-
.../backendapi/resources/ExploratoryResource.java | 29 +-
.../resources/ImageExploratoryResource.java | 18 +-
.../resources/LibExploratoryResource.java | 31 +-
.../backendapi/resources/SchedulerJobResource.java | 31 +-
.../resources/aws/ComputationalResourceAws.java | 36 +-
.../azure/ComputationalResourceAzure.java | 58 +-
.../callback/CheckInactivityCallback.java | 5 +-
.../resources/callback/ComputationalCallback.java | 15 +-
.../callback/EnvironmentStatusCallback.java | 4 +-
.../resources/callback/ExploratoryCallback.java | 26 +-
...tePopUp.java => ComputationalTemplatesDTO.java} | 14 +-
.../dto/ExploratoryImageCreateFormDTO.java | 16 +-
.../resources/dto/LibInstallFormDTO.java | 3 +
.../resources/dto/SearchLibsFormDTO.java | 4 +
.../dlab/backendapi/resources/dto/UserRoleDto.java | 10 +-
.../resources/gcp/ComputationalResourceGcp.java | 44 +-
.../backendapi/service/ComputationalService.java | 21 +-
.../backendapi/service/EnvironmentService.java | 11 -
.../backendapi/service/ExploratoryService.java | 26 +-
.../service/ImageExploratoryService.java | 10 +-
.../dlab/backendapi/service/InactivityService.java | 8 +-
.../dlab/backendapi/service/LibraryService.java | 10 +-
.../backendapi/service/SchedulerJobService.java | 106 +--
.../service/impl/ComputationalServiceImpl.java | 158 ++--
.../service/impl/EnvironmentServiceImpl.java | 32 +-
.../service/impl/ExploratoryServiceImpl.java | 115 +--
.../service/impl/ImageExploratoryServiceImpl.java | 10 +-
.../service/impl/InactivityServiceImpl.java | 4 +-
.../service/impl/LibraryServiceImpl.java | 50 +-
.../service/impl/ProjectServiceImpl.java | 16 +-
.../service/impl/ReuploadKeyServiceImpl.java | 66 +-
.../service/impl/SchedulerJobServiceImpl.java | 81 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 35 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 26 +
.../manage-environment-dilog.component.html | 2 +-
.../management-grid/management-grid.component.html | 3 +-
.../management/management.component.html | 2 +-
.../administration/project/project-data.service.ts | 9 +-
.../app/administration/roles/roles.component.html | 84 +-
.../app/administration/roles/roles.component.scss | 29 +-
.../app/administration/roles/roles.component.ts | 113 ++-
.../services/applicationServiceFacade.service.ts | 9 +
.../services/dataengineConfiguration.service.ts | 16 +-
.../core/services/librariesInstallation.service.ts | 12 +-
.../src/app/core/services/scheduler.service.ts | 8 +-
.../src/app/core/services/userResource.service.ts | 12 +-
.../reporting-grid/reporting-grid.component.html | 2 +-
.../src/app/reporting/reporting.component.ts | 8 +-
.../cluster-details/cluster-details.component.ts | 4 +-
...utational-resource-create-dialog.component.html | 9 +-
...mputational-resource-create-dialog.component.ts | 30 +-
.../computational-resources-list.component.scss | 25 +-
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.ts | 3 +-
.../detail-dialog/detail-dialog.component.ts | 4 +-
.../install-libraries.component.ts | 4 +-
.../install-libraries/install-libraries.model.ts | 9 +-
.../resources-grid/resources-grid.component.ts | 8 +-
.../app/resources/scheduler/scheduler.component.ts | 23 +-
.../src/app/resources/scheduler/scheduler.model.ts | 12 +-
.../webapp/src/app/shared/form-controls/index.ts | 5 +-
.../multi-level-select-dropdown.component.html} | 27 +-
.../multi-level-select-dropdown.component.scss} | 80 +-
.../multi-level-select-dropdown.component.ts | 101 +++
.../confirmation-dialog.component.html | 10 +-
.../confirmation-dialog.component.scss | 3 +
.../resources/webapp/src/assets/styles/_theme.scss | 6 +
.../resources/EnvironmentResourceTest.java | 256 +-----
.../resources/ExploratoryResourceTest.java | 57 +-
.../resources/ImageExploratoryResourceTest.java | 25 +-
.../resources/LibExploratoryResourceTest.java | 602 +++++++------
.../resources/SchedulerJobResourceTest.java | 383 ++++----
.../service/impl/ComputationalServiceImplTest.java | 993 +++++++++++----------
.../service/impl/EnvironmentServiceImplTest.java | 124 +--
.../service/impl/ExploratoryServiceImplTest.java | 586 ++++++------
.../impl/ImageExploratoryServiceImplTest.java | 61 +-
.../service/impl/LibraryServiceImplTest.java | 464 +++++-----
.../service/impl/ReuploadKeyServiceImplTest.java | 49 +-
.../service/impl/SchedulerJobServiceImplTest.java | 250 +++---
267 files changed, 10953 insertions(+), 10764 deletions(-)
create mode 100644 infrastructure-provisioning/terraform/aws/endpoint/main/bucket.tf
create mode 100644 infrastructure-provisioning/terraform/azure/endpoint/main/bucket.tf
create mode 100644 infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{ExploratoryCreatePopUp.java => ComputationalTemplatesDTO.java} (73%)
copy services/self-service/src/main/resources/webapp/src/app/shared/form-controls/{multi-select-dropdown/multi-select-dropdown.component.html => multi-level-select-dropdown/multi-level-select-dropdown.component.html} (57%)
copy services/self-service/src/main/resources/webapp/src/app/shared/form-controls/{dropdowns.component.scss => multi-level-select-dropdown/multi-level-select-dropdown.component.scss} (79%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1615]: Added service value to billing
Azure
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1615
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d16f579e5508bb29fc6451bc338e4db97f2af12f
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Mar 12 13:34:43 2020 +0200
[DLAB-1615]: Added service value to billing Azure
---
.../src/app/reporting/reporting-grid/reporting-grid.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index d7827fa..932bd3e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -123,7 +123,7 @@
</button>
</th>
<td mat-cell *matCellDef="let element">
- <span *ngIf="element.service">{{ element.service }}</span>
+ <span *ngIf="element[DICTIONARY[PROVIDER].billing.service]">{{ element[DICTIONARY[PROVIDER].billing.service] }}</span>
</td>
<td mat-footer-cell *matFooterCellDef class="table-footer"></td>
</ng-container>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org