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/05/14 09:09:51 UTC
ambari git commit: AMBARI-16175: Clean up imports for Accumulo,
Ambari-metrics, Atlas, Falcon, Flume and Ganglia (Juanjo Marron via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 4e2723474 -> 84bd9ca44
AMBARI-16175: Clean up imports for Accumulo, Ambari-metrics, Atlas, Falcon, Flume and Ganglia (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/84bd9ca4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84bd9ca4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84bd9ca4
Branch: refs/heads/trunk
Commit: 84bd9ca44b57a7a0157fb7fe394e3e42f1809bd6
Parents: 4e27234
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Sat May 14 02:09:45 2016 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Sat May 14 02:09:45 2016 -0700
----------------------------------------------------------------------
.../package/scripts/accumulo_configuration.py | 8 +++++++-
.../1.6.1.2.2.0/package/scripts/accumulo_service.py | 5 +++--
.../1.6.1.2.2.0/package/scripts/service_check.py | 6 +++++-
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 7 ++++++-
.../0.1.0/package/scripts/ams_service.py | 4 +++-
.../AMBARI_METRICS/0.1.0/package/scripts/hbase.py | 6 +++++-
.../0.1.0/package/scripts/hbase_master.py | 1 -
.../0.1.0/package/scripts/hbase_regionserver.py | 1 -
.../0.1.0/package/scripts/hbase_service.py | 3 ++-
.../0.1.0/package/scripts/metrics_collector.py | 2 +-
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 7 ++++++-
.../0.1.0/package/scripts/params_linux.py | 4 +++-
.../0.1.0/package/scripts/status_params.py | 4 +++-
.../ATLAS/0.1.0.2.3/package/scripts/atlas_client.py | 8 ++++----
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 11 ++++++++---
.../0.1.0.2.3/package/scripts/metadata_server.py | 15 ++++++++-------
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 5 +++--
.../ATLAS/0.1.0.2.3/package/scripts/service_check.py | 9 ++++++---
.../ATLAS/0.1.0.2.3/package/scripts/status_params.py | 5 +++--
.../0.5.0.2.1/package/scripts/falcon_client.py | 8 ++++----
.../0.5.0.2.1/package/scripts/falcon_server.py | 2 +-
.../package/scripts/falcon_server_upgrade.py | 3 +--
.../0.5.0.2.1/package/scripts/params_windows.py | 3 +--
.../0.5.0.2.1/package/scripts/service_check.py | 4 +++-
.../FLUME/1.4.0.2.0/package/scripts/flume.py | 9 ++++++++-
.../FLUME/1.4.0.2.0/package/scripts/flume_check.py | 4 +++-
.../FLUME/1.4.0.2.0/package/scripts/flume_handler.py | 13 ++++++-------
.../1.4.0.2.0/package/scripts/params_windows.py | 2 +-
.../GANGLIA/3.5.0/package/scripts/functions.py | 3 ++-
.../GANGLIA/3.5.0/package/scripts/ganglia.py | 6 +++++-
.../GANGLIA/3.5.0/package/scripts/ganglia_monitor.py | 3 ++-
.../3.5.0/package/scripts/ganglia_monitor_service.py | 4 +++-
.../GANGLIA/3.5.0/package/scripts/ganglia_server.py | 6 +++++-
.../3.5.0/package/scripts/ganglia_server_service.py | 5 +++--
.../GANGLIA/3.5.0/package/scripts/params.py | 4 +++-
.../GANGLIA/3.5.0/package/scripts/status_params.py | 2 +-
36 files changed, 128 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
index 09a3d90..ed6ba68 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
@@ -18,8 +18,14 @@ limitations under the License.
"""
-from resource_management import *
import os
+from resource_management.core.resources.system import Directory, Execute, File
+from resource_management.core.source import InlineTemplate, StaticFile
+from resource_management.core.shell import as_user
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.resources.properties_file import PropertiesFile
+from resource_management.libraries.resources.template_config import TemplateConfig
+from resource_management.libraries.resources.xml_config import XmlConfig
def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or 'tracer' or 'client'
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
index 33d3273..22c0ec4 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
@@ -17,9 +17,10 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-
-from resource_management import *
+from resource_management.core.resources.system import Directory, Execute
+from resource_management.core.shell import as_user
from resource_management.libraries.functions.show_logs import show_logs
+from resource_management.libraries.functions.format import format
import time
import os
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
index a7067cb..e23e18b 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/service_check.py
@@ -18,9 +18,13 @@ limitations under the License.
"""
-from resource_management import *
import os
+from resource_management.core.resources.system import Execute, File
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.script.script import Script
+
class AccumuloServiceCheck(Script):
def service_check(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index 3c3d804..28aba35 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -18,7 +18,12 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.core.resources.system import Directory, Execute, File
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.resources.template_config import TemplateConfig
+from resource_management.core.resources.service import ServiceConfig
+from resource_management.core.source import InlineTemplate, Template
+from resource_management.libraries.functions.format import format
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
from ambari_commons.str_utils import compress_backslashes
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
index eb1b6d7..35e11f7 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
@@ -18,8 +18,10 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.core.resources.system import Directory, Execute, File
+from resource_management.core.resources.service import Service
from resource_management.libraries.functions.show_logs import show_logs
+from resource_management.libraries.functions.format import format
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
from hbase_service import hbase_service
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index 7fb9715..020af2a 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -19,7 +19,11 @@ limitations under the License.
"""
import os
from ambari_commons import OSConst
-from resource_management import *
+from resource_management.core.resources.system import Directory, Execute, File
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.resources.template_config import TemplateConfig
+from resource_management.libraries.functions.format import format
+from resource_management.core.source import Template, InlineTemplate
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
@OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py
index b769a0d..c045a91 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py
@@ -19,7 +19,6 @@ limitations under the License.
"""
import sys
-from resource_management import *
from hbase import hbase
from hbase_service import hbase_service
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py
index cf0efef..8735b2d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py
@@ -19,7 +19,6 @@ limitations under the License.
"""
import sys
-from resource_management import *
from hbase import hbase
from hbase_service import hbase_service
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py
index 4d0d7f3..ba4725b 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py
@@ -18,7 +18,8 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.core.resources.system import Execute, File
+from resource_management.libraries.functions.format import format
def hbase_service(
name,
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
index a5abe1c..825a48e 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -18,7 +18,7 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script import Script
from resource_management.libraries.functions.security_commons import build_expectations, \
cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, \
FILE_TYPE_XML
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 32b8fdb..1bbb5b6 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -22,9 +22,14 @@ from functions import calc_xmn_from_xms
from functions import check_append_heap_property
from functions import trim_heap_property
from resource_management.core.logger import Logger
-from resource_management import *
+from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources
+from resource_management.libraries import functions
from resource_management.libraries.functions.expect import expect
+from resource_management.libraries.functions.default import default
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions.substitute_vars import substitute_vars
+from resource_management.libraries.resources.hdfs_resource import HdfsResource
import status_params
from ambari_commons import OSCheck
import ConfigParser
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
index 21b491d..13ec279 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
@@ -18,8 +18,10 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions.default import default
+from resource_management.libraries.functions.format import format
from ambari_commons import OSCheck
from ambari_commons.constants import AMBARI_SUDO_BINARY
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
index 3c4bffc..5be54e3 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
@@ -18,7 +18,9 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.libraries import functions
+from resource_management.libraries.functions.format import format
from ambari_commons import OSCheck
if OSCheck.is_windows_family():
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
index 2bdb4c0..6b045ca 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_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.script.script import Script
+from resource_management.libraries.functions import conf_select, stack_select
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
+from resource_management.core.exceptions import ClientComponentHasNoStatus
from metadata import metadata
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index 3138161..e305138 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -17,9 +17,14 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-from resource_management import Directory, Fail, Logger, File, \
- InlineTemplate, PropertiesFile, StaticFile, XmlConfig
-from resource_management.libraries.functions import format
+
+from resource_management.core.resources.system import Directory, File
+from resource_management.core.exceptions import Fail
+from resource_management.core.logger import Logger
+from resource_management.core.source import StaticFile, InlineTemplate
+from resource_management.libraries.resources.properties_file import PropertiesFile
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.functions.format import format
from resource_management.libraries.resources.template_config import TemplateConfig
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index 1e9e7a7..352937a 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -16,19 +16,20 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
+import os
+import shutil
from metadata import metadata
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management import Execute, File, check_process_status, Script
-from resource_management.libraries.functions import format
+from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.core.resources.system import Execute, File
+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.format import format
from resource_management.libraries.functions.security_commons import build_expectations, \
get_params_from_filesystem, validate_security_config_properties, \
FILE_TYPE_PROPERTIES
from resource_management.libraries.functions.show_logs import show_logs
from resource_management.libraries.functions.stack_features import check_stack_feature
-from resource_management.libraries.functions import StackFeature
-import os
-import shutil
+from resource_management.libraries.functions.constants import StackFeature
class MetadataServer(Script):
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index f9422ee..fb4a55f 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -19,8 +19,9 @@ limitations under the License.
"""
import os
import sys
-from resource_management import format_stack_version, Script
-from resource_management.libraries.functions import format
+from resource_management.libraries.functions.version import format_stack_version
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.format import format
from resource_management.libraries.functions.default import default
import status_params
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
index 194a3fb..8978396 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
@@ -16,9 +16,12 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-from resource_management import Script, Logger, ComponentIsNotRunning, \
- Execute
-from resource_management.libraries.functions import format
+
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.format import format
+from resource_management.core.logger import Logger
+from resource_management.core.resources.system import Execute
+from resource_management.core.exceptions import ComponentIsNotRunning
class AtlasServiceCheck(Script):
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
index 4c54214..a92d24c 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
@@ -18,8 +18,9 @@ limitations under the License.
"""
import os
-from resource_management import Script
-from resource_management.libraries.functions import get_kinit_path, format
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.functions.default import default
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
index 64ace1a..1e7ed1f3 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_client.py
@@ -17,14 +17,14 @@ limitations under the License.
"""
-from resource_management import *
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import conf_select, stack_select
from falcon import falcon
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
+from resource_management.libraries.functions.constants import StackFeature
class FalconClient(Script):
def configure(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
index a201619..7c2cdf4 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server.py
@@ -34,7 +34,7 @@ from falcon import falcon
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
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
class FalconServer(Script):
def configure(self, env, upgrade_type=None):
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py
index 6277086..8eca96c 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py
@@ -24,8 +24,7 @@ import tempfile
from resource_management.core.logger import Logger
from resource_management.core.exceptions import Fail
from resource_management.libraries.functions import tar_archive
-from resource_management.core.resources.system import Execute
-from resource_management.core.resources.system import Directory
+from resource_management.core.resources.system import Execute, Directory
BACKUP_TEMP_DIR = "falcon-upgrade-backup"
BACKUP_DATA_ARCHIVE = "falcon-local-backup.tar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
index b213028..2658d39 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_windows.py
@@ -16,9 +16,8 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-
-from resource_management import *
import os
+from resource_management.libraries.script.script import Script
from status_params import *
config = Script.get_config()
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
index 473b7c3..ef45855 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
@@ -17,7 +17,9 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.format import format
+from resource_management.core.resources.system import Execute
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
index 9df2ba6..704770f 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py
@@ -20,7 +20,14 @@ limitations under the License.
import glob
import ambari_simplejson as json # simplejson is much faster comparing to Python 2.6 json module and has the same functions set.
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 Directory, Execute, File
+from resource_management.core.exceptions import Fail
+from resource_management.core.shell import as_user, as_sudo
+from resource_management.core.source import Template, InlineTemplate
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.resources.properties_file import PropertiesFile
from resource_management.libraries.functions.flume_agent_helper import is_flume_process_live
from resource_management.libraries.functions.flume_agent_helper import find_expected_agent_names
from resource_management.libraries.functions.flume_agent_helper import await_flume_process_termination
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
index 25d9a08..c5450bb 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
@@ -17,7 +17,9 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.format import format
+from resource_management.core.resources.system import Execute
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
index 1333605..4d72463 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py
@@ -22,18 +22,17 @@ import flume_upgrade
from flume import flume
from flume import get_desired_state
-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.flume_agent_helper import find_expected_agent_names
-from resource_management.libraries.functions.flume_agent_helper import get_flume_status
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions.flume_agent_helper import find_expected_agent_names, get_flume_status
from resource_management.libraries.functions.default import default
-
+from resource_management.core.logger import Logger
+from resource_management.core.resources.service import Service
import service_mapping
from ambari_commons import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
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, Direction
class FlumeHandler(Script):
def configure(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_windows.py
index 66e9852..1ec945a 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/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
# server configurations
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/functions.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/functions.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/functions.py
index 02c44f0..351da0f 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/functions.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/functions.py
@@ -15,7 +15,8 @@
# specific language governing permissions and limitations
# under the License.
#
-from resource_management import *
+from resource_management.core.resources.system import Execute, File
+from resource_management.libraries.functions.format import format
from ambari_commons.os_check import OSCheck
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia.py
index 9a69b72..097fa01 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia.py
@@ -16,7 +16,11 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-from resource_management import *
+from resource_management.core.resources.system import Directory, Execute, File
+from resource_management.libraries.resources.template_config import TemplateConfig
+from resource_management.libraries.functions.format import format
+from resource_management.core.exceptions import Fail
+from resource_management.core.source import StaticFile
import os
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor.py
index feb0af3..26f96c7 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor.py
@@ -19,7 +19,8 @@ limitations under the License.
import sys
import os
from os import path
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.core.resources.system import Directory, File
from ganglia import generate_daemon
import ganglia
import functions
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor_service.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor_service.py
index 58d512c..2784b19 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor_service.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_monitor_service.py
@@ -16,7 +16,9 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-from resource_management import *
+from resource_management.core.resources.system import Execute
+from resource_management.core.shell import as_sudo
+from resource_management.libraries.functions.format import format
def monitor(action=None):# 'start' or 'stop'
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server.py
index 8d75d7f..246b1d9 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server.py
@@ -19,7 +19,11 @@ limitations under the License.
import sys
import os
from os import path
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.core.resources.system import Directory, File
+from resource_management.core.source import Template
+from resource_management.libraries.resources.template_config import TemplateConfig
+from resource_management.libraries.functions.format import format
from ganglia import generate_daemon
import ganglia
import functions
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server_service.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server_service.py
index 70fdbf6..ca62091 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server_service.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/ganglia_server_service.py
@@ -16,8 +16,9 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-from resource_management import *
-
+from resource_management.core.shell import as_sudo
+from resource_management.core.resources.system import Execute
+from resource_management.libraries.resources.monitor_webserver import MonitorWebserver
def server(action=None):# 'start' or 'stop'
command = as_sudo(('service', 'hdp-gmetad', action)) + " >> /tmp/gmetad.log 2>&1 ; /bin/ps auwx | /bin/grep [g]metad >> /tmp/gmetad.log 2>&1"
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
index 30f8ee4..8473013 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
@@ -16,7 +16,9 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions.default import default
+from resource_management.libraries.functions.format import format
from resource_management.core.system import System
from ambari_commons.os_check import OSCheck
import os
http://git-wip-us.apache.org/repos/asf/ambari/blob/84bd9ca4/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/status_params.py
index 0c69ca9..f96562b 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/status_params.py
@@ -18,7 +18,7 @@ limitations under the License.
"""
-from resource_management import *
+from resource_management.libraries.script.script import Script
config = Script.get_config()