imperituroard 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9ba1bf7f94a89e810bae8f664f1e689e6fe6b1
-  data.tar.gz: 95581f121eeee4c82c736ffc68c0fdf2a79f8957
+  metadata.gz: 9145a7e26b0478b84af6d549588cd403cf52080d
+  data.tar.gz: fbdc0528f7ff7e535eaa29a2ad3eba67216163be
 SHA512:
-  metadata.gz: 15bed0107947bbd3a31ed87d7bc1117844b8bebe3043ce781a76246983ca9c20aa975a55f029f18732525b101bd97d35fc04ad1bf4209af16317b23c29bf38aa
-  data.tar.gz: 842547ef619f8a3dbc57756fd04d17b02352885c5ad90e6e2df79539fffd7bbc38f35ce9ac3683d0a878ebd1b91b320a5c3a4c5e2586e8d4d27c412eb2e5e654
+  metadata.gz: 2db737b82e9d6127b475ea6c6e472d86c82857a253fb8e16e5de2c804fdded8681a4764d1c6735994c783e81da413370d95b300a498094fc98276792a623544e
+  data.tar.gz: 8e93980bda5a7d66317611c4291c62b4f094d318dd45f404196f7c5219c6fec88ae2637f00f59f0c5cc62747a56543a67d355b977209ba68ab80352b2b853e83

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

@@ -50,7 +50,7 @@ class HuaIot
   end
 
   def get_token(app_id, secret)
-    internal_func.printer_texter("get_token: start. Step1, iput: app_id: #{app_id.to_s}, #{secret.to_s}", "debug")
+    internal_func.printer_texter("get_token: start. Step1, iput: app_id: #{app_id.to_s}, secret: #{secret.to_s}", "debug")
     out_resp = {}
     begin
       path = "/iocm/app/sec/v1.1.0/login"
@@ -134,7 +134,7 @@ class HuaIot
   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)
+  def dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile, manufacturer_id, manufacturer_name, model)
     out_resp = {}
     token = get_token(app_id, secret)[:body]["accessToken"]
     path = "/iocm/app/reg/v2.0.0/deviceCredentials?appId=" + app_id
@@ -149,7 +149,44 @@ class HuaIot
     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
+    data_out = {deviceInfo: {nodeId: node_id,
+                             name: name_p,
+                             description: description_p,
+                             deviceType: device_type,
+                             manufacturerId: manufacturer_id,
+                             manufacturerName: manufacturer_name,
+                             model: model,
+                             isSecurity: "FALSE",
+                             supportedSecurity: "FALSE"}}.to_json
+    internal_func.printer_texter({:procedure => "dev_register_passw_code_mode2", :data => {:body => data_out, :url => url_string}}, "debug")
+    request.body = data_out
+    res = https.request(request)
+    p res.body.to_s
+    out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    p out_resp
+    out_resp
+  end
+
+
+  #2.2.4 Registering a Directly Connected Device (Password Mode) (V2)
+  def dev_reg_passw_code_mode2_2(app_id, secret, attr_list)
+    out_resp = {}
+    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
+    data_out = {deviceInfo: attr_list}.to_json
+    internal_func.printer_texter({:procedure => "dev_register_passw_code_mode2", :data => {:body => data_out, :url => url_string}}, "debug")
+    request.body = data_out
     res = https.request(request)
     p res.body.to_s
     out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
@@ -188,7 +225,6 @@ class HuaIot
     end
     p out_resp
     out_resp
-
   end
 
 
@@ -298,9 +334,8 @@ 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
+  def quer_dev_direct_conn_batches(app_id, dev_list, token)
+
     path = "/iocm/app/dm/v1.1.0/queryDevicesByIds"
     url_string = "https://" + platformip + ":" + platformport + path
     p url_string
@@ -317,9 +352,46 @@ class HuaIot
     request.body = {deviceIds: dev_list}.to_json
     res = https.request(request)
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+
+  end
+
+
+  #2.2.11 Modifying Device Information (V2)
+  def dev_modify_location_v2(app_id, dev_id, token, address)
+    out_resp = {}
+
+    begin
+      path = "/iocm/app/dm/v1.4.0/devices/" + dev_id + "?app_Id=" + app_id
+      url_string = "https://" + platformip + ":" + platformport + path
+      internal_func.printer_texter({:url_string=>url_string, :procedure=>"dev_modify_location_v2"}, "debug")
+      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::Put.new(uri.path)
+      request.content_type = 'application/json'
+      request['Authorization'] = 'Bearer ' + token
+      request['app_key'] = app_id
+      request.body = {location: address}.to_json
+      res = https.request(request)
+      p res.code
+      p res.body
+      if res.body != nil
+        out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
+      else
+        out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
+      end
+    rescue
+      out_resp = {:code => 500, :message => "dev_modify_location_v2: Unknown IOT error"}
+    end
+    p out_resp
+    out_resp
   end
 
 
+
   ##2.10.7 Adding Members to a Device Group
 
 
@@ -327,8 +399,40 @@ class HuaIot
 
 
   ########final procedures###############
-  def add_new_device_on_huawei(app_id, secret, node_id, name_p, description_p, device_type, profile)
-    self.dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
+
+  def modify_location_iot(app_id, secret, dev_id, address)
+
+    out_resp = {}
+    begin
+      token = self.get_token(app_id, secret)
+      if token[:code] != 500 && token[:body]["accessToken"]!=nil
+        out_resp = self.dev_modify_location_v2(app_id, dev_id, token[:body]["accessToken"], address)
+        if out_resp[:code].to_i == 200 || out_resp[:code].to_i == 204
+          ###logout#
+          begin
+            self.token_logout(token[:body]["accessToken"])
+          rescue
+            nil
+          end
+          ##########
+        end
+      else
+        out_resp = {:code => 500, :message => "modify_location_iot: Invalid IOT platform token"}
+      end
+    rescue
+      out_resp = {:code => 500, :message => "modify_location_iot: Unknown error"}
+    end
+    jjj = {:procedure => "modify_location_iot", :answ => out_resp}
+    internal_func.printer_texter(jjj, "debug")
+    out_resp
+  end
+
+  def add_new_device_on_huawei(app_id, secret, node_id, name_p, description_p, device_type, profile, manufacturer_id, manufacturer_name, model)
+    self.dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile, manufacturer_id, manufacturer_name, model)
+  end
+
+  def add_new_device_on_huawei2(app_id, secret, attr_list)
+    self.dev_reg_passw_code_mode2_2(app_id, secret, attr_list)
   end
 
 
@@ -353,7 +457,34 @@ class HuaIot
     rescue
       out_resp = {:code => 500, :message => "remove_one_device_from_iot: Unknown error"}
     end
-    p jjj = {:procedure => "remove_one_device_from_iot", :answ => out_resp}
+    jjj = {:procedure => "remove_one_device_from_iot", :answ => out_resp}
+    internal_func.printer_texter(jjj, "debug")
+    out_resp
+  end
+
+  def quer_dev_query_list(app_id, secret, dev_list)
+    out_resp = {}
+    begin
+      token = self.get_token(app_id, secret)
+      if token[:code] != 500 && token[:body]["accessToken"]!=nil
+        out_resp = self.quer_dev_direct_conn_batches(app_id, dev_list, token[:body]["accessToken"])
+        if out_resp[:code].to_i == 200 || out_resp[:code].to_i == 204
+          ###logout#
+          begin
+            self.token_logout(token[:body]["accessToken"])
+          rescue
+            nil
+          end
+          ##########
+        end
+      else
+        out_resp = {:code => 500, :message => "quer_dev_query_list: Invalid IOT platform token"}
+      end
+    rescue
+      out_resp = {:code => 500, :message => "quer_dev_query_list: Unknown error"}
+    end
+    jjj = {:procedure => "quer_dev_query_list", :answ => out_resp}
+    internal_func.printer_texter(jjj, "debug")
     out_resp
   end
 

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

@@ -1,10 +1,12 @@
 $LOAD_PATH.unshift File.expand_path("../projects/iot", __dir__)
 
+require 'date'
+
 class InternalFunc
 
 
   def printer_texter(text, log_level)
-    mess = {:sdk=> "imperituroard", :sdk_version=> "0.3.2", :message => text}
+    mess = {:datetime => DateTime.now, :sdk=> "imperituroard", :sdk_version=> "0.3.3", :message => text}
     p mess
   end
 

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

@@ -23,8 +23,7 @@ class MongoIot
   def audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
     out_resp = {}
     begin
-      d = DateTime.now
-      current = d.strftime("%d/%m/%Y %H:%M:%S")
+      current = DateTime.now
       collection = client[:audit]
       doc = {
           :proc_name => proc_name,
@@ -213,7 +212,7 @@ class MongoIot
     p not_ex
     p res_exists
     out_resp = {:code => 200, :result => "check_imei_exists: Request completed successfully",
-     :body => {:exists => res_exists, :not_exists => not_ex}}
+                :body => {:exists => res_exists, :not_exists => not_ex}}
     internal_func.printer_texter(out_resp, "debug")
     out_resp
   end
@@ -238,7 +237,7 @@ class MongoIot
         p result
       end
     rescue
-      continue
+      nil
     end
   end
 
@@ -262,10 +261,22 @@ class MongoIot
         p result
       end
     rescue
-      continue
+      nil
+    end
+  end
+
+
+  def imei_insert_model(model)
+    begin
+      collection = client[:device_types]
+      result = collection.insert_one(model)
+      p result
+    rescue
+      nil
     end
   end
 
+
   def get_profile_name_from_imei(imei)
     out_resp = {}
     begin
@@ -386,6 +397,28 @@ class MongoIot
   end
 
 
+  def get_device_type_info_by_model(device_model)
+    out_resp = {}
+    begin
+      result_ps = []
+      collection = client[:device_types]
+      collection.find({"model" => device_model}).each {|row|
+        result_ps.append(row)
+      }
+      dattaa = result_ps[0]
+      if dattaa!=nil
+        out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
+      else
+        out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
+      end
+    rescue
+      out_resp = {:code => 500, :result => "get_device_type_info_by_model: procedure error", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
+    end
+    internal_func.printer_texter(out_resp, "debug")
+    out_resp
+  end
+
+
   def ttt
     p "111111"
     begin

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/imperituroard.rb

@@ -10,6 +10,7 @@ require "imperituroard/projects/iot/add_functions"
 require "imperituroard/projects/iot/internal_functions"
 require 'json'
 require 'ipaddr'
+require 'date'
 
 module Imperituroard
   class Error < StandardError;
@@ -98,7 +99,8 @@ class Iot
                 :add_functions_connector,
                 :real_ip, #real ip address of procedure caller
                 :remote_ip, #ip address of balancer
-                :hua_aceanconnect_connector
+                :hua_aceanconnect_connector,
+                :internal_func
 
   def initialize(mongoip, mongoport, iotip, mongo_database,
                  iotplatform_ip, iotplatform_port, cert_path, key_path, telegram_api_url, telegram_chat_id, real_ip, remote_ip)
@@ -115,6 +117,7 @@ class Iot
     @real_ip = real_ip
     @remote_ip = remote_ip
     @hua_aceanconnect_connector = HuaIot.new(iotplatform_ip, iotplatform_port, cert_path, key_path)
+    @internal_func = InternalFunc.new
   end
 
   #error list
@@ -177,10 +180,25 @@ class Iot
               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"])
+
+                  #get {"model"=>"BGT_PPMC", "ManufacturerID"=>"unknown", "ManufacturerNAME"=>"unknown", "device_type"=>"unknown"}
+                  #from database
+                  model_data = mongo_client.get_device_type_info_by_model(aaa["device_type"])
+                  resss = hua_aceanconnect_connector.add_new_device_on_huawei(credentials[:body][:app_id],
+                                                                              credentials[:body][:secret],
+                                                                              aaa["imei"],
+                                                                              dev_name,
+                                                                              aaa["description"],
+                                                                              model_data[:body]["device_type"],
+                                                                              aaa["profile"],
+                                                                              model_data[:body]["ManufacturerID"],
+                                                                              model_data[:body]["ManufacturerNAME"],
+                                                                              model_data[:body]["model"]
+                  )
                   if resss[:code]=="200"
                     s1 = aaa
                     s1[:huadata] = resss
+                    s1[:created] = DateTime.now
                     added_on_iot_platf.append(s1)
                   else
                     not_processed_list.append({:imei => aaa["imei"], :error => resss})
@@ -282,15 +300,29 @@ class Iot
 
     li_new_imei = []
     list1 = {}
+
+    #dictionary for imeis which not processed. Final dictionary
     not_processed_list = []
+
+    #dictionary for devices which was processed correctly
+    processed_list = []
+
+    #array for translations from old imei to new
+    old_new_translation = {}
+
     approved_list = []
     resp_out = {}
 
+    #old_imei_list for query to iot platform for data request
+    step1_approved_dict_old=[]
+
+    #form dictionary for processing
     for pr1 in im_list
       p "pr1"
       p pr1
       li_new_imei.append(pr1["imei_new"])
       list1[pr1["imei_new"]]=pr1["imei_old"]
+      old_new_translation[pr1["imei_old"]]=pr1["imei_new"]
     end
 
     p list1
@@ -299,41 +331,37 @@ class Iot
 
       thr3 = Thread.new do
 
+        #check if imei_new exists in database. If exists - not process this imei
         list_checked = mongo_client.check_imei_exists(li_new_imei)
+
+        internal_func.printer_texter({:function => "imei_replace Step1", :list_checked => list_checked}, "debug")
+
+        #add already exists new IMEI in error dictionary
         for ss in list_checked[:body][:exists]
           not_processed_list.append({:record => {:imei_old => list1[ss], :imei_new => ss}, :error => "New IMEI exists in database"})
         end
 
+        #new_imei list which processed step1
         step2_list = list_checked[:body][:not_exists]
 
+        internal_func.printer_texter({:function => "imei_replace Step2", :step2_list => step2_list}, "debug")
+
+
         for a in step2_list
           begin
-            p "list1[a]"
-            p list1
-            p a
-            p list1[a]
-            prof_name1 = mongo_client.get_profile_name_from_imei(list1[a])
 
-            p prof_name1
-            if prof_name1[:code]==200
+            #step3 checking permission for writing for imei list
+            prof_name1 = mongo_client.get_profile_name_from_imei(list1[a])
 
-              p "if prof_name1[:code]==200"
+            internal_func.printer_texter({:function => "imei_replace Step3", :prof_name1 => prof_name1}, "debug")
 
+            if prof_name1[:code]==200
               permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1[:body]["profile"])[:code]
-              p "permiss1"
-              p permiss1
+              internal_func.printer_texter({:function => "imei_replace Step4", :permiss1 => permiss1, :input => prof_name1[:body]["profile"]}, "debug")
               if permiss1==200
 
-                ##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})
-
                 approved_list.append({:imei_old => list1[a], :imei_new => a})
-
+                step1_approved_dict_old.append(list1[a])
 
               else
                 not_processed_list.append({:record => {:imei_old => list1[a], :imei_new => a}, :error => "Old IMEI modification denied"})
@@ -346,15 +374,67 @@ class Iot
           end
         end
 
+        internal_func.printer_texter({:function => "imei_replace Step5", :not_processed_list => not_processed_list, :input => list1, :approved_list => approved_list, :step1_approved_dict_old => step1_approved_dict_old}, "debug")
+
+
+        ##Logic for IOT Platform connection###
+
+        list_from_iot = self.get_info_by_imeilist_from_iot(login, step1_approved_dict_old)
+
+        internal_func.printer_texter({:function => "imei_replace Step6", :list_from_iot => list_from_iot, :description => "data from iot platform by old imei"}, "debug")
+
+        #processing data. modifying data on iot platform and mongoDB
+        if list_from_iot[:code]=="200"
+
+          for ard in list_from_iot[:body]["devices"]
+            p ard
+            new_data_cur_dev = {}
+            mongo_answer = {}
+            current_old_dev = ard["deviceInfo"]["nodeId"]
+            current_device_id = ard["deviceId"]
+            new_data_cur_dev = ard["deviceInfo"]
+            new_data_cur_dev["nodeId"] = old_new_translation[current_old_dev.to_i].to_s
+
+            credentials = mongo_client.get_iot_oceanconnect_credent(login)
+
+            if credentials[:code]==200
+              flag_remove=0
+              flag_create=0
+              remove_answer = hua_aceanconnect_connector.remove_one_device_from_iot(credentials[:body][:app_id], credentials[:body][:secret], current_device_id)
+              create_answer = hua_aceanconnect_connector.add_new_device_on_huawei2(credentials[:body][:app_id], credentials[:body][:secret], new_data_cur_dev)
+
+              if remove_answer[:code]=="204" || remove_answer[:code]=="200"
+                flag_remove=1
+              end
+              if create_answer[:code]=="200"
+                flag_create=1
+              end
+              if flag_remove==1 && flag_create==1
+                mongo_answer = mongo_client.device_modify_any_attr_mongo(current_old_dev.to_i, {:imei => old_new_translation[current_old_dev.to_i], :huadata => {:body => create_answer[:body]}, :updated => DateTime.now})
+                processed_list.append({:imei_old => current_old_dev.to_i, :imei_new => old_new_translation[current_old_dev.to_i]})
+              else
+                not_processed_list.append({:record => {:imei_old => current_old_dev.to_i, :imei_new => old_new_translation[current_old_dev.to_i]}, :error => "Failed for provisioning to IOT platform"})
+              end
+
+              internal_func.printer_texter({:function => "imei_replace Step7", :remove_answer => remove_answer, :create_answer => create_answer, :mongo_answer => mongo_answer, :description => "processing imei #{current_old_dev.to_s}"}, "debug")
+
+            else
+              approved_list=[]
+            end
+          end
+
+        else
+          approved_list=[]
+        end
+
         if approved_list!=[]
-          resp_out = {:code => 200, :result => "Request completed successfully", :data => {:approved_list => approved_list, :unapproved_list => not_processed_list}}
+          resp_out = {:code => 200, :result => "Request completed successfully", :data => {:approved_list => processed_list, :unapproved_list => not_processed_list}}
         else
-          resp_out = {:code => 202, :result => "Nothing to do", :data => {:approved_list => approved_list, :unapproved_list => not_processed_list}}
+          resp_out = {:code => 202, :result => "Nothing to do", :data => {:approved_list => processed_list, :unapproved_list => not_processed_list}}
         end
 
       end
 
-
     rescue
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
@@ -442,7 +522,8 @@ class Iot
   #imei = newdevice_list
   #address = newdevice_list
   #newdevice_list=[{:imei=>7967843245665, :address=>"Golubeva51"}]
-  #++
+  #+++
+  #iot platform integration completed
   def device_add_address(login, newdevice_list)
     #add_functions_connector.telegram_message(newdevice_list.to_s)
     p newdevice_list
@@ -465,6 +546,21 @@ class Iot
             if permiss[:code]==200
 
               ##Logic for IOT Platform connection###
+              credentials = mongo_client.get_iot_oceanconnect_credent(login)
+              resp = {}
+
+              if credentials[:code]==200
+                imei_data = mongo_client.get_imei_info_from_db([p[:imei]])
+                if imei_data[:body]!=[]
+                  ans =hua_aceanconnect_connector.modify_location_iot(credentials[:body][:app_id], credentials[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"], p[:address])
+
+                  internal_func.printer_texter({:function => "device_add_address Step2", :ans => ans, :descrition=>"answer from hua IOT", :input=>{:did=>imei_data[:body][0]["huadata"]["body"]["deviceId"], :appid=>credentials[:body][:app_id], :secret=>credentials[:body][:secret], :address=>p[:address]}}, "debug")
+
+                  p ans
+                end
+
+              end
+
 
               #########end iot platform logic#######
 
@@ -542,11 +638,8 @@ class Iot
                   end
                 end
                 p attr
-
                 mongo_client.device_modify_any_attr_mongo(g["imei"], attr)
-
                 processed.append(g["imei"])
-
               else
                 not_processed.append({:imei => g["imei"], :description => "New profile permission error", :error => permiss2})
               end
@@ -554,9 +647,7 @@ class Iot
             else
               attr = g["attributes"]
               mongo_client.device_modify_any_attr_mongo(g["imei"], attr)
-
               processed.append(g["imei"])
-
             end
           else
             not_processed.append({:imei => g["imei"], :description => "Old profile permission error", :error => permiss1})
@@ -586,6 +677,44 @@ class Iot
     mongo_client.audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
   end
 
+  #additional procedure for checking status on iot platform
+  def get_info_by_imeilist_from_iot(login, imei_list)
+    resp_out={}
+    begin
+      dev_id_list = []
+      resss = {}
+      data_from_db = mongo_client.get_imei_info_from_db(imei_list)
+      p data_from_db
+      for g in data_from_db[:body]
+        dev_id_list.append(g["huadata"]["body"]["deviceId"])
+      end
+      credentials = mongo_client.get_iot_oceanconnect_credent(login)
+      if credentials[:code]==200
+        p apid = credentials[:body][:app_id]
+        p secre = credentials[:body][:secret]
+        resp_out = hua_aceanconnect_connector.quer_dev_query_list(apid, secre, dev_id_list)
+      end
+    rescue
+      resp_out = {:code => "500", :message => "get_info_by_imeilist_from_iot: Something wrong", :body => {"devices" => []}}
+    end
+    internal_func.printer_texter(resp_out, "debug")
+    resp_out
+  end
+
+
+  #for internal use. Add new device model
+  def add_model_to_mongo(model, manufacture_id, manufacture_name, device_type, description, note)
+    model = {
+        model: model,
+        ManufacturerID: manufacture_id,
+        ManufacturerNAME: manufacture_name,
+        device_type: device_type,
+        description: description,
+        note: note,
+        created: DateTime.now
+    }
+    mongo_client.imei_insert_model(model)
+  end
 
   def test()
     ddd = MongoIot.new(mongoip, mongoport, mongo_database)
@@ -595,43 +724,10 @@ class Iot
     #ddd.get_imsi_info_from_db(ff)
 
     #p ddd.get_profile_id_by_name("1341241")
-    p ddd.get_iot_oceanconnect_credent("test")
+    p ddd.get_device_type_info_by_model("BGT_PPMC11")
   end
 
 
-  def testhua()
-    cert_file = cert_path
-    key_file = key_path
-    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")
-    #ddd1.querying_device_info("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "a8834c5e-4b4d-4f0f-ad87-14e916f3d0bb")
-    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")
-    # ddd1.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
-    #p ddd1.dev_register_verif_code_mode("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "45324523452345")
-
-    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"])
-
-    #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
-
-
-  def testhua2()
-    tt = "{\"deviceId\":\"fad0a417-b6a3-4b0b-abfc-fa2b0af9691a\",\"verifyCode\":\"6cb6dcca\",\"timeout\":180,\"psk\":\"1d16b55d577bc1f2e5e75d416ce6b8a2\"}"
-    #tt = tt.gsub("\\","")
-    #p tt
-    ff = tt.to_s
-    p ff
-    gg = JSON.parse(ff)
-    p gg
-  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dzmitry Buynovskiy