Modified method of obtaining the names of service

pym/cl_ldap.py

@@ -237,8 +237,17 @@ imp_cl_help = cl_utils2.cl_help
 # Форматированный вывод
 imp_cl_smcon = cl_utils2.cl_smartcon
 
+class prnServ:
+    """Класс хранения метода печати названия сервиса"""
+    def printNameService(self, service):
+        """Выдает имя сервиса для печати"""
+        if service in ["ldap", "dns", "dhcp", "ftp"]:
+            ret = service.upper()
+        else:
+            ret = service.capitalize()
+        return ret
 
-class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
+class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon, prnServ):
     """Класс где храняться общие методы для всех сервисов"""
 
     # DN сервисов относительно базового
@@ -743,21 +752,14 @@ in a sambaDomainName',
                     self.printERROR( _("Daemon %s was not started") %daemon)
                     flagError = True
                     break
-        if service == "ldap":
-            service = "LDAP"
-        elif service == "dns":
-            service = "DNS"
-        elif service == "dhcp":
-            service = "DHCP"
-        elif service == "ftp":
-            service = "FTP"
+        prnService = self.printNameService(service)
         if flagError:
-            self.printNotOK(_("Starting") + " " + service.capitalize() + " " +\
+            self.printNotOK(_("Starting") + " " + prnService + " " +\
                             _("service") + " ...")
             return False
         else:
             if printSuccess:
-                self.printOK(_("Starting") + " " + service.capitalize() + " "+\
+                self.printOK(_("Starting") + " " + prnService + " "+\
                              _("service") + " ...")
             return True
 
@@ -7464,13 +7466,12 @@ outdated. If the backup is obsolete, use cl-backup."))
                         break
                     if verbose and type(files) == types.ListType:
                         self.printSUCCESS(_("Updating config from service %s")\
-                                %service.capitalize())
-                        #self.printSUCCESS(_("Updated files:"))
+                                          %self.printNameService(service))
                         for applyFile in files:
                             self.printWARNING(applyFile)
                     else:
                         self.printOK(_("Updating config from service %s")\
-                                %service.capitalize() + " ...")
+                                     %self.printNameService(service) + " ...")
                 if flagMailRelay:
                     service = "mail_relay"
                 servicesRestart.append(service)
@@ -7494,17 +7495,8 @@ outdated. If the backup is obsolete, use cl-backup."))
                 if service == "mail_relay":
                     service = "mail"
                 # Название сервиса для вывода на экран
-                if service == "ldap":
-                    servicePrn = "LDAP"
-                elif service == "dns":
-                    servicePrn = "DNS"
-                elif service == "dhcp":
-                    servicePrn = "DHCP"
-                elif service == "ftp":
-                    servicePrn = "FTP"
-                else:
-                    servicePrn = service.capitalize()
-                self.printOK(_("Restarting service %s")%servicePrn+\
+                servicePrn = self.printNameService(service)
+                self.printOK(_("Restarting service %s")%servicePrn +\
                              " ...")
         if not flagError and "samba" in servInstalled and\
             serviceUpdate in ["all","samba"]:
@@ -13082,14 +13074,12 @@ together with option '-r'"))
         self.printOK(_("Replication setuped") + " ...")
         return True
 
-class cl_info(cl_utils2.cl_smartcon):
+class cl_info(cl_utils2.cl_smartcon, prnServ):
     """Класс для вывода информации"""
 
     def getInfoServer(self, options, service):
         """Выводит на печать информацию"""
-        strService = service.capitalize()
-        if service == "ftp" or service == "dns":
-            strService = service.upper()
+        strService = self.printNameService(service)
         # Информация сервиса DHCP
         # Информация о всех сетях DHCP
         if service == "dhcp" and options.has_key("n"):
@@ -13731,7 +13721,8 @@ with another option."))
         searchStr = machName
         data, delData = self.genDataMachines(service)
         if not data:
-            self.printERROR(_("Incorrect service %s") %service.capitalize())
+            self.printERROR(_("Incorrect service %s")\
+                            %self.printNameService(service))
             return False
         headers = [_("Field"),_("Value")]
         attributes = map(lambda x: x[0], data)
@@ -13785,7 +13776,8 @@ with another option."))
         searchStr = groupName
         data, delData = self.genDataGroups(service)
         if not data:
-            self.printERROR(_("Incorrect service %s") %service.capitalize())
+            self.printERROR(_("Incorrect service %s")\
+                            %self.printNameService(service))
             return False
         headers = [_("Field"),_("Value")]
         attributes = map(lambda x: x[0], data)
@@ -13858,7 +13850,8 @@ with another option."))
         searchStr = userName
         data, delData = self.genDataUsers(service)
         if not data:
-            self.printERROR(_("Incorrect service %s") %service.capitalize())
+            self.printERROR(_("Incorrect service %s")\
+                            %self.printNameService(service))
             return False
         headers = [_("Field"), _("Value")]
         attributes = map(lambda x: x[0], data)
@@ -13992,7 +13985,7 @@ with another option."))
         data, delData = self.genDataMachines(service, fields)
         if not data:
             self.printWARNING(_("Service %s has no machines")\
-                              %service.capitalize())
+                              %self.printNameService(service))
             return False
         if fields == "short":
             data = filter(lambda x: not x[0] in delData,  data)
@@ -14029,7 +14022,7 @@ with another option."))
         data, delData = self.genDataGroups(service, fields)
         if not data:
             self.printWARNING(_("Service %s has no groups")\
-                              %service.capitalize())
+                              %self.printNameService(service))
             return False
         if fields == "short":
             data = filter(lambda x: not x[0] in delData,  data)
@@ -14207,7 +14200,8 @@ with another option."))
         searchStr = "*"
         data, delData = self.genDataUsers(service, fields)
         if not data:
-            self.printERROR(_("Incorrect service %s") %service.capitalize())
+            self.printERROR(_("Incorrect service %s")\
+                            %self.printNameService(service))
             return False
         if fields == "short":
             data = filter(lambda x: not x[0] in delData,  data)