aio_elin 0.0.1 → 1.0.0

data/lib/modules/special/style/compare.rb

@@ -3,108 +3,158 @@
 require "aio/core"
 
 class Aio::Module::SpecialStyle::Compare < Aio::Module::SpecialStyle
-	include Aio::Module
-
-	include Aio::Ui::Verbose
-
-	# 用于传递已经分析好的现有的device
-	attr_accessor :device_manager
-
-	# 用于传递由XML，Json生成并已经解析的Hash值
-	attr_accessor :input_benchmark
-
-	def initialize
-		super({
-			:author		=> "Elin",
-			:description => "此模块用于解析两个Hash值的不同点,并发出警告",
-		})
-	end
-
-	def parse
-		 # 将device_manager 中的按照{device_name => useful} 形式重新编排
-		 # cmds_useful为深度克隆信息，对本体无影响
-	  device_warning = {}
-		total = device_manager.devices_number
-		print_good "总共 #{total} 台设备进行比较"
-
-	  device_manager.each_devices_with_index do |device_name, device_klass, i|
-
-		 	device_warning[device_name] = Aio::Base::Toolkit::DeepClone.clone(device_klass.cmds_useful)
-			# 进度条
-			progress_bar(total, i+1, device_name)
-
-		end
-			
-		clear_line
-		clear_other_info(device_warning, input_benchmark)
-		delete(device_warning, input_benchmark)
-	end
-
-	# 只留下要比较的两个数据有共同命令的交集,其他的命令就丢弃
-	# 因为即使是保留了,产生的也是大量的垃圾信息
-	def clear_other_info(device_warning, input_benchmark)
-		device_arr = {}
-		input_arr  = {}
-
-		# 获得命令信息
-		device_warning.each_pair 	{ |k, v| device_arr[k] = v.keys }
-		input_benchmark.each_pair { |k, v| input_arr[k]  = v.keys }
-
-		# 删除 device_warning 中多余的命令信息
-		device_warning.each_pair do |name, hash|
-			hash.delete_if do |k, v|
-				next true unless input_arr.has_key?(name)
-				input_arr[name].include?(k) ? false : true
-			end
-		end
-
-		# 删除 input_benchmark 中多余的命令信息
-		input_benchmark.each_pair do |name, hash|
-			hash.delete_if do |k, v|
-				next true unless device_arr.has_key?(name)
-				device_arr[name].include?(k) ? false : true
-			end
-		end
-	end
-
-	def delete(cm1, cm2)
-		cm1.delete_if do |key, val|
-			
-			# 当末端是Hash时，迭代循环
-			if val.class == Hash
-				# 保证无论是Symbol 还是 String 都能互换
-				unless cm2.has_key?(key)
-					cm2_val = cm2[key.to_sym] if key.kind_of? String
-					cm2_val = cm2[key.to_s]   if key.kind_of? Symbol
-					next if cm2_val.nil?
-				else
-					cm2_val = cm2[key]
-				end
-				res = delete(cm1[key], cm2_val)
-				# 当有内容时，说明存在差异，则保留
-				res.empty? ? true : false
-			else
-
-				# 当末端不是Hash时,判断是否相等
-				unless cm2.has_key?(key)
-					cm2_val = cm2[key.to_sym] if key.kind_of? String
-					cm2_val = cm2[key.to_s]   if key.kind_of? Symbol
-					next if cm2_val.nil?
-				else
-					cm2_val = cm2[key]
-				end
-				#cm1[key].eql?(cm2_val)
-				# 当配置中有信息时，那么只有当大于配置中的区间波动才会被记录
-				# 当有Pass值的时候，直接Pass
-				# 只有是数值才可以
-				compare = Aio::Config::Warning::Compare
-				if compare.has_key?(key)
-					compare[key] == "pass" ? true : (cm1[key].to_i < cm2_val.to_i + compare[key])
-				else
-					cm1[key].eql?(cm2_val)
-				end
-			end
-		end
-	end
+  include Aio::Module
+
+  include Aio::Ui::Verbose
+
+  # 用于传递已经分析好的现有的device
+  attr_accessor :device_manager
+
+  # 用于传递由XML，Json生成并已经解析的Hash值
+  attr_accessor :input_benchmark
+
+  def initialize
+    super({
+      :author		=> "Elin",
+      :description => "此模块用于解析两个Hash值的不同点,并发出警告",
+    })
+  end
+
+  def parse
+    # 将device_manager 中的按照{device_name => useful} 形式重新编排
+    # cmds_useful为深度克隆信息，对本体无影响
+    device_warning = {}
+    total = device_manager.devices_number
+    print_good "总共 #{total} 台设备进行比较"
+
+    device_manager.each_devices_with_index do |device_name, device_klass, i|
+
+      device_warning[device_name] = Aio::Base::Toolkit::DeepClone.clone(device_klass.cmds_useful)
+      # 进度条
+      progress_bar(total, i+1, device_name)
+
+    end
+
+    @compare_hash = Aio::Module::Compare.new
+    clear_line
+
+    clear_other_info(device_warning, input_benchmark)
+    compare(device_warning, input_benchmark)
+  end
+
+  # 只留下要比较的两个数据有共同命令的交集,其他的命令就丢弃
+  # 因为即使是保留了,产生的也是大量的垃圾信息
+  def clear_other_info(device_warning, input_benchmark)
+    device_arr = {}
+    input_arr  = {}
+
+    # 获得命令信息
+    device_warning.each_pair 	{ |k, v| device_arr[k] = v.keys }
+    input_benchmark.each_pair { |k, v| input_arr[k]  = v.keys }
+
+    # 删除 device_warning 中多余的命令信息
+    device_warning.each_pair do |name, hash|
+      hash.delete_if do |k, v|
+        next true unless input_arr.has_key?(name)
+        input_arr[name].include?(k) ? false : true
+      end
+    end
+
+    # 删除 input_benchmark 中多余的命令信息
+    input_benchmark.each_pair do |name, hash|
+      hash.delete_if do |k, v|
+        next true unless device_arr.has_key?(name)
+        device_arr[name].include?(k) ? false : true
+      end
+    end
+  end
+
+  def compare(cm1, cm2, opts={})
+    # NOTE 待加PASS
+    @config_compare = Aio::Config::Warning::Compare
+
+    cm1_arr = []
+    cm2_arr = []
+    Aio::Base::Toolkit::Hash.flat(cm1,
+                                  Aio::Base::Toolkit::Chain.new,
+                                  cm1_arr)
+
+    Aio::Base::Toolkit::Hash.flat(cm2,
+                                  Aio::Base::Toolkit::Chain.new,
+                                  cm2_arr)
+
+    cp = find_diff(cm1_arr, cm2_arr)
+
+    diff = { cm1: [], cm2: []}
+    # NOTE 还需要加入config_compare
+    # diff = {
+    #    cm1: [ [device_name, cmd, str], .. ],
+    #    cm2: [ [device_name, cmd, str], .. ]
+    # }
+    cp[:cm1].each do |e|
+      # 加入cmd
+      cmd = e[1]
+      diff[:cm1] << [e.first, cmd, e.last]
+    end
+
+    cp[:cm2].each do |e|
+      diff[e.first] ||= {}
+      # 加入cmd
+      cmd = e[1]
+      diff[:cm2] << [e.first, cmd, e.last]
+    end
+
+    diff
+  end
+
+  def find_diff(cm1, cm2)
+    res = {}
+    res[:cm1] = []
+    res[:cm2] = []
+
+    # res 为相同的内容
+    total = cm1.size
+    cm1.each_with_index do |link_1, i|
+
+      cm2.each do |link_2|
+
+        # 如果长度不一致，就下一个
+        if link_1.size != link_2.size
+          next
+
+        else
+          name_1 = long_name(link_1)
+          name_2 = long_name(link_2)
+
+          if name_1 == name_2
+            res[:cm1] << link_1
+            res[:cm2] << link_2
+
+            # 找到了相同的就跳出小循环
+            break
+          end
+
+        end
+      end
+
+      # 进度条
+      progress_bar(total, i+1, '')
+    end
+
+    clear_line
+
+    # 获得不同的内容
+    res[:cm1] = cm1 - res[:cm1]
+    res[:cm2] = cm2 - res[:cm2]
+
+    res
+  end
+
+  # 将一个数组转化成一长串字符作为比较方式
+  def long_name(arr)
+    res = ''
+    arr.each { |x| res += x.to_s }
+    res
+  end
 
 end

data/lib/modules/special/style/compare_old.rb

@@ -0,0 +1,121 @@
+#coding=utf-8
+
+require "aio/core"
+
+class Aio::Module::SpecialStyle::CompareOld < Aio::Module::SpecialStyle
+  include Aio::Module
+
+  include Aio::Ui::Verbose
+
+  # 用于传递已经分析好的现有的device
+  attr_accessor :device_manager
+
+  # 用于传递由XML，Json生成并已经解析的Hash值
+  attr_accessor :input_benchmark
+
+  def initialize
+    super({
+      :author		=> "Elin",
+      :description => "此模块用于解析两个Hash值的不同点,并发出警告，此模块废弃",
+    })
+  end
+
+  def parse
+    # 将device_manager 中的按照{device_name => useful} 形式重新编排
+    # cmds_useful为深度克隆信息，对本体无影响
+    device_warning = {}
+    total = device_manager.devices_number
+    print_good "总共 #{total} 台设备进行比较"
+
+    device_manager.each_devices_with_index do |device_name, device_klass, i|
+
+      device_warning[device_name] = Aio::Base::Toolkit::DeepClone.clone(device_klass.cmds_useful)
+      # 进度条
+      progress_bar(total, i+1, device_name)
+
+    end
+
+    debugger
+    clear_line
+    clear_other_info(device_warning, input_benchmark)
+    delete(device_warning, input_benchmark)
+  end
+
+  # 只留下要比较的两个数据有共同命令的交集,其他的命令就丢弃
+  # 因为即使是保留了,产生的也是大量的垃圾信息
+  def clear_other_info(device_warning, input_benchmark)
+    device_arr = {}
+    input_arr  = {}
+
+    # 获得命令信息
+    device_warning.each_pair 	{ |k, v| device_arr[k] = v.keys }
+    input_benchmark.each_pair { |k, v| input_arr[k]  = v.keys }
+
+    # 删除 device_warning 中多余的命令信息
+    device_warning.each_pair do |name, hash|
+      hash.delete_if do |k, v|
+        next true unless input_arr.has_key?(name)
+        input_arr[name].include?(k) ? false : true
+      end
+    end
+
+    # 删除 input_benchmark 中多余的命令信息
+    input_benchmark.each_pair do |name, hash|
+      hash.delete_if do |k, v|
+        next true unless device_arr.has_key?(name)
+        device_arr[name].include?(k) ? false : true
+      end
+    end
+  end
+
+  def delete(cm1, cm2)
+    compare = Aio::Config::Warning::Compare
+    
+    cm1.delete_if do |key, val|
+
+      # 当末端是Hash时，迭代循环
+      if val.class == Hash
+        # 保证无论是Symbol 还是 String 都能互换
+        # 有可能整个val都不一样
+        unless cm2.has_key?(key)
+          cm2_val = cm2[key.to_sym] if key.kind_of? String
+          cm2_val = cm2[key.to_s]   if key.kind_of? Symbol
+          next if cm2_val.nil?
+        else
+          cm2_val = cm2[key]
+        end
+        res = delete(cm1[key], cm2_val)
+        # 当有内容时，说明存在差异，则保留
+        res.empty? ? true : false
+      else
+
+        # 当末端不是Hash时,判断是否相等
+
+        unless cm2.has_key?(key)
+          cm2_val = cm2[key.to_sym] if key.kind_of? String
+          cm2_val = cm2[key.to_s]   if key.kind_of? Symbol
+          next if cm2_val.nil?
+        else
+          cm2_val = cm2[key]
+        end
+
+        #cm1[key].eql?(cm2_val)
+        # 当配置中有信息时，那么只有当大于配置中的区间波动才会被记录
+        # 当有Pass值的时候，直接Pass
+        # 只有是数值才可以
+        if compare.has_key?(key)
+          compare[key] == "pass" ? true : (cm1[key].to_i < cm2_val.to_i + compare[key])
+        else
+
+          if cm1[key].eql?(cm2_val)
+            true
+          else
+            cm1[key].compare_val = cm2_val
+            false
+          end
+        end
+      end
+    end
+  end
+
+end

data/lib/modules/special/style/compare_with_device_manager.rb

@@ -0,0 +1,227 @@
+#coding=utf-8
+
+require "aio/core"
+
+class Aio::Module::SpecialStyle::CompareWithDeviceManager < Aio::Module::SpecialStyle
+  include Aio::Module
+
+  include Aio::Ui::Verbose
+
+  # 用于传递已经分析好的现有的device
+  attr_accessor :device_manager
+
+  # 用于传递由上一次成的device_manager信息
+  attr_accessor :input_benchmark
+
+  def initialize
+    super({
+      :author		=> "Elin",
+      :description => "此模块用于解析两次生成的device_manager值",
+    })
+  end
+
+  def parse
+    # 将device_manager 中的按照{device_name => useful} 形式重新编排
+    # cmds_useful为深度克隆信息，对本体无影响
+    device_warning = {}
+    input_benchmark_device_warning = {}
+    total = device_manager.devices_number
+    print_good "总共 #{total} 台设备进行比较"
+
+    device_manager.each_devices_with_index do |device_name, device_klass, i|
+
+      device_warning[device_name] = Aio::Base::Toolkit::DeepClone.clone(device_klass.cmds_useful)
+      # 进度条
+      progress_bar(total, i+1, device_name)
+
+    end
+
+    input_benchmark.each_devices_with_index do |device_name, device_klass, i|
+
+      input_benchmark_device_warning[device_name] = Aio::Base::Toolkit::DeepClone.clone(device_klass.cmds_useful)
+      # 进度条
+      progress_bar(total, i+1, device_name)
+
+    end
+
+    clear_line
+    clear_other_info(device_warning, input_benchmark_device_warning)
+    compare(device_warning, input_benchmark_device_warning)
+  end
+
+  # 只留下要比较的两个数据有共同命令的交集,其他的命令就丢弃
+  # 因为即使是保留了,产生的也是大量的垃圾信息
+  def clear_other_info(device_warning, input_benchmark)
+    device_arr = {}
+    input_arr  = {}
+
+    # 获得命令信息
+    device_warning.each_pair 	{ |k, v| device_arr[k] = v.keys }
+    input_benchmark.each_pair { |k, v| input_arr[k]  = v.keys }
+
+    # 删除 device_warning 中多余的命令信息
+    device_warning.each_pair do |name, hash|
+      hash.delete_if do |k, v|
+        next true unless input_arr.has_key?(name)
+        input_arr[name].include?(k) ? false : true
+      end
+    end
+
+    # 删除 input_benchmark 中多余的命令信息
+    input_benchmark.each_pair do |name, hash|
+      hash.delete_if do |k, v|
+        next true unless device_arr.has_key?(name)
+        device_arr[name].include?(k) ? false : true
+      end
+    end
+  end
+
+  def compare(cm1, cm2, opts={})
+    # NOTE 待加PASS
+    @config_compare = Aio::Config::Warning::Compare
+
+    cm1_arr = []
+    cm2_arr = []
+    Aio::Base::Toolkit::Hash.flat_cm1(cm1,
+                                  Aio::Base::Toolkit::Chain.new,
+                                  cm1_arr)
+
+    Aio::Base::Toolkit::Hash.flat_cm2(cm2,
+                                  Aio::Base::Toolkit::Chain.new,
+                                  cm2_arr)
+
+    cp = find_diff_2(cm1_arr, cm2_arr)
+
+    diff = { cm1: [], cm2: []}
+    # NOTE 还需要加入config_compare
+    # diff = {
+    #    cm1: [ [device_name, cmd, key, str], .. ],
+    #    cm2: [ [device_name, cmd, key, str], .. ]
+    # }
+    cp[:cm1].each do |e|
+      # 加入cmd
+      cmd = e[1]
+      diff[:cm1] << [e.first, cmd, e[-2], e.last]
+    end
+
+    cp[:cm2].each do |e|
+      diff[e.first] ||= {}
+      # 加入cmd
+      cmd = e[1]
+      diff[:cm2] << [e.first, cmd, e[-2], e.last]
+    end
+
+    #detect_pass?(diff)
+
+    diff
+  end
+
+  # 检查是否为需要忽略的项
+  def detect_pass?(diff)
+
+    # 当没有就返回false，表示不能跳过
+    diff.each_value do |elem|
+
+      # 取key值
+      elem.delete_if do |e|
+        
+        key = e[2]
+        if @config_compare.has_key?(key.to_sym)
+          @config_compare[key] == 'pass' ? true : false
+        end
+      end
+    end
+          
+  end
+      
+
+
+  # 低效率的双循环结构
+  def find_diff(cm1, cm2)
+    res = {}
+    cm1_dup = cm1.dup
+    cm2_dup = cm2.dup
+
+    debugger
+    # res 为相同的内容
+    total = cm1.size
+    cm1.each_with_index do |link_1, i|
+
+      cm2.each do |link_2|
+
+        # 如果长度不一致，就下一个
+        if link_1.size != link_2.size
+          next
+
+        else
+          name_1 = long_name(link_1)
+          name_2 = long_name(link_2)
+
+          if name_1 == name_2
+            cm1_dup.delete link_1
+            cm2_dup.delete link_2
+
+            # 找到了相同的就跳出小循环
+            break
+          end
+
+        end
+      end
+
+      # 进度条
+      progress_bar(total, i+1, '')
+    end
+
+    clear_line
+
+    # 获得不同的内容
+    res[:cm1] = cm1_dup
+    res[:cm2] = cm2_dup
+
+    res
+  end
+
+  # 将一个数组转化成一长串字符作为比较方式
+  def long_name(arr)
+    res = ''
+    arr.each { |x| res += x.to_s }
+    res
+  end
+
+  # 排序后循环，效率更高
+  def find_diff_2(cm1, cm2)
+    cm1.concat(cm2)
+    cm1.sort! { |x, y| x.string <=> y.string }
+
+    tmp = []
+    bool = false
+    cm1.each_with_index do |e, i|
+      # 当为真的时候，说明是重复的，就跳过
+      if bool
+        bool = false
+        next
+      end
+
+      # 当相等的时候，将bool 设置为true，跳过
+      if e.eql? cm1[i+1]
+        bool = true
+        next
+      end
+
+      # 如果和下一个不相等，则说明是单独的，那么就记录
+      tmp << e
+    end
+    
+    res = { cm1: [], cm2: [] }
+    tmp.each do |e|
+      case e.cm_type
+      when :cm1
+        res[:cm1] << e.line
+      when :cm2
+        res[:cm2] << e.line
+      end
+    end
+
+    res
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aio_elin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Elin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies: []
 description: 网络设备巡检工具
 email: 365433079@qq.com
@@ -31,7 +31,9 @@ files:
 - lib/aio/base/toolkit/excel_office.rb
 - lib/aio/base/toolkit/excel_wps.rb
 - lib/aio/base/toolkit/excel_wps.rb.bak
+- lib/aio/base/toolkit/hash.rb
 - lib/aio/base/toolkit/ipaddr.rb
+- lib/aio/base/toolkit/myers.rb
 - lib/aio/base/toolkit/os.rb
 - lib/aio/base/toolkit/regexp.rb
 - lib/aio/base/toolkit/string.rb
@@ -54,6 +56,7 @@ files:
 - lib/aio/core/device_manager.rb
 - lib/aio/core/module.rb
 - lib/aio/core/module/cmd.rb
+- lib/aio/core/module/compare.rb
 - lib/aio/core/module/description.rb
 - lib/aio/core/module/input_style.rb
 - lib/aio/core/module/output_style.rb
@@ -78,8 +81,11 @@ files:
 - lib/aio/core/parse/parser_machine/no_device_state.rb
 - lib/aio/core/parse/parser_machine/parent_state.rb
 - lib/aio/core/text.rb
+- lib/aio/core/text/block.rb
+- lib/aio/core/text/compare.rb
 - lib/aio/core/text/context.rb
 - lib/aio/core/text/line_string.rb
