imperituroard 1.1.5 → 1.1.11

data/lib/imperituroard/projects/ukaz60/fortigate.rb

@@ -113,7 +113,7 @@ class FortiUkaz60_2
       p "ansible_answer: #{ansible_answer}"
 
       #hh = "\nPLAY [ha_master] ***************************************************************\n\nTASK [set url table] ***********************************************************\nchanged: [gom32sg1]\nchanged: [bre32sg1]\nchanged: [min32sg1]\nchanged: [vit32sg1]\nchanged: [min32sg3]\nchanged: [gro32sg1]\nchanged: [mog32sg1]\n\nTASK [check current url table] *************************************************\nok: [min32sg1]\nok: [bre32sg1]\nok: [min32sg3]\nok: [vit32sg1]\nok: [gom32sg1]\nok: [gro32sg1]\nok: [mog32sg1]\n\nTASK [debug] *******************************************************************\nok: [min32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [min32sg3] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [bre32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [vit32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [gom32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [gro32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [mog32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\n\nPLAY RECAP *********************************************************************\nbre32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \ngom32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \ngro32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nmin32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nmin32sg3                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nmog32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nvit32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \n\n"
-      answ_pr = add_func_connector.ansible_answer_parse(ansible_answer)
+      answ_pr = add_func_connector.ansible_answer_parse_fmg(ansible_answer)
       output_data = {:code => 200, :result => "update_weburl_fortigate: Request completed", :body => answ_pr}
     rescue
       output_data = {:code => 507, :result => "update_weburl_fortigate: Unknown SDK error"}

data/lib/imperituroard/projects/ukaz60/staros.rb

@@ -129,13 +129,13 @@ class Ukaz60Staros_2
 end
 
 
-uu ="/fgd?ef"
+#uu ="/fgd?ef"
 
 #ggg = uu.force_encoding('ASCII-8BIT')
 #puts CGI.escape ggg
-p url_encode("foo/bar? baz&")
+#p url_encode("foo/bar? baz&")
 
-p URI.parse("foo/bar? baz&").to_s
-p URI::encode("foo/bar? baz&")
+#p URI.parse("foo/bar? baz&").to_s
+#p URI::encode("foo/bar? baz&")
 
-p URI.decode("newsx-ru.ru/by/251-potencia-spartagen-by/%3futm%20medium=251&utmcampaign=4&%20utm%20content=57849345&utm%20source=56960717")
+#p URI.decode("newsx-ru.ru/by/251-potencia-spartagen-by/%3futm%20medium=251&utmcampaign=4&%20utm%20content=57849345&utm%20source=56960717")

data/lib/imperituroard/projects/ukaz60/ukaz60_add_func.rb

@@ -154,6 +154,52 @@ class AddFuncUkaz60_2
   end
 
 
+  def ansible_answer_parse_fmg(answer_string)
+    input_data = {:answer_string => answer_string}
+    output_data = {}
+
+    begin
+      answ_ans_parsed = answer_string.gsub("\n", " ")
+      result_out = {}
+      #result_out = []
+      num_ok = 0
+      num_failed = 0
+      #final_checks = /(fortimanager1)\s+:\s+ok=(\d)\s+changed=(\d)\s+unreachable=(\d)\s+failed=(\d)\s+/
+      final_checks = /(fortimanager1)\s+:\s+ok=(\d+)\s+changed=(\d+)\s+unreachable=(\d+)\s+failed=(\d+)\s+/
+
+      #p answ_ans_parsed
+      processed_data = answ_ans_parsed.scan(final_checks)
+      #p processed_data
+      if processed_data!=[] && processed_data!=""
+        for aaa in processed_data
+          begin
+            if aaa[1].to_i>0 && aaa[3].to_i==0 && aaa[4].to_i==0
+              result_out[aaa[0]] = {:ok => aaa[1], :changed => aaa[2], :unreachable => aaa[3], :failed => aaa[4], :result => "Ok"}
+              #result_out.push({aaa[0] => "Ok"})
+              num_ok = num_ok + 1
+            else
+              result_out[aaa[0]] = {:ok => aaa[1], :unreachable => aaa[3], :failed => aaa[4], :result => "Failed"}
+              #result_out.push({aaa[0] => "Failed"})
+              num_failed = num_failed + 1
+            end
+          rescue
+            result_out["unknown"] = aaa.to_s
+            #result_out.push({"unknown" => aaa.to_s})
+            num_failed = num_failed + 1
+          end
+        end
+        output_data = {:code => 200, :result => "ansible_answer_parse: Request completed successfully", :body => {:list => result_out, :num_ok => num_ok, :num_failed => num_failed}}
+      else
+        output_data = {:code => 400, :result => "ansible_answer_parse: Ansible returned empty data"}
+      end
+    rescue
+      output_data = {:code => 507, :result => "ansible_answer_parse: Unknown error"}
+    end
+    add_functions.printer_texter(output_data, "debug")
+    output_data
+  end
+
+
   def https_to_forti_prep(domain)
     f0 = domain.gsub("#", "")
     f1 = f0.gsub("https://", "").split("/")
