From: František Dvořák Date: Tue, 13 Sep 2016 14:48:53 +0000 (+0200) Subject: Tuning of the network get: fix description, look also into the template. X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e2af7f4a5dacbd934dab78fc6ade812dfba0b19d;p=now.git Tuning of the network get: fix description, look also into the template. --- diff --git a/lib/nebula.rb b/lib/nebula.rb index 4eee867..a49d3b7 100644 --- a/lib/nebula.rb +++ b/lib/nebula.rb @@ -186,9 +186,9 @@ module Now id = vn.id title = vn.name - desc = vn['SUMMARY'] + desc = vn['DESCRIPTION'] || vn['TEMPLATE/DESCRIPTION'] desc && desc.empty? && desc = nil - vlan = vn['VLAN_ID'] + vlan = vn['VLAN_ID'] || vn['TEMPLATE/VLAN_ID'] vlan && vlan.empty? && vlan = nil range = parse_ranges(id, vn) @@ -198,7 +198,7 @@ module Now title: title, description: desc, user: vn['UNAME'], - bridge: vn['BRIDGE'], + bridge: vn['BRIDGE'] || vn['TEMPLATE/BRIDGE'], vlan: vlan, range: range, zone: zone