imperituroard 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 162e6e937083e7f1307a970dde31e6f1e32361cc
-  data.tar.gz: 2cbd8b609bc29adee176e4f655c32884b470bb06
+  metadata.gz: 82ccb8c3495b39d57508a73c4a7d8fbdb773dda8
+  data.tar.gz: b9b50d62346f67480c4f25529cc05bc3857c467e
 SHA512:
-  metadata.gz: 67208ee0587648aca3539642c80cff0bc3588a3dae78e9ee6cc4f58d6f2228e2c9044f1b45e89263f6090becc65f860fab664eda5862e650ea5634577994b9ed
-  data.tar.gz: 833d138815a513d483ad4a154d13a168fe17f1e993f87fdf6a5b2d0278c024c2cbe6972f8504e538855c48cab12b46a882e5a318cda181d7ea2ba928dc481dad
+  metadata.gz: 7a1c07bf801f14556025427da6b5cc9de7fc72fa138735da13442314ec2ed185eb234b826e4cf0032d975c3d18f1dba1a31f95bf37447ec6b35ec212c93478b8
+  data.tar.gz: 2a0eddeb80e167ccfe33b1d2b25dd1281cbea7f5fda5f02da99cc714e830bb7d044efcb5d74237bd4b1259fd28716ec4881f2e9e77658fd3a61d624977ccd909

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

@@ -10,6 +10,7 @@ class AdditionalFunc
   def initialize(telegram_api_url, telegram_chat_id)
     @telegram_api_url = telegram_api_url
     @telegram_chat_id = telegram_chat_id
+
   end
 
   #procedure for send log to telegram chat
@@ -113,4 +114,6 @@ class AdditionalFunc
     end
 
   end
+
+
 end

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

@@ -11,11 +11,10 @@ class HuaIot
 
   attr_accessor :platformip, :platformport, :client, :database, :cert_file, :key_file
 
-  def initialize(platformip, platformport, iotip, database, cert_file, key_file)
+  def initialize(platformip, platformport, cert_file, key_file)
     @database = database
     @platformip = platformip
     @platformport = platformport
-    @iotip = iotip
     @cert_file = cert_file
     @key_file = key_file
     #client_host = [mongoip + ":" + mongoport]
@@ -89,10 +88,33 @@ class HuaIot
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
+#2.2.4 Registering a Directly Connected Device (Password Mode) (V2)
+  def dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
+    token = get_token(app_id, secret)[:body]["accessToken"]
+    path = "/iocm/app/reg/v2.0.0/deviceCredentials?appId=" + app_id
+    url_string = "https://" + platformip + ":" + platformport + path
+    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::Post.new(uri.path)
+    request.content_type = 'application/json'
+    request['Authorization'] = 'Bearer ' + token
+    request['app_key'] = app_id
+    request.body = {deviceInfo: {nodeId: node_id, name: name_p, description: description_p, deviceType: device_type}}.to_json
+    res = https.request(request)
+    p res.body.to_s
+    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+  end
+
+
 
-  def dev_delete(app_id, secret, node_id)
+  #2.2.12 Deleting a Directly Connected Device
+  def dev_delete(app_id, secret, dev_id)
     token = get_token(app_id, secret)[:body]["accessToken"]
-    path = "/iocm/app/dm/v1.1.0/devices/" + node_id + "?app_Id=" + app_id + "&cascade=true"
+    path = "/iocm/app/dm/v1.1.0/devices/" + dev_id + "?app_Id=" + app_id + "&cascade=true"
     url_string = "https://" + platformip + ":" + platformport + path
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
@@ -105,13 +127,21 @@ class HuaIot
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
     res = https.request(request)
