imperituroard 1.1.2 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84beb64e487d828317872eeeac09c4c3201597c4
-  data.tar.gz: 181ae04e40a8a401727884b7681d9f8efe0388b4
+  metadata.gz: 5f9c5a08701e31d0a87ce664a92db4cc736dd56a
+  data.tar.gz: 1f5b19a4aaf12b01b0ef9f30026541f5f63e05d1
 SHA512:
-  metadata.gz: 417bd36e8ff9cb214c6b6d7046c3e8d4c3e359e52efc0636940a3ba54de2643176a057f71b4e7193a6405c1f53f4dcb65f04052586a4bd38c022df6c3768a985
-  data.tar.gz: e93a89ecf954a45df334149404853f012ae31a08cde511e9576efab73022bdfa102c678fb722a3f3160c33883949c65514c3862baec2425a29e9f590a4acb126
+  metadata.gz: 821eec2e26448ded59f48f9a5a9564e6253fd95d302038a4f375218d0ff4215e79302adf8b5a4904aaa2b48051f37cae86657258b01f27baadf1734cf8e1d83c
+  data.tar.gz: 6284ef90f6d634930e5a87d6dc6fc590c4a924ba2df7168023bf82ae9c7cdab42f44a8854db3731ed8462aa1b6ea935f39f824f4a4366782c6bf2086ff01fc5a

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/lib/imperituroard.rb

@@ -269,6 +269,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)
@@ -431,3 +442,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 = {

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

@@ -310,6 +310,9 @@ class HuaIot
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
+    #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

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

@@ -167,6 +167,7 @@ class InternalFunc
   #delete one key from hash
   def delete_key_hash(hash_f, delete_key)
     inp_fun = {:hash_f => hash_f, :delete_key => delete_key}
+    hash_f = hash_f.to_h
     out_data = {}
     res = {}
     hash_f.each do |ggg|

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/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.2"
+  VERSION = "1.1.8"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.8
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-29 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
@@ -229,7 +233,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