7075613 installadm dhcp output: once more with feeling
authorJesse Butler <jesse.butler@oracle.com>
Fri, 05 Aug 2011 13:01:44 -0700
changeset 1362 cafc3d3e0a60
parent 1361 8fa0488f54d3
child 1363 16fafa961cbd
7075613 installadm dhcp output: once more with feeling
usr/src/cmd/installadm/client_control.py
usr/src/cmd/installadm/service.py
--- a/usr/src/cmd/installadm/client_control.py	Fri Aug 05 12:23:54 2011 -0700
+++ b/usr/src/cmd/installadm/client_control.py	Fri Aug 05 13:01:44 2011 -0700
@@ -81,6 +81,14 @@
     return client_id, os.path.join(com.BOOT_DIR, client_id)
 
 
+_PXE_CLIENT_DHCP_CONFIG = """
+No local DHCP configuration found. If not already configured, the
+following should be added to the DHCP configuration:
+    Boot server IP      : %s
+    Boot file           : %s
+"""
+
+
 def setup_x86_client(service, mac_address, bootargs=''):
     ''' Set up an x86 client
 
@@ -162,11 +170,7 @@
         if valid_nets:
             server_ip = valid_nets[0]
 
-        print cw(_("No local DHCP configuration found. If not already "
-                   "configured, the following should be added to the DHCP "
-                   "configuration:"))
-        print _("\t%-20s : %s\n\t%-20s : %s" %
-               ("Boot server IP", server_ip, "Boot file", bootfile))
+        print _(_PXE_CLIENT_DHCP_CONFIG % (server_ip, bootfile))
 
         if len(valid_nets) > 1:
             print cw(_("\nNote: determined more than one IP address "
--- a/usr/src/cmd/installadm/service.py	Fri Aug 05 12:23:54 2011 -0700
+++ b/usr/src/cmd/installadm/service.py	Fri Aug 05 13:01:44 2011 -0700
@@ -1235,6 +1235,11 @@
     return (os.path.join(NETBOOT, MENULST + '.' + clientid))
 
 
+_DHCP_MSG = """No local DHCP configuration found. This service is the default
+alias for all %s clients. If not already in place, the following should
+be added to the DHCP configuration:"""
+
+
 def setup_dhcp_server(service, ip_start, ip_count, bootserver):
     '''Set-up DHCP server for given AI service and IP address range'''
     
@@ -1344,10 +1349,7 @@
         if valid_nets:
             server_ip = valid_nets[0]
 
-        print cw(_("No local DHCP configuration found. This service is the "
-                   "default alias for all %s clients. If not already in "
-                   "place, the following should be added to the DHCP "
-                   "configuration:") % client_type)
+        print _(_DHCP_MSG % client_type)
 
         if arch == 'i386':
             # Boot server IP is not needed for SPARC clients