-    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    p res.code
+    p res.body
+    if res.body != nil
+      {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
+    else
+      {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
+    end
+
   end
 
 
   #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
     p path
     p path
@@ -127,9 +157,9 @@ class HuaIot
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
-    p request.body
     res = https.request(request)
     p res.body.to_s
+    p res.code
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
@@ -216,8 +246,10 @@ class HuaIot
   #2.9.6 Querying Directly Connected Devices and Their Mounted Devices in Batches
   def quer_dev_direct_conn_batches(app_id, secret, dev_list)
     token = get_token(app_id, secret)[:body]["accessToken"]
+    p token
     path = "/iocm/app/dm/v1.1.0/queryDevicesByIds"
     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
@@ -235,6 +267,25 @@ class HuaIot
 
 
 
+  ##2.10.7 Adding Members to a Device Group
+
+
+##############################################################3
+
+
+  ########final procedures###############
+  def add_new_device_on_huawei(app_id, secret, node_id, name_p, description_p, device_type, profile)
+    dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
+  end
+
+
+  def remove_one_device_from_iot(app_id, secret, dev_id)
+    dev_delete(app_id, secret, dev_id)
+  end
+
+
+  #######################################
+
   def test()
 
     url_string = "https://134.17.93.4:8743/iocm/app/sec/v1.1.0/login"

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

@@ -18,7 +18,7 @@ class MongoIot
     @client = Mongo::Client.new(client_host, :database => mongo_database)
   end
 
-  def audit_logger(proc_name, src_ip, input_json, output_json)
+  def audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
     begin
       d = DateTime.now
       current = d.strftime("%d/%m/%Y %H:%M:%S")
@@ -26,7 +26,7 @@ class MongoIot
       doc = {
           :proc_name => proc_name,
           :date => current,
-          :sender => {:src_ip => src_ip},
+          :sender => {:src_ip => src_ip, :real_ip => real_ip},
           :input_params => input_json,
           :output_params => output_json
       }
@@ -207,8 +207,32 @@ class MongoIot
       for l in imei_list
         doc = {
             imei: l,
-            imsi: "",
-            msisdn: "",
+            imsi: "unknown",
+            msisdn: "unknown",
+            description: "test imei",
+            note: "second description",
+            profile: 0,
+            type: 0,
+            address: "unknown"
+        }
+        result = collection.insert_one(l)
+        p result
+      end
+    rescue
+      continue
+    end
+  end
+
+
+  def imei_insert_list2(imei_list)
+    begin
+      collection = client[:device_imei]
+      p imei_list
+      for l in imei_list
+        doc = {
+            imei: l,
+            imsi: "unknown",
+            msisdn: "unknown",
             description: "test imei",
             note: "second description",
             profile: 0,
@@ -308,6 +332,24 @@ class MongoIot
   end
 
 
+  def get_iot_oceanconnect_credent(login)
+    begin
+      result_ps = []
+      collection = client[:users]
+      collection.find({"login" => login}).each {|row|
+        result_ps.append(row)
+      }
+      p result_ps[0]
+      app_id = result_ps[0][:iot_data][:app_id]
+      secret = result_ps[0][:iot_data][:secret]
+      return {:code => 200, :result => "get_iot_oceanconnect_credent: Request completed successfully", :body => {:app_id => app_id, :secret => secret}}
+    rescue
+      {:code => 500, :result => "get_iot_oceanconnect_credent: Process failed"}
+    end
+
+      end
+
+
   def ttt
     p "111111"
     begin

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

data/lib/imperituroard.rb

@@ -88,17 +88,19 @@ class Iot
   attr_accessor :mongoip,
                 :mongoport,
                 :iotip,
-                :iottoken,
                 :mongo_database,
                 :iotplatform_ip,
                 :iotplatform_port,
                 :cert_path,
                 :key_path,
                 :mongo_client,
-                :add_functions_connector
+                :add_functions_connector,
+                :real_ip, #real ip address of procedure caller
+                :remote_ip, #ip address of balancer
+                :hua_aceanconnect_connector
 
   def initialize(mongoip, mongoport, iotip, mongo_database,
-                 iotplatform_ip, iotplatform_port, cert_path, key_path, telegram_api_url, telegram_chat_id)
+                 iotplatform_ip, iotplatform_port, cert_path, key_path, telegram_api_url, telegram_chat_id, real_ip, remote_ip)
     @mongoip = mongoip
     @mongoport = mongoport
     @iotip = iotip
@@ -109,6 +111,9 @@ class Iot
     @key_path = key_path
     @mongo_client = MongoIot.new(mongoip, mongoport, mongo_database)
     @add_functions_connector = AdditionalFunc.new(telegram_api_url, telegram_chat_id)
+    @real_ip = real_ip
+    @remote_ip = remote_ip
+    @hua_aceanconnect_connector = HuaIot.new(iotplatform_ip, iotplatform_port, cert_path, key_path)
   end
 
   #error list
@@ -117,15 +122,16 @@ class Iot
   #{:code => 200, :result => "Request completed successfully", :body => result_ps}
 
 
-  #!1. Add device to profile (only for new device)
+  #!!1. Add device to profile (only for new device)
   #login - login for client identification
   #profile - profile for device
   #imei_list - device identificator
-  #imei_list = [{"imei" => 131234123412341233, "description" => "dfdsf", "note"=>"second description", "profile"=>0},
+  #imei_list = [{"imei" => 131234123412341233, "description" => "dfdsf", "note"=>"second description", "profile"=>0, "device_type"=>"phone"},
   #{"imei" => 56213126347645784, "description" => "dfdsf", "note"=>"second description", "profile"=>0}]
   #massive commands
-  #++
-  def add_device_to_profile(login, imei_list, remote_ip)
+  #+++
+  #iot logic added
+  def add_device_to_profile(login, imei_list)
     input_json = {:login => login, :imei_list => imei_list}
     resp_out = {}
     begin
@@ -150,8 +156,6 @@ class Iot
           begin
             get_login_info = mongo_client.check_login_prof_perm_id_one(login, list1[jj]["profile"])[:code]
             if get_login_info==200
-
-
               for_insert.append(list1[jj])
             else
               not_processed_list.append({:imei => list1[jj], :error => "Permission denied for this profile"})
@@ -162,15 +166,40 @@ class Iot
         end
 
         begin
+          added_on_iot_platf = []
           if for_insert!=[]
             ##Logic for IOT Platform connection###
 
-            #########end iot platform logic#######
+            credentials = mongo_client.get_iot_oceanconnect_credent(login)
+
+            if credentials[:code]==200
+              for aaa in for_insert
+                begin
+                  dev_name = aaa["imei"].to_s
+                  resss = hua_aceanconnect_connector.add_new_device_on_huawei(credentials[:body][:app_id], credentials[:body][:secret], aaa["imei"], dev_name, aaa["description"], aaa["device_type"], aaa["profile"])
+                  if resss[:code]=="200"
+                    s1 = aaa
+                    s1[:huadata] = resss
+                    added_on_iot_platf.append(s1)
+                  else
+                    not_processed_list.append({:imei => aaa["imei"], :error => resss})
+                  end
+                rescue
+                  not_processed_list.append({:imei => aaa["imei"], :error => "Unknown error with insertion imei on IOT platform"})
+                end
+              end
+
+              #########end iot platform logic#######
+
+              mongo_client.imei_insert_list(added_on_iot_platf)
+              resp_out = {:code => 200, :result => "Data processed", :body => {:imei_processed => added_on_iot_platf, :error_list => not_processed_list}}
+            else
+              resp_out = {:code => 400, :result => "IOT platform credentials not found"}
+            end
+
 
-            mongo_client.imei_insert_list(for_insert)
-            resp_out = {:code => 200, :result => "Data processed", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
           else
-            resp_out = {:code => 202, :result => "Nothing for insertion", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
+            resp_out = {:code => 202, :result => "Nothing for insertion", :body => {:imei_processed => added_on_iot_platf, :error_list => not_processed_list}}
 
           end
         rescue
@@ -181,19 +210,19 @@ class Iot
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
     thr1.join
-    mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out)
+    mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip)
     resp_out
   end
 
 
-  #!2 Find device (only mongo datebase. IOT platform not need)
+  #!!2 Find device (only mongo datebase. IOT platform not need)
   # procedure for data selection from mongo database.
   # for this function IOT platform not need
   # login
   # imei
   # imei_list =[41234,23452345,132412]
   #++
-  def device_find(login, imei_list, remote_ip)
+  def device_find(login, imei_list)
     input_json = {:login => login, :imei_list => imei_list}
     ime_list_approved = []
     ime_list_notapproved = []
@@ -236,7 +265,7 @@ class Iot
       resp = {:code => 507, :result => "Unknown SDK error"}
     end
     thr2.join
-    mongo_client.audit_logger("device_find", remote_ip, input_json, resp)
+    mongo_client.audit_logger("device_find", remote_ip, input_json, resp, real_ip)
     resp
   end
 
@@ -247,7 +276,7 @@ class Iot
   #massive commands
   #im_list = [{"imei_old"=>7967843245667, "imei_new"=>7967843245665}]
   #++
-  def imei_replace(login, im_list, remote_ip)
+  def imei_replace(login, im_list)
     input_json = {:login => login, :imei_list => im_list}
 
     li_new_imei = []
@@ -296,6 +325,8 @@ class Iot
 
                 ##Logic for IOT Platform connection###
 
+                remove_one_device_from_iot(app_id, secret, dev_id)
+
                 #########end iot platform logic#######
 
                 mongo_client.device_modify_any_attr_mongo(list1[a], {:imei => a})
@@ -328,56 +359,79 @@ class Iot
     end
 
     thr3.join
-    mongo_client.audit_logger("imei_replace", remote_ip, input_json, resp_out)
+    mongo_client.audit_logger("imei_replace", remote_ip, input_json, resp_out, real_ip)
 
     resp_out
 
   end
 
 
-  #!4 remove device
+  #!!4 remove device
   #login
   #imei
   # not massive commands
   #imei=11341341234
   #login="test"
-  #++
-  def device_remove(login, imei, remote_ip)
+  #+++
+  #IOT logic added
+  def device_remove(login, imei)
 
     input_json = {:login => login, :imei_list => imei}
     resp_out = {}
 
     begin
       thr4 = Thread.new do
-      prof_name = mongo_client.get_profile_name_from_imei(imei)
-      if prof_name[:code]==200
-        permiss = mongo_client.check_login_profile_permiss(login, prof_name[:body]["profile"])
-        if permiss[:code]==200
+        prof_name = mongo_client.get_profile_name_from_imei(imei)
+        if prof_name[:code]==200
+          permiss = mongo_client.check_login_profile_permiss(login, prof_name[:body]["profile"])
+          if permiss[:code]==200
+
+            ##Logic for IOT Platform connection###
+
+
+            credentials = mongo_client.get_iot_oceanconnect_credent(login)
+            resp = {}
 
-          ##Logic for IOT Platform connection###
+            if credentials[:code]==200
 
-          #########end iot platform logic#######
+              imei_data = mongo_client.get_imei_info_from_db([imei])
+              if imei_data[:body]!=[]
+                ans = hua_aceanconnect_connector.remove_one_device_from_iot(credentials[:body][:app_id], credentials[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"])
+                p ans
+                if ans[:code]=="204" or ans[:code]=="200"
+                  resp = mongo_client.device_remove_single_mongo(imei)
+                else
+                  resp = {:code => 500, :result => "Unknown IOT platform error", :body => ans}
+                end
+              else
+                resp_out = {:code => 404, :result => "Data not found"}
+              end
 
-          resp = mongo_client.device_remove_single_mongo(imei)
+              #########end iot platform logic#######
+
+              if resp[:code]==200
+                resp_out = {:code => 200, :result => "Request completed successfully"}
+              else
+                resp_out=resp
+              end
+
+            else
+              resp_out = {:code => 400, :result => "IOT platform credentials not found"}
+            end
 
-          if resp[:code]==200
-            resp_out = {:code => 200, :result => "Request completed successfully"}
           else
-            resp_out=resp
+            resp_out=permiss
           end
         else
-          resp_out=permiss
+          resp_out=prof_name
         end
-      else
-        resp_out=prof_name
-      end
       end
 
     rescue
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
     thr4.join
-    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out)
+    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out, real_ip)
     resp_out
   end
 
@@ -388,7 +442,7 @@ class Iot
   #address = newdevice_list
   #newdevice_list=[{:imei=>7967843245665, :address=>"Golubeva51"}]
   #++
-  def device_add_address(login, newdevice_list, remote_ip)
+  def device_add_address(login, newdevice_list)
     #add_functions_connector.telegram_message(newdevice_list.to_s)
     p newdevice_list
     p "gas"
@@ -400,43 +454,43 @@ class Iot
     processed = []
     begin
       thr5 = Thread.new do
-      for p in newdevice_list
-        prof_name = mongo_client.get_profile_name_from_imei(p[:imei])
+        for p in newdevice_list
+          prof_name = mongo_client.get_profile_name_from_imei(p[:imei])
 
-        if prof_name[:code]==200
-          p "prof_name"
-          p prof_name
-          permiss = mongo_client.check_login_profile_permiss(login, prof_name[:body]["profile"])
-          if permiss[:code]==200
+          if prof_name[:code]==200
+            p "prof_name"
+            p prof_name
+            permiss = mongo_client.check_login_profile_permiss(login, prof_name[:body]["profile"])
+            if permiss[:code]==200
 
-            ##Logic for IOT Platform connection###
+              ##Logic for IOT Platform connection###
 
-            #########end iot platform logic#######
+              #########end iot platform logic#######
 
 
-            resp = mongo_client.device_modify_attr_mongo(p[:imei], p[:address])
-            if resp[:code]==200
-              processed.append({:imei=>p[:imei]})
+              resp = mongo_client.device_modify_attr_mongo(p[:imei], p[:address])
+              if resp[:code]==200
+                processed.append({:imei => p[:imei]})
+              end
+            else
+              not_processed.append({:imei => p[:imei], :address => p[:address], :error => permiss})
             end
           else
-            not_processed.append({:imei=>p[:imei], :address=>p[:address], :error=>permiss})
+            not_processed.append({:imei => p[:imei], :address => p[:address], :error => prof_name})
           end
-        else
-          not_processed.append({:imei=>p[:imei], :address=>p[:address], :error=>prof_name})
         end
-      end
 
-      if processed!=[]
-        resp_out = {:code => 200, :result => "Request completed successfully", :body => {:imei_processed => processed, :error_list => not_processed}}
-      else
-        resp_out = {:code => 202, :result => "Nothing processed", :body => {:imei_processed => processed, :error_list => not_processed}}
-      end
+        if processed!=[]
+          resp_out = {:code => 200, :result => "Request completed successfully", :body => {:imei_processed => processed, :error_list => not_processed}}
+        else
+          resp_out = {:code => 202, :result => "Nothing processed", :body => {:imei_processed => processed, :error_list => not_processed}}
+        end
       end
     rescue
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
     thr5.join
-    mongo_client.audit_logger("device_add_address", remote_ip, input_json, resp_out)
+    mongo_client.audit_logger("device_add_address", remote_ip, input_json, resp_out, real_ip)
     resp_out
   end
 
@@ -448,7 +502,7 @@ class Iot
   #msisdn
   #newdevice_list=[{:imei=>7967843245665, :attributes=>{:address=>"Golubeva51", :profile=>"wqeqcqeqwev", :msisdn=>375298766719, :imsi=>25702858586756875}}]
   #+
-  def add_service(login, device_list, remote_ip)
+  def add_service(login, device_list)
     resp_out = {}
     not_processed = []
     processed = []
@@ -493,7 +547,7 @@ class Iot
                 processed.append(g["imei"])
 
               else
-                not_processed.append({:imei=>g["imei"], :description=> "New profile permission error", :error=>permiss2 })
+                not_processed.append({:imei => g["imei"], :description => "New profile permission error", :error => permiss2})
               end
 
             else
@@ -503,14 +557,12 @@ class Iot
               processed.append(g["imei"])
 
             end
-
-
           else
-            not_processed.append({:imei=>g["imei"], :description=> "Old profile permission error", :error=>permiss1 })
+            not_processed.append({:imei => g["imei"], :description => "Old profile permission error", :error => permiss1})
           end
 
         else
-          not_processed.append({:imei=>g["imei"],:error=>prof_name1})
+          not_processed.append({:imei => g["imei"], :error => prof_name1})
         end
 
       end
@@ -519,7 +571,7 @@ class Iot
     rescue
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out)
+    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out, real_ip)
     resp_out
   end
 
