You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by of...@apache.org on 2020/10/05 08:43:21 UTC
[incubator-datalab] branch develop updated: Replaced old name with
new one
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 725dad6 Replaced old name with new one
725dad6 is described below
commit 725dad66e9f014bf62863dea8776d16deae55f8f
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Mon Oct 5 11:43:07 2020 +0300
Replaced old name with new one
---
.../deeplearning/deeplearning-notebook.json | 10 +-
.../deeplearning/spark_cluster.json | 8 +-
.../azure_templates/jupyter/jupyter-notebook.json | 10 +-
.../azure_templates/jupyter/spark_cluster.json | 8 +-
.../azure_templates/rstudio/rstudio-notebook.json | 10 +-
.../azure_templates/rstudio/spark_cluster.json | 8 +-
.../azure_templates/tensor/spark_cluster.json | 8 +-
.../azure_templates/tensor/tensor-notebook.json | 10 +-
.../azure_templates/zeppelin/spark_cluster.json | 8 +-
.../zeppelin/zeppelin-notebook.json | 8 +-
integration-tests/examples/config.properties | 9 +-
.../examples/ec2_templates/deeplearning/EMR.json | 16 +-
.../ec2_templates/deeplearning/EMR_spot.json | 20 +--
.../deeplearning/deeplearning-notebook.json | 10 +-
.../ec2_templates/deeplearning/spark_cluster.json | 8 +-
.../examples/ec2_templates/jupyter/EMR.json | 16 +-
.../examples/ec2_templates/jupyter/EMR_spot.json | 20 +--
.../ec2_templates/jupyter/jupyter-notebook.json | 10 +-
.../ec2_templates/jupyter/spark_cluster.json | 8 +-
.../examples/ec2_templates/rstudio/EMR.json | 16 +-
.../examples/ec2_templates/rstudio/EMR_spot.json | 20 +--
.../ec2_templates/rstudio/rstudio-notebook.json | 10 +-
.../ec2_templates/rstudio/spark_cluster.json | 8 +-
.../examples/ec2_templates/tensor/EMR.json | 16 +-
.../examples/ec2_templates/tensor/EMR_spot.json | 20 +--
.../ec2_templates/tensor/spark_cluster.json | 8 +-
.../ec2_templates/tensor/tensor-notebook.json | 10 +-
.../examples/ec2_templates/zeppelin/EMR.json | 16 +-
.../examples/ec2_templates/zeppelin/EMR_spot.json | 20 +--
.../ec2_templates/zeppelin/spark_cluster.json | 8 +-
.../ec2_templates/zeppelin/zeppelin-notebook.json | 8 +-
.../gcp_templates/deeplearning/dataproc.json | 12 +-
.../deeplearning/deeplearning-notebook.json | 10 +-
.../gcp_templates/deeplearning/spark_cluster.json | 8 +-
.../examples/gcp_templates/jupyter/dataproc.json | 12 +-
.../gcp_templates/jupyter/jupyter-notebook.json | 10 +-
.../gcp_templates/jupyter/spark_cluster.json | 8 +-
.../examples/gcp_templates/rstudio/dataproc.json | 12 +-
.../gcp_templates/rstudio/rstudio-notebook.json | 10 +-
.../gcp_templates/rstudio/spark_cluster.json | 8 +-
.../examples/gcp_templates/tensor/dataproc.json | 12 +-
.../gcp_templates/tensor/spark_cluster.json | 8 +-
.../gcp_templates/tensor/tensor-notebook.json | 10 +-
.../examples/gcp_templates/zeppelin/dataproc.json | 12 +-
.../gcp_templates/zeppelin/spark_cluster.json | 8 +-
.../gcp_templates/zeppelin/zeppelin-notebook.json | 8 +-
integration-tests/pom.xml | 8 +-
.../cloud/VirtualMachineStatusChecker.java | 12 +-
.../automation/cloud/aws/AmazonHelper.java | 7 +-
.../automation/cloud/aws/AmazonInstanceState.java | 0
.../automation/cloud/azure/AzureHelper.java | 0
.../automation/cloud/gcp/GcpHelper.java | 13 +-
.../automation/cloud/gcp/GcpInstanceState.java | 0
.../automation/docker/AckStatus.java | 0
.../automation/docker/Bridge.java | 0
.../automation/docker/Docker.java | 0
.../automation/docker/DockerContainer.java | 0
.../automation/docker/HostConfig.java | 0
.../automation/docker/Labels.java | 0
.../automation/docker/NetworkSettings.java | 0
.../automation/docker/Networks.java | 0
.../automation/docker/SSHConnect.java | 7 +-
.../automation/exceptions/CloudException.java | 0
.../automation/exceptions/DockerException.java | 0
.../automation/exceptions/JenkinsException.java | 0
.../automation/exceptions/LoadFailException.java | 0
.../automation/helper/CloudHelper.java | 21 ++-
.../automation/helper/CloudProvider.java | 0
.../automation/helper/ConfigPropertyValue.java | 178 ++++++++++-----------
.../automation/helper/NamingHelper.java | 0
.../automation/helper/PropertiesResolver.java | 0
.../automation/helper/WaitForStatus.java | 0
.../{dlab => datalab}/automation/http/ApiPath.java | 0
.../automation/http/ContentType.java | 0
.../automation/http/HttpRequest.java | 0
.../automation/http/HttpStatusCode.java | 0
.../jenkins/JenkinsConfigProperties.java | 0
.../jenkins/JenkinsResponseElements.java | 0
.../automation/jenkins/JenkinsService.java | 0
.../automation/jenkins/JenkinsUrls.java | 0
.../automation/model/CreateNotebookDto.java | 0
.../automation/model/DeployClusterDto.java | 0
.../automation/model/DeployDataProcDto.java | 0
.../automation/model/DeployEMRDto.java | 0
.../automation/model/DeploySparkDto.java | 0
.../automation/model/ExploratoryImageDto.java | 0
.../automation/model/ImageDto.java | 0
.../automation/model/JsonMapperDto.java | 0
.../{dlab => datalab}/automation/model/Lib.java | 0
.../automation/model/LoginDto.java | 0
.../automation/model/NotebookConfig.java | 0
.../automation/test/TestCallable.java | 23 ++-
.../automation/test/TestDataEngineService.java | 11 +-
.../automation/test/TestServices.java | 13 +-
.../test/libs/LibraryNotFoundException.java | 0
.../automation/test/libs/LibsHelper.java | 6 +-
.../automation/test/libs/TestDescription.java | 0
.../automation/test/libs/TestLibGroupStep.java | 0
.../automation/test/libs/TestLibInstallStep.java | 6 +-
.../automation/test/libs/TestLibListStep.java | 0
.../automation/test/libs/TestLibStep.java | 0
.../test/libs/models/LibInstallRequest.java | 0
.../test/libs/models/LibSearchRequest.java | 0
.../test/libs/models/LibStatusResponse.java | 0
.../test/libs/models/LibToSearchData.java | 0
.../automation/test/libs/models/LibraryStatus.java | 0
106 files changed, 435 insertions(+), 383 deletions(-)
diff --git a/integration-tests/examples/azure_templates/deeplearning/deeplearning-notebook.json b/integration-tests/examples/azure_templates/deeplearning/deeplearning-notebook.json
index bf0159d..69dea4e 100644
--- a/integration-tests/examples/azure_templates/deeplearning/deeplearning-notebook.json
+++ b/integration-tests/examples/azure_templates/deeplearning/deeplearning-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-deeplearning",
- "name" : "set the name",
- "shape" : "Standard_NC6",
- "version" : "deeplearning-2.2",
- "template_name" : "Deep Learning 2.2"
+ "image": "docker.datalab-deeplearning",
+ "name": "set the name",
+ "shape": "Standard_NC6",
+ "version": "deeplearning-2.2",
+ "template_name": "Deep Learning 2.2"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/deeplearning/spark_cluster.json b/integration-tests/examples/azure_templates/deeplearning/spark_cluster.json
index 565307a..3e17708 100644
--- a/integration-tests/examples/azure_templates/deeplearning/spark_cluster.json
+++ b/integration-tests/examples/azure_templates/deeplearning/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "Standard_NC6",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/jupyter/jupyter-notebook.json b/integration-tests/examples/azure_templates/jupyter/jupyter-notebook.json
index ea6dd42..fa661da 100644
--- a/integration-tests/examples/azure_templates/jupyter/jupyter-notebook.json
+++ b/integration-tests/examples/azure_templates/jupyter/jupyter-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-jupyter",
- "name" : "set the name",
- "shape" : "Standard_F2s",
- "version" : "jupyter_notebook-5.7.4",
- "template_name" : "Jupyter notebook 5.7.4"
+ "image": "docker.datalab-jupyter",
+ "name": "set the name",
+ "shape": "Standard_F2s",
+ "version": "jupyter_notebook-5.7.4",
+ "template_name": "Jupyter notebook 5.7.4"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/jupyter/spark_cluster.json b/integration-tests/examples/azure_templates/jupyter/spark_cluster.json
index 51615e1..9c5f9ee 100644
--- a/integration-tests/examples/azure_templates/jupyter/spark_cluster.json
+++ b/integration-tests/examples/azure_templates/jupyter/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "Standard_F4s",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/rstudio/rstudio-notebook.json b/integration-tests/examples/azure_templates/rstudio/rstudio-notebook.json
index 7a82e7c..3458ed1 100644
--- a/integration-tests/examples/azure_templates/rstudio/rstudio-notebook.json
+++ b/integration-tests/examples/azure_templates/rstudio/rstudio-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-rstudio",
- "name" : "set the name",
- "shape" : "Standard_F2s",
- "version" : "RStudio-1.1.463",
- "template_name" : "RStudio 1.1.463"
+ "image": "docker.datalab-rstudio",
+ "name": "set the name",
+ "shape": "Standard_F2s",
+ "version": "RStudio-1.1.463",
+ "template_name": "RStudio 1.1.463"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/rstudio/spark_cluster.json b/integration-tests/examples/azure_templates/rstudio/spark_cluster.json
index 51615e1..9c5f9ee 100644
--- a/integration-tests/examples/azure_templates/rstudio/spark_cluster.json
+++ b/integration-tests/examples/azure_templates/rstudio/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "Standard_F4s",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/tensor/spark_cluster.json b/integration-tests/examples/azure_templates/tensor/spark_cluster.json
index 565307a..3e17708 100644
--- a/integration-tests/examples/azure_templates/tensor/spark_cluster.json
+++ b/integration-tests/examples/azure_templates/tensor/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "Standard_NC6",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/tensor/tensor-notebook.json b/integration-tests/examples/azure_templates/tensor/tensor-notebook.json
index 7e62794..40241e4 100644
--- a/integration-tests/examples/azure_templates/tensor/tensor-notebook.json
+++ b/integration-tests/examples/azure_templates/tensor/tensor-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-tensor",
- "name" : "set the name",
- "shape" : "Standard_NC6",
- "version" : "tensorflow_gpu-1.3.0",
- "template_name" : "TensorFlow 1.3.0"
+ "image": "docker.datalab-tensor",
+ "name": "set the name",
+ "shape": "Standard_NC6",
+ "version": "tensorflow_gpu-1.3.0",
+ "template_name": "TensorFlow 1.3.0"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/zeppelin/spark_cluster.json b/integration-tests/examples/azure_templates/zeppelin/spark_cluster.json
index 51615e1..9c5f9ee 100644
--- a/integration-tests/examples/azure_templates/zeppelin/spark_cluster.json
+++ b/integration-tests/examples/azure_templates/zeppelin/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "Standard_F4s",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/azure_templates/zeppelin/zeppelin-notebook.json b/integration-tests/examples/azure_templates/zeppelin/zeppelin-notebook.json
index 2c7aff4..5afcbde 100644
--- a/integration-tests/examples/azure_templates/zeppelin/zeppelin-notebook.json
+++ b/integration-tests/examples/azure_templates/zeppelin/zeppelin-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-zeppelin",
- "name" : "set the name",
- "shape" : "Standard_F2s",
- "version" : "zeppelin-0.8.0",
+ "image": "docker.datalab-zeppelin",
+ "name": "set the name",
+ "shape": "Standard_F2s",
+ "version": "zeppelin-0.8.0",
"template_name": "Apache Zeppelin 0.8.0"
}
\ No newline at end of file
diff --git a/integration-tests/examples/config.properties b/integration-tests/examples/config.properties
index 4ee463e..3fb0921 100644
--- a/integration-tests/examples/config.properties
+++ b/integration-tests/examples/config.properties
@@ -23,15 +23,13 @@ USERNAME=
PASSWORD=
NOT_IAM_USERNAME=
NOT_IAM_PASSWORD=
-NOT_DLAB_USERNAME=
-NOT_DLAB_PASSWORD=
+NOT_DATALAB_USERNAME=
+NOT_DATALAB_PASSWORD=
JENKINS_JOB_URL=
USER_FOR_ACTIVATE_KEY=
PASSWORD_FOR_ACTIVATE_KEY=
-
ACCESS_KEY_PRIV_FILE_NAME=
ACCESS_KEY_PUB_FILE_NAME=
-
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_REGION=
@@ -40,8 +38,7 @@ AWS_REQUEST_TIMEOUT=10s
TIMEOUT_JENKINS_AUTOTEST=20m
TIMEOUT_UPLOAD_KEY=40m
TIMEOUT_SSN_STARTUP=60m
-
-CLUSTER_OS_USERNAME=dlab-user
+CLUSTER_OS_USERNAME=datalab-user
CLUSTER_OS_FAMILY=debian
#NOTEBOOKS_TO_TEST=\
diff --git a/integration-tests/examples/ec2_templates/deeplearning/EMR.json b/integration-tests/examples/ec2_templates/deeplearning/EMR.json
index 62f80d3..01d4d02 100644
--- a/integration-tests/examples/ec2_templates/deeplearning/EMR.json
+++ b/integration-tests/examples/ec2_templates/deeplearning/EMR.json
@@ -1,10 +1,10 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "2",
- "emr_master_instance_type" : "c4.xlarge",
- "emr_slave_instance_type" : "c4.xlarge",
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "2",
+ "emr_master_instance_type": "c4.xlarge",
+ "emr_slave_instance_type": "c4.xlarge",
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/deeplearning/EMR_spot.json b/integration-tests/examples/ec2_templates/deeplearning/EMR_spot.json
index feedfd1..5fed763 100644
--- a/integration-tests/examples/ec2_templates/deeplearning/EMR_spot.json
+++ b/integration-tests/examples/ec2_templates/deeplearning/EMR_spot.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "3",
- "emr_master_instance_type" : "c4.large",
- "emr_slave_instance_type" : "c4.large",
- "emr_slave_instance_spot":true,
- "emr_slave_instance_spot_pct_price":40,
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "3",
+ "emr_master_instance_type": "c4.large",
+ "emr_slave_instance_type": "c4.large",
+ "emr_slave_instance_spot": true,
+ "emr_slave_instance_spot_pct_price": 40,
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/deeplearning/deeplearning-notebook.json b/integration-tests/examples/ec2_templates/deeplearning/deeplearning-notebook.json
index 846203b..1430f00 100644
--- a/integration-tests/examples/ec2_templates/deeplearning/deeplearning-notebook.json
+++ b/integration-tests/examples/ec2_templates/deeplearning/deeplearning-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-deeplearning",
- "name" : "set the name",
- "shape" : "p2.xlarge",
- "version" : "deeplearning-2.2",
- "template_name" : "Deep Learning 2.2"
+ "image": "docker.datalab-deeplearning",
+ "name": "set the name",
+ "shape": "p2.xlarge",
+ "version": "deeplearning-2.2",
+ "template_name": "Deep Learning 2.2"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/deeplearning/spark_cluster.json b/integration-tests/examples/ec2_templates/deeplearning/spark_cluster.json
index 33975f2..357fe01 100644
--- a/integration-tests/examples/ec2_templates/deeplearning/spark_cluster.json
+++ b/integration-tests/examples/ec2_templates/deeplearning/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "p2.xlarge",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/jupyter/EMR.json b/integration-tests/examples/ec2_templates/jupyter/EMR.json
index 62f80d3..01d4d02 100644
--- a/integration-tests/examples/ec2_templates/jupyter/EMR.json
+++ b/integration-tests/examples/ec2_templates/jupyter/EMR.json
@@ -1,10 +1,10 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "2",
- "emr_master_instance_type" : "c4.xlarge",
- "emr_slave_instance_type" : "c4.xlarge",
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "2",
+ "emr_master_instance_type": "c4.xlarge",
+ "emr_slave_instance_type": "c4.xlarge",
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/jupyter/EMR_spot.json b/integration-tests/examples/ec2_templates/jupyter/EMR_spot.json
index feedfd1..5fed763 100644
--- a/integration-tests/examples/ec2_templates/jupyter/EMR_spot.json
+++ b/integration-tests/examples/ec2_templates/jupyter/EMR_spot.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "3",
- "emr_master_instance_type" : "c4.large",
- "emr_slave_instance_type" : "c4.large",
- "emr_slave_instance_spot":true,
- "emr_slave_instance_spot_pct_price":40,
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "3",
+ "emr_master_instance_type": "c4.large",
+ "emr_slave_instance_type": "c4.large",
+ "emr_slave_instance_spot": true,
+ "emr_slave_instance_spot_pct_price": 40,
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/jupyter/jupyter-notebook.json b/integration-tests/examples/ec2_templates/jupyter/jupyter-notebook.json
index adbea51..94db781 100644
--- a/integration-tests/examples/ec2_templates/jupyter/jupyter-notebook.json
+++ b/integration-tests/examples/ec2_templates/jupyter/jupyter-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-jupyter",
- "name" : "set the name",
- "shape" : "t2.medium",
- "version" : "jupyter_notebook-5.7.4",
- "template_name" : "Jupyter notebook 5.7.4"
+ "image": "docker.datalab-jupyter",
+ "name": "set the name",
+ "shape": "t2.medium",
+ "version": "jupyter_notebook-5.7.4",
+ "template_name": "Jupyter notebook 5.7.4"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/jupyter/spark_cluster.json b/integration-tests/examples/ec2_templates/jupyter/spark_cluster.json
index 65b0d92..2a712e3 100644
--- a/integration-tests/examples/ec2_templates/jupyter/spark_cluster.json
+++ b/integration-tests/examples/ec2_templates/jupyter/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "c4.xlarge",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/rstudio/EMR.json b/integration-tests/examples/ec2_templates/rstudio/EMR.json
index 62f80d3..01d4d02 100644
--- a/integration-tests/examples/ec2_templates/rstudio/EMR.json
+++ b/integration-tests/examples/ec2_templates/rstudio/EMR.json
@@ -1,10 +1,10 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "2",
- "emr_master_instance_type" : "c4.xlarge",
- "emr_slave_instance_type" : "c4.xlarge",
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "2",
+ "emr_master_instance_type": "c4.xlarge",
+ "emr_slave_instance_type": "c4.xlarge",
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/rstudio/EMR_spot.json b/integration-tests/examples/ec2_templates/rstudio/EMR_spot.json
index feedfd1..5fed763 100644
--- a/integration-tests/examples/ec2_templates/rstudio/EMR_spot.json
+++ b/integration-tests/examples/ec2_templates/rstudio/EMR_spot.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "3",
- "emr_master_instance_type" : "c4.large",
- "emr_slave_instance_type" : "c4.large",
- "emr_slave_instance_spot":true,
- "emr_slave_instance_spot_pct_price":40,
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "3",
+ "emr_master_instance_type": "c4.large",
+ "emr_slave_instance_type": "c4.large",
+ "emr_slave_instance_spot": true,
+ "emr_slave_instance_spot_pct_price": 40,
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/rstudio/rstudio-notebook.json b/integration-tests/examples/ec2_templates/rstudio/rstudio-notebook.json
index d06b9b0..366065a 100644
--- a/integration-tests/examples/ec2_templates/rstudio/rstudio-notebook.json
+++ b/integration-tests/examples/ec2_templates/rstudio/rstudio-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-rstudio",
- "name" : "set the name",
- "shape" : "t2.medium",
- "version" : "RStudio-1.1.463",
- "template_name" : "RStudio 1.1.463"
+ "image": "docker.datalab-rstudio",
+ "name": "set the name",
+ "shape": "t2.medium",
+ "version": "RStudio-1.1.463",
+ "template_name": "RStudio 1.1.463"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/rstudio/spark_cluster.json b/integration-tests/examples/ec2_templates/rstudio/spark_cluster.json
index 65b0d92..2a712e3 100644
--- a/integration-tests/examples/ec2_templates/rstudio/spark_cluster.json
+++ b/integration-tests/examples/ec2_templates/rstudio/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "c4.xlarge",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/tensor/EMR.json b/integration-tests/examples/ec2_templates/tensor/EMR.json
index 62f80d3..01d4d02 100644
--- a/integration-tests/examples/ec2_templates/tensor/EMR.json
+++ b/integration-tests/examples/ec2_templates/tensor/EMR.json
@@ -1,10 +1,10 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "2",
- "emr_master_instance_type" : "c4.xlarge",
- "emr_slave_instance_type" : "c4.xlarge",
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "2",
+ "emr_master_instance_type": "c4.xlarge",
+ "emr_slave_instance_type": "c4.xlarge",
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/tensor/EMR_spot.json b/integration-tests/examples/ec2_templates/tensor/EMR_spot.json
index feedfd1..5fed763 100644
--- a/integration-tests/examples/ec2_templates/tensor/EMR_spot.json
+++ b/integration-tests/examples/ec2_templates/tensor/EMR_spot.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "3",
- "emr_master_instance_type" : "c4.large",
- "emr_slave_instance_type" : "c4.large",
- "emr_slave_instance_spot":true,
- "emr_slave_instance_spot_pct_price":40,
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "3",
+ "emr_master_instance_type": "c4.large",
+ "emr_slave_instance_type": "c4.large",
+ "emr_slave_instance_spot": true,
+ "emr_slave_instance_spot_pct_price": 40,
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/tensor/spark_cluster.json b/integration-tests/examples/ec2_templates/tensor/spark_cluster.json
index 33975f2..357fe01 100644
--- a/integration-tests/examples/ec2_templates/tensor/spark_cluster.json
+++ b/integration-tests/examples/ec2_templates/tensor/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "p2.xlarge",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/tensor/tensor-notebook.json b/integration-tests/examples/ec2_templates/tensor/tensor-notebook.json
index a5945a0..5746900 100644
--- a/integration-tests/examples/ec2_templates/tensor/tensor-notebook.json
+++ b/integration-tests/examples/ec2_templates/tensor/tensor-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-tensor",
- "name" : "set the name",
- "shape" : "p2.xlarge",
- "version" : "tensorflow_gpu-1.3.0",
- "template_name" : "TensorFlow 1.3.0"
+ "image": "docker.datalab-tensor",
+ "name": "set the name",
+ "shape": "p2.xlarge",
+ "version": "tensorflow_gpu-1.3.0",
+ "template_name": "TensorFlow 1.3.0"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/zeppelin/EMR.json b/integration-tests/examples/ec2_templates/zeppelin/EMR.json
index 62f80d3..01d4d02 100644
--- a/integration-tests/examples/ec2_templates/zeppelin/EMR.json
+++ b/integration-tests/examples/ec2_templates/zeppelin/EMR.json
@@ -1,10 +1,10 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "2",
- "emr_master_instance_type" : "c4.xlarge",
- "emr_slave_instance_type" : "c4.xlarge",
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "2",
+ "emr_master_instance_type": "c4.xlarge",
+ "emr_slave_instance_type": "c4.xlarge",
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/zeppelin/EMR_spot.json b/integration-tests/examples/ec2_templates/zeppelin/EMR_spot.json
index feedfd1..5fed763 100644
--- a/integration-tests/examples/ec2_templates/zeppelin/EMR_spot.json
+++ b/integration-tests/examples/ec2_templates/zeppelin/EMR_spot.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
- "emr_instance_count" : "3",
- "emr_master_instance_type" : "c4.large",
- "emr_slave_instance_type" : "c4.large",
- "emr_slave_instance_spot":true,
- "emr_slave_instance_spot_pct_price":40,
- "emr_version" : "emr-5.12.0",
- "notebook_name" : "set notebook name",
- "template_name" : "EMR cluster"
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
+ "emr_instance_count": "3",
+ "emr_master_instance_type": "c4.large",
+ "emr_slave_instance_type": "c4.large",
+ "emr_slave_instance_spot": true,
+ "emr_slave_instance_spot_pct_price": 40,
+ "emr_version": "emr-5.12.0",
+ "notebook_name": "set notebook name",
+ "template_name": "EMR cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/zeppelin/spark_cluster.json b/integration-tests/examples/ec2_templates/zeppelin/spark_cluster.json
index 65b0d92..2a712e3 100644
--- a/integration-tests/examples/ec2_templates/zeppelin/spark_cluster.json
+++ b/integration-tests/examples/ec2_templates/zeppelin/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "c4.xlarge",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/ec2_templates/zeppelin/zeppelin-notebook.json b/integration-tests/examples/ec2_templates/zeppelin/zeppelin-notebook.json
index 287ef45..b0b63dc 100644
--- a/integration-tests/examples/ec2_templates/zeppelin/zeppelin-notebook.json
+++ b/integration-tests/examples/ec2_templates/zeppelin/zeppelin-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-zeppelin",
- "name" : "set the name",
- "shape" : "t2.medium",
- "version" : "zeppelin-0.8.0",
+ "image": "docker.datalab-zeppelin",
+ "name": "set the name",
+ "shape": "t2.medium",
+ "version": "zeppelin-0.8.0",
"template_name": "Apache Zeppelin 0.8.0"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/deeplearning/dataproc.json b/integration-tests/examples/gcp_templates/deeplearning/dataproc.json
index 1f4724f..7d80aea 100644
--- a/integration-tests/examples/gcp_templates/deeplearning/dataproc.json
+++ b/integration-tests/examples/gcp_templates/deeplearning/dataproc.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
"dataproc_master_count": "1",
"dataproc_slave_count": "2",
"dataproc_preemptible_count": "0",
- "dataproc_master_instance_type" : "n1-standard-2",
- "dataproc_slave_instance_type" : "n1-standard-2",
- "dataproc_version" : "1.2",
+ "dataproc_master_instance_type": "n1-standard-2",
+ "dataproc_slave_instance_type": "n1-standard-2",
+ "dataproc_version": "1.2",
"notebook_name": "set notebook name",
- "template_name" : "Dataproc cluster"
+ "template_name": "Dataproc cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/deeplearning/deeplearning-notebook.json b/integration-tests/examples/gcp_templates/deeplearning/deeplearning-notebook.json
index 50924b3..98baf0f 100644
--- a/integration-tests/examples/gcp_templates/deeplearning/deeplearning-notebook.json
+++ b/integration-tests/examples/gcp_templates/deeplearning/deeplearning-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-deeplearning",
- "name" : "set the name",
- "shape" : "n1-highcpu-8",
- "version" : "deeplearning-1.9",
- "template_name" : "Deep Learning 1.9"
+ "image": "docker.datalab-deeplearning",
+ "name": "set the name",
+ "shape": "n1-highcpu-8",
+ "version": "deeplearning-1.9",
+ "template_name": "Deep Learning 1.9"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/deeplearning/spark_cluster.json b/integration-tests/examples/gcp_templates/deeplearning/spark_cluster.json
index 63047da..96e78d1 100644
--- a/integration-tests/examples/gcp_templates/deeplearning/spark_cluster.json
+++ b/integration-tests/examples/gcp_templates/deeplearning/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "n1-standard-2",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/jupyter/dataproc.json b/integration-tests/examples/gcp_templates/jupyter/dataproc.json
index 1f4724f..7d80aea 100644
--- a/integration-tests/examples/gcp_templates/jupyter/dataproc.json
+++ b/integration-tests/examples/gcp_templates/jupyter/dataproc.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
"dataproc_master_count": "1",
"dataproc_slave_count": "2",
"dataproc_preemptible_count": "0",
- "dataproc_master_instance_type" : "n1-standard-2",
- "dataproc_slave_instance_type" : "n1-standard-2",
- "dataproc_version" : "1.2",
+ "dataproc_master_instance_type": "n1-standard-2",
+ "dataproc_slave_instance_type": "n1-standard-2",
+ "dataproc_version": "1.2",
"notebook_name": "set notebook name",
- "template_name" : "Dataproc cluster"
+ "template_name": "Dataproc cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/jupyter/jupyter-notebook.json b/integration-tests/examples/gcp_templates/jupyter/jupyter-notebook.json
index c109dc1..ba385c7 100644
--- a/integration-tests/examples/gcp_templates/jupyter/jupyter-notebook.json
+++ b/integration-tests/examples/gcp_templates/jupyter/jupyter-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-jupyter",
- "name" : "set the name",
- "shape" : "n1-standard-2",
- "version" : "jupyter_notebook-5.7.4",
- "template_name" : "Jupyter notebook 5.7.4"
+ "image": "docker.datalab-jupyter",
+ "name": "set the name",
+ "shape": "n1-standard-2",
+ "version": "jupyter_notebook-5.7.4",
+ "template_name": "Jupyter notebook 5.7.4"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/jupyter/spark_cluster.json b/integration-tests/examples/gcp_templates/jupyter/spark_cluster.json
index 63047da..96e78d1 100644
--- a/integration-tests/examples/gcp_templates/jupyter/spark_cluster.json
+++ b/integration-tests/examples/gcp_templates/jupyter/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "n1-standard-2",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/rstudio/dataproc.json b/integration-tests/examples/gcp_templates/rstudio/dataproc.json
index 1f4724f..7d80aea 100644
--- a/integration-tests/examples/gcp_templates/rstudio/dataproc.json
+++ b/integration-tests/examples/gcp_templates/rstudio/dataproc.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
"dataproc_master_count": "1",
"dataproc_slave_count": "2",
"dataproc_preemptible_count": "0",
- "dataproc_master_instance_type" : "n1-standard-2",
- "dataproc_slave_instance_type" : "n1-standard-2",
- "dataproc_version" : "1.2",
+ "dataproc_master_instance_type": "n1-standard-2",
+ "dataproc_slave_instance_type": "n1-standard-2",
+ "dataproc_version": "1.2",
"notebook_name": "set notebook name",
- "template_name" : "Dataproc cluster"
+ "template_name": "Dataproc cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/rstudio/rstudio-notebook.json b/integration-tests/examples/gcp_templates/rstudio/rstudio-notebook.json
index 607992a..3e1187d 100644
--- a/integration-tests/examples/gcp_templates/rstudio/rstudio-notebook.json
+++ b/integration-tests/examples/gcp_templates/rstudio/rstudio-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-rstudio",
- "name" : "set the name",
- "shape" : "n1-standard-2",
- "version" : "RStudio-1.1.463",
- "template_name" : "RStudio 1.1.463"
+ "image": "docker.datalab-rstudio",
+ "name": "set the name",
+ "shape": "n1-standard-2",
+ "version": "RStudio-1.1.463",
+ "template_name": "RStudio 1.1.463"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/rstudio/spark_cluster.json b/integration-tests/examples/gcp_templates/rstudio/spark_cluster.json
index 63047da..96e78d1 100644
--- a/integration-tests/examples/gcp_templates/rstudio/spark_cluster.json
+++ b/integration-tests/examples/gcp_templates/rstudio/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "n1-standard-2",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/tensor/dataproc.json b/integration-tests/examples/gcp_templates/tensor/dataproc.json
index 1f4724f..7d80aea 100644
--- a/integration-tests/examples/gcp_templates/tensor/dataproc.json
+++ b/integration-tests/examples/gcp_templates/tensor/dataproc.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
"dataproc_master_count": "1",
"dataproc_slave_count": "2",
"dataproc_preemptible_count": "0",
- "dataproc_master_instance_type" : "n1-standard-2",
- "dataproc_slave_instance_type" : "n1-standard-2",
- "dataproc_version" : "1.2",
+ "dataproc_master_instance_type": "n1-standard-2",
+ "dataproc_slave_instance_type": "n1-standard-2",
+ "dataproc_version": "1.2",
"notebook_name": "set notebook name",
- "template_name" : "Dataproc cluster"
+ "template_name": "Dataproc cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/tensor/spark_cluster.json b/integration-tests/examples/gcp_templates/tensor/spark_cluster.json
index 63047da..96e78d1 100644
--- a/integration-tests/examples/gcp_templates/tensor/spark_cluster.json
+++ b/integration-tests/examples/gcp_templates/tensor/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "n1-standard-2",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/tensor/tensor-notebook.json b/integration-tests/examples/gcp_templates/tensor/tensor-notebook.json
index 6586c21..3dca522 100644
--- a/integration-tests/examples/gcp_templates/tensor/tensor-notebook.json
+++ b/integration-tests/examples/gcp_templates/tensor/tensor-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-tensor",
- "name" : "set the name",
- "shape" : "n1-highcpu-8",
- "version" : "tensorflow_gpu-1.4.0",
- "template_name" : "TensorFlow 1.4.0"
+ "image": "docker.datalab-tensor",
+ "name": "set the name",
+ "shape": "n1-highcpu-8",
+ "version": "tensorflow_gpu-1.4.0",
+ "template_name": "TensorFlow 1.4.0"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/zeppelin/dataproc.json b/integration-tests/examples/gcp_templates/zeppelin/dataproc.json
index 1f4724f..7d80aea 100644
--- a/integration-tests/examples/gcp_templates/zeppelin/dataproc.json
+++ b/integration-tests/examples/gcp_templates/zeppelin/dataproc.json
@@ -1,12 +1,12 @@
{
- "image" : "docker.dlab-dataengine-service",
- "name" : "set the name",
+ "image": "docker.datalab-dataengine-service",
+ "name": "set the name",
"dataproc_master_count": "1",
"dataproc_slave_count": "2",
"dataproc_preemptible_count": "0",
- "dataproc_master_instance_type" : "n1-standard-2",
- "dataproc_slave_instance_type" : "n1-standard-2",
- "dataproc_version" : "1.2",
+ "dataproc_master_instance_type": "n1-standard-2",
+ "dataproc_slave_instance_type": "n1-standard-2",
+ "dataproc_version": "1.2",
"notebook_name": "set notebook name",
- "template_name" : "Dataproc cluster"
+ "template_name": "Dataproc cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/zeppelin/spark_cluster.json b/integration-tests/examples/gcp_templates/zeppelin/spark_cluster.json
index 63047da..96e78d1 100644
--- a/integration-tests/examples/gcp_templates/zeppelin/spark_cluster.json
+++ b/integration-tests/examples/gcp_templates/zeppelin/spark_cluster.json
@@ -1,8 +1,8 @@
{
- "image" : "docker.dlab-dataengine",
- "name" : "set the name",
- "dataengine_instance_count" : "2",
+ "image": "docker.datalab-dataengine",
+ "name": "set the name",
+ "dataengine_instance_count": "2",
"dataengine_instance_shape": "n1-standard-2",
- "notebook_name" : "set notebook name",
+ "notebook_name": "set notebook name",
"template_name": "Apache Spark cluster"
}
\ No newline at end of file
diff --git a/integration-tests/examples/gcp_templates/zeppelin/zeppelin-notebook.json b/integration-tests/examples/gcp_templates/zeppelin/zeppelin-notebook.json
index 56b8790..a48491e 100644
--- a/integration-tests/examples/gcp_templates/zeppelin/zeppelin-notebook.json
+++ b/integration-tests/examples/gcp_templates/zeppelin/zeppelin-notebook.json
@@ -1,7 +1,7 @@
{
- "image" : "docker.dlab-zeppelin",
- "name" : "set the name",
- "shape" : "n1-standard-2",
- "version" : "zeppelin-0.8.0",
+ "image": "docker.datalab-zeppelin",
+ "name": "set the name",
+ "shape": "n1-standard-2",
+ "version": "zeppelin-0.8.0",
"template_name": "Apache Zeppelin 0.8.0"
}
\ No newline at end of file
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index a6121d9..37ad85c 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.epam.dlab</groupId>
+ <groupId>com.epam.datalab</groupId>
<artifactId>integration-tests</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
@@ -247,11 +247,11 @@
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <!-- <mainClass>com.epam.dlab.automation</mainClass> -->
+ <!-- <mainClass>com.epam.datalab.automation</mainClass> -->
<manifestEntries>
<Created-By><EPAM> Systems</Created-By>
- <Name>com/epam/dlab/automation</Name>
- <Implementation-Title>DLab Integration Tests</Implementation-Title>
+ <Name>com/epam/datalab/automation</Name>
+ <Implementation-Title>DataLab Integration Tests</Implementation-Title>
<Implementation-Version>${datalab.version}</Implementation-Version>
<Implementation-Vendor><EPAM> Systems</Implementation-Vendor>
<Build-Time>${maven.build.timestamp}</Build-Time>
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/VirtualMachineStatusChecker.java b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/VirtualMachineStatusChecker.java
similarity index 95%
rename from integration-tests/src/main/java/com/epam/dlab/automation/cloud/VirtualMachineStatusChecker.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/cloud/VirtualMachineStatusChecker.java
index 79313b3..af5b0ea 100644
--- a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/VirtualMachineStatusChecker.java
+++ b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/VirtualMachineStatusChecker.java
@@ -48,9 +48,9 @@ public class VirtualMachineStatusChecker {
AzureHelper.checkAzureStatus(tagNameValue, PowerState.RUNNING, restrictionMode);
break;
case CloudProvider.GCP_PROVIDER:
- GcpHelper.checkGcpStatus(tagNameValue, ConfigPropertyValue.getGcpDlabProjectId(),
+ GcpHelper.checkGcpStatus(tagNameValue, ConfigPropertyValue.getGcpDataLabProjectId(),
GcpInstanceState.RUNNING, restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId()));
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId()));
break;
default:
Assert.fail(UNKNOWN_CLOUD_PROVIDER);
@@ -69,9 +69,9 @@ public class VirtualMachineStatusChecker {
AzureHelper.checkAzureStatus(tagNameValue, PowerState.STOPPED, restrictionMode);
break;
case CloudProvider.GCP_PROVIDER:
- GcpHelper.checkGcpStatus(tagNameValue, ConfigPropertyValue.getGcpDlabProjectId(),
+ GcpHelper.checkGcpStatus(tagNameValue, ConfigPropertyValue.getGcpDataLabProjectId(),
GcpInstanceState.TERMINATED, restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId()));
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId()));
break;
default:
Assert.fail(UNKNOWN_CLOUD_PROVIDER);
@@ -90,9 +90,9 @@ public class VirtualMachineStatusChecker {
AzureHelper.checkAzureStatus(tagNameValue, PowerState.DEALLOCATED, restrictionMode);
break;
case CloudProvider.GCP_PROVIDER:
- GcpHelper.checkGcpStatus(tagNameValue, ConfigPropertyValue.getGcpDlabProjectId(),
+ GcpHelper.checkGcpStatus(tagNameValue, ConfigPropertyValue.getGcpDataLabProjectId(),
GcpInstanceState.TERMINATED, restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId()));
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId()));
break;
default:
Assert.fail(UNKNOWN_CLOUD_PROVIDER);
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/aws/AmazonHelper.java
similarity index 94%
rename from integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/cloud/aws/AmazonHelper.java
index c5cc69f..4235de9 100644
--- a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonHelper.java
+++ b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/aws/AmazonHelper.java
@@ -25,7 +25,12 @@ import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.ec2.AmazonEC2;
import com.amazonaws.services.ec2.AmazonEC2Client;
-import com.amazonaws.services.ec2.model.*;
+import com.amazonaws.services.ec2.model.DescribeInstancesRequest;
+import com.amazonaws.services.ec2.model.DescribeInstancesResult;
+import com.amazonaws.services.ec2.model.Filter;
+import com.amazonaws.services.ec2.model.Instance;
+import com.amazonaws.services.ec2.model.Reservation;
+import com.amazonaws.services.ec2.model.Tag;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.AccessControlList;
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonInstanceState.java b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/aws/AmazonInstanceState.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/cloud/aws/AmazonInstanceState.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/cloud/aws/AmazonInstanceState.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/azure/AzureHelper.java b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/azure/AzureHelper.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/cloud/azure/AzureHelper.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/cloud/azure/AzureHelper.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpHelper.java b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/gcp/GcpHelper.java
similarity index 95%
rename from integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpHelper.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/cloud/gcp/GcpHelper.java
index b796510..7d309ba 100644
--- a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpHelper.java
+++ b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/gcp/GcpHelper.java
@@ -27,7 +27,12 @@ import com.google.api.client.http.HttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.compute.Compute;
-import com.google.api.services.compute.model.*;
+import com.google.api.services.compute.model.AccessConfig;
+import com.google.api.services.compute.model.Instance;
+import com.google.api.services.compute.model.InstanceList;
+import com.google.api.services.compute.model.NetworkInterface;
+import com.google.api.services.compute.model.Zone;
+import com.google.api.services.compute.model.ZoneList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.testng.Assert;
@@ -36,7 +41,11 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpInstanceState.java b/integration-tests/src/main/java/com/epam/datalab/automation/cloud/gcp/GcpInstanceState.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpInstanceState.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/cloud/gcp/GcpInstanceState.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/AckStatus.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/AckStatus.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/AckStatus.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/AckStatus.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/Bridge.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/Bridge.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/Bridge.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/Bridge.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/Docker.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/Docker.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/Docker.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/Docker.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/DockerContainer.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/DockerContainer.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/DockerContainer.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/DockerContainer.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/HostConfig.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/HostConfig.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/HostConfig.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/HostConfig.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/Labels.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/Labels.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/Labels.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/Labels.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/NetworkSettings.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/NetworkSettings.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/NetworkSettings.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/NetworkSettings.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/Networks.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/Networks.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/Networks.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/Networks.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/docker/SSHConnect.java b/integration-tests/src/main/java/com/epam/datalab/automation/docker/SSHConnect.java
similarity index 95%
rename from integration-tests/src/main/java/com/epam/dlab/automation/docker/SSHConnect.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/docker/SSHConnect.java
index 6d498f3..c09fdf3 100644
--- a/integration-tests/src/main/java/com/epam/dlab/automation/docker/SSHConnect.java
+++ b/integration-tests/src/main/java/com/epam/datalab/automation/docker/SSHConnect.java
@@ -20,7 +20,12 @@
package com.epam.datalab.automation.docker;
import com.epam.datalab.automation.helper.ConfigPropertyValue;
-import com.jcraft.jsch.*;
+import com.jcraft.jsch.Channel;
+import com.jcraft.jsch.ChannelExec;
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java b/integration-tests/src/main/java/com/epam/datalab/automation/exceptions/CloudException.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/exceptions/CloudException.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/exceptions/DockerException.java b/integration-tests/src/main/java/com/epam/datalab/automation/exceptions/DockerException.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/exceptions/DockerException.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/exceptions/DockerException.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/exceptions/JenkinsException.java b/integration-tests/src/main/java/com/epam/datalab/automation/exceptions/JenkinsException.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/exceptions/JenkinsException.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/exceptions/JenkinsException.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/exceptions/LoadFailException.java b/integration-tests/src/main/java/com/epam/datalab/automation/exceptions/LoadFailException.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/exceptions/LoadFailException.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/exceptions/LoadFailException.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/helper/CloudHelper.java b/integration-tests/src/main/java/com/epam/datalab/automation/helper/CloudHelper.java
similarity index 94%
rename from integration-tests/src/main/java/com/epam/dlab/automation/helper/CloudHelper.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/helper/CloudHelper.java
index 3917764..76ef9ed 100644
--- a/integration-tests/src/main/java/com/epam/dlab/automation/helper/CloudHelper.java
+++ b/integration-tests/src/main/java/com/epam/datalab/automation/helper/CloudHelper.java
@@ -49,9 +49,9 @@ public class CloudHelper {
} else return null;
case CloudProvider.GCP_PROVIDER:
List<com.google.api.services.compute.model.Instance> instanceList =
- GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDlabProjectId(),
+ GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDataLabProjectId(),
restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId()));
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId()));
if (instanceList != null && !GcpHelper.getInstancePublicIps(instanceList.get(0)).isEmpty()) {
return GcpHelper.getInstancePublicIps(instanceList.get(0)).get(0);
} else return null;
@@ -71,8 +71,8 @@ public class CloudHelper {
} else return null;
case CloudProvider.GCP_PROVIDER:
List<com.google.api.services.compute.model.Instance> instanceList =
- GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDlabProjectId(), restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId()));
+ GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDataLabProjectId(), restrictionMode,
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId()));
if (instanceList != null && !GcpHelper.getInstancePrivateIps(instanceList.get(0)).isEmpty()) {
return GcpHelper.getInstancePrivateIps(instanceList.get(0)).get(0);
} else return null;
@@ -92,18 +92,17 @@ public class CloudHelper {
}
throw new CloudException("Could not detect name for instance " + name);
case CloudProvider.AZURE_PROVIDER:
- if(AzureHelper.getVirtualMachinesByName(name, restrictionMode) != null){
+ if (AzureHelper.getVirtualMachinesByName(name, restrictionMode) != null) {
return AzureHelper.getVirtualMachinesByName(name, restrictionMode).get(0).name();
} else return null;
case CloudProvider.GCP_PROVIDER:
- if (GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDlabProjectId(), restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId())) != null) {
- return GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDlabProjectId(),
+ if (GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDataLabProjectId(), restrictionMode,
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId())) != null) {
+ return GcpHelper.getInstancesByName(name, ConfigPropertyValue.getGcpDataLabProjectId(),
restrictionMode,
- GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDlabProjectId()))
+ GcpHelper.getAvailableZonesForProject(ConfigPropertyValue.getGcpDataLabProjectId()))
.get(0).getName();
- }
- else return null;
+ } else return null;
default:
return null;
}
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/helper/CloudProvider.java b/integration-tests/src/main/java/com/epam/datalab/automation/helper/CloudProvider.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/helper/CloudProvider.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/helper/CloudProvider.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/helper/ConfigPropertyValue.java b/integration-tests/src/main/java/com/epam/datalab/automation/helper/ConfigPropertyValue.java
similarity index 65%
rename from integration-tests/src/main/java/com/epam/dlab/automation/helper/ConfigPropertyValue.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/helper/ConfigPropertyValue.java
index 01e0cdf..3ac7221 100644
--- a/integration-tests/src/main/java/com/epam/dlab/automation/helper/ConfigPropertyValue.java
+++ b/integration-tests/src/main/java/com/epam/datalab/automation/helper/ConfigPropertyValue.java
@@ -34,45 +34,45 @@ public class ConfigPropertyValue {
private static final Logger LOGGER = LogManager.getLogger(ConfigPropertyValue.class);
private static final String CONFIG_FILE_NAME;
- public static final String JENKINS_USERNAME="JENKINS_USERNAME";
+ public static final String JENKINS_USERNAME = "JENKINS_USERNAME";
public static final String JENKINS_PASS = "JENKINS_PASSWORD";
- private static final String USERNAME="USERNAME";
+ private static final String USERNAME = "USERNAME";
private static final String PASS = "PASSWORD";
- private static final String NOT_IAM_USERNAME="NOT_IAM_USERNAME";
+ private static final String NOT_IAM_USERNAME = "NOT_IAM_USERNAME";
private static final String NOT_IAM_PASS = "NOT_IAM_PASSWORD";
- private static final String NOT_DLAB_USERNAME="NOT_DLAB_USERNAME";
- private static final String NOT_DLAB_PASS = "NOT_DLAB_PASSWORD";
- private static final String JENKINS_JOB_URL="JENKINS_JOB_URL";
- private static final String USER_FOR_ACTIVATE_KEY="USER_FOR_ACTIVATE_KEY";
+ private static final String NOT_DATALAB_USERNAME = "NOT_DATALAB_USERNAME";
+ private static final String NOT_DATALAB_PASS = "NOT_DATALAB_PASSWORD";
+ private static final String JENKINS_JOB_URL = "JENKINS_JOB_URL";
+ private static final String USER_FOR_ACTIVATE_KEY = "USER_FOR_ACTIVATE_KEY";
private static final String PASS_FOR_ACTIVATE_KEY = "PASSWORD_FOR_ACTIVATE_KEY";
- private static final String ACCESS_KEY_PRIV_FILE_NAME="ACCESS_KEY_PRIV_FILE_NAME";
- private static final String ACCESS_KEY_PUB_FILE_NAME="ACCESS_KEY_PUB_FILE_NAME";
+ private static final String ACCESS_KEY_PRIV_FILE_NAME = "ACCESS_KEY_PRIV_FILE_NAME";
+ private static final String ACCESS_KEY_PUB_FILE_NAME = "ACCESS_KEY_PUB_FILE_NAME";
- private static final String CLOUD_PROVIDER="CLOUD_PROVIDER";
-
- private static final String AWS_ACCESS_KEY_ID="AWS_ACCESS_KEY_ID";
- private static final String AWS_SECRET_ACCESS_KEY="AWS_SECRET_ACCESS_KEY";
- private static final String AWS_REGION="AWS_REGION";
- private static final String AWS_REQUEST_TIMEOUT="AWS_REQUEST_TIMEOUT";
-
- private static final String AZURE_REGION="AZURE_REGION";
- private static final String AZURE_REQUEST_TIMEOUT="AZURE_REQUEST_TIMEOUT";
- private static final String AZURE_DATALAKE_ENABLED="AZURE_DATALAKE_ENABLED";
- private static final String AZURE_DATALAKE_SHARED_ACCOUNT="AZURE_DATALAKE_SHARED_ACCOUNT";
- private static final String AZURE_STORAGE_SHARED_ACCOUNT="AZURE_STORAGE_SHARED_ACCOUNT";
+ private static final String CLOUD_PROVIDER = "CLOUD_PROVIDER";
+
+ private static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
+ private static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
+ private static final String AWS_REGION = "AWS_REGION";
+ private static final String AWS_REQUEST_TIMEOUT = "AWS_REQUEST_TIMEOUT";
+
+ private static final String AZURE_REGION = "AZURE_REGION";
+ private static final String AZURE_REQUEST_TIMEOUT = "AZURE_REQUEST_TIMEOUT";
+ private static final String AZURE_DATALAKE_ENABLED = "AZURE_DATALAKE_ENABLED";
+ private static final String AZURE_DATALAKE_SHARED_ACCOUNT = "AZURE_DATALAKE_SHARED_ACCOUNT";
+ private static final String AZURE_STORAGE_SHARED_ACCOUNT = "AZURE_STORAGE_SHARED_ACCOUNT";
private static final String AZURE_AUTHENTICATION_FILE = "AZURE_AUTHENTICATION_FILE";
- private static final String GCP_DLAB_PROJECT_ID = "GCP_DLAB_PROJECT_ID";
- private static final String GCP_REGION="GCP_REGION";
+ private static final String GCP_DATALAB_PROJECT_ID = "GCP_DATALAB_PROJECT_ID";
+ private static final String GCP_REGION = "GCP_REGION";
private static final String GCP_REQUEST_TIMEOUT = "GCP_REQUEST_TIMEOUT";
private static final String GCP_AUTHENTICATION_FILE = "GCP_AUTHENTICATION_FILE";
- private static final String TIMEOUT_JENKINS_AUTOTEST="TIMEOUT_JENKINS_AUTOTEST";
- private static final String TIMEOUT_UPLOAD_KEY="TIMEOUT_UPLOAD_KEY";
- private static final String TIMEOUT_SSN_STARTUP="TIMEOUT_SSN_STARTUP";
+ private static final String TIMEOUT_JENKINS_AUTOTEST = "TIMEOUT_JENKINS_AUTOTEST";
+ private static final String TIMEOUT_UPLOAD_KEY = "TIMEOUT_UPLOAD_KEY";
+ private static final String TIMEOUT_SSN_STARTUP = "TIMEOUT_SSN_STARTUP";
- private static final String CLUSTER_OS_USERNAME = "CLUSTER_OS_USERNAME";
- private static final String CLUSTER_OS_FAMILY = "CLUSTER_OS_FAMILY";
+ private static final String CLUSTER_OS_USERNAME = "CLUSTER_OS_USERNAME";
+ private static final String CLUSTER_OS_FAMILY = "CLUSTER_OS_FAMILY";
private static final String CONF_TAG_RESOURCE_ID = "CONF_TAG_RESOURCE_ID";
private static final String JUPYTER_SCENARIO_FILES = "JUPYTER_SCENARIO_FILES";
@@ -143,47 +143,47 @@ public class ConfigPropertyValue {
private static void loadProperties() {
try (FileReader fin = new FileReader(new File(CONFIG_FILE_NAME))) {
- props.load(fin);
-
- PropertiesResolver.overlapProperty(props, CLUSTER_OS_USERNAME, true);
- PropertiesResolver.overlapProperty(props, CLUSTER_OS_FAMILY, true);
- PropertiesResolver.overlapProperty(props, AWS_REGION, true);
- PropertiesResolver.overlapProperty(props, AZURE_REGION, true);
- PropertiesResolver.overlapProperty(props, GCP_DLAB_PROJECT_ID, true);
- PropertiesResolver.overlapProperty(props, GCP_REGION, true);
- PropertiesResolver.overlapProperty(props, NOTEBOOKS_TO_TEST, false);
- PropertiesResolver.overlapProperty(props, SKIPPED_LIBS, true);
- PropertiesResolver.overlapProperty(props, USE_JENKINS, true);
- PropertiesResolver.overlapProperty(props, JENKINS_JOB_URL, !isUseJenkins());
- PropertiesResolver.overlapProperty(props, SSN_URL, isUseJenkins());
- PropertiesResolver.overlapProperty(props, SERVICE_BASE_NAME, isUseJenkins());
- PropertiesResolver.overlapProperty(props, RUN_MODE_LOCAL, true);
-
- setKeyProperty(ACCESS_KEY_PRIV_FILE_NAME);
+ props.load(fin);
+
+ PropertiesResolver.overlapProperty(props, CLUSTER_OS_USERNAME, true);
+ PropertiesResolver.overlapProperty(props, CLUSTER_OS_FAMILY, true);
+ PropertiesResolver.overlapProperty(props, AWS_REGION, true);
+ PropertiesResolver.overlapProperty(props, AZURE_REGION, true);
+ PropertiesResolver.overlapProperty(props, GCP_DATALAB_PROJECT_ID, true);
+ PropertiesResolver.overlapProperty(props, GCP_REGION, true);
+ PropertiesResolver.overlapProperty(props, NOTEBOOKS_TO_TEST, false);
+ PropertiesResolver.overlapProperty(props, SKIPPED_LIBS, true);
+ PropertiesResolver.overlapProperty(props, USE_JENKINS, true);
+ PropertiesResolver.overlapProperty(props, JENKINS_JOB_URL, !isUseJenkins());
+ PropertiesResolver.overlapProperty(props, SSN_URL, isUseJenkins());
+ PropertiesResolver.overlapProperty(props, SERVICE_BASE_NAME, isUseJenkins());
+ PropertiesResolver.overlapProperty(props, RUN_MODE_LOCAL, true);
+
+ setKeyProperty(ACCESS_KEY_PRIV_FILE_NAME);
setKeyProperty(ACCESS_KEY_PUB_FILE_NAME);
} catch (Exception e) {
LOGGER.fatal("Load properties from file {} fails.", CONFIG_FILE_NAME, e);
- throw new LoadFailException("Load properties from \"" + CONFIG_FILE_NAME + "\" fails. " +
- e.getLocalizedMessage(), e);
+ throw new LoadFailException("Load properties from \"" + CONFIG_FILE_NAME + "\" fails. " +
+ e.getLocalizedMessage(), e);
}
-
- printProperty(JENKINS_USERNAME);
+
+ printProperty(JENKINS_USERNAME);
printProperty(JENKINS_PASS);
- printProperty(USERNAME);
+ printProperty(USERNAME);
printProperty(PASS);
- printProperty(NOT_IAM_USERNAME);
+ printProperty(NOT_IAM_USERNAME);
printProperty(NOT_IAM_PASS);
- printProperty(NOT_DLAB_USERNAME);
- printProperty(NOT_DLAB_PASS);
- printProperty(JENKINS_JOB_URL);
- printProperty(USER_FOR_ACTIVATE_KEY);
+ printProperty(NOT_DATALAB_USERNAME);
+ printProperty(NOT_DATALAB_PASS);
+ printProperty(JENKINS_JOB_URL);
+ printProperty(USER_FOR_ACTIVATE_KEY);
printProperty(PASS_FOR_ACTIVATE_KEY);
- printProperty(ACCESS_KEY_PRIV_FILE_NAME);
- printProperty(ACCESS_KEY_PUB_FILE_NAME);
-
- printProperty(TIMEOUT_JENKINS_AUTOTEST);
- printProperty(TIMEOUT_UPLOAD_KEY);
- printProperty(TIMEOUT_SSN_STARTUP);
+ printProperty(ACCESS_KEY_PRIV_FILE_NAME);
+ printProperty(ACCESS_KEY_PUB_FILE_NAME);
+
+ printProperty(TIMEOUT_JENKINS_AUTOTEST);
+ printProperty(TIMEOUT_UPLOAD_KEY);
+ printProperty(TIMEOUT_SSN_STARTUP);
printProperty(JUPYTER_SCENARIO_FILES);
printProperty(CLOUD_PROVIDER);
@@ -233,29 +233,29 @@ public class ConfigPropertyValue {
return get(PASS);
}
- public static String getNotIAMUsername() {
- return get(NOT_IAM_USERNAME);
- }
+ public static String getNotIAMUsername() {
+ return get(NOT_IAM_USERNAME);
+ }
- public static String getNotIAMPassword() {
+ public static String getNotIAMPassword() {
return get(NOT_IAM_PASS);
- }
+ }
- public static String getNotDLabUsername() {
- return get(NOT_DLAB_USERNAME);
- }
+ public static String getNotDataLabUsername() {
+ return get(NOT_DATALAB_USERNAME);
+ }
- public static String getNotDLabPassword() {
- return get(NOT_DLAB_PASS);
- }
+ public static String getNotDataLabPassword() {
+ return get(NOT_DATALAB_PASS);
+ }
- public static String getJenkinsJobURL() {
- return get(JENKINS_JOB_URL);
- }
+ public static String getJenkinsJobURL() {
+ return get(JENKINS_JOB_URL);
+ }
- public static String getUserForActivateKey() {
- return get(USER_FOR_ACTIVATE_KEY);
- }
+ public static String getUserForActivateKey() {
+ return get(USER_FOR_ACTIVATE_KEY);
+ }
public static String getPasswordForActivateKey() {
return get(PASS_FOR_ACTIVATE_KEY);
@@ -310,21 +310,21 @@ public class ConfigPropertyValue {
return get(AZURE_DATALAKE_ENABLED);
}
- public static String getAzureDatalakeSharedAccount() {
- return get(AZURE_DATALAKE_SHARED_ACCOUNT);
- }
+ public static String getAzureDatalakeSharedAccount() {
+ return get(AZURE_DATALAKE_SHARED_ACCOUNT);
+ }
- public static String getAzureStorageSharedAccount() {
- return get(AZURE_STORAGE_SHARED_ACCOUNT);
- }
+ public static String getAzureStorageSharedAccount() {
+ return get(AZURE_STORAGE_SHARED_ACCOUNT);
+ }
- public static String getGcpDlabProjectId() {
- return get(GCP_DLAB_PROJECT_ID);
+ public static String getGcpDataLabProjectId() {
+ return get(GCP_DATALAB_PROJECT_ID);
}
- public static String getGcpRegion() {
- return get(GCP_REGION);
- }
+ public static String getGcpRegion() {
+ return get(GCP_REGION);
+ }
public static Duration getGcpRequestTimeout() {
return getDuration(get(GCP_REQUEST_TIMEOUT, "10s"));
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/helper/NamingHelper.java b/integration-tests/src/main/java/com/epam/datalab/automation/helper/NamingHelper.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/helper/NamingHelper.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/helper/NamingHelper.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/helper/PropertiesResolver.java b/integration-tests/src/main/java/com/epam/datalab/automation/helper/PropertiesResolver.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/helper/PropertiesResolver.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/helper/PropertiesResolver.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/helper/WaitForStatus.java b/integration-tests/src/main/java/com/epam/datalab/automation/helper/WaitForStatus.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/helper/WaitForStatus.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/helper/WaitForStatus.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/http/ApiPath.java b/integration-tests/src/main/java/com/epam/datalab/automation/http/ApiPath.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/http/ApiPath.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/http/ApiPath.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/http/ContentType.java b/integration-tests/src/main/java/com/epam/datalab/automation/http/ContentType.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/http/ContentType.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/http/ContentType.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/http/HttpRequest.java b/integration-tests/src/main/java/com/epam/datalab/automation/http/HttpRequest.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/http/HttpRequest.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/http/HttpRequest.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/http/HttpStatusCode.java b/integration-tests/src/main/java/com/epam/datalab/automation/http/HttpStatusCode.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/http/HttpStatusCode.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/http/HttpStatusCode.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsConfigProperties.java b/integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsConfigProperties.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsConfigProperties.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsConfigProperties.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsResponseElements.java b/integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsResponseElements.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsResponseElements.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsResponseElements.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsService.java b/integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsService.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsService.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsService.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsUrls.java b/integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsUrls.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/jenkins/JenkinsUrls.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/jenkins/JenkinsUrls.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/CreateNotebookDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/CreateNotebookDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/CreateNotebookDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/CreateNotebookDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/DeployClusterDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/DeployClusterDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/DeployClusterDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/DeployClusterDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/DeployDataProcDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/DeployDataProcDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/DeployDataProcDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/DeployDataProcDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/DeployEMRDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/DeployEMRDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/DeployEMRDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/DeployEMRDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/DeploySparkDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/DeploySparkDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/DeploySparkDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/DeploySparkDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/ExploratoryImageDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/ExploratoryImageDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/ExploratoryImageDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/ExploratoryImageDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/ImageDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/ImageDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/ImageDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/ImageDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/JsonMapperDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/JsonMapperDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/JsonMapperDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/JsonMapperDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/Lib.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/Lib.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/Lib.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/Lib.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/LoginDto.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/LoginDto.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/LoginDto.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/LoginDto.java
diff --git a/integration-tests/src/main/java/com/epam/dlab/automation/model/NotebookConfig.java b/integration-tests/src/main/java/com/epam/datalab/automation/model/NotebookConfig.java
similarity index 100%
rename from integration-tests/src/main/java/com/epam/dlab/automation/model/NotebookConfig.java
rename to integration-tests/src/main/java/com/epam/datalab/automation/model/NotebookConfig.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/TestCallable.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/TestCallable.java
similarity index 97%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/TestCallable.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/TestCallable.java
index de0de05..568a205 100644
--- a/integration-tests/src/test/java/com/epam/dlab/automation/test/TestCallable.java
+++ b/integration-tests/src/test/java/com/epam/datalab/automation/test/TestCallable.java
@@ -22,12 +22,24 @@ package com.epam.datalab.automation.test;
import com.epam.datalab.automation.cloud.VirtualMachineStatusChecker;
import com.epam.datalab.automation.cloud.aws.AmazonHelper;
import com.epam.datalab.automation.docker.Docker;
-import com.epam.datalab.automation.helper.*;
+import com.epam.datalab.automation.helper.CloudHelper;
+import com.epam.datalab.automation.helper.CloudProvider;
+import com.epam.datalab.automation.helper.ConfigPropertyValue;
+import com.epam.datalab.automation.helper.NamingHelper;
+import com.epam.datalab.automation.helper.PropertiesResolver;
+import com.epam.datalab.automation.helper.WaitForStatus;
import com.epam.datalab.automation.http.ApiPath;
import com.epam.datalab.automation.http.ContentType;
import com.epam.datalab.automation.http.HttpRequest;
import com.epam.datalab.automation.http.HttpStatusCode;
-import com.epam.datalab.automation.model.*;
+import com.epam.datalab.automation.model.CreateNotebookDto;
+import com.epam.datalab.automation.model.DeployClusterDto;
+import com.epam.datalab.automation.model.DeploySparkDto;
+import com.epam.datalab.automation.model.ExploratoryImageDto;
+import com.epam.datalab.automation.model.ImageDto;
+import com.epam.datalab.automation.model.JsonMapperDto;
+import com.epam.datalab.automation.model.Lib;
+import com.epam.datalab.automation.model.NotebookConfig;
import com.epam.datalab.automation.test.libs.LibsHelper;
import com.epam.datalab.automation.test.libs.TestLibGroupStep;
import com.epam.datalab.automation.test.libs.TestLibInstallStep;
@@ -42,7 +54,12 @@ import org.testng.Assert;
import java.io.File;
import java.nio.file.Paths;
import java.time.Duration;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Random;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/TestDataEngineService.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/TestDataEngineService.java
similarity index 98%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/TestDataEngineService.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/TestDataEngineService.java
index f828a75..dc8c718 100644
--- a/integration-tests/src/test/java/com/epam/dlab/automation/test/TestDataEngineService.java
+++ b/integration-tests/src/test/java/com/epam/datalab/automation/test/TestDataEngineService.java
@@ -25,7 +25,11 @@ import com.epam.datalab.automation.helper.CloudHelper;
import com.epam.datalab.automation.helper.ConfigPropertyValue;
import com.epam.datalab.automation.helper.NamingHelper;
import com.epam.datalab.automation.helper.PropertiesResolver;
-import com.jcraft.jsch.*;
+import com.jcraft.jsch.ChannelExec;
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.SftpException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -40,7 +44,10 @@ import java.util.Vector;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
class TestDataEngineService {
private final static Logger LOGGER = LogManager.getLogger(TestDataEngineService.class);
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/TestServices.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/TestServices.java
similarity index 95%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/TestServices.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/TestServices.java
index 801bee1..2d51800 100644
--- a/integration-tests/src/test/java/com/epam/dlab/automation/test/TestServices.java
+++ b/integration-tests/src/test/java/com/epam/datalab/automation/test/TestServices.java
@@ -21,7 +21,12 @@ package com.epam.datalab.automation.test;
import com.epam.datalab.automation.cloud.VirtualMachineStatusChecker;
import com.epam.datalab.automation.docker.Docker;
-import com.epam.datalab.automation.helper.*;
+import com.epam.datalab.automation.helper.CloudHelper;
+import com.epam.datalab.automation.helper.CloudProvider;
+import com.epam.datalab.automation.helper.ConfigPropertyValue;
+import com.epam.datalab.automation.helper.NamingHelper;
+import com.epam.datalab.automation.helper.PropertiesResolver;
+import com.epam.datalab.automation.helper.WaitForStatus;
import com.epam.datalab.automation.http.ApiPath;
import com.epam.datalab.automation.http.ContentType;
import com.epam.datalab.automation.http.HttpRequest;
@@ -176,14 +181,14 @@ public class TestServices {
// administrator to create corresponding IAM User");
// }
- responseBody = login(ConfigPropertyValue.getNotDLabUsername(), ConfigPropertyValue.getNotDLabPassword(),
- HttpStatusCode.UNAUTHORIZED, "Unauthorized user " + ConfigPropertyValue.getNotDLabUsername());
+ responseBody = login(ConfigPropertyValue.getNotDataLabUsername(), ConfigPropertyValue.getNotDataLabPassword(),
+ HttpStatusCode.UNAUTHORIZED, "Unauthorized user " + ConfigPropertyValue.getNotDataLabUsername());
Assert.assertEquals(responseBody.path("message"), "Username or password is invalid");
if (!ConfigPropertyValue.isRunModeLocal()) {
responseBody = login(ConfigPropertyValue.getUsername(), ".", HttpStatusCode.UNAUTHORIZED,
- "Unauthorized user " + ConfigPropertyValue.getNotDLabUsername());
+ "Unauthorized user " + ConfigPropertyValue.getNotDataLabUsername());
Assert.assertEquals(responseBody.path("message"), "Username or password is invalid");
}
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/LibraryNotFoundException.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/LibraryNotFoundException.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/LibraryNotFoundException.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/LibraryNotFoundException.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/LibsHelper.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/LibsHelper.java
similarity index 87%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/LibsHelper.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/LibsHelper.java
index 70fa2b7..2426b66 100644
--- a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/LibsHelper.java
+++ b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/LibsHelper.java
@@ -21,7 +21,11 @@ package com.epam.datalab.automation.test.libs;
import com.epam.datalab.automation.helper.NamingHelper;
-import static com.epam.datalab.automation.helper.NamingHelper.*;
+import static com.epam.datalab.automation.helper.NamingHelper.DEEPLEARNING;
+import static com.epam.datalab.automation.helper.NamingHelper.JUPYTER;
+import static com.epam.datalab.automation.helper.NamingHelper.RSTUDIO;
+import static com.epam.datalab.automation.helper.NamingHelper.TENSOR;
+import static com.epam.datalab.automation.helper.NamingHelper.ZEPPELIN;
public class LibsHelper {
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestDescription.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestDescription.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibGroupStep.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibGroupStep.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibGroupStep.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibGroupStep.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibInstallStep.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibInstallStep.java
similarity index 98%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibInstallStep.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibInstallStep.java
index 7fa95e7..32c5581 100644
--- a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibInstallStep.java
+++ b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibInstallStep.java
@@ -33,7 +33,11 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.testng.Assert;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
@TestDescription("Test \"Install libraries\" ")
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibListStep.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibListStep.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibListStep.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibListStep.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibStep.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibStep.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestLibStep.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/TestLibStep.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibInstallRequest.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibInstallRequest.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibInstallRequest.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibInstallRequest.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibSearchRequest.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibSearchRequest.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibSearchRequest.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibSearchRequest.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibStatusResponse.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibStatusResponse.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibStatusResponse.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibStatusResponse.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibToSearchData.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibToSearchData.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibToSearchData.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibToSearchData.java
diff --git a/integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibraryStatus.java b/integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibraryStatus.java
similarity index 100%
rename from integration-tests/src/test/java/com/epam/dlab/automation/test/libs/models/LibraryStatus.java
rename to integration-tests/src/test/java/com/epam/datalab/automation/test/libs/models/LibraryStatus.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org