imperituroard 1.1.3 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44204f257643647687e7d62d06c363274cad09f3
-  data.tar.gz: 710581ba122cda979fd1989107dd981f028c456e
+  metadata.gz: 629626efbfcfa0108c2b1646a42d25856e6f3135
+  data.tar.gz: 8a3a7f5357873aa432d9058a2a54d933e6177c7d
 SHA512:
-  metadata.gz: fd5089b028b66fb283f57a0f5a870113ba4ad0c183c056937c2440b09c38c27d5166cb4d8670b95aa8da4f083cb6abcbe981b61a0474eb6cc1a8caeeda44a133
-  data.tar.gz: c5a0e5737f947b4dfcd360170309cf8bf2c955532b35e3f93e84280d1ee39c8a0751cf7009dbcff36c9da2afcc73fd351e8531135aed8612572966d6184ec63a
+  metadata.gz: 61e4e034d6b705161bc67e7c270406cbb62a0306ca18c17a619b04b6cf78af4bd802c0f59517e5856101ec75be031be38086872e68893de159412ef241aaaf53
+  data.tar.gz: 87151a1bbfa092b6d77fef7279cf114446dba7540ca949b897cad0a8f77270afe3833d7d49678f7e46476fb144be849a805d2bc493c2c625b3a185630f1e96ad

data/.idea/runConfigurations/autovpn.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="autovpn" type="RubyRunConfigurationType" factoryName="Ruby">
+    <module name="imperituroard" />
+    <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/imperituroard/projects" />
+    <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+    <envs />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+      <COVERAGE_PATTERN ENABLED="true">
+        <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+      </COVERAGE_PATTERN>
+    </EXTENSION>
+    <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/imperituroard/projects/autovpn.rb" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+    <method />
+  </configuration>
+</component>

data/imperituroard.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ipaddr", "1.2.2"
   spec.add_dependency "simpleidn", "0.1.1"
   spec.add_dependency "net-scp", "3.0.0"
-
   spec.add_dependency "rails", "5.0.7.2"
 
+
 end

data/lib/imperituroard.rb

@@ -25,6 +25,7 @@ require 'imperituroard/projects/dns'
 require 'imperituroard/platforms/cps/qps_connector'
 require 'imperituroard/platforms/public/telegram'
 require 'imperituroard/projects/ukaz60'
+require 'imperituroard/projects/mhub/gms'
 
 require 'json'
 require 'ipaddr'
@@ -269,6 +270,17 @@ class Iot
     iot_connector.set_data_replace_2(soapgw_params, real_ip, remote_ip)
   end
 
+  #14 integration with SPA
+  # add imei to correct profile
+  def spa_service_set(soapgw_params, real_ip, remote_ip)
+    #imei
+    #imsi
+    #msisdn
+    #unp
+    #note
+    #descriptiot
+  end
+
 
   def logger_to_audit_database(proc_name, src_ip, input_json, output_json, real_ip)
     mongo_client.audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
@@ -334,6 +346,26 @@ class Mhub_2
 end
 
 
