lib/freewifi.rb in freewifi-0.2.3 vs lib/freewifi.rb in freewifi-0.2.4

@@ -1,12 +1,12 @@
 #$LOAD_PATH.unshift File.expand_path("../freewifi", __dir__)
-$LOAD_PATH.unshift File.expand_path("../mikrotik", __dir__)
-$LOAD_PATH.unshift File.expand_path("../database/mysql", __dir__)
-$LOAD_PATH.unshift File.expand_path("../database/mongo", __dir__)
-$LOAD_PATH.unshift File.expand_path("../additional", __dir__)
-$LOAD_PATH.unshift File.expand_path("../general", __dir__)
-$LOAD_PATH.unshift File.expand_path("../huawei", __dir__)
+$LOAD_PATH.unshift File.expand_path('../mikrotik', __dir__)
+$LOAD_PATH.unshift File.expand_path('../database/mysql', __dir__)
+$LOAD_PATH.unshift File.expand_path('../database/mongo', __dir__)
+$LOAD_PATH.unshift File.expand_path('../additional', __dir__)
+$LOAD_PATH.unshift File.expand_path('../general', __dir__)
+$LOAD_PATH.unshift File.expand_path('../huawei', __dir__)
 
 require "freewifi/version"
 require "freewifi/params"
 require "freewifi/config"
 require 'freewifi/mikrotik/newhub_mtik_ssh'
@@ -133,53 +133,53 @@
                   :subscribers_address => subscribers_address,
                   :subscribers_region => subscribers_region,
                   :subscribers_contacts => subscribers_contacts,
                   :wifi_ssid => wifi_ssid,
                   :portalstyle => portalstyle,
-                  :ap => "MikroTik",
+                  :ap => 'MikroTik',
                   :ap_serial_number => ap_serial_number,
                   :ap_model => ap_model,
                   :description => description,
                   :note => note,
                   :tunnel_id => tunnel_addition[:body][:eoip_tunnel_id],
                   :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name],
                   :created_date => DateTime.now
           }
 
           mongo_response = mongo_connector_wifi_1.data_ap_auto_created_insert_1(data)
-          if mongo_response[:code]==200
+          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)
 
                 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)
+                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_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]}}
+            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"}
+            output_params = {:code => 400, :result => 'Something wrong with insertion to mongo'}
           end
         else
           output_params = {:code => 401, :result => tunnel_addition[:result]}
         end
       else
-        output_params = {:code => 202, :result => "AP exists", :body => {:tunnel_id => ap_state[:tunnel_id].to_s}}
+        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"}
+      output_params = {:code => 507, :result => 'Unknown SDK error'}
     end
-    mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", 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
 
 
@@ -209,13 +209,13 @@
       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 => res[:code], :result => res[:result], :body => {:ap_configuration => conf_1}}
 
     rescue
-      output_params = {:code => 507, :result => "Unknown SDK error"}
+      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)
+    mongo_connector_wifi_1.audit_logger_wifi_1('mtik_sch1_config_gen_1', remote_ip, input_params, conf_1, real_ip, subscriber_ip)
     output_params
   end
 
 
   def add_eoip_for_mikr_hub(bridge_name, ap_ip_address, tunnel_name)
@@ -241,14 +241,15 @@
   end
 
   def test()
     newcapsman1 = NEWhubWifi_1.new
 
+    capsman_ip = ['1.1.1.1']
     threads = []
     capsman_ip.each do |capsman|
       threads << Thread.new do
-        newcapsman1.set_capsman_config_1("test_ss", capsman, capsman_user, capsman_password, "172.25.208.14", "test_company")
+        newcapsman1.set_capsman_config_1('test_ss', capsman, capsman_user, capsman_password, '172.25.208.14', 'test_company')
       end
     end
     threads.each(&:join)
 
     #newhub1.hub_get_all_eoip_tunnels_1("172.24.223.132", "soapgw", "fr8Hn3Ed2k0Im4gWmav2Nh7Y1qAm8KlmRh3Dcu2Wcok5gBdm")
@@ -345,22 +346,22 @@
     subs_info_ret_1_thr1 = Thread.new do
       begin
         resp_procedure = general_procedures.get_subs_info_return_1(ipaddress)
         output_params = resp_procedure
       rescue
-        output_params = {:code => 507, :result => "Unknown SDK error"}
+        output_params = {:code => 507, :result => 'Unknown SDK error'}
       end
     end
     subs_info_ret_1_thr1.join
 
     subs_info_ret_1_thr2 = Thread.new do
       begin
-        p "mongo"
+        p 'mongo'
         #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
         #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
       rescue
-        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
+        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => 'mongo failed'}, :procedure => 'wifi_get_subs_info_return_1', :file => 'freewifi.rb'}, 'debug')
         additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
       end
     end
     subs_info_ret_1_thr2.join
 
@@ -375,21 +376,21 @@
     subs_info_ret_1_thr1 = Thread.new do
       begin
         resp_procedure = general_procedures.get_subs_info_ret_ssh_1(ipaddress)
         output_params = resp_procedure
       rescue
-        output_params = {:code => 507, :result => "Unknown SDK error"}
+        output_params = {:code => 507, :result => 'Unknown SDK error'}
       end
     end
     subs_info_ret_1_thr1.join
 
     subs_info_ret_1_thr2 = Thread.new do
       begin
         p "mongo"
           #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
           #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
       rescue
-        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
+        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => 'freewifi.rb'}, "debug")
         additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
       end
     end
     subs_info_ret_1_thr2.join