summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ipalib/plugins/f_host.py40
-rw-r--r--ipalib/plugins/f_hostgroup.py64
-rw-r--r--ipalib/plugins/f_pwpolicy.py21
-rw-r--r--ipalib/plugins/f_service.py30
4 files changed, 64 insertions, 91 deletions
diff --git a/ipalib/plugins/f_host.py b/ipalib/plugins/f_host.py
index e842230fe..020231e57 100644
--- a/ipalib/plugins/f_host.py
+++ b/ipalib/plugins/f_host.py
@@ -149,12 +149,11 @@ class host_add(crud.Add):
kw['objectclass'].remove('krbprincipalaux')
return ldap.create(**kw)
- def output_for_cli(self, ret):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if ret:
- print "Host added"
+ textui.print_plain("Host added")
api.register(host_add)
@@ -172,12 +171,11 @@ class host_del(crud.Del):
ldap = self.api.Backend.ldap
dn = get_host(hostname)
return ldap.delete(dn)
- def output_for_cli(self, ret):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if ret:
- print "Host deleted"
+ textui.print_plain("Host deleted")
api.register(host_del)
@@ -202,12 +200,11 @@ class host_mod(crud.Mod):
dn = get_host(hostname)
return ldap.update(dn, **kw)
- def output_for_cli(self, ret):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if ret:
- print "Host updated"
+ textui.print_plain("Host updated")
api.register(host_mod)
@@ -242,21 +239,18 @@ class host_find(crud.Find):
else:
kw['attributes'] = default_attributes
return ldap.search(**kw)
- def output_for_cli(self, hosts):
- if not hosts:
- return
- counter = hosts[0]
- hosts = hosts[1:]
+ def output_for_cli(self, textui, result, *args, **options):
+ counter = result[0]
+ hosts = result[1:]
if counter == 0:
- print "No entries found"
+ textui.print_plain("No entries found")
return
- elif counter == -1:
- print "These results are truncated."
- print "Please refine your search and try again."
for h in hosts:
- for a in h.keys():
- print "%s: %s" % (a, h[a])
+ textui.print_entry(h)
+ if counter == -1:
+ textui.print_plain("These results are truncated.")
+ textui.print_plain("Please refine your search and try again.")
api.register(host_find)
@@ -286,9 +280,7 @@ class host_show(crud.Get):
value = ldap.retrieve(dn, default_attributes)
del value['dn']
return value
- def output_for_cli(self, host):
- if host:
- for a in host.keys():
- print "%s: %s" % (a, host[a])
+ def output_for_cli(self, textui, result, *args, **options):
+ textui.print_entry(result)
api.register(host_show)
diff --git a/ipalib/plugins/f_hostgroup.py b/ipalib/plugins/f_hostgroup.py
index 6cbf4d51a..bde257f94 100644
--- a/ipalib/plugins/f_hostgroup.py
+++ b/ipalib/plugins/f_hostgroup.py
@@ -93,12 +93,11 @@ class hostgroup_add(crud.Add):
return ldap.create(**kw)
- def output_for_cli(self, ret):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if ret:
- print "Group added"
+ textui.print_plain("Group added")
api.register(hostgroup_add)
@@ -120,12 +119,11 @@ class hostgroup_del(crud.Del):
return ldap.delete(dn)
- def output_for_cli(self, ret):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if ret:
- print "Group deleted"
+ textui.print_plain("Group deleted")
api.register(hostgroup_del)
@@ -150,12 +148,11 @@ class hostgroup_mod(crud.Mod):
dn = ldap.find_entry_dn("cn", cn, hostgroup_filter)
return ldap.update(dn, **kw)
- def output_for_cli(self, ret):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if ret:
- print "Group updated"
+ texui.print_plain("Group updated")
api.register(hostgroup_mod)
@@ -178,22 +175,19 @@ class hostgroup_find(crud.Find):
kw['objectclass'] = hostgroup_filter
return ldap.search(**kw)
- def output_for_cli(self, groups):
- if not groups:
- return
-
- counter = groups[0]
- groups = groups[1:]
+ def output_for_cli(self, textui, result, *args, **options):
+ counter = result[0]
+ groups = result[1:]
if counter == 0:
- print "No entries found"
+ textui.print_plain("No entries found")
return
- elif counter == -1:
- print "These results are truncated."
- print "Please refine your search and try again."
for g in groups:
- for a in g.keys():
- print "%s: %s" % (a, g[a])
+ textui.print_entry(g)
+
+ if counter == -1:
+ textui.print_plain("These results are truncated.")
+ textui.print_plain("Please refine your search and try again.")
api.register(hostgroup_find)
@@ -219,12 +213,8 @@ class hostgroup_show(crud.Get):
# FIXME: should kw contain the list of attributes to display?
return ldap.retrieve(dn)
- def output_for_cli(self, group):
- if not group:
- return
-
- for a in group.keys():
- print "%s: %s" % (a, group[a])
+ def output_for_cli(self, textui, result, *args, **options):
+ textui.print_entry(result)
api.register(hostgroup_show)
@@ -283,16 +273,16 @@ class hostgroup_add_member(frontend.Command):
return add_failed
- def output_for_cli(self, add_failed):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if add_failed:
- print "These entries failed to add to the group:"
- for a in add_failed:
+ if result:
+ textui.print_plain("These entries failed to add to the group:")
+ for a in result:
print "\t'%s'" % a
else:
- print "Group membership updated."
+ textui.print_entry("Group membership updated.")
api.register(hostgroup_add_member)
@@ -351,15 +341,15 @@ class hostgroup_remove_member(frontend.Command):
return remove_failed
- def output_for_cli(self, remove_failed):
+ def output_for_cli(self, textui, result, *args, **options):
"""
Output result of this command to command line interface.
"""
- if remove_failed:
- print "These entries failed to be removed from the group:"
- for a in remove_failed:
+ if result:
+ textui.print_plain("These entries failed to be removed from the group:")
+ for a in result:
print "\t'%s'" % a
else:
- print "Group membership updated."
+ textui.print_plain("Group membership updated.")
api.register(hostgroup_remove_member)
diff --git a/ipalib/plugins/f_pwpolicy.py b/ipalib/plugins/f_pwpolicy.py
index ce52e4678..87a7d8fa6 100644
--- a/ipalib/plugins/f_pwpolicy.py
+++ b/ipalib/plugins/f_pwpolicy.py
@@ -88,9 +88,8 @@ class pwpolicy_mod(frontend.Command):
return ldap.update(dn, **kw)
- def output_for_cli(self, ret):
- if ret:
- print "Policy modified"
+ def output_for_cli(self, textui, result, *args, **options):
+ textui.print_plain("Policy modified")
api.register(pwpolicy_mod)
@@ -120,14 +119,12 @@ class pwpolicy_show(frontend.Command):
return policy
- def output_for_cli(self, policy):
- if not policy: return
-
- print "Password Policy"
- print "Min. Password Lifetime (hours): %s" % policy.get('krbminpwdlife')
- print "Max. Password Lifetime (days): %s" % policy.get('krbmaxpwdlife')
- print "Min. Number of Character Classes: %s" % policy.get('krbpwdmindiffchars')
- print "Min. Length of Password: %s" % policy.get('krbpwdminlength')
- print "Password History Size: %s" % policy.get('krbpwdhistorylength')
+ def output_for_cli(self, textui, result, *args, **options):
+ textui.print_plain("Password Policy")
+ textui.print_plain("Min. Password Lifetime (hours): %s" % result.get('krbminpwdlife'))
+ textui.print_plain("Max. Password Lifetime (days): %s" % result.get('krbmaxpwdlife'))
+ textui.print_plain("Min. Number of Character Classes: %s" % result.get('krbpwdmindiffchars'))
+ textui.print_plain("Min. Length of Password: %s" % result.get('krbpwdminlength'))
+ textui.print_plain("Password History Size: %s" % result.get('krbpwdhistorylength'))
api.register(pwpolicy_show)
diff --git a/ipalib/plugins/f_service.py b/ipalib/plugins/f_service.py
index 04187a863..fc0ae65e7 100644
--- a/ipalib/plugins/f_service.py
+++ b/ipalib/plugins/f_service.py
@@ -158,22 +158,20 @@ class service_find(crud.Find):
return ldap.search(**kw)
- def output_for_cli(self, services):
- if not services:
- return
-
- counter = services[0]
- services = services[1:]
+ def output_for_cli(self, textui, result, *args, **options):
+ counter = result[0]
+ services = result[1:]
if counter == 0:
- print "No entries found"
+ textui.print_plain("No entries found")
return
- elif counter == -1:
- print "These results are truncated."
- print "Please refine your search and try again."
for s in services:
- for a in s.keys():
- print "%s: %s" % (a, s[a])
+ textui.print_entry(s)
+
+ if counter == -1:
+ textui.print_plain("These results are truncated.")
+ textui.print_plain("Please refine your search and try again.")
+ textui.print_count(services, '%d services matched')
api.register(service_find)
@@ -196,11 +194,7 @@ class service_show(crud.Get):
dn = ldap.find_entry_dn("krbprincipalname", principal)
# FIXME: should kw contain the list of attributes to display?
return ldap.retrieve(dn)
- def output_for_cli(self, service):
- if not service:
- return
-
- for a in service.keys():
- print "%s: %s" % (a, service[a])
+ def output_for_cli(self, textui, result, *args, **options):
+ textui.print_entry(result)
api.register(service_show)
generated by cgit (git 2.34.1) at 2025-02-27 06:55:53 +0000