network-utility 1.1.8 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9ac63c16de8a73195eec7507541d5e9de86533021278f46e47dfd5eee405840
-  data.tar.gz: 33d459ce18988ed46286ab740b3574de6f72b6fce3b21a0b25d429b208e4c5a8
+  metadata.gz: 359c2a418cd608485e5294848265847fd25923ac4017f12e9e4d418efe5fcd31
+  data.tar.gz: 0c1f6c130bdd97c00a91e5ac6b6fe7049dab56a7b8e536da4f0adfd7809efd02
 SHA512:
-  metadata.gz: dbd745d13b587ed611764fae9cda85e61fbb0752a8d4b5133ecc965e81f321de18fd16bb5837954f6f241ba02dcf496ded9644c45618dde2a9604c5e596992c5
-  data.tar.gz: b78ff9668ebb8f2e6c97f440823c9b950a9d2373a2897299aa7c316bb2e3da8433964ebd54557cb7310898b4f4029e4751afdde8bc871cdafe7237d1aeef2ee4
+  metadata.gz: 0b193e331aeebc7a27e758c41fbe99417f146e9457c30198ebc387d3ce1affb88c93eaac4e5856d5bd52fd36287e2e3f2485df884410392c99a69750e8bfc419
+  data.tar.gz: 17f46ace27713d94c39daea5cc5698755865eeb2daf963fccc4e07ab417797a5adf8c745df53177ad07b49514ceba79fb2f8e032a233f12ff18e081511ae7e1d

data/document/config.md

@@ -1049,7 +1049,7 @@ module CR16010H_F
     module_function
 
     def 配置解析 braw,*guards
-        raw = braw
+        raw = braw.gsub("\r","")
         begin
             raw.split("\n")
         rescue
@@ -1086,7 +1086,7 @@ module CR16018_F
     module_function
 
     def 配置解析 braw,*guards
-        raw = braw
+        raw = braw.gsub("\r","")
         begin
             raw.split("\n")
         rescue
@@ -1123,7 +1123,7 @@ module CR19000_20
     module_function
 
     def 配置解析 braw,*guards
-        raw = braw
+        raw = braw.gsub("\r","")
         begin
             raw.split("\n")
         rescue

data/document/if-CR16018-F.md

@@ -36,7 +36,7 @@ module CR16018_F
 
   def 特殊接口配置 接口集合
     接口集合.collect{|接口|
-      接口 if /Virtual|NULL|LoopBack|M\-GigabitEthernet/.match(接口.split("\n")[0])
+      接口 if /Virtual|VE\-L2VPN|NULL|LoopBack|M\-GigabitEthernet/.match(接口.split("\n")[0])
     }.compact.sort_by{|接口|接口.split("\n")[0]}
   end
 
@@ -64,7 +64,7 @@ module CR16018_F
   # func: 根据一个端口的描述信息，给出其格式化的类型、连接符、端口编号
   def 端口识别 描述
     连接符 = ''
-    type = /HundredGigE|GigabitEthernet|Ten\-GigabitEthernet|M\-GigabitEthernet|Bridge\-Aggregation|Route\-Aggregation|Virtual\-Template|NULL|LoopBack/.match(描述)
+    type = /HundredGigE|GigabitEthernet|Ten\-GigabitEthernet|M\-GigabitEthernet|Bridge\-Aggregation|Route\-Aggregation|Virtual\-Template|VE\-L2VPN|NULL|LoopBack/.match(描述)
     类型 = type ? type.to_s : '未知类型'
     port = /(\d+|\/|\.)*(\d+)/.match(描述.split(类型).join)
     端口 = port ? port.to_s : '未知端口'

data/document/if-M6000-18S.md

@@ -757,7 +757,7 @@ module M6000_18S
         invlan = eval(pattern[1].to_s.gsub('-','..'))
         if exvlan.instance_of?(Range)
           exvlan.each{|exv|vlan['qinq'] << [exv,invlan]}
-        elsif exvlan.instance_of?(Fixnum)
+        elsif exvlan.instance_of?(Integer) # Fixnum
           vlan['qinq'] << [exvlan,invlan]
         end;next
       end

data/document/if-NE40E-X16.md

@@ -68,7 +68,7 @@ module NE40E_X16
   # func: 根据一个端口的描述信息，给出其格式化的类型、连接符、端口编号
   def 端口识别 描述
     连接符 = ''
-    type = /100GE|GE|GigabitEthernet|Global\-VE|Pos|Ethernet|Eth\-Trunk|Ip-Trunk|Tunnel|Vlanif|Virtual\-Template|NULL|LoopBack|Logic\-Channel|Aux/.match(描述)
+    type = /100GE|GE|GigabitEthernet|Global\-VE|Pos|Ethernet|Eth\-Trunk|Ip-Trunk|ServiceIf|Tunnel|Vlanif|Virtual\-Template|NULL|LoopBack|Logic\-Channel|Aux/.match(描述)
     类型 = type ? type.to_s : '未知类型'
     port = /(\d+|\/|\.)*(\d+)/.match(描述.split(类型).join)
     端口 = port ? port.to_s : '未知端口'

data/network.rb

@@ -18,5 +18,5 @@
 ].each{|mod|require mod}
 
 module Network
-  VERSION = '1.1.8'
+  VERSION = '1.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: network-utility
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.10
 platform: ruby
 authors:
 - Matt