+#2020.09.02 function for some procedure for get message status
+class GmsFunctions_2
+
+  attr_accessor :gms_func
+
+  def initialize(gms_t_login, gms_t_password, gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+    @gms_func = Gmsgms_2.new(gms_t_login, gms_t_password, gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+  end
+
+  def get_t_status_external(external_id)
+    gms_func.get_t_status_external_2(external_id)
+  end
+
+  def get_r_status_external(external_id)
+    gms_func.get_r_status_external_2(external_id)
+  end
+
+end
+
+
 class CpsFunctions_2
 
   attr_accessor :qps_connector
@@ -431,3 +463,17 @@ class Ukaz60Automation_2
   end
 
 end
+
+
+class Autovpn
+  attr_accessor :vpn_connector
+
+  def initialize (mongo_vpn_ip, mongo_vpn_port, mongo_vpn_database)
+    @vpn_connector = Autovpn.new(mongo_vpn_ip, mongo_vpn_port, mongo_vpn_database)
+  end
+
+  def vpn_add_msisdn_by_example(new_msisdn, example_msisdn)
+    vpn_connector.vpn_add_msisdn_by_example_2(new_msisdn, example_msisdn)
+  end
+
+end

data/lib/imperituroard/platforms/staros/staros_automation.rb

@@ -22,7 +22,7 @@ end
 staros_hosts.each do |ggsn|
   staros_thr_1233 << Thread.new do
 
-    p ggsn
+    #p ggsn
 
     begin
 

data/lib/imperituroard/projects/autovpn.rb

@@ -0,0 +1,27 @@
+require 'imperituroard/projects/autovpn/mongo_vpn'
+
+class Autovpn
+
+  attr_accessor :mongo_client
+
+  def initialize(mongo_vpn_ip, mongo_vpn_port, mongo_vpn_database)
+    @mongo_client = MongoVpn.new(mongo_vpn_ip, mongo_vpn_port, mongo_vpn_database)
+  end
+
+  def vpn_add_msisdn_by_example_2(new_msisdn, example_msisdn)
+
+  end
+
+  def test
+    mongo_client.get_mongo_msisdn("375298766719")
+  end
+
+end
+
+
+vvv = Autovpn.new("172.24.210.177",
+                  "27017",
+                  "autovpn"
+)
+
+vvv.test

data/lib/imperituroard/projects/autovpn/mongo_vpn.rb

@@ -0,0 +1,56 @@
+require 'mongo'
+
+require 'json'
+require 'rubygems'
+require 'nokogiri'
+require 'rails'
+
+require 'imperituroard/add_functions/logger/any_functions'
+
+class MongoVpn
+
+  attr_accessor :mongo_vpn_ip, :mongo_vpn_port, :client_vpn, :mongo_vpn_database, :internal_vpn_func, :logger_any
+
+  def initialize(mongo_vpn_ip, mongo_vpn_port, mongo_vpn_database)
+    @mongo_vpn_database = mongo_vpn_database
+    @mongo_vpn_ip = mongo_vpn_ip
+    @mongo_vpn_port = mongo_vpn_port
+    client_vpn_host = [mongo_vpn_ip + ":" + mongo_vpn_port]
+    @client_vpn = Mongo::Client.new(client_vpn_host, :database => mongo_vpn_database)
+    @logger_any = LogAddFunctions_2.new
+  end
+
+  #get data by msisdn. Validate data from collection msisdn_list
+  def get_mongo_msisdn(msisdn)
+    out_resp = {}
+    begin
+      msisdn_data = []
+      collection = client_vpn[:msisdn_list]
+      collection.find({:msisdn => msisdn.to_s}).each {|row|
+        msisdn_data = row
+      }
+      if msisdn_data != [] && msisdn_data["msisdn"] != nil && msisdn_data["msisdn"] != ""
+        if msisdn_data["group_id"] != [] && msisdn_data["group_id"] != nil && msisdn_data["group_id"] != ""
+          if msisdn_data["profile_id"] != [] && msisdn_data["profile_id"] != nil && msisdn_data["profile_id"] != ""
+            out_resp = {:code => 200, :result => "get_mongo_msisdn: Request completed successfully", :body => msisdn_data}
+          else
+            out_resp = {:code => 406, :result => "get_mongo_msisdn: invalid data. profile_id not found"}
+          end
+        else
+          out_resp = {:code => 405, :result => "get_mongo_msisdn: invalid data. organization_id not found"}
+        end
+      else
+        out_resp = {:code => 404, :result => "get_mongo_msisdn: login not found in database"}
+      end
+    rescue
+      out_resp = {:code => 507, :result => "get_mongo_msisdn: Unknown SDK error"}
+    end
+    logger_any.printer_texter(out_resp, "debug")
+    out_resp
+  end
+
+
+
+end
+
+

data/lib/imperituroard/projects/iot.rb

@@ -214,7 +214,6 @@ class IotFunctions_2
   end
 
 
-
   def add_device_to_prof2_2(request_full, real_ip, remote_ip)
 
     #{"autorization"=>{"login"=>"test", "token"=>"tE3aFvs27"}, "devlist"=>[{"devices"=>{"imei"=>123419520034999, "type"=>"1000002", "profile"=>0}}]}
@@ -229,6 +228,7 @@ class IotFunctions_2
     imei_list = im_li
 
     input_json = {:request_full => request_full}
+    input_json22 = {:login => login, :imei_list => imei_list}
     resp_out = {}
     begin
 
@@ -368,7 +368,7 @@ class IotFunctions_2
     end
     thr1.join
 
-    resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json, resp_out)
+    resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json22, resp_out)
     mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
@@ -1381,10 +1381,6 @@ class IotFunctions_2
   end
 
 
-
-
-
-
   ################################################
   ############technology procedures###############
   ################################################
@@ -1404,8 +1400,6 @@ class IotFunctions_2
   end
 
 