@@ -529,8 +581,8 @@ class Iot
   end
 
 
-  def logger_to_audit_database(proc_name, src_ip, input_json, output_json)
-    mongo_client.audit_logger(proc_name, src_ip, input_json, output_json)
+  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)
   end
 
 
@@ -541,14 +593,15 @@ class Iot
     ff = [131234123412341233, 131234123127341233]
     #ddd.get_imsi_info_from_db(ff)
 
-    p ddd.get_profile_id_by_name("1341241")
+    #p ddd.get_profile_id_by_name("1341241")
+    p ddd.get_iot_oceanconnect_credent("test")
   end
 
 
   def testhua()
     cert_file = cert_path
     key_file = key_path
-    ddd1 = HuaIot.new(iotplatform_ip, iotplatform_port, "", "", cert_file, key_file)
+    ddd1 = HuaIot.new(iotplatform_ip, iotplatform_port, cert_file, key_file)
     #p ddd1.dev_register_verif_code_mode("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
     #ddd1.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "a8834c5e-4b4d-4f0f-ad87-14e916f3d0bb")
     #ddd1.querying_device_activ_status("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
@@ -556,14 +609,16 @@ class Iot
     list = ["41c0ba82-d771-4669-b766-fcbfbedc17f4", "7521234165452", "feb9c4d1-4944-4b04-a717-df87dfde30f7", "9868e121-c309-4f4f-8ab3-0aa69072caff", "b3b82f35-0723-4a83-90af-d4ea40017194"]
     #p ddd1.querying_device_direct_conn("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", list)
     #p ddd1.querying_device_type_list("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa")
