AMBARI-26247: convert .format() to f-strings for ambari-contrib

contrib/agent-simulator/docker.py

@@ -35,7 +35,7 @@ def to_json(self):
         :return: A map, which is JSON format object.
         """
         docker_json = {}
-        docker_json["weave_ip"] = "{0}/{1}".format(self.ip, self.mask)
+        docker_json["weave_ip"] = f"{self.ip}/{self.mask}"
         docker_json["weave_domain_name"] = self.weave_domain_name
         return docker_json
 

contrib/agent-simulator/docker_image/launcher_agent.py

@@ -69,7 +69,7 @@ def set_weave_ip(weave_ip):
         for index in range(len(all_resolution)):
             if index == 0:
                 token = all_resolution[index].split()
-                etc_hosts.write("{0} {1} {2}\n".format(weave_ip, token[1], token[2]))
+                etc_hosts.write(f"{weave_ip} {token[1]} {token[2]}\n")
             else:
                 etc_hosts.write(all_resolution[index])
 

contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/hooks/after-INSTALL/scripts/shared_initialization.py

@@ -51,7 +51,7 @@ def setup_stack_symlinks(struct_out_file):
   json_version = load_version(struct_out_file)
 
   if not json_version:
-    Logger.info("There is no advertised version for this component stored in {0}".format(struct_out_file))
+    Logger.info(f"There is no advertised version for this component stored in {struct_out_file}")
     return
 
   # On parallel command execution this should be executed by a single process at a time.
@@ -63,7 +63,7 @@ def setup_stack_symlinks(struct_out_file):
 def setup_config():
   import params
   stackversion = params.stack_version_unformatted
-  Logger.info("FS Type: {0}".format(params.dfs_type))
+  Logger.info(f"FS Type: {params.dfs_type}")
 
   is_hadoop_conf_dir_present = False
   if hasattr(params, "hadoop_conf_dir") and params.hadoop_conf_dir is not None and os.path.exists(params.hadoop_conf_dir):
@@ -111,7 +111,7 @@ def link_configs(struct_out_file):
   json_version = load_version(struct_out_file)
 
   if not json_version:
-    Logger.info("Could not load 'version' from {0}".format(struct_out_file))
+    Logger.info(f"Could not load 'version' from {struct_out_file}")
     return
 
   # On parallel command execution this should be executed by a single process at a time.

contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/hooks/before-INSTALL/scripts/repo_initialization.py

@@ -39,7 +39,7 @@ def _alter_repo(action, repo_string, repo_template):
   if 0 == len(repo_dicts):
     Logger.info("Repository list is empty. Ambari may not be managing the repositories.")
   else:
-    Logger.info("Initializing {0} repositories".format(str(len(repo_dicts))))
+    Logger.info(f"Initializing {str(len(repo_dicts))} repositories")
 
   for repo in repo_dicts:
     if not 'baseUrl' in repo:

contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/services/stack_advisor.py

@@ -54,19 +54,19 @@ def getComponentLayoutValidations(self, services, hosts):
          if "+" in cardinality:
            hostsMin = int(cardinality[:-1])
            if componentHostsCount < hostsMin:
-             message = "At least {0} {1} components should be installed in cluster.".format(hostsMin, componentDisplayName)
+             message = f"At least {hostsMin} {componentDisplayName} components should be installed in cluster."
          elif "-" in cardinality:
            nums = cardinality.split("-")
            hostsMin = int(nums[0])
            hostsMax = int(nums[1])
            if componentHostsCount > hostsMax or componentHostsCount < hostsMin:
-             message = "Between {0} and {1} {2} components should be installed in cluster.".format(hostsMin, hostsMax, componentDisplayName)
+             message = f"Between {hostsMin} and {hostsMax} {componentDisplayName} components should be installed in cluster."
          elif "ALL" == cardinality:
            if componentHostsCount != hostsCount:
-             message = "{0} component should be installed on all hosts in cluster.".format(componentDisplayName)
+             message = f"{componentDisplayName} component should be installed on all hosts in cluster."
          else:
            if componentHostsCount != int(cardinality):
-             message = "Exactly {0} {1} components should be installed in cluster.".format(int(cardinality), componentDisplayName)
+             message = f"Exactly {int(cardinality)} {componentDisplayName} components should be installed in cluster."
 
          if message is not None:
            items.append({"type": 'host-component', "level": 'ERROR', "message": message, "component-name": componentName})
@@ -295,7 +295,7 @@ def recommendRangerConfigurations(self, configurations, clusterData, services, h
         policymgr_external_url = services['configurations']['admin-properties']['properties']['policymgr_external_url']
       else:
         ranger_admin_host = ranger_admin_hosts[0]
-        policymgr_external_url = "{0}://{1}:{2}".format(protocol, ranger_admin_host, port)
+        policymgr_external_url = f"{protocol}://{ranger_admin_host}:{port}"
 
       putRangerAdminProperty('policymgr_external_url', policymgr_external_url)
 
@@ -403,10 +403,10 @@ def recommendRangerConfigurations(self, configurations, clusterData, services, h
       if 'infra-solr-env' in services['configurations'] and \
         ('infra_solr_znode' in services['configurations']['infra-solr-env']['properties']):
         infra_solr_znode = services['configurations']['infra-solr-env']['properties']['infra_solr_znode']
-        ranger_audit_zk_port = '{0}{1}'.format(zookeeper_host_port, infra_solr_znode)
+        ranger_audit_zk_port = f'{zookeeper_host_port}{infra_solr_znode}'
       putRangerAdminSiteProperty('ranger.audit.solr.zookeepers', ranger_audit_zk_port)
     elif zookeeper_host_port and is_solr_cloud_enabled and is_external_solr_cloud_enabled:
-      ranger_audit_zk_port = '{0}/{1}'.format(zookeeper_host_port, 'ranger_audits')
+      ranger_audit_zk_port = f'{zookeeper_host_port}/ranger_audits'
       putRangerAdminSiteProperty('ranger.audit.solr.zookeepers', ranger_audit_zk_port)
     else:
       putRangerAdminSiteProperty('ranger.audit.solr.zookeepers', 'NONE')
@@ -1002,13 +1002,13 @@ def convertToNumber(number):
               userValue = convertToNumber(configurations[configName]["properties"][propertyName])
               maxValue = convertToNumber(recommendedDefaults[configName]["property_attributes"][propertyName]["maximum"])
               if userValue > maxValue:
-                validationItems.extend([{"config-name": propertyName, "item": self.getWarnItem("Value is greater than the recommended maximum of {0} ".format(maxValue))}])
+                validationItems.extend([{"config-name": propertyName, "item": self.getWarnItem(f"Value is greater than the recommended maximum of {maxValue} ")}])
             if "minimum" in recommendedDefaults[configName]["property_attributes"][propertyName] and \
                     propertyName in recommendedDefaults[configName]["properties"]:
               userValue = convertToNumber(configurations[configName]["properties"][propertyName])
               minValue = convertToNumber(recommendedDefaults[configName]["property_attributes"][propertyName]["minimum"])
               if userValue < minValue:
-                validationItems.extend([{"config-name": propertyName, "item": self.getWarnItem("Value is less than the recommended minimum of {0} ".format(minValue))}])
+                validationItems.extend([{"config-name": propertyName, "item": self.getWarnItem(f"Value is less than the recommended minimum of {minValue} ")}])
       items.extend(self.toConfigurationValidationProblems(validationItems, configName))
     pass
 
@@ -1491,7 +1491,7 @@ def validatorNotRootFs(self, properties, recommendedDefaults, propertyName, host
     mountPoint = getMountPointForDir(dir, mountPoints)
 
     if "/" == mountPoint and self.getPreferredMountPoints(hostInfo)[0] != mountPoint:
-      return self.getWarnItem("It is not recommended to use root partition for {0}".format(propertyName))
+      return self.getWarnItem(f"It is not recommended to use root partition for {propertyName}")
 
     return None
 
@@ -1509,10 +1509,10 @@ def validatorEnoughDiskSpace(self, properties, propertyName, hostInfo, reqiuredD
     mountPoint = getMountPointForDir(dir, mountPoints.keys())
 
     if not mountPoints:
-      return self.getErrorItem("No disk info found on host %s" % hostInfo["host_name"])
+      return self.getErrorItem(f"No disk info found on host {hostInfo['host_name']}")
 
     if mountPoint is None:
-      return self.getErrorItem("No mount point in directory %s. Mount points: %s" % (dir, ', '.join(mountPoints.keys())))
+      return self.getErrorItem(f"No mount point in directory {dir}. Mount points: {', '.join(mountPoints.keys())}")
 
     if mountPoints[mountPoint] < reqiuredDiskSpace:
       msg = "Ambari Metrics disk space requirements not met. \n" \
@@ -1535,22 +1535,22 @@ def validatorLessThenDefaultValue(self, properties, recommendedDefaults, propert
     if defaultValue is None:
       return None
     if value < defaultValue:
-      return self.getWarnItem("Value is less than the recommended default of {0}".format(defaultValue))
+      return self.getWarnItem(f"Value is less than the recommended default of {defaultValue}")
     return None
 
   def validatorEqualsPropertyItem(self, properties1, propertyName1,
                                   properties2, propertyName2,
                                   emptyAllowed=False):
     if not propertyName1 in properties1:
-      return self.getErrorItem("Value should be set for %s" % propertyName1)
+      return self.getErrorItem(f"Value should be set for {propertyName1}")
     if not propertyName2 in properties2:
-      return self.getErrorItem("Value should be set for %s" % propertyName2)
+      return self.getErrorItem(f"Value should be set for {propertyName2}")
     value1 = properties1.get(propertyName1)
     if value1 is None and not emptyAllowed:
-      return self.getErrorItem("Empty value for %s" % propertyName1)
+      return self.getErrorItem(f"Empty value for {propertyName1}")
     value2 = properties2.get(propertyName2)
     if value2 is None and not emptyAllowed:
-      return self.getErrorItem("Empty value for %s" % propertyName2)
+      return self.getErrorItem(f"Empty value for {propertyName2}")
     if value1 != value2:
       return self.getWarnItem("It is recommended to set equal values "
              "for properties {0} and {1}".format(propertyName1, propertyName2))
@@ -1560,10 +1560,10 @@ def validatorEqualsPropertyItem(self, properties1, propertyName1,
   def validatorEqualsToRecommendedItem(self, properties, recommendedDefaults,
                                        propertyName):
     if not propertyName in properties:
-      return self.getErrorItem("Value should be set for %s" % propertyName)
+      return self.getErrorItem(f"Value should be set for {propertyName}")
     value = properties.get(propertyName)
     if not propertyName in recommendedDefaults:
-      return self.getErrorItem("Value should be recommended for %s" % propertyName)
+      return self.getErrorItem(f"Value should be recommended for {propertyName}")
     recommendedValue = recommendedDefaults.get(propertyName)
     if value != recommendedValue:
       return self.getWarnItem("It is recommended to set value {0} "

contrib/management-packs/isilon-onefs-mpack/src/test/python/unitTests.py

@@ -110,13 +110,13 @@ def main():
     sys.stderr.write("Failed tests:\n")
   for failed_tests in [test_errors,test_failures]:
     for err in failed_tests:
-      sys.stderr.write("{0}: {1}\n".format(err[2],err[0]))
+      sys.stderr.write(f"{err[2]}: {err[0]}\n")
       sys.stderr.write("----------------------------------------------------------------------\n")
-      sys.stderr.write("{0}\n".format(err[1]))
+      sys.stderr.write(f"{err[1]}\n")
   sys.stderr.write("----------------------------------------------------------------------\n")
-  sys.stderr.write("Total run:{0}\n".format(test_runs))
-  sys.stderr.write("Total errors:{0}\n".format(len(test_errors)))
-  sys.stderr.write("Total failures:{0}\n".format(len(test_failures)))
+  sys.stderr.write(f"Total run:{test_runs}\n")
+  sys.stderr.write(f"Total errors:{len(test_errors)}\n")
+  sys.stderr.write(f"Total failures:{len(test_failures)}\n")
 
   if tests_status:
     sys.stderr.write("OK\n")

contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/microsoft_r_server.py

@@ -27,7 +27,7 @@ class MicrosoftRServer(Script):
   def install(self, env):
     Logger.info('Installing R Node Client...')
     tmp_dir = Script.tmp_dir
-    Logger.debug('Using temp dir: {0}'.format(tmp_dir))
+    Logger.debug(f'Using temp dir: {tmp_dir}')
     self.install_packages(env)
     Logger.info('Installed R Node Client')
 

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/hooks/after-INSTALL/scripts/shared_initialization.py

@@ -51,7 +51,7 @@ def setup_stack_symlinks(struct_out_file):
   json_version = load_version(struct_out_file)
 
   if not json_version:
-    Logger.info("There is no advertised version for this component stored in {0}".format(struct_out_file))
+    Logger.info(f"There is no advertised version for this component stored in {struct_out_file}")
     return
 
   # On parallel command execution this should be executed by a single process at a time.
@@ -63,7 +63,7 @@ def setup_stack_symlinks(struct_out_file):
 def setup_config():
   import params
   stackversion = params.stack_version_unformatted
-  Logger.info("FS Type: {0}".format(params.dfs_type))
+  Logger.info(f"FS Type: {params.dfs_type}")
 
   is_hadoop_conf_dir_present = False
   if hasattr(params, "hadoop_conf_dir") and params.hadoop_conf_dir is not None and os.path.exists(params.hadoop_conf_dir):
@@ -111,7 +111,7 @@ def link_configs(struct_out_file):
   json_version = load_version(struct_out_file)
 
   if not json_version:
-    Logger.info("Could not load 'version' from {0}".format(struct_out_file))
+    Logger.info(f"Could not load 'version' from {struct_out_file}")
     return
 
   # On parallel command execution this should be executed by a single process at a time.

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/hooks/before-INSTALL/scripts/repo_initialization.py

@@ -39,7 +39,7 @@ def _alter_repo(action, repo_string, repo_template):
   if 0 == len(repo_dicts):
     Logger.info("Repository list is empty. Ambari may not be managing the repositories.")
   else:
-    Logger.info("Initializing {0} repositories".format(str(len(repo_dicts))))
+    Logger.info(f"Initializing {str(len(repo_dicts))} repositories")
 
   for repo in repo_dicts:
     if not 'baseUrl' in repo:

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/alerts/alert_webhcat_server.py

@@ -121,7 +121,7 @@ def execute(configurations={}, parameters={}, host_name=None):
     smokeuser = configurations[SMOKEUSER_KEY]
 
   # webhcat always uses http, never SSL
-  query_url = "http://{0}:{1}/templeton/v1/status?user.name={2}".format(host_name, webhcat_port, smokeuser)
+  query_url = f"http://{host_name}:{webhcat_port}/templeton/v1/status?user.name={smokeuser}"
 
   # initialize
   total_time = 0

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive_server.py

@@ -193,7 +193,7 @@ def security_status(self, env):
       else:
         issues = []
         for cf in result_issues:
-          issues.append("Configuration file %s did not pass the validation. Reason: %s" % (cf, result_issues[cf]))
+          issues.append(f"Configuration file {cf} did not pass the validation. Reason: {result_issues[cf]}")
         self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
         self.put_structured_out({"securityState": "UNSECURED"})
     else:

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/service_check.py

@@ -98,7 +98,7 @@ def service_check(self, env):
   def check_hive_server(self, env, server_component_name, kinit_cmd, address_list, server_port):
     import params
     env.set_params(params)
-    Logger.info("Server Address List : {0}, Port : {1}".format(address_list, server_port))
+    Logger.info(f"Server Address List : {address_list}, Port : {server_port}")
 
     if not address_list:
       raise Fail("Can not find any "+server_component_name+" ,host. Please check configuration.")
@@ -108,7 +108,7 @@ def check_hive_server(self, env, server_component_name, kinit_cmd, address_list,
     start_time = time.time()
     end_time = start_time + SOCKET_WAIT_SECONDS
 
-    Logger.info("Waiting for the {0} to start...".format(server_component_name))
+    Logger.info(f"Waiting for the {server_component_name} to start...")
 
     workable_server_available = False
     i = 0
@@ -120,10 +120,10 @@ def check_hive_server(self, env, server_component_name, kinit_cmd, address_list,
                                transport_mode=params.hive_transport_mode, http_endpoint=params.hive_http_endpoint,
                                ssl=params.hive_ssl, ssl_keystore=params.hive_ssl_keystore_path,
                                ssl_password=params.hive_ssl_keystore_password)
-        Logger.info("Successfully connected to {0} on port {1}".format(address, server_port))
+        Logger.info(f"Successfully connected to {address} on port {server_port}")
         workable_server_available = True
       except:
-        Logger.info("Connection to {0} on port {1} failed".format(address, server_port))
+        Logger.info(f"Connection to {address} on port {server_port} failed")
         time.sleep(5)
 
       i += 1
@@ -172,7 +172,7 @@ def check_llap(self, env, kinit_cmd, address, port, key, hive_auth="NOSASL", tra
       exec_path =  os.environ['PATH'] + os.pathsep + params.hadoop_bin_dir + os.pathsep + upgrade_hive_bin
 
     # beeline path
-    llap_cmd = "! beeline -u '%s'" % format(";".join(beeline_url))
+    llap_cmd = f"! beeline -u '{format(';'.join(beeline_url))}'"
     # Append LLAP SQL script path
     llap_cmd += format(" --hiveconf \"hiveLlapServiceCheck={unique_id}\" -f {stack_root}/current/hive-server2-hive2/scripts/llap/sql/serviceCheckScript.sql")
     # Append grep patterns for detecting failure

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/webhcat_server.py

@@ -145,7 +145,7 @@ def security_status(self, env):
       else:
         issues = []
         for cf in result_issues:
-          issues.append("Configuration file %s did not pass the validation. Reason: %s" % (cf, result_issues[cf]))
+          issues.append(f"Configuration file {cf} did not pass the validation. Reason: {result_issues[cf]}")
         self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
         self.put_structured_out({"securityState": "UNSECURED"})
     else:

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/package/scripts/application_timeline_server.py

@@ -137,7 +137,7 @@ def security_status(self, env):
       else:
         issues = []
         for cf in result_issues:
-          issues.append("Configuration file %s did not pass the validation. Reason: %s" % (cf, result_issues[cf]))
+          issues.append(f"Configuration file {cf} did not pass the validation. Reason: {result_issues[cf]}")
         self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
         self.put_structured_out({"securityState": "UNSECURED"})
     else:

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/package/scripts/historyserver.py

@@ -172,7 +172,7 @@ def security_status(self, env):
       else:
         issues = []
         for cf in result_issues:
-          issues.append("Configuration file %s did not pass the validation. Reason: %s" % (cf, result_issues[cf]))
+          issues.append(f"Configuration file {cf} did not pass the validation. Reason: {result_issues[cf]}")
         self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
         self.put_structured_out({"securityState": "UNSECURED"})
     else:

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/package/scripts/mapred_service_check.py

@@ -52,7 +52,7 @@ def service_check(self, env):
       python_executable, validateStatusFilePath, component_type, component_address, params.hadoop_ssl_enabled)
 
     if params.security_enabled:
-      kinit_cmd = "{0} -kt {1} {2};".format(params.kinit_path_local, params.smoke_user_keytab, params.smokeuser)
+      kinit_cmd = f"{params.kinit_path_local} -kt {params.smoke_user_keytab} {params.smokeuser};"
       smoke_cmd = kinit_cmd + validateStatusCmd
     else:
       smoke_cmd = validateStatusCmd

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/package/scripts/mapreduce2_client.py

@@ -67,7 +67,7 @@ def stack_upgrade_save_new_config(self, env):
     config_dir = self.get_config_dir_during_stack_upgrade(env, base_dir, conf_select_name)
 
     if config_dir:
-      Logger.info("stack_upgrade_save_new_config(): Calling conf-select on %s using version %s" % (conf_select_name, str(params.version)))
+      Logger.info(f"stack_upgrade_save_new_config(): Calling conf-select on {conf_select_name} using version {str(params.version)}")
 
       # Because this script was called from ru_execute_tasks.py which already enters an Environment with its own basedir,
       # must change it now so this function can find the Jinja Templates for the service.

contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/YARN/package/scripts/nodemanager.py

@@ -143,7 +143,7 @@ def security_status(self, env):
       else:
         issues = []
         for cf in result_issues:
-          issues.append("Configuration file %s did not pass the validation. Reason: %s" % (cf, result_issues[cf]))
+          issues.append(f"Configuration file {cf} did not pass the validation. Reason: {result_issues[cf]}")
         self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
         self.put_structured_out({"securityState": "UNSECURED"})
     else: