You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/06/01 02:31:21 UTC
ambari git commit: AMBARI-16669: clean up import * for KNOX service
scripts in common-services (Juanjo Marron via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk aaf5b3b0c -> a294e8d41
AMBARI-16669: clean up import * for KNOX service scripts in common-services (Juanjo Marron via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a294e8d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a294e8d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a294e8d4
Branch: refs/heads/trunk
Commit: a294e8d41470c3aff67031004b47eb2e471ea039
Parents: aaf5b3b
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue May 31 19:31:15 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue May 31 19:31:15 2016 -0700
----------------------------------------------------------------------
.../KNOX/0.5.0.2.2/package/scripts/knox.py | 1 -
.../KNOX/0.5.0.2.2/package/scripts/knox_gateway.py | 11 +++++------
.../KNOX/0.5.0.2.2/package/scripts/knox_ldap.py | 5 +++--
.../KNOX/0.5.0.2.2/package/scripts/params_linux.py | 5 ++---
.../KNOX/0.5.0.2.2/package/scripts/params_windows.py | 2 +-
.../KNOX/0.5.0.2.2/package/scripts/service_check.py | 5 ++++-
6 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a294e8d4/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
index fbd879f..f256f99 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py
@@ -30,7 +30,6 @@ from resource_management.core.source import InlineTemplate
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
-from resource_management.core.logger import Logger
from resource_management.libraries.functions.stack_features import check_stack_feature
from resource_management.libraries.functions import StackFeature
http://git-wip-us.apache.org/repos/asf/ambari/blob/a294e8d4/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
index 1917369..c571a8f 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_gateway.py
@@ -21,20 +21,19 @@ import os
from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.check_process_status import check_process_status
-from resource_management.libraries.functions import format
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import Direction
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions.constants import Direction
from resource_management.libraries.functions.security_commons import build_expectations
from resource_management.libraries.functions.security_commons import cached_kinit_executor
from resource_management.libraries.functions.security_commons import validate_security_config_properties
from resource_management.libraries.functions.security_commons import get_params_from_filesystem
from resource_management.libraries.functions.security_commons import FILE_TYPE_XML
-
+from resource_management.libraries.functions.show_logs import show_logs
from resource_management.core.resources.system import File, Execute, Link
from resource_management.core.resources.service import Service
from resource_management.core.logger import Logger
-from resource_management.libraries.functions.show_logs import show_logs
+
from ambari_commons import OSConst, OSCheck
from ambari_commons.os_family_impl import OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/a294e8d4/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_ldap.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_ldap.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_ldap.py
index dee0154..fd7af18 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_ldap.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox_ldap.py
@@ -18,8 +18,9 @@ limitations under the License.
"""
import os
-from resource_management import *
-
+from resource_management.libraries.script.script import Script
+from resource_management.core.resources.service import ServiceConfig
+from resource_management.core.resources.system import File
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/a294e8d4/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 5d454de..cba388b 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -32,11 +32,10 @@ from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.script.script import Script
from status_params import *
from resource_management.libraries.resources.hdfs_resource import HdfsResource
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import stack_select, conf_select
from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources
from resource_management.libraries.functions.stack_features import check_stack_feature
-from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions.constants import StackFeature
# server configurations
config = Script.get_config()
http://git-wip-us.apache.org/repos/asf/ambari/blob/a294e8d4/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_windows.py
index e7a3747..53a3316 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_windows.py
@@ -18,7 +18,7 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
import os
from status_params import *
http://git-wip-us.apache.org/repos/asf/ambari/blob/a294e8d4/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
index 5e9b89e..a2134d6 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/service_check.py
@@ -18,7 +18,10 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.core.resources.system import Execute, File
+from resource_management.libraries.functions.format import format
+from resource_management.core.source import StaticFile
import sys
import os
from ambari_commons import OSConst