You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/10 15:53:13 UTC
[incubator-dlab] 10/19: [DLAB-834]: added proper data keys
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ea4fd6152f408ae3be5d7dc8f4595e6bf90d41c9
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 9 13:23:53 2019 +0300
[DLAB-834]: added proper data keys
---
.../mock_response/aws/project_create.json | 57 ++++++++++++++++++++++
.../management-grid/management-grid.component.html | 18 ++++---
2 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json b/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json
new file mode 100644
index 0000000..31ca8e5
--- /dev/null
+++ b/services/provisioning-service/src/main/resources/mock_response/aws/project_create.json
@@ -0,0 +1,57 @@
+{
+ "status": "ok",
+ "response": {
+ "result": {
+ "tunnel_port": "22",
+ "full_edge_conf": {
+ "edge_service_account_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge",
+ "fw_edge_egress_internal": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-egress-internal",
+ "dlab_ssh_user": "dlab-user",
+ "ps_role_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps",
+ "fw_ps_egress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-egress-public",
+ "private_ip": "10.10.0.3",
+ "fw_ps_ingress": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-ingress",
+ "ssh_key_path": "/root/keys/BDCC-DSS-POC.pem",
+ "zone": "us-west1-a ",
+ "fw_edge_egress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-egress-public",
+ "ami_name": "/projects/ubuntu-os-cloud/global/images/ubuntu-1604-xenial-v20170721",
+ "edge_role_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge",
+ "private_subnet_prefix": "24",
+ "subnet_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-subnet",
+ "vpc_cidr": "10.10.0.0/16",
+ "key_name": "${CONF_KEY_NAME}",
+ "service_base_name": "${CONF_SERVICE_BASE_NAME}",
+ "static_address_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ip",
+ "fw_ps_egress_private": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps-egress-private",
+ "vpc_name": "${CONF_SERVICE_BASE_NAME}-ssn-vpc",
+ "static_ip": "104.198.5.3",
+ "bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket",
+ "fw_edge_ingress_public": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-ingress-public",
+ "ps_service_account_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps",
+ "firewall_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-firewall",
+ "region": "us-west1",
+ "fw_common_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-ps",
+ "instance_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge",
+ "user_keyname": "${EDGE_USER_NAME}",
+ "edge_user_name": "${EDGE_USER_NAME}",
+ "private_subnet_cidr": "10.10.16.0/24",
+ "fw_edge_ingress_internal": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-edge-ingress-internal",
+ "vpc_selflink": "https://www.googleapis.com/compute/v1/projects/or2-msq-epmc-dlab-t1iylu/global/networks/${CONF_SERVICE_BASE_NAME}-ssn-vpc",
+ "instance_size": "n1-standard-1",
+ "notebook_firewall_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-nb-firewall"
+ },
+ "key_name": "BDCC-DSS-POC",
+ "hostname": "104.198.5.3",
+ "public_ip": "104.198.5.3",
+ "ip": "10.10.0.3",
+ "Action": "Create new EDGE server",
+ "user_own_bucket_name": "${CONF_SERVICE_BASE_NAME}-${EDGE_USER_NAME}-bucket",
+ "socks_port": "1080",
+ "notebook_subnet": "10.10.16.0/24",
+ "project_name": "${PROJECT_NAME}",
+ "@class": "com.epam.dlab.dto.gcp.edge.EdgeInfoGcp"
+ },
+ "log": "/var/log/dlab/edge/edge_${EDGE_USER_NAME}_${REQUEST_ID}.log"
+ },
+ "request_id": "${REQUEST_ID}"
+}
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index ce66673..7933342 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -24,14 +24,19 @@
<td mat-cell *matCellDef="let element">{{ element.user }}</td>
</ng-container>
+ <ng-container matColumnDef="project">
+ <th mat-header-cell *matHeaderCellDef class="project"> Type </th>
+ <td mat-cell *matCellDef="let element">{{ element.project }}</td>
+ </ng-container>
+
<ng-container matColumnDef="type">
<th mat-header-cell *matHeaderCellDef class="type"> Type </th>
- <td mat-cell *matCellDef="let element">{{ element.name }}</td>
+ <td mat-cell *matCellDef="let element">{{ element.resource_name || element.resource_type }}</td>
</ng-container>
<ng-container matColumnDef="shape">
<th mat-header-cell *matHeaderCellDef class="shape"> Shape / Resource id </th>
- <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.ip }}</td>
+ <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.public_ip }}</td>
</ng-container>
<ng-container matColumnDef="status">
@@ -77,9 +82,7 @@
<td mat-cell *matCellDef="let element" class="actions settings">
<span #settings class="actions" (click)="actions.toggle($event, settings)"
[ngClass]="{ 'disabled'
- : (element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' )
- || (element.type === 'edge node' && element.user.toLowerCase() === currentUser && element.status === 'stopping')
- || element.type === 'edge node' && element.user.toLowerCase() !== currentUser && element.status !== 'running' }"></span>
+ : element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' }"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
<li
@@ -102,8 +105,8 @@
</div>
</li>
- <div *ngIf="element.name === 'edge node' && element.user.toLowerCase() === currentUser">
- <li (click)="toggleResourceAction(element, 'run')" *ngIf="element.status === 'stopped'">
+ <div *ngIf="element.name === 'edge node' && element.status === 'stopped'">
+ <li (click)="toggleResourceAction(element, 'run')">
<i class="material-icons">play_circle_outline</i>
<span>Start</span>
</li>
@@ -114,6 +117,7 @@
</ng-container>
<ng-container matColumnDef="placeholder">
<td mat-footer-cell *matFooterCellDef colspan="6" class="info">
+ <span *ngIf="loading">LOADING</span>
To start working, please, create new environment
</td>
</ng-container>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org