-    #p ddd1.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
-    #p ddd1.dev_register_verif_code_mode("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "12321234545345")
-
-    p ddd1.quer_dev_direct_conn_batches("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", ["62c5f5ef-dead-48bf-9f09-292ca5e41577", "4c763ea1-be51-4eff-81db-863bc04791bb"])
+    # ddd1.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
+    #p ddd1.dev_register_verif_code_mode("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "45324523452345")
 
-    #ddd1.querying_device_info("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "c6e0dfb1-8042-472a-a35d-e984f118d2a6")
+    p devtestid = ddd1.dev_register_passw_code_mode2("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "24235455", "test", "test", "phone", "0")
+    p ddd1.quer_dev_direct_conn_batches("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", [devtestid[:body]["deviceId"], "4c763ea1-be51-4eff-81db-863bc04791bb"])
 
-    #ddd1.dev_delete("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "484114f6-a49c-4bab-88e6-4ddaf1cc1c8f")
+    #p ddd1.querying_device_info("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "c6e0dfb1-8042-472a-a35d-e984f118d2a6")
+    p "delete start"
+    p ddd1.dev_delete("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", devtestid[:body]["deviceId"])
+    #p ddd1.dev_delete("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "2881a9cc-cb2a-4b59-8fac-de3aace2324d")
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler