You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/02/02 15:18:23 UTC
[incubator-datalab] branch DATALAB-2091 updated: [DATALAB-2091]:
replaced import of fabric.api with import fabric
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2091 by this push:
new 559f7f6 [DATALAB-2091]: replaced import of fabric.api with import fabric
559f7f6 is described below
commit 559f7f62bde4967702fb1c07c03844c6a0f886db
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Feb 2 17:18:05 2021 +0200
[DATALAB-2091]: replaced import of fabric.api with import fabric
---
infrastructure-provisioning/scripts/deploy_datalab.py | 2 +-
.../scripts/deploy_keycloak/deploy_keycloak.py | 2 +-
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../scripts/deploy_repository/scripts/update_amazon_repositories.py | 2 +-
infrastructure-provisioning/scripts/post-deployment_configuration.py | 2 +-
infrastructure-provisioning/src/base/entrypoint.py | 2 +-
infrastructure-provisioning/src/base/scripts/create_ssh_user.py | 2 +-
infrastructure-provisioning/src/base/scripts/install_prerequisites.py | 2 +-
infrastructure-provisioning/src/base/scripts/install_user_key.py | 2 +-
infrastructure-provisioning/src/dataengine-service/fabfile.py | 2 +-
infrastructure-provisioning/src/dataengine/fabfile.py | 2 +-
.../src/deeplearning/scripts/configure_deep_learning_node.py | 2 +-
infrastructure-provisioning/src/edge/fabfile.py | 2 +-
infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py | 2 +-
.../src/edge/scripts/configure_nginx_reverse_proxy.py | 2 +-
infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py | 2 +-
infrastructure-provisioning/src/general/api/check_inactivity.py | 2 +-
infrastructure-provisioning/src/general/api/configure.py | 2 +-
infrastructure-provisioning/src/general/api/create.py | 2 +-
infrastructure-provisioning/src/general/api/create_image.py | 2 +-
infrastructure-provisioning/src/general/api/git_creds.py | 2 +-
infrastructure-provisioning/src/general/api/install_libs.py | 2 +-
infrastructure-provisioning/src/general/api/list_libs.py | 2 +-
infrastructure-provisioning/src/general/api/reconfigure_spark.py | 2 +-
infrastructure-provisioning/src/general/api/recreate.py | 2 +-
infrastructure-provisioning/src/general/api/reupload_key.py | 2 +-
infrastructure-provisioning/src/general/api/start.py | 2 +-
infrastructure-provisioning/src/general/api/status.py | 2 +-
infrastructure-provisioning/src/general/api/stop.py | 2 +-
infrastructure-provisioning/src/general/api/terminate.py | 2 +-
infrastructure-provisioning/src/general/api/terminate_image.py | 2 +-
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/azure/actions_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/gcp/meta_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/fab.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 2 +-
.../src/general/scripts/aws/common_collect_data.py | 2 +-
.../src/general/scripts/aws/common_download_git_certfile.py | 2 +-
.../scripts/aws/common_notebook_configure_dataengine-service.py | 2 +-
.../src/general/scripts/aws/common_notebook_configure_dataengine.py | 2 +-
.../src/general/scripts/aws/common_prepare_notebook.py | 2 +-
.../src/general/scripts/aws/common_remove_remote_kernels.py | 2 +-
.../src/general/scripts/aws/common_reupload_key.py | 2 +-
.../src/general/scripts/aws/common_start_notebook.py | 2 +-
.../src/general/scripts/aws/common_stop_notebook.py | 2 +-
.../src/general/scripts/aws/dataengine-service_configure.py | 2 +-
.../src/general/scripts/aws/dataengine-service_create.py | 2 +-
.../src/general/scripts/aws/dataengine-service_install_libs.py | 2 +-
.../src/general/scripts/aws/dataengine-service_list_libs.py | 2 +-
.../src/general/scripts/aws/dataengine-service_prepare.py | 2 +-
.../src/general/scripts/aws/dataengine_configure.py | 2 +-
.../src/general/scripts/aws/dataengine_prepare.py | 2 +-
.../src/general/scripts/aws/dataengine_start.py | 2 +-
.../src/general/scripts/aws/deeplearning_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/edge_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/edge_status.py | 2 +-
.../src/general/scripts/aws/jupyter_configure.py | 2 +-
.../general/scripts/aws/jupyter_dataengine-service_create_configs.py | 2 +-
.../general/scripts/aws/jupyter_install_dataengine-service_kernels.py | 2 +-
.../src/general/scripts/aws/jupyterlab_configure.py | 2 +-
.../src/general/scripts/aws/project_prepare.py | 2 +-
.../src/general/scripts/aws/rstudio_configure.py | 2 +-
.../general/scripts/aws/rstudio_dataengine-service_create_configs.py | 2 +-
.../general/scripts/aws/rstudio_install_dataengine-service_kernels.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/ssn_terminate.py | 2 +-
.../src/general/scripts/aws/tensor-rstudio_configure.py | 2 +-
.../src/general/scripts/aws/tensor_configure.py | 2 +-
.../src/general/scripts/aws/zeppelin_configure.py | 2 +-
.../general/scripts/aws/zeppelin_dataengine-service_create_configs.py | 2 +-
.../scripts/aws/zeppelin_install_dataengine-service_kernels.py | 2 +-
.../src/general/scripts/azure/common_collect_data.py | 2 +-
.../src/general/scripts/azure/common_create_notebook_image.py | 2 +-
.../src/general/scripts/azure/common_download_git_certfile.py | 2 +-
.../src/general/scripts/azure/common_notebook_configure_dataengine.py | 2 +-
.../src/general/scripts/azure/common_notebook_update_refresh_token.py | 4 ++--
.../src/general/scripts/azure/common_prepare_notebook.py | 2 +-
.../src/general/scripts/azure/common_remove_remote_kernels.py | 2 +-
.../src/general/scripts/azure/common_reupload_key.py | 2 +-
.../src/general/scripts/azure/common_start_notebook.py | 2 +-
.../src/general/scripts/azure/dataengine_configure.py | 2 +-
.../src/general/scripts/azure/dataengine_prepare.py | 2 +-
.../src/general/scripts/azure/dataengine_start.py | 2 +-
.../src/general/scripts/azure/deeplearning_configure.py | 2 +-
.../src/general/scripts/azure/edge_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/azure/edge_status.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 2 +-
.../src/general/scripts/azure/jupyterlab_configure.py | 2 +-
.../src/general/scripts/azure/project_prepare.py | 2 +-
.../src/general/scripts/azure/rstudio_change_pass.py | 2 +-
.../src/general/scripts/azure/rstudio_configure.py | 2 +-
.../src/general/scripts/azure/ssn_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py | 2 +-
.../src/general/scripts/azure/ssn_terminate.py | 2 +-
.../src/general/scripts/azure/tensor_configure.py | 2 +-
.../src/general/scripts/azure/zeppelin_configure.py | 2 +-
.../src/general/scripts/gcp/common_collect_data.py | 2 +-
.../src/general/scripts/gcp/common_download_git_certfile.py | 2 +-
.../scripts/gcp/common_notebook_configure_dataengine-service.py | 2 +-
.../src/general/scripts/gcp/common_notebook_configure_dataengine.py | 2 +-
.../src/general/scripts/gcp/common_prepare_notebook.py | 2 +-
.../src/general/scripts/gcp/common_reupload_key.py | 2 +-
.../src/general/scripts/gcp/common_start_notebook.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_configure.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_create.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_install_libs.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_list_libs.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_prepare.py | 2 +-
.../src/general/scripts/gcp/dataengine_configure.py | 2 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 2 +-
.../src/general/scripts/gcp/dataengine_start.py | 2 +-
.../src/general/scripts/gcp/deeplearning_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 2 +-
.../src/general/scripts/gcp/jupyter_configure.py | 2 +-
.../general/scripts/gcp/jupyter_dataengine-service_create_configs.py | 2 +-
.../general/scripts/gcp/jupyter_install_dataengine-service_kernels.py | 2 +-
.../src/general/scripts/gcp/jupyterlab_configure.py | 2 +-
.../src/general/scripts/gcp/project_prepare.py | 2 +-
.../src/general/scripts/gcp/rstudio_configure.py | 2 +-
.../general/scripts/gcp/rstudio_dataengine-service_create_configs.py | 2 +-
.../general/scripts/gcp/rstudio_install_dataengine-service_kernels.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py | 2 +-
.../src/general/scripts/gcp/superset_configure.py | 2 +-
.../src/general/scripts/gcp/tensor-rstudio_configure.py | 2 +-
.../src/general/scripts/gcp/tensor_configure.py | 2 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 2 +-
.../general/scripts/gcp/zeppelin_dataengine-service_create_configs.py | 2 +-
.../scripts/gcp/zeppelin_install_dataengine-service_kernels.py | 2 +-
.../src/general/scripts/os/check_inactivity.py | 2 +-
.../src/general/scripts/os/common_clean_instance.py | 2 +-
.../src/general/scripts/os/common_configure_proxy.py | 2 +-
.../src/general/scripts/os/common_configure_reverse_proxy.py | 2 +-
.../src/general/scripts/os/common_configure_spark.py | 2 +-
.../src/general/scripts/os/configure_proxy_for_docker.py | 2 +-
.../src/general/scripts/os/dataengine_install_libs.py | 2 +-
.../src/general/scripts/os/dataengine_list_libs.py | 2 +-
.../src/general/scripts/os/dataengine_reconfigure_spark.py | 2 +-
.../src/general/scripts/os/deeplearning_dataengine_create_configs.py | 2 +-
.../src/general/scripts/os/deeplearning_install_dataengine_kernels.py | 2 +-
.../src/general/scripts/os/get_list_available_pkgs.py | 2 +-
.../src/general/scripts/os/install_additional_libs.py | 2 +-
.../src/general/scripts/os/jupyter_dataengine_create_configs.py | 2 +-
.../src/general/scripts/os/jupyter_install_dataengine_kernels.py | 2 +-
.../src/general/scripts/os/jupyterlab_container_start.py | 2 +-
.../src/general/scripts/os/manage_git_creds.py | 2 +-
.../src/general/scripts/os/notebook_git_creds.py | 2 +-
.../src/general/scripts/os/notebook_install_libs.py | 2 +-
.../src/general/scripts/os/notebook_list_libs.py | 2 +-
.../src/general/scripts/os/notebook_reconfigure_dataengine_spark.py | 2 +-
.../src/general/scripts/os/notebook_reconfigure_spark.py | 2 +-
.../src/general/scripts/os/reconfigure_spark.py | 2 +-
.../src/general/scripts/os/rstudio_dataengine_create_configs.py | 2 +-
.../src/general/scripts/os/rstudio_install_dataengine_kernels.py | 2 +-
infrastructure-provisioning/src/general/scripts/os/superset_start.py | 2 +-
.../general/scripts/os/tensor-rstudio_dataengine_create_configs.py | 2 +-
.../general/scripts/os/tensor-rstudio_install_dataengine_kernels.py | 2 +-
.../src/general/scripts/os/tensor_dataengine_create_configs.py | 2 +-
.../src/general/scripts/os/tensor_install_dataengine_kernels.py | 2 +-
.../src/general/scripts/os/update_inactivity_on_start.py | 2 +-
.../src/general/scripts/os/zeppelin_dataengine_create_configs.py | 2 +-
.../src/general/scripts/os/zeppelin_install_dataengine_kernels.py | 2 +-
infrastructure-provisioning/src/project/fabfile.py | 2 +-
.../src/project/scripts/configure_http_proxy.py | 2 +-
infrastructure-provisioning/src/project/scripts/configure_nftables.py | 2 +-
.../src/project/scripts/configure_nginx_reverse_proxy.py | 2 +-
infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py | 2 +-
.../src/rstudio/scripts/configure_rstudio_node.py | 2 +-
infrastructure-provisioning/src/ssn/fabfile.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/backup.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_billing.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/docker_build.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/restore.py | 2 +-
.../src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py | 2 +-
.../src/tensor/scripts/configure_tensor_node.py | 2 +-
.../src/zeppelin/scripts/configure_zeppelin_node.py | 2 +-
integration-tests/examples/copy_files.py | 2 +-
.../examples/scenario_deeplearning/deeplearning_tests.py | 2 +-
integration-tests/examples/scenario_jupyter/jupyter_tests.py | 2 +-
integration-tests/examples/scenario_rstudio/rstudio_tests.py | 2 +-
integration-tests/examples/scenario_tensor/tensor_tests.py | 2 +-
integration-tests/examples/scenario_zeppelin/zeppelin_tests.py | 2 +-
198 files changed, 199 insertions(+), 199 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index 2e8b7e0..a3a07ee 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -23,7 +23,7 @@
import argparse
import os
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--conf_service_base_name', type=str, help='unique name for DataLab environment')
diff --git a/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py b/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py
index 0d3849d..138ce32 100644
--- a/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py
+++ b/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py
@@ -22,7 +22,7 @@
# ******************************************************************************
import logging
-from fabric.api import *
+from fabric import *
import argparse
import sys
import os
diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 12688a2..a30cc05 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -29,7 +29,7 @@ import sys
import time
import traceback
from ConfigParser import SafeConfigParser
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/scripts/deploy_repository/scripts/update_amazon_repositories.py b/infrastructure-provisioning/scripts/deploy_repository/scripts/update_amazon_repositories.py
index 609cc2c..7d2ba04 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/scripts/update_amazon_repositories.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/scripts/update_amazon_repositories.py
@@ -21,7 +21,7 @@
# ******************************************************************************
-from fabric.api import *
+from fabric import *
import argparse
diff --git a/infrastructure-provisioning/scripts/post-deployment_configuration.py b/infrastructure-provisioning/scripts/post-deployment_configuration.py
index 4df4e15..9780394 100644
--- a/infrastructure-provisioning/scripts/post-deployment_configuration.py
+++ b/infrastructure-provisioning/scripts/post-deployment_configuration.py
@@ -25,7 +25,7 @@ import argparse
import requests
import uuid
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
diff --git a/infrastructure-provisioning/src/base/entrypoint.py b/infrastructure-provisioning/src/base/entrypoint.py
index d00742d..cc752a5 100644
--- a/infrastructure-provisioning/src/base/entrypoint.py
+++ b/infrastructure-provisioning/src/base/entrypoint.py
@@ -24,7 +24,7 @@
import os
from configparser import SafeConfigParser
import argparse
-from fabric.api import *
+from fabric import *
import json
import sys
import select
diff --git a/infrastructure-provisioning/src/base/scripts/create_ssh_user.py b/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
index ef51eb7..78b712d 100644
--- a/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
+++ b/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
@@ -21,7 +21,7 @@
#
# ******************************************************************************
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
from datalab.fab import *
import argparse
diff --git a/infrastructure-provisioning/src/base/scripts/install_prerequisites.py b/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
index 1725aae..6f43f1e 100644
--- a/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
+++ b/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
@@ -26,7 +26,7 @@ import json
import os
from datalab.common_lib import *
from datalab.fab import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/base/scripts/install_user_key.py b/infrastructure-provisioning/src/base/scripts/install_user_key.py
index d9cdd4c..f9d954a 100644
--- a/infrastructure-provisioning/src/base/scripts/install_user_key.py
+++ b/infrastructure-provisioning/src/base/scripts/install_user_key.py
@@ -25,7 +25,7 @@ import argparse
import json
import sys
from datalab.fab import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/dataengine-service/fabfile.py b/infrastructure-provisioning/src/dataengine-service/fabfile.py
index a508540..e38d069 100644
--- a/infrastructure-provisioning/src/dataengine-service/fabfile.py
+++ b/infrastructure-provisioning/src/dataengine-service/fabfile.py
@@ -28,7 +28,7 @@ import uuid
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def run():
diff --git a/infrastructure-provisioning/src/dataengine/fabfile.py b/infrastructure-provisioning/src/dataengine/fabfile.py
index 752f8e4..8dc4341 100644
--- a/infrastructure-provisioning/src/dataengine/fabfile.py
+++ b/infrastructure-provisioning/src/dataengine/fabfile.py
@@ -27,7 +27,7 @@ import sys
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def run():
diff --git a/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py b/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
index d2e7b15..bca8b15 100644
--- a/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
+++ b/infrastructure-provisioning/src/deeplearning/scripts/configure_deep_learning_node.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/edge/fabfile.py b/infrastructure-provisioning/src/edge/fabfile.py
index 7f3cedb..9569704 100644
--- a/infrastructure-provisioning/src/edge/fabfile.py
+++ b/infrastructure-provisioning/src/edge/fabfile.py
@@ -26,7 +26,7 @@ import os
import sys
import traceback
from datalab.fab import *
-from fabric.api import *
+from fabric import *
def status():
diff --git a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
index e1d28ab..6765d59 100644
--- a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
+++ b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
@@ -25,7 +25,7 @@ import argparse
import json
import sys
from datalab.edge_lib import configure_http_proxy_server
-from fabric.api import *
+from fabric import *
from datalab.fab import *
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
index 94e65dd..9658d74 100644
--- a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
@@ -26,7 +26,7 @@ import logging
import os
import sys
from datalab.edge_lib import install_nginx_ldap
-from fabric.api import *
+from fabric import *
from datalab.fab import *
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py b/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py
index 20dcd4c..a4deccd 100644
--- a/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py
+++ b/infrastructure-provisioning/src/edge/scripts/reupload_ssh_key.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'],
diff --git a/infrastructure-provisioning/src/general/api/check_inactivity.py b/infrastructure-provisioning/src/general/api/check_inactivity.py
index d18b07e..04cda89 100644
--- a/infrastructure-provisioning/src/general/api/check_inactivity.py
+++ b/infrastructure-provisioning/src/general/api/check_inactivity.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/configure.py b/infrastructure-provisioning/src/general/api/configure.py
index 0c0285a..046a501 100644
--- a/infrastructure-provisioning/src/general/api/configure.py
+++ b/infrastructure-provisioning/src/general/api/configure.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/create.py b/infrastructure-provisioning/src/general/api/create.py
index e92db83..43a12f7 100644
--- a/infrastructure-provisioning/src/general/api/create.py
+++ b/infrastructure-provisioning/src/general/api/create.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/create_image.py b/infrastructure-provisioning/src/general/api/create_image.py
index eb4828a..5804132 100644
--- a/infrastructure-provisioning/src/general/api/create_image.py
+++ b/infrastructure-provisioning/src/general/api/create_image.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/git_creds.py b/infrastructure-provisioning/src/general/api/git_creds.py
index f9f2994..9d1bbe9 100644
--- a/infrastructure-provisioning/src/general/api/git_creds.py
+++ b/infrastructure-provisioning/src/general/api/git_creds.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/install_libs.py b/infrastructure-provisioning/src/general/api/install_libs.py
index 3abeeeb..3a6bcc3 100644
--- a/infrastructure-provisioning/src/general/api/install_libs.py
+++ b/infrastructure-provisioning/src/general/api/install_libs.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/list_libs.py b/infrastructure-provisioning/src/general/api/list_libs.py
index 45dd0eb..88b955b 100644
--- a/infrastructure-provisioning/src/general/api/list_libs.py
+++ b/infrastructure-provisioning/src/general/api/list_libs.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/reconfigure_spark.py b/infrastructure-provisioning/src/general/api/reconfigure_spark.py
index fac58d6..b023164 100644
--- a/infrastructure-provisioning/src/general/api/reconfigure_spark.py
+++ b/infrastructure-provisioning/src/general/api/reconfigure_spark.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/recreate.py b/infrastructure-provisioning/src/general/api/recreate.py
index b81ee4f..ae48f51 100644
--- a/infrastructure-provisioning/src/general/api/recreate.py
+++ b/infrastructure-provisioning/src/general/api/recreate.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/reupload_key.py b/infrastructure-provisioning/src/general/api/reupload_key.py
index ac3eab5..6e2f3df 100644
--- a/infrastructure-provisioning/src/general/api/reupload_key.py
+++ b/infrastructure-provisioning/src/general/api/reupload_key.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/start.py b/infrastructure-provisioning/src/general/api/start.py
index d583d2d..4474a67 100644
--- a/infrastructure-provisioning/src/general/api/start.py
+++ b/infrastructure-provisioning/src/general/api/start.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/status.py b/infrastructure-provisioning/src/general/api/status.py
index e45957e..2983035 100644
--- a/infrastructure-provisioning/src/general/api/status.py
+++ b/infrastructure-provisioning/src/general/api/status.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/stop.py b/infrastructure-provisioning/src/general/api/stop.py
index 6a97339..a4feb7a 100644
--- a/infrastructure-provisioning/src/general/api/stop.py
+++ b/infrastructure-provisioning/src/general/api/stop.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/terminate.py b/infrastructure-provisioning/src/general/api/terminate.py
index f10b30d..df40496 100644
--- a/infrastructure-provisioning/src/general/api/terminate.py
+++ b/infrastructure-provisioning/src/general/api/terminate.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/api/terminate_image.py b/infrastructure-provisioning/src/general/api/terminate_image.py
index 91a47dd..1e7f67f 100644
--- a/infrastructure-provisioning/src/general/api/terminate_image.py
+++ b/infrastructure-provisioning/src/general/api/terminate_image.py
@@ -24,7 +24,7 @@
import json
import os
import sys
-from fabric.api import local
+from fabric import local
if __name__ == "__main__":
success = True
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 0f4d8df..a3580e5 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -35,7 +35,7 @@ import uuid
from botocore.client import Config
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
index ecaba1a..e7dc348 100644
--- a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
@@ -41,7 +41,7 @@ from azure.mgmt.network import NetworkManagementClient
from azure.mgmt.resource import ResourceManagementClient
from azure.mgmt.storage import StorageManagementClient
from azure.storage.blob import BlockBlobService
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 87cda96..1e1d41e 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -35,7 +35,7 @@ import traceback
import urllib3
from Crypto.PublicKey import RSA
from datalab.fab import *
-from fabric.api import *
+from fabric import *
from google.cloud import exceptions
from google.cloud import storage
from googleapiclient import errors
diff --git a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
index a626884..9455ef7 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/meta_lib.py
@@ -27,7 +27,7 @@ import re
import sys
import time
import traceback
-from fabric.api import *
+from fabric import *
from datalab.fab import *
from google.cloud import exceptions
from google.cloud import storage
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index 5a38eaf..c7f3359 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -21,7 +21,7 @@
#
# ******************************************************************************
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
import sys
import os
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index 2e003c0..d3d2628 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -27,7 +27,7 @@ from datalab.common_lib import configure_nginx_LE
from datalab.common_lib import install_certbot
from datalab.common_lib import manage_pkg
from datalab.common_lib import run_certbot
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index 931b204..c483ea7 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -28,7 +28,7 @@ import sys
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 4d0aa4b..34ccebe 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -29,7 +29,7 @@ import traceback
from datalab.common_lib import manage_pkg
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def ensure_docker_daemon(datalab_path, os_user, region):
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 951d015..c2ded0c 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -33,7 +33,7 @@ import traceback
from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py
index 70d39e5..b4f880f 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py
@@ -21,7 +21,7 @@
#
# ******************************************************************************
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
import sys
import os
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py
index fa22cc3..03bb708 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py
@@ -24,7 +24,7 @@
import os
import sys
from datalab.common_lib import manage_pkg
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
index e017af4..8c5d9a2 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
@@ -27,7 +27,7 @@ import sys
from datalab.common_lib import manage_pkg
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index d3823e9..c7733d6 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -29,7 +29,7 @@ import traceback
from datalab.common_lib import manage_pkg
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def ensure_docker_daemon(datalab_path, os_user, region):
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_collect_data.py b/infrastructure-provisioning/src/general/scripts/aws/common_collect_data.py
index 3eabe20..14d2bde 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_collect_data.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_collect_data.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--list_resources', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
index a1bfbc6..8297550 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
@@ -24,7 +24,7 @@
import argparse
import os
from datalab.actions_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
index 218b80c..2e995c4 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def clear_resources():
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
index be704cd..a73d24b 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def clear_resources():
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index bd61362..e50c268 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
index 8fa9800..c52c919 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
@@ -25,7 +25,7 @@ import argparse
import sys
from datalab.actions_lib import *
from datalab.fab import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_reupload_key.py b/infrastructure-provisioning/src/general/scripts/aws/common_reupload_key.py
index a31d8f3..3f89329 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_reupload_key.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_reupload_key.py
@@ -26,7 +26,7 @@ import argparse
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--conf_resource', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py
index e60bca1..68615ae 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
index 0962bb1..9ddcdf4 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
@@ -29,7 +29,7 @@ import json
import logging
import os
import sys
-from fabric.api import *
+from fabric import *
def stop_notebook(nb_tag_value, bucket_name, tag_name, ssh_user, key_path):
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index 33af51d..2564b89 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -32,7 +32,7 @@ import os
import sys
import traceback
from datalab.common_lib import manage_pkg
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py
index a2fb168..cc3fc8d 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_create.py
@@ -32,7 +32,7 @@ import traceback
from botocore.client import Config
from datalab.actions_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
# parser.add_argument('--id', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py
index 2354a66..a8ee162 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_install_libs.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def install_libs(instance, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py
index 9aca247..eeec353 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_list_libs.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
index 0ef0c88..05915d5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -31,7 +31,7 @@ import os
import sys
import time
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
index 8abf5d4..ba52eca 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -30,7 +30,7 @@ import multiprocessing
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def configure_slave(slave_number, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
index ca68a33..df48a08 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
index 57f74fa..1f71fac 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def start_data_engine(cluster_name):
diff --git a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index e5cefbc..b7230e4 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 251687a..8928814 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
import uuid
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
index 9c714b5..64fffa6 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
@@ -28,7 +28,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
index 05413d4..4a03c47 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
index 1e4bfe3..61e954e 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_dataengine-service_create_configs.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py
index 8660174..0d6244c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_install_dataengine-service_kernels.py
@@ -25,7 +25,7 @@ import argparse
import boto3
import os
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
index 7d0ac43..267eec7 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index f65b64e..3f40045 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -31,7 +31,7 @@ import os
import sys
import time
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index 4fe2516..535214b 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py
index 01850a2..0f9104e 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_dataengine-service_create_configs.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py
index 89277c0..05f6c49 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_install_dataengine-service_kernels.py
@@ -23,7 +23,7 @@
import argparse
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 29b86c9..c2b025b 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
index 8c545b3..2a3a406 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate.py
index 86c2ee0..8555ecb 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_terminate.py
@@ -27,7 +27,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
index b201ba1..106a781 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
index 83aa12b..c1fced4 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
index b2e413c..cec16c1 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py
index a8d5fa5..a539b1a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_dataengine-service_create_configs.py
@@ -26,7 +26,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py
index dfb0a0b..6cc8c9c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_install_dataengine-service_kernels.py
@@ -24,7 +24,7 @@
import argparse
import os
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_collect_data.py b/infrastructure-provisioning/src/general/scripts/azure/common_collect_data.py
index 24984f5..11a62db 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_collect_data.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_collect_data.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--resource_group_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py b/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py
index 5866a65..562b98c 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py
@@ -27,7 +27,7 @@ import datalab.meta_lib
import json
import os
import sys
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
try:
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py
index 9ed2297..8dae105 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_download_git_certfile.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.actions_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
index 9167703..81ee565 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def clear_resources():
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_update_refresh_token.py b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_update_refresh_token.py
index 7795847..ffef0f7 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_update_refresh_token.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_update_refresh_token.py
@@ -22,12 +22,12 @@
# ******************************************************************************
from xml.etree.ElementTree import parse, Element
-from fabric.api import *
+from fabric import *
import argparse
import os
import sys
import time
-from fabric.api import lcd
+from fabric import lcd
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
index a23b6a2..25c7f5a 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_remove_remote_kernels.py b/infrastructure-provisioning/src/general/scripts/azure/common_remove_remote_kernels.py
index 69cd276..e68628b 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_remove_remote_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_remove_remote_kernels.py
@@ -25,7 +25,7 @@ import argparse
import sys
from datalab.actions_lib import *
from datalab.fab import find_cluster_kernels
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_reupload_key.py b/infrastructure-provisioning/src/general/scripts/azure/common_reupload_key.py
index 795d753..494b5ab 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_reupload_key.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_reupload_key.py
@@ -26,7 +26,7 @@ import argparse
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--conf_resource', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_start_notebook.py b/infrastructure-provisioning/src/general/scripts/azure/common_start_notebook.py
index b740400..e8ab8b0 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_start_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_start_notebook.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index f08cd05..b2625e0 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -31,7 +31,7 @@ import os
import sys
import traceback
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
def configure_slave(slave_number, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
index fcfd763..6febd9d 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
index c216bcb..2eaac5b 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def start_data_engine(resource_group_name, cluster_name):
diff --git a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
index 50f5d0f..3cac49f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index 9b26e74..dde21cd 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
import uuid
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_status.py b/infrastructure-provisioning/src/general/scripts/azure/edge_status.py
index 4e87ce8..fe5f8da 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_status.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_status.py
@@ -28,7 +28,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
index 2d62cd1..5002078 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
index b2a3631..9dc075f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 82f3392..44fb0b9 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/rstudio_change_pass.py b/infrastructure-provisioning/src/general/scripts/azure/rstudio_change_pass.py
index ebd32e5..42a7f98 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_change_pass.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_change_pass.py
@@ -24,7 +24,7 @@
import argparse
import sys
from datalab.fab import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
index d603098..f6cbc5d 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 17a5655..1fa2ce1 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
index 38f27ca..63865ff 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py
index 753d938..c803eba 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def terminate_ssn_node(resource_group_name, service_base_name, vpc_name, region):
diff --git a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
index 7055a5e..f649c50 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
index 65448d0..58cb4c5 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_collect_data.py b/infrastructure-provisioning/src/general/scripts/gcp/common_collect_data.py
index 9c75f91..02a3dcb 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_collect_data.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_collect_data.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--list_resources', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py
index 1fe2874..8d43156 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_download_git_certfile.py
@@ -24,7 +24,7 @@
import argparse
import os
from datalab.actions_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
index b213bdf..8c6d83d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def clear_resources():
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
index f721f8c..6ad175f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def clear_resources():
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index a2818fe..3407eb7 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_reupload_key.py b/infrastructure-provisioning/src/general/scripts/gcp/common_reupload_key.py
index 25089af..a5e6653 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_reupload_key.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_reupload_key.py
@@ -26,7 +26,7 @@ import argparse
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--conf_resource', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_start_notebook.py b/infrastructure-provisioning/src/general/scripts/gcp/common_start_notebook.py
index c41a1a8..aebbc9e 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_start_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_start_notebook.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
index a3b60c6..e2b9377 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -31,7 +31,7 @@ import multiprocessing
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def configure_dataengine_service(instance, dataproc_conf):
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_create.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_create.py
index e169980..f63e94c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_create.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_create.py
@@ -27,7 +27,7 @@ import json
import sys
from datalab.actions_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
# parser.add_argument('--dry_run', action='store_true', help='Print all variables')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_install_libs.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_install_libs.py
index b1d3c09..477cbba 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_install_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_install_libs.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def install_libs(instance, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_list_libs.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_list_libs.py
index 03d2e36..fe7f3ff 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_list_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_list_libs.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
index 0013f69..09123ff 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
@@ -31,7 +31,7 @@ import sys
import time
import traceback
from Crypto.PublicKey import RSA
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
index d282097..1620c43 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
@@ -30,7 +30,7 @@ import multiprocessing
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def configure_slave(slave_number, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
index ef6ac25..0070324 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
index 88513b5..095ba98 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
def start_data_engine(zone, cluster_name):
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
index b1c2496..9c71192 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 6532870..08ca1df 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
import uuid
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
index 814259d..540e00d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
index 62e0277..0a33898 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_install_dataengine-service_kernels.py
index fcff32c..d8097f2 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_install_dataengine-service_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.actions_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
index 34d634f..26dddf1 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 683cb1f..e27c358 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -30,7 +30,7 @@ import os
import sys
import traceback
import uuid
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
index f1831d7..8e8af65 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_dataengine-service_create_configs.py
index d633f81..1db9600 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_dataengine-service_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_dataengine-service_create_configs.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_install_dataengine-service_kernels.py
index 682543b..eaafaeb 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_install_dataengine-service_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.actions_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 86de1fe..9da2932 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--ssn_unique_index', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
index 7158b8e..d355250 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--ssn_unique_index', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
index b174a14..0c04bb0 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
@@ -27,7 +27,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
index 322cd10..4c9d178 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
@@ -31,7 +31,7 @@ import requests
import sys
import traceback
import uuid
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['project_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
index dd39cae..5632287 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
@@ -30,7 +30,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--uuid', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
index 41ee2fc..728e244 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
index f6150e2..928c7ce 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
@@ -29,7 +29,7 @@ import logging
import os
import sys
import traceback
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_dataengine-service_create_configs.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_dataengine-service_create_configs.py
index 2c05849..ac7f4d4 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_dataengine-service_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_dataengine-service_create_configs.py
@@ -26,7 +26,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py
index b153572..d22ce7f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_install_dataengine-service_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.actions_lib import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--bucket', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/check_inactivity.py b/infrastructure-provisioning/src/general/scripts/os/check_inactivity.py
index ff5f599..29d0043 100644
--- a/infrastructure-provisioning/src/general/scripts/os/check_inactivity.py
+++ b/infrastructure-provisioning/src/general/scripts/os/check_inactivity.py
@@ -26,7 +26,7 @@ import json
from datalab.actions_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--os_user', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
index f49d806..a185daa 100644
--- a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
+++ b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
@@ -25,7 +25,7 @@ import argparse
import os
import sys
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/common_configure_proxy.py b/infrastructure-provisioning/src/general/scripts/os/common_configure_proxy.py
index b899322..ab1b53c 100644
--- a/infrastructure-provisioning/src/general/scripts/os/common_configure_proxy.py
+++ b/infrastructure-provisioning/src/general/scripts/os/common_configure_proxy.py
@@ -24,7 +24,7 @@
import argparse
import json
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py b/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
index e809511..e11de15 100644
--- a/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
+++ b/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
@@ -25,7 +25,7 @@ import argparse
import json
import sys
from datalab.meta_lib import get_instance_private_ip_address
-from fabric.api import *
+from fabric import *
from jinja2 import Environment, FileSystemLoader
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/os/common_configure_spark.py b/infrastructure-provisioning/src/general/scripts/os/common_configure_spark.py
index d1522ea..2cd1806 100644
--- a/infrastructure-provisioning/src/general/scripts/os/common_configure_spark.py
+++ b/infrastructure-provisioning/src/general/scripts/os/common_configure_spark.py
@@ -28,7 +28,7 @@ import sys
import time
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/configure_proxy_for_docker.py b/infrastructure-provisioning/src/general/scripts/os/configure_proxy_for_docker.py
index 32bea59..6647dca 100644
--- a/infrastructure-provisioning/src/general/scripts/os/configure_proxy_for_docker.py
+++ b/infrastructure-provisioning/src/general/scripts/os/configure_proxy_for_docker.py
@@ -23,7 +23,7 @@
import argparse
import sys
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py b/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py
index f1b6127..bd90687 100644
--- a/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_install_libs.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def install_libs_on_slaves(slave, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py b/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py
index 886fcf9..7699587 100644
--- a/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_list_libs.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py b/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py
index 5dc572a..a3739a4 100644
--- a/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py
+++ b/infrastructure-provisioning/src/general/scripts/os/dataengine_reconfigure_spark.py
@@ -30,7 +30,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
def install_libs_on_slaves(slave, data_engine):
diff --git a/infrastructure-provisioning/src/general/scripts/os/deeplearning_dataengine_create_configs.py b/infrastructure-provisioning/src/general/scripts/os/deeplearning_dataengine_create_configs.py
index 68c3ae0..acdb889 100644
--- a/infrastructure-provisioning/src/general/scripts/os/deeplearning_dataengine_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/deeplearning_dataengine_create_configs.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/deeplearning_install_dataengine_kernels.py b/infrastructure-provisioning/src/general/scripts/os/deeplearning_install_dataengine_kernels.py
index ea067e3..26aa06f 100644
--- a/infrastructure-provisioning/src/general/scripts/os/deeplearning_install_dataengine_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/os/deeplearning_install_dataengine_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py b/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
index 028a1c6..cdb7a66 100644
--- a/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
@@ -27,7 +27,7 @@ import sys
import xmlrpc.client
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--os_user', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
index f801d22..89c95bf 100644
--- a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
@@ -27,7 +27,7 @@ import json
import sys
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py b/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
index 1c9328d..f7ed852 100644
--- a/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/jupyter_dataengine_create_configs.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/jupyter_install_dataengine_kernels.py b/infrastructure-provisioning/src/general/scripts/os/jupyter_install_dataengine_kernels.py
index abdc78d..e3e7e6f 100644
--- a/infrastructure-provisioning/src/general/scripts/os/jupyter_install_dataengine_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/os/jupyter_install_dataengine_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/os/jupyterlab_container_start.py b/infrastructure-provisioning/src/general/scripts/os/jupyterlab_container_start.py
index 47313bd..4dabf7d 100644
--- a/infrastructure-provisioning/src/general/scripts/os/jupyterlab_container_start.py
+++ b/infrastructure-provisioning/src/general/scripts/os/jupyterlab_container_start.py
@@ -25,7 +25,7 @@ import sys
import argparse
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/manage_git_creds.py b/infrastructure-provisioning/src/general/scripts/os/manage_git_creds.py
index 6193da6..22fe55b 100644
--- a/infrastructure-provisioning/src/general/scripts/os/manage_git_creds.py
+++ b/infrastructure-provisioning/src/general/scripts/os/manage_git_creds.py
@@ -28,7 +28,7 @@ import sys
from datalab.actions_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py b/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py
index 75382f6..3dade5b 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_git_creds.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py b/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py
index 17fb635..3c49c97 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_install_libs.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py b/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py
index 60bcd62..b18ea2f 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_list_libs.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_dataengine_spark.py b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_dataengine_spark.py
index 1491e14..a342692 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_dataengine_spark.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_dataengine_spark.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py
index c08bdf8..771a580 100644
--- a/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py
+++ b/infrastructure-provisioning/src/general/scripts/os/notebook_reconfigure_spark.py
@@ -29,7 +29,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
instance_class = 'notebook'
diff --git a/infrastructure-provisioning/src/general/scripts/os/reconfigure_spark.py b/infrastructure-provisioning/src/general/scripts/os/reconfigure_spark.py
index 3897b7d..cacd00f 100644
--- a/infrastructure-provisioning/src/general/scripts/os/reconfigure_spark.py
+++ b/infrastructure-provisioning/src/general/scripts/os/reconfigure_spark.py
@@ -26,7 +26,7 @@ import os
from datalab.actions_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--os_user', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/rstudio_dataengine_create_configs.py b/infrastructure-provisioning/src/general/scripts/os/rstudio_dataengine_create_configs.py
index 17022a4..7fe1050 100644
--- a/infrastructure-provisioning/src/general/scripts/os/rstudio_dataengine_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/rstudio_dataengine_create_configs.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/rstudio_install_dataengine_kernels.py b/infrastructure-provisioning/src/general/scripts/os/rstudio_install_dataengine_kernels.py
index a4a0b19..c185f4e 100644
--- a/infrastructure-provisioning/src/general/scripts/os/rstudio_install_dataengine_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/os/rstudio_install_dataengine_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/os/superset_start.py b/infrastructure-provisioning/src/general/scripts/os/superset_start.py
index afe38ae..611715c 100644
--- a/infrastructure-provisioning/src/general/scripts/os/superset_start.py
+++ b/infrastructure-provisioning/src/general/scripts/os/superset_start.py
@@ -25,7 +25,7 @@ import argparse
import sys
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_dataengine_create_configs.py b/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_dataengine_create_configs.py
index 24bc6d7..802e651 100644
--- a/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_dataengine_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_dataengine_create_configs.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_install_dataengine_kernels.py b/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_install_dataengine_kernels.py
index 36d358e..c276b4e 100644
--- a/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_install_dataengine_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/os/tensor-rstudio_install_dataengine_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/os/tensor_dataengine_create_configs.py b/infrastructure-provisioning/src/general/scripts/os/tensor_dataengine_create_configs.py
index e93d125..38382c6 100644
--- a/infrastructure-provisioning/src/general/scripts/os/tensor_dataengine_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/tensor_dataengine_create_configs.py
@@ -27,7 +27,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/tensor_install_dataengine_kernels.py b/infrastructure-provisioning/src/general/scripts/os/tensor_install_dataengine_kernels.py
index 0e7b7b0..7f63d45 100644
--- a/infrastructure-provisioning/src/general/scripts/os/tensor_install_dataengine_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/os/tensor_install_dataengine_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/general/scripts/os/update_inactivity_on_start.py b/infrastructure-provisioning/src/general/scripts/os/update_inactivity_on_start.py
index 3691ba8..99ad83c 100644
--- a/infrastructure-provisioning/src/general/scripts/os/update_inactivity_on_start.py
+++ b/infrastructure-provisioning/src/general/scripts/os/update_inactivity_on_start.py
@@ -25,7 +25,7 @@ import argparse
from datalab.actions_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/zeppelin_dataengine_create_configs.py b/infrastructure-provisioning/src/general/scripts/os/zeppelin_dataengine_create_configs.py
index 5c917a2..e71db17 100644
--- a/infrastructure-provisioning/src/general/scripts/os/zeppelin_dataengine_create_configs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/zeppelin_dataengine_create_configs.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cluster_name', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/scripts/os/zeppelin_install_dataengine_kernels.py b/infrastructure-provisioning/src/general/scripts/os/zeppelin_install_dataengine_kernels.py
index 1f3f448..7c89cea 100644
--- a/infrastructure-provisioning/src/general/scripts/os/zeppelin_install_dataengine_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/os/zeppelin_install_dataengine_kernels.py
@@ -25,7 +25,7 @@ import argparse
import os
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/project/fabfile.py b/infrastructure-provisioning/src/project/fabfile.py
index fc01dc6..0c89602 100644
--- a/infrastructure-provisioning/src/project/fabfile.py
+++ b/infrastructure-provisioning/src/project/fabfile.py
@@ -26,7 +26,7 @@ import os
import sys
import traceback
from datalab.fab import *
-from fabric.api import *
+from fabric import *
def run():
diff --git a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
index aa119aa..4a27cfb 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
@@ -25,7 +25,7 @@ import argparse
import json
import sys
from datalab.edge_lib import configure_http_proxy_server
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nftables.py b/infrastructure-provisioning/src/project/scripts/configure_nftables.py
index 0d53ea6..53ff094 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nftables.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nftables.py
@@ -25,7 +25,7 @@ import argparse
import json
import sys
from datalab.edge_lib import configure_nftables
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
index 218c899..5601120 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
@@ -27,7 +27,7 @@ import os
import sys
from datalab.common_lib import ensure_step
from datalab.edge_lib import install_nginx_lua
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py b/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py
index 20dcd4c..a4deccd 100644
--- a/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py
+++ b/infrastructure-provisioning/src/project/scripts/reupload_ssh_key.py
@@ -28,7 +28,7 @@ import traceback
from datalab.actions_lib import *
from datalab.fab import *
from datalab.meta_lib import *
-from fabric.api import *
+from fabric import *
if __name__ == "__main__":
local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], os.environ['edge_user_name'],
diff --git a/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py b/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py
index 35c09b66..c648fe3 100644
--- a/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py
+++ b/infrastructure-provisioning/src/rstudio/scripts/configure_rstudio_node.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/ssn/fabfile.py b/infrastructure-provisioning/src/ssn/fabfile.py
index 47da688..7ec6adb 100644
--- a/infrastructure-provisioning/src/ssn/fabfile.py
+++ b/infrastructure-provisioning/src/ssn/fabfile.py
@@ -27,7 +27,7 @@ import sys
import traceback
import uuid
from datalab.fab import *
-from fabric.api import *
+from fabric import *
def run():
diff --git a/infrastructure-provisioning/src/ssn/scripts/backup.py b/infrastructure-provisioning/src/ssn/scripts/backup.py
index 67ea945..b78b84d 100644
--- a/infrastructure-provisioning/src/ssn/scripts/backup.py
+++ b/infrastructure-provisioning/src/ssn/scripts/backup.py
@@ -26,7 +26,7 @@ import json
import os
import sys
import yaml
-from fabric.api import *
+from fabric import *
from time import gmtime, strftime
parser = argparse.ArgumentParser(description="Backup script for DataLab configs, keys, certs, jars, database & logs")
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_billing.py b/infrastructure-provisioning/src/ssn/scripts/configure_billing.py
index b5511d2..f3357a5 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_billing.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_billing.py
@@ -23,7 +23,7 @@
import argparse
import sys
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--cloud_provider', type=str,
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py b/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
index 72c9ea2..dbcd025 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_conf_file.py
@@ -25,7 +25,7 @@ import configparser
import argparse
import json
import sys
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--datalab_dir', type=str, default='')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 0d21450..afc5851 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -27,7 +27,7 @@ import os
import sys
import time
from datalab.ssn_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py b/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
index 200f4cd..5393344 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
@@ -25,7 +25,7 @@ import argparse
import json
import os
import sys
-from fabric.api import *
+from fabric import *
from datalab.fab import *
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 7df937d..9b59319 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -29,7 +29,7 @@ import traceback
from datalab.common_lib import *
from datalab.fab import *
from datalab.ssn_lib import *
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 6ffaba7..cb85f29 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -29,7 +29,7 @@ import sys
import traceback
from datalab.fab import *
from datalab.ssn_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/ssn/scripts/docker_build.py b/infrastructure-provisioning/src/ssn/scripts/docker_build.py
index fc26bf8..709f61c 100644
--- a/infrastructure-provisioning/src/ssn/scripts/docker_build.py
+++ b/infrastructure-provisioning/src/ssn/scripts/docker_build.py
@@ -24,7 +24,7 @@
import sys
import traceback
-from fabric.api import *
+from fabric import *
from os.path import exists
src_path = '/opt/datalab/sources/infrastructure-provisioning/src/'
diff --git a/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py b/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py
index 047eac4..f2569e2 100644
--- a/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py
+++ b/infrastructure-provisioning/src/ssn/scripts/gitlab_deploy.py
@@ -22,7 +22,7 @@
from ConfigParser import SafeConfigParser
-from fabric.api import *
+from fabric import *
import argparse
import boto3
from botocore.client import Config
diff --git a/infrastructure-provisioning/src/ssn/scripts/restore.py b/infrastructure-provisioning/src/ssn/scripts/restore.py
index eeccf82..5395e72 100644
--- a/infrastructure-provisioning/src/ssn/scripts/restore.py
+++ b/infrastructure-provisioning/src/ssn/scripts/restore.py
@@ -26,7 +26,7 @@ import filecmp
import os
import sys
import yaml
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser(description="Restore script for DataLab configs, keys, certs, jars & database")
parser.add_argument('--datalab_path', type=str, default='/opt/datalab/', help='Path to DataLab. Default: /opt/datalab/')
diff --git a/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py b/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py
index 3cb3864..201defc 100644
--- a/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py
+++ b/infrastructure-provisioning/src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/tensor/scripts/configure_tensor_node.py b/infrastructure-provisioning/src/tensor/scripts/configure_tensor_node.py
index fbd809a..d06ee87 100644
--- a/infrastructure-provisioning/src/tensor/scripts/configure_tensor_node.py
+++ b/infrastructure-provisioning/src/tensor/scripts/configure_tensor_node.py
@@ -28,7 +28,7 @@ from datalab.actions_lib import *
from datalab.common_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py b/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py
index b288f7b..e3b487e 100644
--- a/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py
+++ b/infrastructure-provisioning/src/zeppelin/scripts/configure_zeppelin_node.py
@@ -28,7 +28,7 @@ import sys
from datalab.actions_lib import *
from datalab.fab import *
from datalab.notebook_lib import *
-from fabric.api import *
+from fabric import *
from fabric.contrib.files import exists
parser = argparse.ArgumentParser()
diff --git a/integration-tests/examples/copy_files.py b/integration-tests/examples/copy_files.py
index 7e5ed4f..0295091 100644
--- a/integration-tests/examples/copy_files.py
+++ b/integration-tests/examples/copy_files.py
@@ -23,7 +23,7 @@
import os, sys, json
import argparse
-from fabric.api import *
+from fabric import *
parser = argparse.ArgumentParser()
parser.add_argument('--storage', type=str, default='S3/GCP buckets, Azure Blob container / Datalake folder')
diff --git a/integration-tests/examples/scenario_deeplearning/deeplearning_tests.py b/integration-tests/examples/scenario_deeplearning/deeplearning_tests.py
index 4978328..c862814 100644
--- a/integration-tests/examples/scenario_deeplearning/deeplearning_tests.py
+++ b/integration-tests/examples/scenario_deeplearning/deeplearning_tests.py
@@ -22,7 +22,7 @@
# ******************************************************************************
import os, sys, json
-from fabric.api import *
+from fabric import *
import argparse
diff --git a/integration-tests/examples/scenario_jupyter/jupyter_tests.py b/integration-tests/examples/scenario_jupyter/jupyter_tests.py
index 1fe4354..e293d23 100644
--- a/integration-tests/examples/scenario_jupyter/jupyter_tests.py
+++ b/integration-tests/examples/scenario_jupyter/jupyter_tests.py
@@ -22,7 +22,7 @@
# ******************************************************************************
import os, sys, json
-from fabric.api import *
+from fabric import *
import argparse
diff --git a/integration-tests/examples/scenario_rstudio/rstudio_tests.py b/integration-tests/examples/scenario_rstudio/rstudio_tests.py
index bd9764b..3dcf28d 100644
--- a/integration-tests/examples/scenario_rstudio/rstudio_tests.py
+++ b/integration-tests/examples/scenario_rstudio/rstudio_tests.py
@@ -22,7 +22,7 @@
# ******************************************************************************
import os, sys, json
-from fabric.api import *
+from fabric import *
import argparse
diff --git a/integration-tests/examples/scenario_tensor/tensor_tests.py b/integration-tests/examples/scenario_tensor/tensor_tests.py
index a9985c0..3ef8db6 100644
--- a/integration-tests/examples/scenario_tensor/tensor_tests.py
+++ b/integration-tests/examples/scenario_tensor/tensor_tests.py
@@ -22,7 +22,7 @@
# ******************************************************************************
import os, sys, json
-from fabric.api import *
+from fabric import *
import argparse
diff --git a/integration-tests/examples/scenario_zeppelin/zeppelin_tests.py b/integration-tests/examples/scenario_zeppelin/zeppelin_tests.py
index daa1c6b..18919be 100644
--- a/integration-tests/examples/scenario_zeppelin/zeppelin_tests.py
+++ b/integration-tests/examples/scenario_zeppelin/zeppelin_tests.py
@@ -22,7 +22,7 @@
# ******************************************************************************
import os, sys, json
-from fabric.api import *
+from fabric import *
import argparse
import requests
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org