@@ -248,10 +294,10 @@ class AddFuncUkaz60_2
     end
 
     #p JSON.pretty_generate(output_answ)
-    p "staros_compare_http"
-    p output_answ
+    #p "staros_compare_http"
+    #p output_answ
 
-    p "temp data"
+    #p "temp data"
     for i in output_answ[:body][:for_unblock][:for_unblock]["vit11asr2"]
     #for i in output_answ[:body][:for_block][:not_blocked_belgim]["vit11asr2"]
       p i
@@ -280,7 +326,7 @@ class AddFuncUkaz60_2
       end
     end
 
-    p notbl_equal
+    #p notbl_equal
     if notbl_equal == 0
       block_me = {:for_block_count => data[:body][:for_block][:notblocked_stat][compa_n_data]}
       unblock_me = {:for_unblock_count => data[:body][:for_unblock][:for_unblock_stat][compa_n_data]}

data/lib/imperituroard/projects/wttx/updatepostcps.rb

@@ -45,25 +45,25 @@ class StateWTTX
     http = Net::HTTP.new(uri.host, uri.port)
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     p content = response.body
-    p resultcode = response.to_s.include?("OK")
+    p result_code = response.to_s.include?("OK")
     #Rails.logger = Logger.new(STDOUT)
     #logger.info "WTTX service getrestCPS result code: #{response.to_s}"
     #logger.info "WTTX service getrestCPS soap body: #{content.to_s}"
 
 
 
-    if resultcode == false
+    if !result_code
       "false"
     else
-      regimsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
-      regimei = /<field code=\"imei\" value=\"([0-9]{10,17})\"/
+      reg_imsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
+      reg_imei = /<field code=\"imei\" value=\"([0-9]{10,17})\"/
 
-      m1 = regimsi.match(content)
-      m2 = regimei.match(content)
+      m1 = reg_imsi.match(content)
+      m2 = reg_imei.match(content)
       imsi = m1[1]
       imei = m2[1]
 
-      res = resultcode.to_s + " " + imsi + " " + imei
+      res = result_code.to_s + " " + imsi + " " + imei
       p res
       res
     end

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.5"
+  VERSION = "1.1.11"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.11
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/runConfigurations/autovpn.xml"
+- ".idea/runConfigurations/dabrab_proced.xml"
 - ".idea/runConfigurations/hua_oceanconnect_adapter.xml"
+- ".idea/runConfigurations/test9_dab.xml"
 - ".idea/runConfigurations/version.xml"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -206,11 +209,17 @@ files:
 - lib/imperituroard/platforms/cps/cps_multiple_thread_req.rb
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
+- lib/imperituroard/platforms/iwag/get_iwag_data.rb
+- lib/imperituroard/platforms/iwag/iwag_database_worker.rb
+- lib/imperituroard/platforms/iwag/iwag_telnet_connector.rb
 - lib/imperituroard/platforms/public/telegram.rb
 - lib/imperituroard/platforms/staros/get_data_ssh.rb
 - lib/imperituroard/platforms/staros/staros_automation.rb
 - lib/imperituroard/platforms/staros/staros_automation_fun.rb
 - lib/imperituroard/platforms/staros/staros_parser.rb
+- lib/imperituroard/projects/autovpn.rb
+- lib/imperituroard/projects/autovpn/functions_ezuev.rb
+- lib/imperituroard/projects/autovpn/mongo_vpn.rb
 - lib/imperituroard/projects/dns.rb
 - lib/imperituroard/projects/iot.rb
 - lib/imperituroard/projects/iot/add_functions.rb
@@ -218,10 +227,12 @@ files:
 - lib/imperituroard/projects/iot/internal_functions.rb
 - lib/imperituroard/projects/iot/mongoconnector.rb
 - lib/imperituroard/projects/mhub.rb
+- lib/imperituroard/projects/mhub/gms.rb
 - lib/imperituroard/projects/mhub/infobip.rb
 - lib/imperituroard/projects/mhub/sk.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_platform.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb
+- lib/imperituroard/projects/mhub/subs/evrotorg/gms_connector.rb
 - lib/imperituroard/projects/ukaz60.rb
 - lib/imperituroard/projects/ukaz60/belgim.rb
 - lib/imperituroard/projects/ukaz60/dns.rb
@@ -229,7 +240,6 @@ files:
 - lib/imperituroard/projects/ukaz60/fortigate.rb
 - lib/imperituroard/projects/ukaz60/staros.rb
 - lib/imperituroard/projects/ukaz60/ukaz60_add_func.rb
-- lib/imperituroard/projects/vpn/ezuev_fun/functions_ezuev.rb
 - lib/imperituroard/projects/wttx/phpipamcps.rb
 - lib/imperituroard/projects/wttx/phpipamdb.rb
 - lib/imperituroard/projects/wttx/updatepostcps.rb
@@ -242,7 +252,7 @@ metadata:
   homepage_uri: https://rubygems.org/
   source_code_uri: https://github.com/imperituroard/imperituroard
   changelog_uri: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -257,9 +267,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.14
-signing_key: 
+signing_key:
 specification_version: 4
 summary: imperituroard gem
 test_files: []