fix get_ip_mac in bootstrap

api/client/function.py

@@ -87,15 +87,15 @@ def get_ip_mac_type(client_type = None):
     #try:
     results.append ( getIpLocal() )
     #except:
-	#results.append ('no_ip')
+        #results.append ('no_ip')
     #try:
     results.append ( getHwAddr())
     #except:
-	#results.append ('no_mac')
+        #results.append ('no_mac')
     if client_type:
-	results.append (client_type)
+        results.append (client_type)
     else:
-	results.append ('console')
+        results.append ('console')
     return results
     
 def client_install(client):
@@ -123,7 +123,7 @@ def create_obj(client, method_name):
     
     info = operation.methods.get(method_name)
     if not info:
-	raise suds.MethodNotFound(method_name)
+        raise suds.MethodNotFound(method_name)
     type_op = info.binding.input.param_defs(info)[param][inf_param]
     str_type = type_op.__getattribute__('type')[param_type]
     

api/server/bootstrap.py

@@ -127,10 +127,6 @@ def create_request(server_cert, cert_path, data_path, certbase,client_cert_path)
 def sign_certificate(req_id, cert_path, data_path):
     cert_cmd.sing_req_by_server(req_id, cert_path, data_path, auto = True)
 
-def get_ip_mac_type():
-    ip, mac, client_type = get_ip_mac_type('gui')
-    return (ip, mac, client_type)
-
 def get_certificate(cert_path, data_path, certbase, client_cert_path):
     if not os.path.exists(client_cert_path + 'req_id'):
         print _("request was not sent or deleted file %s") \