lib/freewifi.rb in freewifi-0.1.2 vs lib/freewifi.rb in freewifi-0.1.3

@@ -4,11 +4,11 @@
 $LOAD_PATH.unshift File.expand_path("../database/mongo", __dir__)
 $LOAD_PATH.unshift File.expand_path("../additional", __dir__)
 
 require "freewifi/version"
 require 'freewifi/mikrotik/hewhub_mtik_ssh'
-require 'freewifi/database/mysql/database_methods'
+require 'freewifi/database/mysql/database_methods_wifi'
 require 'freewifi/database/mongo/mongoconnector'
 require 'date'
 
 #eoip tunnel ids generates between 10001 - 65535
 
@@ -18,26 +18,26 @@
                 :mtik_hub2_ip,
                 :user_hub,
                 :password_hub,
                 :cps_class,
                 :db_mysql,
-                :additional_func,
+                :additional_func_wifi,
                 :ssh_mikrotik_connector,
-                :mongo_connector,
+                :mongo_connector_wifi,
                 :remote_ip,
                 :real_ip,
                 :subscriber_ip
 
-  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)
+  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)
     @mtik_hub1_ip = hub1ip
     @mtik_hub2_ip = hub2ip
     @user_hub = username_hub
     @password_hub = password_hub
-    @db_mysql = DatabaseMethods.new(database_username, database_password, database_host)
-    @additional_func = InternalFunc.new
-    @ssh_mikrotik_connector = NEWhub.new
-    @mongo_connector = MongoWifi.new(mongo_ip, mongo_port, mongo_database)
+    @db_mysql = DatabaseMethodsWifi.new(database_username, database_password, database_host)
+    @additional_func_wifi = InternalFunc.new
+    @ssh_mikrotik_connector = NEWhubWifi.new
+    @mongo_connector = MongoWifiCl.new(mongo_ip, mongo_port, mongo_database)
     @remote_ip = remote_ip
     @real_ip = real_ip
     @subscriber_ip = subscriber_ip
   end
 
@@ -60,22 +60,22 @@
     }
     output_params = {}
 
     begin
 
-      processed_comp_name = additional_func.company_check(company_name)
+      processed_comp_name = additional_func_wifi.company_check_wifi(company_name)
       #p ap_state = db_mysql.check_mikrotik_ap_exists(sim_ipaddress, sim_msisdn).to_s
-      ap_state = mongo_connector.get_ap_info_sim_ip(sim_ipaddress, sim_msisdn).to_s
+      ap_state = mongo_connector_wifi.get_ap_info_sim_ip_wifi(sim_ipaddress, sim_msisdn).to_s
 
       if ap_state == "" || ap_state == nil || ap_state == "[]" || ap_state == "fttx"
-        tunnel_addition = ssh_mikrotik_connector.add_eoip_for_mikr(bridge_name_hub,
-                                                                   sim_ipaddress,
-                                                                   processed_comp_name,
-                                                                   mtik_hub1_ip,
-                                                                   mtik_hub2_ip,
-                                                                   user_hub,
-                                                                   password_hub)
+        tunnel_addition = ssh_mikrotik_connector.add_eoip_for_mikr_wifi(bridge_name_hub,
+                                                                        sim_ipaddress,
+                                                                        processed_comp_name,
+                                                                        mtik_hub1_ip,
+                                                                        mtik_hub2_ip,
+                                                                        user_hub,
+                                                                        password_hub)
 
 
         if tunnel_addition[:code] == 200
 
           data = {:sim_ipaddress => sim_ipaddress,
@@ -95,11 +95,11 @@
                   :tunnel_id => tunnel_addition[:body][:eoip_tunnel_id],
                   :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name],
                   :created_date => DateTime.now
           }
 
-          mongo_response = mongo_connector.data_ap_auto_created_insert(data)
+          mongo_response = mongo_connector_wifi.data_ap_auto_created_insert(data)
           if mongo_response[:code]==200
             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
@@ -110,37 +110,37 @@
         output_params = {:code => 202, :result => "AP exists"}
       end
     rescue
       output_params = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_connector.audit_logger("add_mikrotik_ap_mobile", remote_ip, input_params, output_params, real_ip, subscriber_ip)
+    mongo_connector_wifi.audit_logger_wifi("add_mikrotik_ap_mobile", 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
 
 
   def add_eoip_for_mikr_hub(bridge_name, ap_ip_address, tunnel_name)
-    newhub = NEWhub.new
-    newhub.add_eoip_for_mikr(bridge_name,
-                             ap_ip_address,
-                             tunnel_name,
-                             mtik_hub1_ip,
-                             mtik_hub2_ip,
-                             user_hub,
-                             password_hub)
+    newhub = NEWhubWifi.new
+    newhub.add_eoip_for_mikr_wifi(bridge_name,
+                                  ap_ip_address,
+                                  tunnel_name,
+                                  mtik_hub1_ip,
+                                  mtik_hub2_ip,
+                                  user_hub,
+                                  password_hub)
   end
 
   def del_one_eoip_from_mikr_hub(tunnel_id)
-    newhub1 = NEWhub.new
+    newhub1 = NEWhubWifi.new
     newhub1.del_eoip_for_mikr(tunnel_id, mtik_hub1_ip, mtik_hub2_ip, user_hub, password_hub)
     p tid = tunnel_id.to_i
-    mongo_connector.tunnelid_remove_single_mongo(tid)
+    mongo_connector_wifi.tunnelid_remove_single_mongo(tid)
   end
 
   def test()
     #newhub1 = NEWhub.new
     #newhub1.hub_get_all_eoip_tunnels("172.24.223.132", "soapgw", "fr8Hn3Ed2k0Im4gWmav2Nh7Y1qAm8KlmRh3Dcu2Wcok5gBdm")
-    mongo_connector.data_ap_auto_created_insert(:test => "test")
+    mongo_connector_wifi.data_ap_auto_created_insert(:test => "test")
   end
 end
 
 
 class Fwifi