-
-
   #for internal use. Add new device model
   def add_model_to_mongo(model, manufacture_id, manufacture_name, device_type, description, note)
     model = {
@@ -1433,6 +1427,6 @@ class IotFunctions_2
     p "yyyyy"
 
     #fff = HuaIot.new("134.17.93.4", "443", "/Users/imperituroard/Desktop/cert.crt", "/Users/imperituroard/Desktop/key.pem")
-    p hua_aceanconnect_connector.querying_device_id("Jy5KpoBUOScZEcrO2bRZhzfaIOUa", "VFFWTOb9k3_cQhzrGsRWT4HE8Z0a", "123456789876543")
+    p hua_aceanconnect_connector.querying_device_id("Jy5KpoBUOScZEcrO2bRZhzfaIOUa", "VFFWTOb9k3_cQhzrGsRWT4HE8Z0a", "123412341284999")
   end
 end

data/lib/imperituroard/projects/iot/add_functions.rb

@@ -55,8 +55,8 @@ class AdditionalFunc
                 note=i["note"]
               end
             end
-            if i.key?("type")
-              type=i["type"]
+            if i.key?("device_type")
+              type=i["device_type"]
             end
             if i.key?("profile")
               profile=i["profile"]

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -82,6 +82,7 @@ class HuaIot
       request.content_type = 'application/x-www-form-urlencoded'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
+      p "get_token"
       p res.code
       p res.message
       p res.body.to_s
@@ -293,27 +294,30 @@ class HuaIot
 
   #2.2.44 Querying the Device ID
   def querying_device_id(app_id, secret, node_id)
-    token = get_token(app_id, secret)[:body]["accessToken"]
-    p token
-    path = "/iocm/app/dm/v1.1.0/queryDeviceIdByNodeId?nodeId=" + node_id + "&appId=Jy5KpoBUOScZEcrO2bRZhzfaIOUa"
-    p path
-    p path
-    url_string = "https://" + platformip + ":" + platformport + path
-    p url_string
-    uri = URI.parse url_string
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
-    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
-    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(uri.path)
-    request.content_type = 'application/json'
-    request['Authorization'] = 'Bearer ' + token
-    request['app_key'] = app_id
-    res = https.request(request)
-    p res.body.to_s
-    p res.code
-    {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
+    get_token_data = get_token(app_id, secret)
+    if get_token_data[:code]=="200"
+      token = get_token_data[:body]["accessToken"]
+      uri1 = URI("https://134.17.93.4:8743/iocm/app/dm/v1.1.0/queryDeviceIdByNodeId?nodeId=" + node_id + "&" + app_id)
+      https = Net::HTTP.new(uri1.host, uri1.port)
+      https.use_ssl = true
+      https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+      https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Get.new(uri1)
+      request.content_type = 'application/json'
+      request['app_key'] = app_id
+      request['Authorization'] = 'Bearer ' + token
+      #request.set_form_data( params )
+      #request['node-id'] = node_id
+      bbb =  {"nodeId": node_id, "appId": "Jy5KpoBUOScZEcrO2bRZhzfaIOUa"}.to_json
+      #request.body = bbb
+      res = https.request(request)
+      #p res.body.to_s
+      #p res.code
+      {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
+    else
+      {:code => "500", :message => "Something wrong", :body => {}}
+    end
   end
 
   #2.2.14 Querying Device Activation Status

data/lib/imperituroard/projects/iot/mongoconnector.rb

@@ -507,6 +507,7 @@ class MongoIot
   #function for get iot platform credentials from profile
   #universal procedure. use profile or profile id
   def get_iot_oceanconn_credent_2(profile)
+    input_in = {:profile => profile}
     out_resp = {}
     begin
       result_ps = []
@@ -528,7 +529,7 @@ class MongoIot
     rescue
       out_resp = {:code => 500, :result => "get_iot_oceanconn_credent_2: Process failed"}
     end
-    internal_func.printer_texter(out_resp, "debug")
+    internal_func.printer_texter({:input_in => input_in, :out_resp => out_resp, :fun => "get_iot_oceanconn_credent_2"}, "debug")
     out_resp
   end
 
@@ -596,6 +597,7 @@ class MongoIot
 
 
   def compare_profiles(profile1, profile2)
+    input_inf = {:profile1 => profile1, :profile2 => profile2}
     out_answ = {}
     ch1 = internal_func.if_digit_or_string(profile1)
     ch2 = internal_func.if_digit_or_string(profile2)
@@ -632,10 +634,12 @@ class MongoIot
         out_answ = {:code => 200, :result => "compare_profiles: profiles are different", :is_the_same => false, :data_type => "different"}
       end
     end
+    internal_func.printer_texter({:input_inf => input_inf, :out => out_answ, :fun => "compare_profiles"}, "debug")
     out_answ
   end
 
   def compare_device_types(type1, type2)
+    input_inf = {:type1 => type1, :type2 => type2}
     out_answ = {}
     tp1 = internal_func.if_digit_or_string(type1)
     tp2 = internal_func.if_digit_or_string(type2)
@@ -682,6 +686,7 @@ class MongoIot
         out_answ = {:code => 200, :result => "compare_device_types: profiles are different", :is_the_same => false, :data_type => "different"}
       end
     end
+    internal_func.printer_texter({:input_inf => input_inf, :out => out_answ, :fun => "compare_device_types"}, "debug")
     out_answ
   end
 

data/lib/imperituroard/projects/mhub.rb

@@ -146,11 +146,12 @@ class MhubFunctions_2
     output_params
   end
 
-
   def test2
     hh = Infobip_1.new
     hh.test
   end
 
 
-end
+end
+
+

data/lib/imperituroard/projects/mhub/gms.rb

@@ -0,0 +1,96 @@
+require 'imperituroard/projects/mhub/subs/evrotorg/gms_connector'
+
+
+class Gmsgms_2
+
+  attr_accessor :gms_t_login, :gms_t_password, :gms_r_login, :gms_r_password, :gms_t_connector, :gms_r_connector
+
+
+  def initialize(gms_t_login, gms_t_password, gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+    @gms_t_login = gms_t_login
+    @gms_t_password = gms_t_password
+    @gms_r_login = gms_r_login
+    @gms_r_password = gms_r_password
+
+    @gms_t_connector = Gms_2.new(gms_t_login, gms_t_password, telegram_api_url, telegram_chat_id)
+    @gms_r_connector = Gms_2.new(gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+
+    @internal_func = InternalFunc.new
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+
+  end
+
+  def gms_parsing(gms_answer)
+    output = {}
+
+    status_dic = {
+        12033 => "Sent to Viber",
+        36013 => "Viber internal failure",
+        36023 => "Viber invalid service id",
+        36033 => "Viber invalid data",
+        36043 => "Viber blocked message type",
+        36053 => "Viber bad message type",
+        36063 => "Viber bad parameters",
+        36073 => "Viber timeout",
+        36083 => "Viber user blocked",
+        36093 => "Viber not viber user",
+        36103 => "Viber no suitable device",
+        36113 => "Viber unauthorized ip",
+        36123 => "Viber already sent",
+        36133 => "Viber not permitted",
+        36143 => "Viber billing failure",
+        36153 => "Viber word in black list",
+        36163 => "Viber internal process error",
+        36173 => "Viber wrong or missing Label",
+        36183 => "Viber invalid TTL value",
+        23033 => "Viber delivered",
+        35015 => "Viber expired",
+        24013 => "Viber delivered(seen)",
+        28013 => "Viber delivered(overdue)",
+        -1 => "in progress"
+    }
+
+    if gms_answer[:code] == 200
+      dt1 = gms_answer[:body][:res_body]["reports"][0]
+      hyber_status = dt1["hyber_status"]
+      output = {:code => 200, :result => "Processed", :body => {"status_code": hyber_status, "status": status_dic[hyber_status], "phone_number": dt1["phone_number"], "message_id": dt1["extra_id"]}}
+    elsif gms_answer[:code] == 404
+      output = {:code => 404, :result => "Not found", :body => {"status_code": "", "status": "", "phone_number": "", "message_id": gms_answer[:body][:request_message][:external_id]}}
+    else
+      output = {:code => gms_answer[:code], :result => gms_answer[:result], :body => {"status_code": "", "status": "", "phone_number": "", "message_id": gms_answer[:body][:request_message][:external_id]}}
+    end
+    output
+  end
+
+
+  def get_t_status_external_2(external_id)
+    output = {}
+    begin
+      ans = gms_t_connector.get_advanced_by_external(external_id)
+      parsed = gms_parsing(ans)
+      output = {:gms_answer => ans, :parsed_answer => parsed}
+    rescue
+      pars = {:code => "505", :result => "Failed", :body => {"status_code": "", "status": "", "phone_number": "", "message_id": ""}}
+      output = {:gms_answer => ans, :parsed_answer => pars}
+    end
+    output
+  end
+
+
+  def get_r_status_external_2(external_id)
+    output = {}
+    begin
+      ans = gms_r_connector.get_advanced_by_external(external_id)
+      parsed = gms_parsing(ans)
+      output = {:gms_answer => ans, :parsed_answer => parsed}
+    rescue
+      pars = {:code => "505", :result => "Failed", :body => {"status_code": "", "status": "", "phone_number": "", "message_id": ""}}
+      output = {:gms_answer => ans, :parsed_answer => pars}
+    end
+    output
+  end
+
+end
+
+
+

data/lib/imperituroard/projects/mhub/subs/evrotorg/gms_connector.rb

@@ -0,0 +1,69 @@
+require 'net/https'
+
+require 'json'
+
+require 'uri'
+require 'net/http'
+require 'rubygems'
+require 'nokogiri'
+require 'rails'
+
+require 'imperituroard/projects/iot/internal_functions'
+
+
+class Gms_2
+
+  attr_accessor :gms_login, :gms_password, :telegram_connector, :internal_func
+
+  def initialize(gms_login, gms_password, telegram_api_url, telegram_chat_id)
+    @gms_login = gms_login
+    @gms_password = gms_password
+    @internal_func = InternalFunc.new
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+  end
+
+  def get_advanced_by_external(external_id)
+
+    input_params = {:external_id => external_id}
+    output_params = {}
+    thr1_get_advanced_by_external = Thread.new do
+      begin
+        uri = URI("https://dr-v2.hyber.im/2160/api/dr/external/" + external_id + "/advanced")
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        req = Net::HTTP::Get.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        req.basic_auth gms_login, gms_password
+        req["Content-Type"] = "application/json"
+        res = https.request(req)
+
+        p res.code
+        p res.body
+        if res.code == "200"
+          output_params = {:code => 200,
+                           :result => "Gms_2.get_advanced_by_external: Request processed",
+                           :body => {:request_message => input_params,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+        else
+          output_params = {:code => res.code.to_i,
+                           :result => "Gms_2.get_advanced_by_external: Request processed",
+                           :body => {:request_message => input_params,
+                                     :res_code => res.code,
+                                     :res_body => res.body.to_s}}
+        end
+      rescue
+        output_params = {:code => 500, :result => "Gms_2.get_advanced_by_external: Something wrong", :body => {:request_message => input_params}}
+      end
+    end
+    thr1_get_advanced_by_external.join
+
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Gms_2.get_advanced_by_external"}, "debug")
+    output_params
+
+  end
+
+
+
+
+end

data/lib/imperituroard/projects/ukaz60.rb

@@ -60,7 +60,7 @@ class Ukaz60All_2
           else
             forti_answer = {:code => update_fortigate_ansible[:code], :result => update_fortigate_ansible[:result]}
           end
-          #forti_connector.clean_tmp_folders
+          forti_connector.clean_tmp_folders
         else
           forti_answer = {:code => 401, :result => "Failed for uploading data to ansible server"}
         end
@@ -85,6 +85,8 @@ class Ukaz60All_2
         #compare data with belgim
         answ = ukaz60_add_func.staros_compare_http(staros_blocks_current, get_belgim_data)
 
+        p answ
+
         if answ[:code] == 200
           #output_starprocess = {:code => 200, :result => "Staros processed", :data => {:block_me => answ[:body][:for_block][:notblocked_stat], :unblock_me =>answ[:body][:for_unblock][:for_unblock_stat]}}
           output_starprocess = ukaz60_add_func.format_star_processed_answ(answ)[:body][:to_message]
@@ -110,7 +112,7 @@ class Ukaz60All_2
 
     begin
       get_belgim_data = belgim_connector.belgim_ukaz60_get
-      p get_belgim_data
+      #p get_belgim_data
 
       if get_belgim_data[:code] == 200
 

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

@@ -55,7 +55,7 @@ class Belgim_2
       curl_belgie_command = "curl -d \"name=#{belgim_login}&pass=#{belgim_password}\" -H \"Content-Type: application/x-www-form-urlencoded\" -X POST #{belgim_url} --insecure"
       #return_from_belgim = `curl -d "name=#{belgim_login}&pass=#{belgim_password}" -H "Content-Type: application/x-www-form-urlencoded" -X POST #{belgim_url} --insecure`
       return_from_belgim = `#{curl_belgie_command}`
-      p curl_belgie_command
+      #p curl_belgie_command
 
       return_from_belgim = return_from_belgim.gsub!("\n", "")
 

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/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.3"
+  VERSION = "1.1.9"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.9
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,6 +186,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/runConfigurations/autovpn.xml"
 - ".idea/runConfigurations/hua_oceanconnect_adapter.xml"
 - ".idea/runConfigurations/version.xml"
 - ".ruby-gemset"
@@ -211,6 +212,9 @@ files:
 - 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 +222,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 +235,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 +247,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 +262,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: []