lib/freewifi.rb in freewifi-0.1.5 vs lib/freewifi.rb in freewifi-0.1.6

@@ -37,11 +37,11 @@
                 :hub_vip,
                 :ap_admin_password,
                 :capsman_ip_wifi
 
 
-  def initialize(hub1ip, hub2ip, username_hub, password_hub, database_username, database_password, database_host, mongo_ip, mongo_port, mongo_database, remote_ip, real_ip, subscriber_ip, capsman_ip, capsman_user, capsman_password, hub_vip, ap_admin_password, capsman_ip_wifi)
+  def initialize(hub1ip, hub2ip, username_hub, password_hub, database_username, database_password, database_host, mongo_ip, mongo_port, mongo_database, remote_ip, real_ip, subscriber_ip, capsman_ip_man, capsman_user, capsman_password, hub_vip, ap_admin_password, capsman_ip_wifi)
     @mtik_hub1_ip = hub1ip
     @mtik_hub2_ip = hub2ip
     @user_hub = username_hub
     @password_hub = password_hub
     @db_mysql = DatabaseMethodsWifi_1.new(database_username, database_password, database_host)
@@ -49,11 +49,11 @@
     @ssh_mikrotik_connector_1 = NEWhubWifi_1.new
     @mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
     @remote_ip = remote_ip
     @real_ip = real_ip
     @subscriber_ip = subscriber_ip
-    @capsman_ip = capsman_ip
+    @capsman_ip_man = capsman_ip_man
     @capsman_user = capsman_user
     @capsman_password = capsman_password
     @mtik_config_gen_1 = MtikSchemesGen_1.new
     @hub_vip = hub_vip
     @ap_admin_password = ap_admin_password
@@ -116,20 +116,27 @@
                   :created_date => DateTime.now
           }
 
           mongo_response = mongo_connector_wifi_1.data_ap_auto_created_insert_1(data)
           if mongo_response[:code]==200
+
             newcapsman1 = NEWhubWifi_1.new
+            threads_1 = []
+            capsman_ip_man.each do |capsman|
+              threads_1 << Thread.new do
+                wifi_ssid_processed = additional_func_wifi_1.prep_ssid_for_config_1(wifi_ssid)
+                company_name_processed = additional_func_wifi_1.prep_comp_name_for_config_1(company_name)
 
-            threads = []
-            capsman_ip.each do |capsman|
-              threads << Thread.new do
-                newcapsman1.set_capsman_config_1(additional_func_wifi_1.prep_ssid_for_config_1(wifi_ssid), capsman, capsman_user, capsman_password, sim_ipaddress, additional_func_wifi_1.prep_comp_name_for_config_1(company_name))
+                input_intern_data = {:wifi_ssid_processed =>wifi_ssid_processed, :company_name_processed =>company_name_processed, :capsman => capsman}
+
+                mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", remote_ip, input_intern_data, nil, real_ip, subscriber_ip)
+
+                newcapsman1.set_capsman_config_1(wifi_ssid_processed, capsman, capsman_user, capsman_password, sim_ipaddress, company_name_processed)
               end
             end
-            threads.each(&:join)
-
+            threads_1.each(&:join)
+            
             output_params = {:code => 200, :result => "Request completed successfully", :body => {:tunnel_id => tunnel_addition[:body][:eoip_tunnel_id], :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name]}}
           else
             output_params = {:code => 400, :result => "Something wrong with insertion to mongo"}
           end
         else
@@ -139,11 +146,11 @@
         output_params = {:code => 202, :result => "AP exists", :body => {:tunnel_id => ap_state[:tunnel_id].to_s}}
       end
     rescue
       output_params = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile", remote_ip, input_params, output_params, real_ip, subscriber_ip)
+    mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", remote_ip, input_params, output_params, real_ip, subscriber_ip)
     #additional_func.printer_texter({:input_params => input_params, :output_params => output_params, :procedure => "add_mikrotik_ap_mobile", :file => "freewifi.rb"}, "info")
     output_params
   end
 
 
@@ -168,10 +175,10 @@
 
       res = self.add_mikrotik_ap_mobile_1(sim_ipaddress, sim_msisdn, bridge_name_hub, company_name, subscribers_address, subscribers_region, subscribers_contacts, wifi_ssid, portalstyle, ap_serial_number, ap_model, description, note)
       tun_id = res[:body][:tunnel_id]
       hostname = additional_func_wifi_1.ap_hostname_generator(company_name, tun_id)
       conf_1 = mtik_config_gen_1.scheme1_3g_config_gen_1(hostname, tun_id, hub_vip, ap_admin_password, wifi_ssid, capsman_ip_wifi)
-      output_params = {:code => 200, :result => "Request completed successfully", :body => {:ap_configuration => conf_1}}
+      output_params = {:code => res[:code], :result => res[:result], :body => {:ap_configuration => conf_1}}
 
     rescue
       output_params = {:code => 507, :result => "Unknown SDK error"}
     end
     mongo_connector_wifi_1.audit_logger_wifi_1("mtik_sch1_config_gen_1", remote_ip, input_params, conf_1, real_ip, subscriber_ip)