fix test bootstrap

api/server/bootstrap.py

@@ -15,7 +15,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from cert_cmd import check_server_certificate, sing_req_by_server
+import cert_cmd
 import post_request
 
 from calculate.api.client.cert_func import new_key_req
@@ -30,8 +30,11 @@ def init(cert, key, cert_path, data_path, certbase, args, port):
             args = change_args(args, step)
             create_server_cert(cert, key, cert_path, args, port)
         
-        create_client_cert(cert, cert_path, data_path, certbase, port)
-        
+        create_client_cert(cert, cert_path, data_path, certbase)
+
+def check():
+    return True
+
 def change_args(args, step = None):
     if step == 0:
         args.host = False
@@ -45,7 +48,7 @@ def change_args(args, step = None):
     return args
     
 def create_server_cert(cert, key, cert_path, args, port):
-    check_server_certificate(cert, key, cert_path, args, port, auto = True)
+    cert_cmd.check_server_certificate(cert, key, cert_path, args, port, auto = True)
     
 def create_client_cert(server_cert, cert_path, data_path, certbase):
     req_id = create_request(server_cert, cert_path, data_path, certbase)
@@ -55,7 +58,7 @@ def create_client_cert(server_cert, cert_path, data_path, certbase):
 def create_request(server_cert, cert_path, data_path, certbase):
     server_host_name = 'localhost'
 
-    #key = cert_path + server_host_name + '.key'
+    key = cert_path + server_host_name + '.key'
     #csr_file = cert_path + server_host_name +'.csr'
     #pritn 'request file = ', csr_file
 
@@ -68,12 +71,12 @@ def create_request(server_cert, cert_path, data_path, certbase):
                                            client_type, certbase, cert_path)
                             
     fc = open(cert_path + 'req_id', 'w')
-    fc.write(res)
+    fc.write(req_id)
     fc.close()
     return req_id
     
 def sign_certificate(req_id, cert_path, data_path):
-    sing_req_by_server(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():
     for Interfaces in ip_mod.getInterfaces():

api/server/cert_cmd.py

@@ -45,9 +45,9 @@ def check_server_certificate(cert, key, cert_path, args, port, auto = False):
     # generate a root certificate
     if args.gen_root_cert:
         if auto:
-            c = raw_input (_("Enter certificate data by hand? [y]/n: "))
-        else:
             c = 'n'
+        else:
+            c = raw_input (_("Enter certificate data by hand? [y]/n: "))
         from M2Crypto import X509
         name = X509.X509_Name()
         if c.lower() in ['n', 'no']:

api/server/post_request.py

@@ -39,7 +39,8 @@ def serv_post_client_request (request, data_path, ip, mac, client_type, \
     try:
         ip = curThread.REMOTE_ADDR
     except:
-        print "EXCEPT ip = curThread.REMOTE_ADDR!"
+        print "EXCEPT ip = curThread.REMOTE_ADDR!!!"
+        ip = 'localhost'
     
     # Finding Id for the current certificate
     ID_FILE = data_path + '/client_certs/id.int'