AMBARI-9066. Service check for Storm Fails (dlynichenko)

ambari-common/src/main/python/resource_management/libraries/functions/get_port_from_url.py

@@ -20,8 +20,7 @@ Ambari Agent
 
 """
 
-from resource_management import *
-from resource_management.libraries.functions.is_empty import *
+from resource_management.libraries.functions.is_empty import is_empty
 from resource_management.core.exceptions import Fail
 import re
 

ambari-common/src/main/python/resource_management/libraries/providers/copy_from_local.py

@@ -21,7 +21,10 @@ Ambari Agent
 """
 
 import os
-from resource_management import *
+from resource_management.libraries.resources.execute_hadoop import ExecuteHadoop
+from resource_management.core.providers import Provider
+from resource_management.libraries.functions.format import format
+from resource_management.core.shell import as_user
 
 class CopyFromLocalProvider(Provider):
   def action_run(self):

ambari-common/src/main/python/resource_management/libraries/providers/execute_hadoop.py

@@ -21,7 +21,11 @@ Ambari Agent
 """
 import os
 
-from resource_management import *
+from resource_management.core.resources import Execute
+from resource_management.core.providers import Provider
+from resource_management.libraries.functions.format import format
+from resource_management.core.environment import Environment
+from resource_management.core.shell import quote_bash_args
 
 class ExecuteHadoopProvider(Provider):
   def action_run(self):

ambari-common/src/main/python/resource_management/libraries/providers/monitor_webserver.py

@@ -20,7 +20,10 @@ Ambari Agent
 
 """
 
-from resource_management import *
+from resource_management.core.resources import Execute
+from resource_management.core.providers import Provider
+from resource_management.libraries.functions.format import format
+from resource_management.core.shell import as_sudo
 from resource_management.core.system import System
 
 

ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py

@@ -22,7 +22,13 @@ Ambari Agent
 
 import time
 import os
-from resource_management import *
+from resource_management.core.resources import File
+from resource_management.core.providers import Provider
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.format import format
+from resource_management.core.environment import Environment
+from resource_management.core.logger import Logger
+
 
 class PropertiesFileProvider(Provider):
   def action_create(self):

ambari-common/src/main/python/resource_management/libraries/providers/repository.py

@@ -24,7 +24,15 @@ import os
 import filecmp
 import tempfile
 from ambari_commons import OSCheck
-from resource_management import *
+from resource_management.core.resources import Execute
+from resource_management.core.resources import File
+from resource_management.core.providers import Provider
+from resource_management.core.source import Template
+from resource_management.core.source import StaticFile
+from resource_management.libraries.functions.format import format
+from resource_management.core.environment import Environment
+from resource_management.core.shell import checked_call
+import re
 
 class RhelSuseRepositoryProvider(Provider):
   def action_create(self):

ambari-common/src/main/python/resource_management/libraries/providers/template_config.py

