Repository: ambari Updated Branches: refs/heads/trunk 37cab36f0 -> f247b78a7
AMBARI-16672: clean up import * for OOZIE service ( 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/f247b78a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f247b78a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f247b78a Branch: refs/heads/trunk Commit: f247b78a74e490660d3975de86098f65b6884736 Parents: 37cab36 Author: Jayush Luniya <[email protected]> Authored: Thu Jun 2 09:39:04 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu Jun 2 09:39:04 2016 -0700 ---------------------------------------------------------------------- .../OOZIE/4.0.0.2.0/package/scripts/oozie_client.py | 8 ++++---- .../OOZIE/4.0.0.2.0/package/scripts/oozie_service.py | 4 +++- .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 9 ++++----- 3 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f247b78a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py index b3c6537..7c5b6e0 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py @@ -19,11 +19,11 @@ limitations under the License. """ import sys -from resource_management import * -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import StackFeature +from resource_management.libraries.script.script import Script +from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature +from resource_management.core.logger import Logger from oozie import oozie from oozie_service import oozie_service http://git-wip-us.apache.org/repos/asf/ambari/blob/f247b78a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py index ffe1783..0c8557e 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py @@ -18,9 +18,11 @@ limitations under the License. """ import os -from resource_management import * from resource_management.core.shell import as_user from resource_management.core.logger import Logger +from resource_management.core.resources.service import Service +from resource_management.core.resources.system import Execute, File +from resource_management.libraries.functions.format import format from resource_management.libraries.functions.show_logs import show_logs from resource_management.libraries.providers.hdfs_resource import WebHDFSUtil from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl http://git-wip-us.apache.org/repos/asf/ambari/blob/f247b78a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py index b76bc89..a4edfa3 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py @@ -17,26 +17,25 @@ See the License for the specific language governing permissions and limitations under the License. """ -from resource_management import * from ambari_commons.constants import AMBARI_SUDO_BINARY 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 StackFeature +from resource_management.libraries.functions import conf_select, stack_select +from resource_management.libraries.functions.constants import StackFeature from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.default import default from resource_management.libraries.functions import get_kinit_path from resource_management.libraries.functions import get_port_from_url from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources from resource_management.libraries.script.script import Script - from resource_management.libraries.functions.get_lzo_packages import get_lzo_packages from resource_management.libraries.functions.expect import expect +from resource_management.libraries.resources.hdfs_resource import HdfsResource from urlparse import urlparse import status_params import os +import re # server configurations config = Script.get_config()
