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/08/09 11:02:58 UTC
[incubator-dlab] 01/03: [DLAB-829]: added max project name constant
per cloud to dictionary
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-829
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 171dfc4e3feaeddb2dde401db827570adb41b2f8
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Aug 9 13:01:21 2019 +0200
[DLAB-829]: added max project name constant per cloud to dictionary
---
.../webapp/src/dictionary/aws.dictionary.ts | 3 +-
.../webapp/src/dictionary/azure.dictionary.ts | 3 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 177 +++++++++++----------
3 files changed, 93 insertions(+), 90 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
index c87b95a..6302f35 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
@@ -78,7 +78,8 @@ export const NAMING_CONVENTION = {
'instance_number': 'Total node number',
'master_node_shape': 'dataengine_instance_shape',
'total_instance_number': 'dataengine_instance_count',
- }
+ },
+ 'max_project_name_length': 40
};
export class ReportingConfigModel {
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
index 66f73f8..17a2403 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
@@ -79,7 +79,8 @@ export const NAMING_CONVENTION = {
'instance_number': 'Total node number',
'master_node_shape': 'dataengine_instance_shape',
'total_instance_number': 'dataengine_instance_count'
- }
+ },
+ 'max_project_name_length': 30
};
export class ReportingConfigModel {
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
index f6ef295..e477161 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
@@ -18,100 +18,101 @@
*/
export const NAMING_CONVENTION = {
- 'cloud_provider': 'gcp',
- 'use_ldap': true,
- 'notebook_instance_size': 'Instance type',
- 'personal_storage': 'Data bucket',
- 'collaboration_storage': 'Collaboration bucket',
- 'account': '',
- 'container': '',
- 'data_engine': 'Deploy Spark Server / Deploy Dataproc',
- 'image': 'Not available',
- 'data_engine_master_instance_size': 'Master machine type',
- 'data_engine_slave_instance_size': 'Slave machine type',
+ 'cloud_provider': 'gcp',
+ 'use_ldap': true,
+ 'notebook_instance_size': 'Instance type',
+ 'personal_storage': 'Data bucket',
+ 'collaboration_storage': 'Collaboration bucket',
+ 'account': '',
+ 'container': '',
+ 'data_engine': 'Deploy Spark Server / Deploy Dataproc',
+ 'image': 'Not available',
+ 'data_engine_master_instance_size': 'Master machine type',
+ 'data_engine_slave_instance_size': 'Slave machine type',
- 'master_node_shape': 'master_node_shape',
- 'slave_node_shape': 'slave_node_shape',
- 'total_instance_number': 'total_instance_number',
+ 'master_node_shape': 'master_node_shape',
+ 'slave_node_shape': 'slave_node_shape',
+ 'total_instance_number': 'total_instance_number',
- 'spot_instance': 'Preemptible worker nodes',
- 'cluster_version': 'dataproc_version',
- 'billing': {
- 'resourceName': 'resource_name',
- 'cost': 'cost',
- 'costTotal': 'cost_total',
- 'currencyCode': 'currency_code',
- 'dateFrom': 'usage_date_start',
- 'dateTo': 'usage_date_end',
- 'service': 'product',
- 'service_filter_key': 'product',
- 'type': 'resource_type',
- 'resourceType': 'dlab_resource_type',
- 'instance_size': 'shape',
- 'dlabId': 'dlab_id'
- },
- 'service': 'Product',
- 'type': 'Resource',
- 'instance_size': 'Type',
- 'computational_resource': 'Computational resources',
- 'user_storage_account_name': '',
- 'shared_storage_account_name': '',
- 'bucket_name': 'user_own_bucket_name',
- 'shared_bucket_name': 'shared_bucket_name',
- 'datalake_name': '',
- 'datalake_user_directory_name': '',
- 'datalake_shared_directory_name': '',
- 'docker.dlab-dataengine-service': {
- 'total_instance_number_min': 'min_instance_count',
- 'total_instance_number_max': 'max_instance_count',
- 'min_emr_spot_instance_bid_pct': 'min_emr_spot_instance_bid_pct',
- 'max_emr_spot_instance_bid_pct': 'max_emr_spot_instance_bid_pct',
- 'data_engine_master_instance_size': 'Master machine type',
- 'data_engine_slave_instance_size': 'Slave machine type',
- 'instance_number': 'Total machine count',
- 'master_instance_number': 'Master node count',
- 'slave_instance_number': 'Worker node count',
- 'master_node_shape': 'master_node_shape',
- 'slave_node_shape': 'slave_node_shape',
- 'total_instance_number': 'total_master_instance_number',
- 'total_slave_instance_number': 'total_slave_instance_number',
- },
- 'docker.dlab-dataengine': {
- 'total_instance_number_min': 'min_spark_instance_count',
- 'total_instance_number_max': 'max_spark_instance_count',
- 'data_engine_master_instance_size': 'Machine type',
- 'instance_number': 'Total machine number',
- 'master_instance_number': 'Master machine number',
- 'master_node_shape': 'dataengine_instance_shape',
- 'total_instance_number': 'dataengine_instance_count',
- }
+ 'spot_instance': 'Preemptible worker nodes',
+ 'cluster_version': 'dataproc_version',
+ 'billing': {
+ 'resourceName': 'resource_name',
+ 'cost': 'cost',
+ 'costTotal': 'cost_total',
+ 'currencyCode': 'currency_code',
+ 'dateFrom': 'usage_date_start',
+ 'dateTo': 'usage_date_end',
+ 'service': 'product',
+ 'service_filter_key': 'product',
+ 'type': 'resource_type',
+ 'resourceType': 'dlab_resource_type',
+ 'instance_size': 'shape',
+ 'dlabId': 'dlab_id'
+ },
+ 'service': 'Product',
+ 'type': 'Resource',
+ 'instance_size': 'Type',
+ 'computational_resource': 'Computational resources',
+ 'user_storage_account_name': '',
+ 'shared_storage_account_name': '',
+ 'bucket_name': 'user_own_bucket_name',
+ 'shared_bucket_name': 'shared_bucket_name',
+ 'datalake_name': '',
+ 'datalake_user_directory_name': '',
+ 'datalake_shared_directory_name': '',
+ 'docker.dlab-dataengine-service': {
+ 'total_instance_number_min': 'min_instance_count',
+ 'total_instance_number_max': 'max_instance_count',
+ 'min_emr_spot_instance_bid_pct': 'min_emr_spot_instance_bid_pct',
+ 'max_emr_spot_instance_bid_pct': 'max_emr_spot_instance_bid_pct',
+ 'data_engine_master_instance_size': 'Master machine type',
+ 'data_engine_slave_instance_size': 'Slave machine type',
+ 'instance_number': 'Total machine count',
+ 'master_instance_number': 'Master node count',
+ 'slave_instance_number': 'Worker node count',
+ 'master_node_shape': 'master_node_shape',
+ 'slave_node_shape': 'slave_node_shape',
+ 'total_instance_number': 'total_master_instance_number',
+ 'total_slave_instance_number': 'total_slave_instance_number',
+ },
+ 'docker.dlab-dataengine': {
+ 'total_instance_number_min': 'min_spark_instance_count',
+ 'total_instance_number_max': 'max_spark_instance_count',
+ 'data_engine_master_instance_size': 'Machine type',
+ 'instance_number': 'Total machine number',
+ 'master_instance_number': 'Master machine number',
+ 'master_node_shape': 'dataengine_instance_shape',
+ 'total_instance_number': 'dataengine_instance_count',
+ },
+ 'max_project_name_length': 10
};
export class ReportingConfigModel {
- static getDefault(): ReportingConfigModel {
- return new ReportingConfigModel([], [], [], [], [], '', '', '');
- }
+ static getDefault(): ReportingConfigModel {
+ return new ReportingConfigModel([], [], [], [], [], '', '', '');
+ }
- constructor(
- public user: Array<string>,
- public product: Array<string>,
- public resource_type: Array<string>,
- public status: Array<string>,
- public shape: Array<string>,
- public date_start: string,
- public date_end: string,
- public dlab_id: string
- ) { }
+ constructor(
+ public user: Array<string>,
+ public product: Array<string>,
+ public resource_type: Array<string>,
+ public status: Array<string>,
+ public shape: Array<string>,
+ public date_start: string,
+ public date_end: string,
+ public dlab_id: string
+ ) { }
- defaultConfigurations(): void {
- this.user = [];
- this.product = [];
- this.resource_type = [];
- this.status = [];
- this.shape = [];
- this.date_start = '';
- this.date_end = '';
- this.dlab_id = '';
- }
+ defaultConfigurations(): void {
+ this.user = [];
+ this.product = [];
+ this.resource_type = [];
+ this.status = [];
+ this.shape = [];
+ this.date_start = '';
+ this.date_end = '';
+ this.dlab_id = '';
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org