+- lib/aio/core/text/match_string_info.rb
 - lib/aio/core/text/warning.rb
 - lib/aio/core/warning.rb
 - lib/aio/core/warning/description.rb
@@ -90,6 +96,7 @@ files:
 - lib/aio/resource/logo.png
 - lib/aio/ui.rb
 - lib/aio/ui/banner.rb
+- lib/aio/ui/logger.rb
 - lib/aio/ui/readable_text.rb
 - lib/aio/ui/verbose.rb
 - lib/aio/ui/version.rb
@@ -120,7 +127,10 @@ files:
 - lib/modules/cmd/h3c/display_power.rb
 - lib/modules/cmd/h3c/display_version.rb
 - lib/modules/cmd/h3c/display_vrrp_verbose.rb
+- lib/modules/cmd/maipu/show_clock.rb
+- lib/modules/cmd/maipu/show_cpu.rb
 - lib/modules/cmd/maipu/show_env.rb
+- lib/modules/cmd/maipu/show_ip_interface_brief.rb
 - lib/modules/cmd/maipu/show_ip_route.rb
 - lib/modules/cmd/maipu/show_ip_route_statistic.rb
 - lib/modules/cmd/maipu/show_memory.rb
@@ -142,6 +152,7 @@ files:
 - lib/modules/input/style/xinhua_nat.rb
 - lib/modules/output/style/boc_day.rb
 - lib/modules/output/style/cmds.rb
+- lib/modules/output/style/compare_diff.rb
 - lib/modules/output/style/compare_json.rb
 - lib/modules/output/style/compare_report.rb
 - lib/modules/output/style/compare_xml.rb
@@ -149,6 +160,8 @@ files:
 - lib/modules/output/style/excel_table_wps.rb
 - lib/modules/output/style/summary_report.rb
 - lib/modules/special/style/compare.rb
+- lib/modules/special/style/compare_old.rb
+- lib/modules/special/style/compare_with_device_manager.rb
 homepage: http://rubygems.org/gems/aio
 licenses:
 - NGPL
@@ -169,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Aio Tool