lib/freewifi.rb in freewifi-0.2.1 vs lib/freewifi.rb in freewifi-0.2.2

- old
+ new

@@ -64,12 +64,11 @@ capsman_ip_man, capsman_user, capsman_password, hub_vip, ap_admin_password, - capsman_ip_wifi - ) + capsman_ip_wifi) @mtik_hub1_ip = hub1ip @mtik_hub2_ip = hub2ip @user_hub = username_hub @password_hub = password_hub @@ -298,11 +297,14 @@ hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, hua_wlc_password, telegram_api_url, - telegram_chat_id + telegram_chat_id, + iwag2_host, + iwag2_username, + iwag2_password ) @general_procedures = WiFiPortal_1.new(apigw_wsdl, apigw_endpoint, apigw_namespace, @@ -315,11 +317,14 @@ mtik_user, mtik_password, hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, - hua_wlc_password + hua_wlc_password, + iwag2_host, + iwag2_username, + iwag2_password, ) @mtik_control_ips_get = mtik_control_ips_get @mtik_user = mtik_user @mtik_password = mtik_password @additional_func_wifi_1 = InternalFunc_1.new @@ -348,9 +353,39 @@ 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.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 + + output_params + end + + + def wifi_get_subs_inf_ret_ssh_1(ipaddress, remote_ip, real_ip) + input_params = {:ipaddress => ipaddress} + output_params = {} + + 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"} + 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.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