You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2020/05/13 13:36:01 UTC
[incubator-dlab] branch DLAB-515-odahu created (now 920c841)
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a change to branch DLAB-515-odahu
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 920c841 [odahu-integration] Bugfix
This branch includes the following new commits:
new f544365 [odahu-integration] Bugfix
new 05006c3 Merge branch 'odahu-integration' into DLAB-515-odahu
new 920c841 [odahu-integration] Bugfix
The 3 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: [odahu-integration] Bugfix
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-515-odahu
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f544365906d4f5463b3a5be47c00311612ab279d
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Mon May 4 11:35:42 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py b/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
index 1324b4b..ca53067 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
tag = {"Key": '{}-Tag'.format(odahu_conf['service_base_name']),
"Value": "{}-{}-subnet".format(odahu_conf['service_base_name'], odahu_conf['project_name'])}
- odahu_conf['private_subnet_cidr'] = get_subnet_by_tag(tag)
+ odahu_conf['private_subnet_cidr'] = dlab.meta_lib.get_subnet_by_tag(tag)
odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
odahu_conf['grafana_pass'] = id_generator()
odahu_conf['docker_password'] = base64.b64decode(os.environ['odahu_docker_password'] + "==")
diff --git a/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
index 72e38d4..d7b5358 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
@@ -48,8 +48,8 @@ if __name__ == "__main__":
odahu_conf['tag_name'] = '{}-tag'.format(odahu_conf['service_base_name'])
odahu_conf['endpoint_tag'] = (os.environ['endpoint_name']).lower().replace('_', '-')
odahu_conf['project_tag'] = (os.environ['project_name']).lower().replace('_', '-')
- odahu_conf['region'] = os.environ['gcp_region']
- odahu_conf['ssn_subnet_id'] = os.environ['ssn_subnet_id']
+ odahu_conf['region'] = os.environ['aws_region']
+ odahu_conf['ssn_subnet_id'] = os.environ['aws_subnet_id']
odahu_conf['bucket_name'] = "{}-tfstate".format(odahu_conf['cluster_name'])
odahu_conf['static_address_name'] = "{}-nat-gw".format(odahu_conf['cluster_name'])
odahu_conf['keycloak_auth_server_url'] = os.environ['keycloak_auth_server_url']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: [odahu-integration] Bugfix
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-515-odahu
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 920c841a1c2f6191639fee32dfe59610b272fe7d
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Wed May 13 16:35:39 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py b/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
index ca53067..73ad8c0 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
@@ -41,7 +41,7 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
odahu_conf = dict()
odahu_conf['allowed_cidr'] = os.environ['odahu_allowed_cidr'].split(',')
- odahu_conf['project_id'] = (os.environ['gcp_project_id'])
+ odahu_conf['project_id'] = (os.environ['aws_project_id'])
odahu_conf['region'] = (os.environ['aws_region'])
odahu_conf['zone'] = (os.environ['aws_zone'])
odahu_conf['edge_user_name'] = os.environ['edge_user_name']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: Merge branch 'odahu-integration' into
DLAB-515-odahu
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-515-odahu
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 05006c32cbfaf2c9944c3c7eddc3c05246f96026
Merge: 1428f9a f544365
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Wed May 13 16:27:18 2020 +0300
Merge branch 'odahu-integration' into DLAB-515-odahu
# Conflicts:
# infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
infrastructure-provisioning/scripts/deploy_dlab.py | 14 +
.../src/general/api/create.py | 8 +
.../src/general/api/start.py | 22 +-
.../src/general/api/stop.py | 21 +-
.../src/general/api/terminate.py | 8 +
.../src/general/conf/dlab.ini | 93 +++++-
.../src/general/files/aws/odahu_Dockerfile | 85 ++++++
.../src/general/files/aws/odahu_description.json | 8 +
.../general/files/gcp/jupyterlab_description.json | 2 +-
.../src/general/files/gcp/odahu_Dockerfile | 85 ++++++
.../src/general/files/gcp/odahu_description.json | 8 +
.../src/general/files/gcp/ssn_policy.json | 20 +-
.../src/general/files/gcp/ssn_roles.json | 4 +-
.../src/general/lib/aws/actions_lib.py | 18 ++
.../src/general/lib/gcp/actions_lib.py | 15 +-
.../src/general/lib/gcp/meta_lib.py | 22 ++
.../src/general/lib/os/fab.py | 1 +
.../src/general/scripts/aws/odahu_deploy.py | 293 +++++++++++++++++++
.../src/general/scripts/aws/odahu_prepare.py | 158 ++++++++++
.../src/general/scripts/aws/odahu_resume.py | 289 +++++++++++++++++++
.../src/general/scripts/aws/odahu_suspend.py | 287 ++++++++++++++++++
.../src/general/scripts/aws/odahu_terminate.py | 307 ++++++++++++++++++++
.../src/general/scripts/aws/project_terminate.py | 7 +
.../src/general/scripts/aws/ssn_configure.py | 7 +-
.../scripts/azure/common_create_notebook_image.py | 4 +-
.../scripts/azure/deeplearning_configure.py | 4 +-
.../src/general/scripts/azure/edge_configure.py | 8 +-
.../src/general/scripts/azure/jupyter_configure.py | 4 +-
.../general/scripts/azure/jupyterlab_configure.py | 4 +-
.../src/general/scripts/azure/project_terminate.py | 11 +
.../src/general/scripts/azure/rstudio_configure.py | 4 +-
.../src/general/scripts/azure/tensor_configure.py | 4 +-
.../general/scripts/azure/zeppelin_configure.py | 4 +-
.../scripts/gcp/common_terminate_notebook.py | 2 +-
.../general/scripts/gcp/deeplearning_configure.py | 4 +-
.../src/general/scripts/gcp/jupyter_configure.py | 4 +-
.../general/scripts/gcp/jupyterlab_configure.py | 4 +-
.../src/general/scripts/gcp/odahu_deploy.py | 319 +++++++++++++++++++++
.../src/general/scripts/gcp/odahu_prepare.py | 142 +++++++++
.../src/general/scripts/gcp/odahu_resume.py | 300 +++++++++++++++++++
.../src/general/scripts/gcp/odahu_suspend.py | 298 +++++++++++++++++++
.../src/general/scripts/gcp/odahu_terminate.py | 318 ++++++++++++++++++++
.../src/general/scripts/gcp/rstudio_configure.py | 4 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 +-
.../src/general/scripts/gcp/superset_configure.py | 4 +-
.../scripts/gcp/tensor-rstudio_configure.py | 4 +-
.../src/general/scripts/gcp/tensor_configure.py | 4 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 4 +-
infrastructure-provisioning/src/odahu/fabfile.py | 98 +++++++
.../src/odahu/templates/profile.json | 73 +++++
.../src/ssn/files/aws/mongo_roles.json | 3 +-
.../src/ssn/files/azure/mongo_roles.json | 3 +-
.../src/ssn/files/gcp/mongo_roles.json | 3 +-
.../src/ssn/scripts/configure_docker.py | 31 ++
.../src/ssn/scripts/configure_ssn_node.py | 3 +-
.../src/ssn/templates/daemon.json | 5 +
.../main/java/com/epam/dlab/dto/ResourceURL.java | 2 +
.../com/epam/dlab/dto/base/odahu/OdahuResult.java} | 51 ++--
.../dlab/dto/exploratory/ExploratoryImageDTO.java | 7 +
.../ActionOdahuDTO.java} | 34 ++-
.../CreateOdahuDTO.java} | 26 +-
.../java/com/epam/dlab/model/ResourceEnum.java | 3 +-
services/provisioning-service/provisioning.yml | 2 +-
.../backendapi/ProvisioningServiceApplication.java | 1 +
...rovisioningServiceApplicationConfiguration.java | 2 +-
.../core/commands/CommandExecutorMockAsync.java | 2 +-
.../response/handlers/OdahuCallbackHandler.java | 94 ++++++
.../dlab/backendapi/modules/ProductionModule.java | 3 +
.../backendapi/modules/ProvisioningDevModule.java | 6 +-
.../dlab/backendapi/resources/OdahuResource.java | 70 +++++
.../dlab/backendapi/service/OdahuService.java} | 15 +-
.../backendapi/service/impl/OdahuServiceImpl.java | 115 ++++++++
.../resources/mock_response/aws/odahu_create.json | 23 ++
.../resources/mock_response/aws/odahu_start.json | 9 +
.../resources/mock_response/aws/odahu_stop.json | 9 +
.../mock_response/aws/odahu_terminate.json | 9 +
.../mock_response/azure/odahu_create.json | 23 ++
.../resources/mock_response/azure/odahu_start.json | 9 +
.../resources/mock_response/azure/odahu_stop.json | 9 +
.../mock_response/azure/odahu_terminate.json | 9 +
.../resources/mock_response/gcp/odahu_create.json | 23 ++
.../resources/mock_response/gcp/odahu_start.json | 9 +
.../resources/mock_response/gcp/odahu_stop.json | 9 +
.../mock_response/gcp/odahu_terminate.json | 9 +
.../dlab/backendapi/SelfServiceApplication.java | 2 +
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 8 +-
.../OdahuDAO.java} | 25 +-
.../com/epam/dlab/backendapi/dao/OdahuDAOImpl.java | 153 ++++++++++
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 34 ++-
.../dlab/backendapi/domain/OdahuActionDTO.java} | 26 +-
.../dlab/backendapi/domain/OdahuCreateDTO.java} | 27 +-
.../dto/UserRoleDto.java => domain/OdahuDTO.java} | 49 ++--
.../dlab/backendapi/domain/OdahuFieldsDTO.java} | 25 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java | 2 +
.../epam/dlab/backendapi/modules/DevModule.java | 2 +
.../dlab/backendapi/modules/ProductionModule.java | 2 +
.../resources/InfrastructureInfoResource.java | 2 +-
.../dlab/backendapi/resources/OdahuResource.java | 97 +++++++
.../resources/callback/OdahuCallback.java | 59 ++++
.../resources/dto/ProjectInfrastructureInfo.java | 3 +
.../dlab/backendapi/resources/dto/UserRoleDto.java | 2 +
.../service/InfrastructureInfoService.java | 2 +-
...structureInfoService.java => OdahuService.java} | 26 +-
.../service/impl/EndpointServiceImpl.java | 8 +-
.../service/impl/EnvironmentServiceImpl.java | 21 +-
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../impl/InfrastructureInfoServiceImpl.java | 40 ++-
.../backendapi/service/impl/OdahuServiceImpl.java | 186 ++++++++++++
.../service/impl/ProjectServiceImpl.java | 33 ++-
.../epam/dlab/backendapi/util/RequestBuilder.java | 36 ++-
.../src/main/resources/mongo/aws/mongo_roles.json | 31 +-
.../main/resources/mongo/azure/mongo_roles.json | 26 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 29 +-
.../app/administration/administration.module.ts | 6 +-
.../create-legion-cluster.component.html | 93 ++++++
.../create-legion-cluster.component.scss | 7 +
.../create-legion-cluster.component.ts | 103 +++++++
.../create-legion-claster}/index.ts | 30 +-
.../{project => legion-deployment}/index.ts | 22 +-
.../legion-deployment-data.service.ts | 27 ++
.../legion-deployment.component.html | 42 +++
.../legion-deployment.component.scss | 0
.../legion-deployment.component.ts | 59 ++++
.../legion-list/legion-list.component.html | 94 ++++++
.../legion-list/legion-list.component.scss | 77 +++++
.../legion-list/legion-list.component.ts | 48 ++++
.../management/endpoints/endpoints.component.ts | 31 +-
.../management-grid/management-grid.component.html | 6 +-
.../management/management.component.ts | 70 ++---
.../webapp/src/app/administration/project/index.ts | 2 +-
.../project/project-form/project-form.component.ts | 4 +-
.../project/project-list/project-list.component.ts | 15 +-
.../app/administration/roles/roles.component.ts | 9 +-
.../resources/webapp/src/app/app.routing.module.ts | 6 +
.../resources/webapp/src/app/core/core.module.ts | 2 +
.../services/applicationServiceFacade.service.ts | 28 +-
.../webapp/src/app/core/services/index.ts | 1 +
.../app/core/services/legion-deployment.service.ts | 35 +++
.../src/app/core/services/project.service.ts | 9 -
.../reporting-grid/reporting-grid.component.ts | 2 +-
.../src/app/reporting/reporting.component.ts | 5 +
.../computational-resources-list.component.scss | 2 +-
.../ami-create-dialog.component.ts | 5 +-
.../detail-dialog/detail-dialog.component.html | 38 ++-
.../detail-dialog/detail-dialog.component.scss | 40 ++-
.../detail-dialog/detail-dialog.component.ts | 17 +-
.../install-libraries.component.html | 18 +-
.../install-libraries.component.scss | 8 +
.../install-libraries.component.ts | 25 +-
.../install-libraries/install-libraries.model.ts | 1 -
.../resources-grid/resources-grid.component.html | 39 ++-
.../resources-grid/resources-grid.component.scss | 5 +
.../resources-grid/resources-grid.component.ts | 36 ++-
.../resources-grid/resources-grid.model.ts | 71 ++++-
.../multi-level-select-dropdown.component.html | 26 +-
.../multi-level-select-dropdown.component.scss | 4 +-
.../multi-level-select-dropdown.component.ts | 39 ++-
.../modal-dialog/edge-action-dialog/index.ts | 2 +-
.../modal-dialog/odahu-action-dialog/index.ts | 15 +
.../odahu-action-dialog.component.ts | 50 ++++
.../webapp/src/app/shared/navbar/index.ts | 4 +-
.../src/app/shared/navbar/navbar.component.html | 5 +
.../webapp/src/assets/styles/_dialogs.scss | 7 +
.../resources/InfrastructureInfoResourceTest.java | 15 +-
.../impl/ImageExploratoryServiceImplTest.java | 24 +-
165 files changed, 5886 insertions(+), 455 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org