@@ -21,7 +21,12 @@ Ambari Agent
 """
 
 import os
-from resource_management import *
+from resource_management.core.resources import File
+from resource_management.core.providers import Provider
+from resource_management.core.source import Template
+from resource_management.libraries.functions.format import format
+from resource_management.core.environment import Environment
+
 
 class TemplateConfigProvider(Provider):
   def action_create(self):

ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py

@@ -23,7 +23,12 @@ Ambari Agent
 import time
 import os
 import resource_management
-from resource_management import *
+from resource_management.core.resources import File
+from resource_management.core.providers import Provider
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions.format import format
+from resource_management.core.environment import Environment
+from resource_management.core.logger import Logger
 
 class XmlConfigProvider(Provider):
   def action_create(self):

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py

@@ -19,7 +19,8 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
+from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.script import Script
 from storm import storm
 from service import service
 from service_check import ServiceCheck

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py

@@ -19,7 +19,8 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
+from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.script import Script
 
 from storm import storm
 from service import service

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py

@@ -19,7 +19,7 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
+from resource_management.libraries.script import Script
 from storm import storm
 from supervisord_service import supervisord_service, supervisord_check_status
 
@@ -63,4 +63,4 @@ class Nimbus(Script):
     supervisord_check_status("nimbus")
 
 if __name__ == "__main__":
-  Nimbus().execute()
+  Nimbus().execute()

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py

@@ -20,7 +20,8 @@ limitations under the License.
 
 from resource_management.libraries.functions.version import format_hdp_stack_version, compare_versions
 from resource_management.libraries.functions.default import default
-from resource_management import *
+from resource_management.libraries.script import Script
+from resource_management.libraries.functions import default, format
 import status_params
 
 # server configurations
@@ -92,4 +93,4 @@ if security_enabled:
 ams_collector_hosts = default("/clusterHostInfo/metric_collector_hosts", [])
 has_metric_collector = not len(ams_collector_hosts) == 0
 if has_metric_collector:
-  metric_collector_host = ams_collector_hosts[0]
+  metric_collector_host = ams_collector_hosts[0]

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py

@@ -19,7 +19,8 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
+from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.script import Script
 
 from storm import storm
 from service import service

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py

@@ -19,7 +19,9 @@ limitations under the License.
 """
 
 
-from resource_management import *
+from resource_management.core.resources import Execute
+from resource_management.core.resources import File
+from resource_management.libraries.functions.format import format
 import time
 
 

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py

@@ -18,8 +18,12 @@ limitations under the License.
 
 """
 
-from resource_management import *
+from resource_management.libraries.functions.format import format
 from resource_management.libraries.functions import get_unique_id_and_date
+from resource_management.core.resources import File
+from resource_management.core.resources import Execute
+from resource_management.libraries.script import Script
+from resource_management.core.source import StaticFile
 
 class ServiceCheck(Script):
   def service_check(self, env):

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/status_params.py

@@ -17,7 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 """
-from resource_management import *
+from resource_management.libraries.script import Script
+from resource_management.libraries.functions.format import format
 
 config = Script.get_config()
 
@@ -33,4 +34,4 @@ pid_files = {"logviewer":pid_logviewer,
              "nimbus": pid_nimbus,
              "supervisor": pid_supervisor,
              "drpc": pid_drpc,
-             "rest_api": pid_rest_api}
+             "rest_api": pid_rest_api}

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py

@@ -18,7 +18,13 @@ limitations under the License.
 
 """
 
-from resource_management import *
+from resource_management.core.resources import File
+from resource_management.core.resources import Directory
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.resources.template_config import TemplateConfig
+from resource_management.libraries.functions.format import format
+from resource_management.core.source import Template
+from resource_management.libraries.functions import compare_versions
 from yaml_utils import escape_yaml_propetry
 import sys
 

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py

@@ -19,7 +19,8 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
+from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.script import Script
 
 from storm import storm
 from service import service

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py

@@ -19,10 +19,10 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
 from storm import storm
 from service import service
 from supervisord_service import supervisord_service, supervisord_check_status
+from resource_management.libraries.script import Script
 
 
 class Supervisor(Script):
@@ -65,4 +65,4 @@ class Supervisor(Script):
     supervisord_check_status("supervisor")
 
 if __name__ == "__main__":
-  Supervisor().execute()
+  Supervisor().execute()

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisord_service.py

@@ -18,7 +18,8 @@ limitations under the License.
 
 """
 
-from resource_management import *
+from resource_management.core.resources.system import Execute
+from resource_management.libraries.functions.format import format
 
 def supervisord_service(component_name, action):
   Execute(format("supervisorctl {action} storm-{component_name}"),

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py

@@ -19,10 +19,11 @@ limitations under the License.
 """
 
 import sys
-from resource_management import *
 from storm import storm
 from service import service
 from service_check import ServiceCheck
+from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.script import Script
 
 
 class UiServer(Script):