imperituroard 1.1.17 → 1.1.22

data/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb

@@ -232,6 +232,20 @@ class Dabrab
         } #Viber subscriber not exists
     }
 
+    data_for_status.default = {:status_id => 9,
+                               :status_grid => 2,
+                               :status_grname => 'UNDELIVERABLE_NOT_DELIVERED',
+                               :status_name => 'UNDELIVERED',
+                               :status_descr => 'Unknown error default',
+                               :error_id => 32,
+                               :error_grid => 1,
+                               :error_grname => 'HANDSET_ERRORS',
+                               :error_name => 'EC_SM_DELIVERY_FAILURE',
+                               :error_descr => 'Unknown error default',
+                               :error_permanent => false
+    }
+
+
     if hub_report_in.key?("msg_status") && !hub_report_in.key?("_json") && !hub_report_in["report"].key?("_json")
       internal_func.printer_texter({:input => "One message delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
 
@@ -301,7 +315,7 @@ class Dabrab
         internal_func.printer_texter({:input => {:hub_report2 => hub_report2}, :procedure => "Dabrab.delivery_report_transform"}, log_level)
 
 
-        if data_for_status[hub_report2["msg_status"]] != nil && data_for_status[hub_report2["msg_status"]] != {} && data_for_status[hub_report2["msg_status"]] != [] && data_for_status[hub_report2["msg_status"]] != ""
+        if data_for_status[hub_report2["msg_status"]] != nil && data_for_status[hub_report2["msg_status"]] != {} && data_for_status[hub_report2["msg_status"]] != [] && data_for_status[hub_report2["msg_status"]] != ''
           report_to_recip.push({
 
                                    "bulkId": "00000000-0000-0000-0000-000000000000",

data/lib/imperituroard/projects/oats/fttx_acl/add_acl_fttx.rb

@@ -0,0 +1,187 @@
+require 'imperituroard/platforms/cps/qps_connector'
+require 'imperituroard/platforms/cps/cps_mongo_connector'
+
+class Kosmonavty_2
+  attr_accessor :file_of_changed_prof,
+                :qps_connector,
+                :cps_mongo,
+                :filename_processed_added,
+                :logfile,
+                :filename_failed_add,
+                :logfile_return,
+                :filename_processed_return,
+                :filename_failed_return
+
+  def initialize(file_of_changed_prof)
+    @file_of_changed_prof = file_of_changed_prof
+    @qps_connector = Qps_2.new('http://172.24.220.65:8080/ua/wsdl/UnifiedApi.wsdl', 'http://172.24.220.65:8080/ua/soap', 'http://broadhop.com/unifiedapi/soap/types')
+    @cps_mongo = MongoCPS_2.new('site1-ca-pri-sessionmgr01', '27720', 'spr')
+
+    @filename_processed_added = 'testfile.txt'
+    @filename_processed_return = 'testfile_return.txt'
+    @logfile = 'day60log.txt'
+    @logfile_return = 'day60log_return.txt'
+    @filename_failed_add = 'testfile_failed.txt'
+    @filename_failed_return = 'testfile_failed_return.txt'
+  end
+
+  def write_to_file_rewr(new_text)
+    File.open(file_of_changed_prof + filename_processed_added, 'w') {|file| file.write(new_text)}
+  end
+
+  def add_line_to_file(new_line, filename)
+    File.open(file_of_changed_prof + filename, 'a') do |file|
+      line = new_line + "\n"
+      file.write line
+    end
+  end
+
+  def get_msisdn_from_file
+    begin
+      file = File.open(file_of_changed_prof + filename_processed_added)
+      file_data = file.read
+      output = []
+      splitted_lines = file_data.split("\n")
+      splitted_lines.each do |aaa|
+        if aaa != '' && aaa != "\n" && aaa.include?(';')
+          msssisdn = aaa.split(';')
+          output.push(msssisdn[0])
+        end
+      end
+      return output
+    rescue
+      return []
+    end
+  end
+
+  def get_msisdn_from_file_for_del
+    begin
+      file = File.open(file_of_changed_prof + filename_processed_added)
+      file_data = file.read
+      output = []
+      splitted_lines = file_data.split("\n")
+      splitted_lines.each do |aaa|
+        if aaa != '' && aaa != "\n" && aaa.include?(';')
+          msssisdn = aaa.split(';')
+          output.push({:msisdn => msssisdn[0], :devId => msssisdn[1]})
+        end
+      end
+      return output
+    rescue
+      return []
+    end
+  end
+
+  def main_processor_add_acl
+    process_json = {}
+    process_msisdn_list = []
+
+    #dat_cps = cps_mongo.get_minsk_fttx_fizlic
+    dat_cps = cps_mongo.get_minsk_fttx_zone2
+
+    dat_cps.each do |t|
+      gg = t.split(';')
+      process_json[gg[0]] = gg[1]
+      process_msisdn_list.push(gg[0])
+    end
+
+    from_file = get_msisdn_from_file
+    list_for_process = process_msisdn_list - from_file
+    uniq_list_for_proc = list_for_process.uniq
+
+    uniq_list_for_proc.each do |ddd|
+      ans = qps_connector.add_avp_acl(ddd, 'GTFU_IN')
+      #ans = {:change_subscriber_avps_response => {:error_code => '0'}}
+      begin
+        if ans[:change_subscriber_avps_response][:error_code] == '0'
+          add_line_to_file(ddd + ';' + process_json[ddd], filename_processed_added)
+          resp = qps_connector.stop_session_username(process_json[ddd])
+          add_line_to_file(ddd + ';' + process_json[ddd] + 'stop_session: ' + resp.to_s, logfile)
+        else
+          add_line_to_file(ddd + ';' + process_json[ddd], filename_failed_add)
+          add_line_to_file(ddd + ';' + process_json[ddd] + 'add_avps: ' + ans.to_s, logfile)
+        end
+      rescue
+        add_line_to_file(ddd + ';' + process_json[ddd], filename_failed_add)
+        add_line_to_file(ddd + ';' + process_json[ddd] + 'add_avps: ' + ans.to_s, logfile)
+      end
+    end
+  end
+
+  def main_processor_del_acl
+    from_file = get_msisdn_from_file_for_del
+
+    from_file.each do |ddd1|
+      ans = qps_connector.delete_avp_acl(ddd1[:msisdn])
+      if ans[:change_subscriber_avps_response][:error_code] == '0'
+        add_line_to_file(ddd1.to_s, filename_processed_return)
+        resp = qps_connector.stop_session_username(ddd1[:devId])
+        add_line_to_file(ddd1.to_s + ';' + ddd1[:devId] + 'stop_session: ' + resp.to_s, logfile_return)
+      else
+        add_line_to_file(ddd1.to_s, filename_failed_return)
+        add_line_to_file(ddd1.to_s + ';' + ddd1[:devId] + 'del_avp: ' + ans.to_s, logfile_return)
+      end
+    end
+  end
+
+  def test
+    qps_connector.stop_session_username('Ethernet1/0/7:1907.0 Min_Rokossovskogo_145_5/0/0/1/0/7')
+  end
+
+  def test_mongo
+
+    dat_cps = cps_mongo.get_minsk_fttx_zone2
+    dat_cps2 = cps_mongo.get_minsk_fttx_zone3_rokos
+    dat_cps3 = cps_mongo.get_minsk_fttx_zone4_mega
+    dat_cps4 = cps_mongo.get_minsk_fttx_zone5_koles
+    dat_cps5 = cps_mongo.get_minsk_fttx_zone6_all
+    dat_cps7 = cps_mongo.get_minsk_fttx_zone7_3last
+
+    #1
+    p "get_minsk_fttx_zone2"
+    p dat_cps
+    p dat_cps.length
+
+    #2
+    p "get_minsk_fttx_zone3_rokos"
+    p dat_cps2
+    p dat_cps2.length
+
+
+    #3
+    p "get_minsk_fttx_zone4_mega"
+    p dat_cps3
+    p dat_cps3.length
+
+
+    #4
+    p "get_minsk_fttx_zone5_koles"
+    p dat_cps4
+    p dat_cps4.length
+
+    #5
+    p "get_minsk_fttx_zone6_all"
+    p dat_cps5
+    p dat_cps5.length
+
+
+    p "get_minsk_fttx_zone7_3last"
+    p dat_cps7
+    p dat_cps7.length
+
+  end
+
+end
+
+
+#p test.delete_avp_acl("375298766719")
+#p test.add_avp_acl("375298766719", "ffgfg2")
+
+#test2 = Kosmonavty_2.new('/Users/imperituroard/Desktop/')
+
+#test2.main_processor_add_acl
+
+#test2.main_processor_del_acl
+
+#test2.test_mongo
+

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

@@ -74,13 +74,14 @@ class Belgim_2
           elem = elem.gsub(" ", "")
         end
 
-        if elem.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+        #if elem.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+        if elem.match(/[а-яА-ЯЁё]/)
           elem = SimpleIDN.to_ascii(elem)
         end
 
         if elem != "-" && elem != ""
           domain_parsed.push(elem)
-          if_www = elem[0]+elem[1]+elem[2]+elem[3]
+          if_www = elem[0] + elem[1] + elem[2] + elem[3]
 
           #if not contain www - add domain with www
           if if_www != "www."

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

@@ -76,36 +76,38 @@ class AddFuncUkaz60_2
           if !processed_domain_in_url.include? "/"
             #it is domain. Process domain
             #if it is kirillica then process
-            if processed_domain_in_url.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+            #if processed_domain_in_url.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+            if processed_domain_in_url.match(/[а-яА-ЯЁё]/)
               processed_domain_in_url = SimpleIDN.to_ascii(processed_domain_in_url)
             end
             domain_only = domain_only + processed_domain_in_url
-            type = "domain"
+            type = 'domain'
           else
             #it is url. process url
-            hh = processed_domain_in_url.split("/")
+            hh = processed_domain_in_url.split('/')
             domain_only = hh[0]
-            if domain_only.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+            #if domain_only.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+            if domain_only.match(/[а-яА-ЯЁё]/)
               hh[0] = SimpleIDN.to_ascii(domain_only)
-              processed_domain_in_url = ""
+              processed_domain_in_url = ''
               for t in hh
-                processed_domain_in_url = processed_domain_in_url + t + "/"
+                processed_domain_in_url = processed_domain_in_url + t + '/'
               end
               sss1len = processed_domain_in_url.size
               processed_domain_in_url = processed_domain_in_url[0..sss1len-2]
             end
-            type = "url"
+            type = 'url'
           end
         else
-          type = "empty"
+          type = 'empty'
         end
-        output_answer = {:code => 200, :result => "Request processed", :ishodnye_dannye => stroka, :first_url => first_url, :processed_domain_in_url => processed_domain_in_url, :domain_only => domain_only, :protocol => protocol, :type => type}
+        output_answer = {:code => 200, :result => 'Request processed', :ishodnye_dannye => stroka, :first_url => first_url, :processed_domain_in_url => processed_domain_in_url, :domain_only => domain_only, :protocol => protocol, :type => type}
 
       else
-        output_answer = {:code => 202, :result => "Data not found"}
+        output_answer = {:code => 202, :result => 'Data not found'}
       end
     rescue
-      output_answer = {:code => 507, :result => "Something wrong"}
+      output_answer = {:code => 507, :result => 'Something wrong'}
     end
     output_answer
   end
@@ -132,12 +134,12 @@ class AddFuncUkaz60_2
               #result_out.push({aaa[0] => "Ok"})
               num_ok = num_ok + 1
             else
-              result_out[aaa[0]] = "Failed"
+              result_out[aaa[0]] = 'Failed'
               #result_out.push({aaa[0] => "Failed"})
               num_failed = num_failed + 1
             end
           rescue
-            result_out["unknown"] = aaa.to_s
+            result_out['unknown'] = aaa.to_s
             #result_out.push({"unknown" => aaa.to_s})
             num_failed = num_failed + 1
           end

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

@@ -5,7 +5,7 @@ require 'savon'
 
 
 class Pcps
-  attr_accessor :wsdl, :endpoint, :namespace, :clientcps
+  attr_accessor :wsdl, :endpoint, :namespace, :client_cps
 
   def initialize(wsdl, endpoint, namespace)
     @wsdl = wsdl
@@ -24,34 +24,35 @@ class Pcps
   def avp_attr_list(username)
 
     message2 = {:networkId => username}
-    response = clientcps.call(:get_subscriber) do
+    response = client_cps.call(:get_subscriber) do
       message(message2)
     end
     aaa = response.to_hash[:get_subscriber_response][:subscriber][:avp]
     #li = {"FRAMED-IP-ADDRESS":0,"FRAMED-NETMASK":0,"Default-Gateway":0,"VRF-ID":0,"DHCP-CLASS":0,"IPV4-UNNUMB":0,"PREFIX":0}
-    li = {"FRAMED-IP-ADDRESS" => 0,
-          "FRAMED-NETMASK" => 0,
-          "Default-Gateway" => 0,
-          "VRF-ID" => 0,
-          "DHCP-CLASS" => 0,
-          "IPV4-UNNUMB" => 0,
-          "FRAMED-ROUTE-1" => 0}
-    if !aaa.is_a?(Hash)
-      for i in aaa
-        if i[:code]=="FRAMED-IP-ADDRESS"
-          li["FRAMED-IP-ADDRESS"]=1
-        elsif i[:code]=="FRAMED-NETMASK"
-          li["FRAMED-NETMASK"]=1
-        elsif i[:code]=="Default-Gateway"
-          li["Default-Gateway"]=1
-        elsif i[:code]=="VRF-ID"
-          li["VRF-ID"]=1
-        elsif i[:code]=="DHCP-CLASS"
-          li["DHCP-CLASS"]=1
-        elsif i[:code]=="IPV4-UNNUMB"
-          li["IPV4-UNNUMB"]=1
-        elsif i[:code]=="FRAMED-ROUTE-1"
-          li["FRAMED-ROUTE-1"]=1
+    li = {'FRAMED-IP-ADDRESS' => 0,
+          'FRAMED-NETMASK' => 0,
+          'Default-Gateway' => 0,
+          'VRF-ID' => 0,
+          'DHCP-CLASS' => 0,
+          'IPV4-UNNUMB' => 0,
+          'FRAMED-ROUTE-1' => 0}
+    is_hash = !aaa.is_a?(Hash)
+    if is_hash
+      aaa.each do |i|
+        if i[:code]=='FRAMED-IP-ADDRESS'
+          li['FRAMED-IP-ADDRESS']=1
+        elsif i[:code]=='FRAMED-NETMASK'
+          li['FRAMED-NETMASK']=1
+        elsif i[:code]=='Default-Gateway'
+          li['Default-Gateway']=1
+        elsif i[:code]=='VRF-ID'
+          li['VRF-ID']=1
+        elsif i[:code]=='DHCP-CLASS'
+          li['DHCP-CLASS']=1
+        elsif i[:code]=='IPV4-UNNUMB'
+          li['IPV4-UNNUMB']=1
+        elsif i[:code]=='FRAMED-ROUTE-1'
+          li['FRAMED-ROUTE-1']=1
         end
       end
     end
@@ -81,7 +82,7 @@ class Pcps
               #                {:code => "PREFIX"}
               ]
           }
-          response = clientcps.call(:change_subscriber_avps) do
+          response = client_cps.call(:change_subscriber_avps) do
             message(message2)
           end
           response
@@ -98,7 +99,7 @@ class Pcps
 
   def get_current_attributes(msisdn)
     message2 = {:networkId => msisdn}
-    response = clientcps.call(:get_subscriber) do
+    response = client_cps.call(:get_subscriber) do
       message(message2)
     end
     aaa = response.to_hash[:get_subscriber_response][:subscriber][:avp]
@@ -111,7 +112,7 @@ class Pcps
         :networkId => username,
         :newAvp => attlist
     }
-    response = clientcps.call(:change_subscriber_avps) do
+    response = client_cps.call(:change_subscriber_avps) do
       message(message1)
     end
     response.to_hash

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

@@ -55,8 +55,8 @@ class StateWTTX
     if !result_code
       "false"
     else
-      reg_imsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
-      reg_imei = /<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 = reg_imsi.match(content)
       m2 = reg_imei.match(content)

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.17"
+  VERSION = '1.1.22'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.22
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,7 @@ files:
 - lib/imperituroard.rb
 - lib/imperituroard/.DS_Store
 - lib/imperituroard/add_functions/logger/any_functions.rb
+- lib/imperituroard/platforms/cps/cps_mongo_connector.rb
 - lib/imperituroard/platforms/cps/cps_multiple_thread_req.rb
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
@@ -233,6 +234,7 @@ files:
 - 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/oats/fttx_acl/add_acl_fttx.rb
 - lib/imperituroard/projects/ukaz60.rb
 - lib/imperituroard/projects/ukaz60/belgim.rb
 - lib/imperituroard/projects/ukaz60/dns.rb