construqt 0.0.5 → 0.0.6

data/lib/construqt/flavour/ciscian/ciscian.rb

@@ -1,3 +1,5 @@
+require_relative("deploy_template")
+
 module Construqt
   module Flavour
     module Ciscian
@@ -34,21 +36,6 @@ module Construqt
               @to_s = str
               @nr = nr
             end
-
-            def <=>(other)
-              a = self.to_s
-              b = other.to_s
-              match_a=/^(.*[^\d])(\d+)$/.match(a)||[nil,a,1]
-              match_b=/^(.*[^\d])(\d+)$/.match(b)||[nil,b,1]
-              #puts match_a, match_b, a, b
-              ret = match_a[1]<=>match_b[1]
-              ret = match_a[2].to_i<=>match_b[2].to_i  if ret==0
-              ret
-            end
-
-            #            def hash
-            #              self.to_s.hash
-            #            end
           end
 
           def initialize(lines)
@@ -91,19 +78,25 @@ module Construqt
           end
         end
 
-        def commit
-          self.dialect.commit
-
+        def serialize
           block=[]
-          @sections.keys.sort.each do |key|
+          section_keys = self.dialect.sort_section_keys(@sections.keys)
+          section_keys.each do |key|
             section = @sections[key]
             block += section.serialize
           end
+          block
+        end
 
-          Util.write_str(block.join("\n"), File.join(@host.name, "#{@host.fname||self.dialect.class.name}.cfg"))
+        def commit
+          self.dialect.commit
+          Util.write_str(self.serialize().join("\n"), File.join(@host.name, "#{@host.fname||self.dialect.class.name}.cfg"))
+          external=@host.id.interfaces.first.address
+          external_ip=external.first_ipv4.nil? ? external.first_ipv6.to_s : external.first_ipv4.to_s
+          DeployTemplate.write_template(@host, self.dialect.class.name, external_ip, "root", @host.password||@host.region.hosts.default_password)
         end
 
-        def add(section, clazz=NestedSection)
+        def add(section, clazz=SingleValueVerb)
           throw "section is nil" unless section
           section = Lines::Line.new(section, -1) unless section.kind_of?(Lines::Line)
           section_key=Result.normalize_section_key(section.to_s)
@@ -115,7 +108,7 @@ module Construqt
             @sections[section_key].yes
           end
 
-          yield(@sections[section_key])  if block_given?
+          yield(@sections[section_key]) if block_given?
           @sections[section_key]
         end
 
@@ -129,7 +122,7 @@ module Construqt
 
           deltas=NestedSection.compare(nu_root, other_root)
           throw "illegal state" if deltas.length != 1
-          result.sections = deltas[0]
+          result.sections = deltas[0].sections unless deltas[0].nil?
           result
         end
       end
@@ -141,18 +134,21 @@ module Construqt
         end
 
         def serialize
-          [[@no, section , value].compact.join(" ")]
+          val = @quotes ? "\"#{value}\"" : value
+          [[@no, section , val].compact.join(" ")]
         end
 
         def self.compare(nu, old)
           return [nu] unless old
-          return [old.no] unless nu
+          # return no changes (empty list) if old configuration of single value verb (default) is not explicitly reconfigured in new configuration:
+          return [] unless nu
           return [nu] unless nu.serialize == old.serialize
           [nil]
         end
 
         def add(value)
           self.value=value
+          self
         end
 
         def no
@@ -166,10 +162,19 @@ module Construqt
           self
         end
 
+        def quotes
+          @quotes=true
+          self
+        end
+
         def self.parse_line(line, lines, section, result)
-          regexp = line.to_s.strip.end_with?("\"") ? /^(.*) (\"[^"]+\")$/ : /^(.*) ([^\s"]+)$/
+          quotes = line.to_s.strip.end_with?("\"")
+          regexp = quotes ? /^\s*((no|).*) \"([^"]+)\"$/ : /^\s*((no|).*) ([^\s"]+)$/
           if (line.to_s.strip =~ regexp)
-            section.add($1, Ciscian::SingleValueVerb).add($2)
+            key=$1
+            val=$3
+            sec = section.add(key, Ciscian::SingleValueVerb).add(val)
+            sec.quotes if quotes
           else
             section.add(line.to_s, Ciscian::SingleValueVerb)
           end
@@ -183,20 +188,21 @@ module Construqt
           self.section=section
         end
 
-        def add(verb, clazz = MultiValueVerb)
-          # if verb.respond_to?(:section_key)
-          #   clazz=verb
-          #   verb=clazz.section_key
-          # end
+        def add(verb, clazz = SingleValueVerb)
+          section_key=Result.normalize_section_key(verb.to_s)
+          self.sections[section_key] ||= clazz.new(section_key)
 
-          self.sections[Result.normalize_section_key(verb.to_s)] ||= clazz.new(verb)
+          if Result.starts_with_no(verb.to_s)
+            @sections[section_key].no
+          end
+          @sections[section_key]
         end
 
         def self.parse_line(line, lines, section, result)
-          #binding.pry if line.start_with?("interface")
           if [/^\s*(no\s+|)interface/, /^\s*(no\s+|)vlan/].find{|i| line.to_s.match(i) }
             resultline=Result::Lines::Line.new(result.dialect.clear_interface(line), line.nr)
-            section.add(resultline.to_s) do |_section|
+            section.add(resultline.to_s, NestedSection) do |_section|
+              _section.virtual if result.dialect.is_virtual?(resultline.to_s)
               while _line = lines.shift
                 break if result.dialect.block_end?(_line.to_s)
                 result.parse_line(_line, lines, _section, result)
@@ -208,7 +214,7 @@ module Construqt
               if (ports.length>1)
                 section_to_split=section.sections.delete(resultline.to_s)
                 ports.each do |port|
-                  section.add(line.to_s.gsub(/#{Construqt::Util::PORTS_DEF_REGEXP}/, port)) do |_section|
+                  section.add(line.to_s.gsub(/#{Construqt::Util::PORTS_DEF_REGEXP}/, port), NestedSection) do |_section|
                     _section.sections.merge!(section_to_split.sections)
                   end
                 end
@@ -244,12 +250,19 @@ module Construqt
           self
         end
 
+        def virtual
+          @virtual=true
+          self
+        end
+
         def serialize
           block=[]
-          block << "#{@no}#{section.to_s}"
-          unless (@no)
-            block += render_verbs(self.sections)
-            block << "exit"
+          if (!self.sections.empty? || (self.sections.empty? && @virtual) || (@no && @virtual))
+            block << "#{@no}#{section.to_s}"
+            unless (@no)
+              block += render_verbs(self.sections)
+              block << "exit"
+            end
           end
 
           block
@@ -259,6 +272,7 @@ module Construqt
           return [nu] unless old
           return [old.no] unless nu
           throw "classes must match #{nu.class.name} != #{old.class.name}" unless nu.class == old.class
+
           if (nu.serialize==old.serialize)
             return [nil]
           else
@@ -266,7 +280,7 @@ module Construqt
               return [nu]
             else
               delta = nu.class.new(nu.section)
-              (nu.sections.keys + old.sections.keys).sort.each do |k,v|
+              (nu.sections.keys + old.sections.keys).uniq.sort.each do |k,v|
                 nu_section=nu.sections[k]
                 old_section=old.sections[k]
                 comps = (nu_section||old_section).class.compare(nu_section, old_section)
@@ -282,48 +296,6 @@ module Construqt
         end
       end
 
-      class MultiValueVerb
-        attr_accessor :section,:values
-        def initialize(section)
-          self.section=section
-          self.values = []
-        end
-
-        def add(value)
-          self.values << value
-          self
-        end
-
-        def no
-          @no="no "
-          self
-        end
-
-        def yes
-          @no=nil
-          self
-        end
-
-        def serialize
-          if @no
-            ["#{@no}#{section}"]
-          else
-            ["#{section} #{values.join(",")}"]
-          end
-        end
-
-        def self.compare(nu, old)
-          return [nu] unless old
-          return [old.no] unless nu
-          throw "classes must match #{nu.class.name} != #{old.class.name}" unless nu.class == old.class
-          if (nu.serialize==old.serialize)
-            [nil]
-          else
-            [nu]
-          end
-        end
-      end
-
       class RangeVerb
         attr_accessor :section,:values
         def initialize(section)
@@ -360,7 +332,7 @@ module Construqt
 
         def serialize
           if @no
-            ["#{@no}#{section}"]
+            ["#{@no}#{section} #{Construqt::Util.createRangeDefinition(values)}"]
           else
             ["#{section} #{Construqt::Util.createRangeDefinition(values)}"]
           end
@@ -449,6 +421,12 @@ module Construqt
         end
 
         def self.compare(nu, old)
+          unless (nu.nil? || old.nil?)
+            if (nu.serialize==old.serialize)
+              return []
+            end
+          end
+
           nu_ports=nu.nil? ? {} : nu.integrate
           old_ports=old.nil? ? {} : old.integrate
 
@@ -561,6 +539,10 @@ module Construqt
           return sets
         end
 
+        def always_select_empty_pattern
+          false
+        end
+
         def determine_output_patterns(value_sets)
           output_patterns=[]
           empty_pattern = nil
@@ -578,20 +560,18 @@ module Construqt
             end
           end
 
-          output_patterns << empty_pattern if output_patterns.empty? && !empty_pattern.nil?
+          output_patterns.unshift(empty_pattern) if (output_patterns.empty? || self.always_select_empty_pattern) && !empty_pattern.nil?
           return output_patterns
         end
 
+        def group?
+          true
+        end
+
         def serialize
           buffer = []
           sets = integrate
 
-          # deactivate grouping, if one variable has a custom regex (i.e. is not a range definition)
-          group=true
-          self.class.variables(self.class.patterns).each do |v|
-            group=false unless self.class.find_regex(self.class.extract_varname(v)).nil?
-          end
-
           sets.each do |key_val,value_sets|
             determine_output_patterns(value_sets).each do |pattern|
               index = 0
@@ -601,8 +581,8 @@ module Construqt
                 result = pattern
                 i += 1
                 self.class.find_variables(pattern).each do |v|
-                  if (group)
-                    if self.class.is_value?(v) || self.class.is_key_value?(v)
+                  if (self.group?)
+                    if (!value_sets[v].kind_of?(Array) && (self.class.is_value?(v) || self.class.is_key_value?(v)))
                       result = result.gsub(v, value_sets[v].to_s) unless value_sets[v].nil? || value_sets[v].to_s.empty?
                     else
                       result = result.gsub(v, Construqt::Util.createRangeDefinition(value_sets[v])) unless value_sets[v].nil? || value_sets[v].empty?

data/lib/construqt/flavour/ciscian/deploy_template.rb

@@ -0,0 +1,36 @@
+module Construqt
+  module Flavour
+    module Ciscian
+      class DeployTemplate
+        def self.write_template(host, flavour, ip, user, pass)
+          template = <<-TEMPLATE
+#!/bin/bash
+
+CURRENT_DIR="`pwd`/$(dirname $0)"
+if [[ ! -e $CURRENT_DIR ]]
+then
+CURRENT_DIR="$(dirname $0)"
+fi
+
+if [ -z "$CONSTRUQT_PATH" ]
+then
+if [[ $CURRENT_DIR =~ (.*construqt).* ]]
+then
+CONSTRUQT_PATH=${BASH_REMATCH[1]}
+else
+echo "could not automatically find construqt path"
+exit
+fi
+fi
+
+FLAVOUR="#{flavour}"
+cd $CONSTRUQT_PATH
+bash $CONSTRUQT_PATH/construqt/switch/deploy/deploy.sh $FLAVOUR #{ip} #{user} #{pass} "$CURRENT_DIR/$FLAVOUR.cfg"
+cd - > /dev/null
+TEMPLATE
+                Util.write_str(template, File.join(host.name, "deploy.sh"))
+              end
+            end
+          end
+        end
+      end

data/lib/construqt/flavour/ciscian/dialect_dlink-dgs15xx.rb

@@ -52,6 +52,10 @@ module Construqt
             "channel-group"
           end
 
+          def always_select_empty_pattern
+            true
+          end
+
           def self.patterns
             ["no channel-group", "channel-group {+channel} mode active"]
           end
@@ -94,12 +98,15 @@ module Construqt
           end
         end
 
-
         class Ipv4RouteVerb < PatternBasedVerb
           def self.section
             "ip route"
           end
 
+          def group?
+            false
+          end
+
           def self.find_regex(variable)
             {
               "routedefs" => "(\\S+\\s+\\S+\\s+\\S+)"
@@ -111,6 +118,16 @@ module Construqt
           end
         end
 
+        class IpHttpServerVerb < SingleValueVerb
+          def self.parse_line(line, lines, section, result)
+            regexp = /^\s*((no|) ip http server)$/
+            if (line.to_s.strip =~ regexp)
+              section.add(line.to_s, Ciscian::SingleValueVerb)
+              return true
+            end
+          end
+        end
+
         class Comment
           def self.parse_line(line, lines, section, result)
             line.to_s.empty? || line.to_s.start_with?("#")
@@ -126,7 +143,7 @@ module Construqt
         class Line
           def self.parse_line(line, lines, section, result)
             return false unless ['line '].find{|i| line.to_s.start_with?(i) }
-            section.add(line) do |_section|
+            section.add(line, NestedSection) do |_section|
               while line = lines.shift
                 break if result.dialect.block_end?(line.to_s)
                 result.parse_line(line, lines, _section, result)
@@ -163,15 +180,6 @@ module Construqt
           def add_host(host)
           end
 
-          def add_device(device)
-            @result.add("interface #{expand_device_name(device)}") do |section|
-              section.add("flowcontrol").add("off")
-              section.add("max-rcv-frame-size").add(device.delegate.mtu)
-              section.add("snmp trap").add("link-status")
-              section.add("switchport mode").add("trunk")
-            end
-          end
-
           def clear_interface(line)
             line.to_s.split(/\s+/).map do |i|
               split = /^([^0-9]+)([0-9].*)$/.match(i)
@@ -179,6 +187,10 @@ module Construqt
             end.flatten.join(' ')
           end
 
+          def is_virtual?(line)
+            line.start_with?("vlan") || line.include?("port-channel")
+          end
+
           def parse_line(line, lines, section, result)
             [
               WtfEnd,
@@ -189,12 +201,34 @@ module Construqt
               MtuVerb,
               SwitchPortTrunkAllowedVlan,
               ChannelGroupVerb,
-              Ipv4RouteVerb
+              Ipv4RouteVerb,
+              IpHttpServerVerb
             ].find do |i|
               i.parse_line(line, lines, section, result)
             end
           end
 
+          def sort_section_keys(keys)
+            return keys.sort do |a,b|
+              a = a.to_s
+              b = b.to_s
+              match_a=/^(.*[^\d])(\d+)$/.match(a)||[nil,a,1]
+              match_b=/^(.*[^\d])(\d+)$/.match(b)||[nil,b,1]
+              #puts match_a, match_b, a, b
+              ret=0
+              ret = rate_higher("vlan", match_a[1], match_b[1]) if ret==0
+              ret = rate_higher("interface port-channel", match_a[1], match_b[1]) if ret==0
+              ret = rate_higher("interface vlan", match_a[1], match_b[1]) if ret==0
+              ret = match_a[1]<=>match_b[1] if ret==0
+              ret = match_a[2].to_i<=>match_b[2].to_i if ret==0
+              ret
+            end
+          end
+
+          def rate_higher(prefix, a, b)
+            return a.start_with?(prefix) ^ b.start_with?(prefix) ? (a.start_with?(prefix) ? -1 : 1) : 0
+          end
+
           def expand_device_name(device)
             return device.delegate.dev_name if device.delegate.dev_name
             pattern = (({
@@ -217,137 +251,51 @@ module Construqt
               @result.add(verb, Ciscian::SingleValueVerb)
             end
 
-            ["line console", "line telnet", "line ssh"].each do |section|
-              @result.add(section) { |_section| _section.add("line") }
-            end
-
-            #@result.host.interfaces.values.each do |iface|
-            #  @result.add(k
-            #end
-
-
-
-
-#             "enable password level 15 7 <>"
-#             "username root password 7 <>"
-#             "username root password 15"
-#
-#             "autoconfig",
-#             ["clock timezone", "+ 1"],
-#             "no clock summer-time"
-#             "sntp interval 720"
-#             "ddp report-timer 30",
-#             "debug"
-#             "debug reboot"
-#             "dim"
-#             "ignore"
-#             "instance 16 vlans"
-  #             no power-saving link-detection
-  #             no dim led
-  #             no power-saving hibernation
-  #             no power-saving dim-led
-  #             no power-saving port-shutdown
-#
-#
-#             "ddp"
-#             "no power-saving eee"
-#             "no snmp-server trap-sending"
-#             "no speed"
-#             "spanning-tree guard"
-#             "spanning-tree mst hello-time"
-#
-#
-#            "ip arp gratuitous"
-#            "ip dhcp relay information option format circuit-id default"
-#            "ip dhcp relay information option format remote-id default"
-#            "ip dhcp relay information policy replace"
-#            "ip domain"
-#            "ip http service-port"
-#            "ip http timeout-policy idle"
-#            "ip ssh"
-#            "ip telnet"
-#            "ip telnet service-port"
-#            "port-channel load-balance"
-#            "power-saving"
-#            "service"
-#
-#            "snmp-server community private  view CommunityView"
-#            "snmp-server community public  view CommunityView"
-#            "snmp-server contact"
-#            "snmp-server enable traps rmon falling-alarm"
-#            "snmp-server enable traps snmp rising-alarm"
-#            "snmp-server engineID local"
-#            "snmp-server group initial"
-#            "snmp-server group initial v3  noauth read restricted notify"
-#            "snmp-server group private v1 read CommunityView write CommunityView notify"
-#            "snmp-server group private v2c read CommunityView write CommunityView notify"
-#            "snmp-server group public v1 read CommunityView notify"
-#            "snmp-server group public v2c read CommunityView notify"
-#            "snmp-server location"
-#            "snmp-server response"
-#            "snmp-server service-port"
-#            "snmp-server user initial"
-#            "snmp-server user initial initial"
-#            "snmp-server view CommunityView 1"
-#            "snmp-server view CommunityView 1.3.6.1.6.3"
-#            "snmp-server view CommunityView 1.3.6.1.6.3.1"
-#            "snmp-server view restricted 1.3.6.1.2.1.1"
-#            "snmp-server view restricted 1.3.6.1.2.1.11"
-#            "snmp-server view restricted 1.3.6.1.6.3.10.2.1"
-#            "snmp-server view restricted 1.3.6.1.6.3.11.2.1"
-#            "snmp-server view restricted 1.3.6.1.6.3.15.1.1"
-#            "sntp"
-#            "sntp interval"
-#            "spanning-tree mode"
-#            "spanning-tree mst"
-#            "ssh user root authentication-method"
-#            "username root password 7"
-#            "username root privilege"
-#
-
-
-            @result.add("snmp-server name", Ciscian::SingleValueVerb).add(@result.host.name)
+            @result.add("snmp-server name").add(@result.host.name)
             @result.host.interfaces.values.each do |iface|
               next unless iface.delegate.address
               iface.delegate.address.routes.each do |route|
                 ip = route.dst.ipv6? ? "ipv6" : "ip"
-                @result.add("#{ip} route #{route.dst.to_string} vlan#{iface.delegate.vlan_id} #{route.via.to_s}", Ciscian::SingleValueVerb)
+                @result.add("#{ip} route #{route.dst.to_string.upcase} vlan#{iface.delegate.vlan_id} #{route.via.to_s.upcase}", Ciscian::SingleValueVerb)
               end
             end
           end
 
-          def add_device(device)
-            @result.add("interface #{expand_device_name(device)}") do |section|
-              section.add("flowcontrol").add("off")
-              section.add("max-rcv-frame-size").add(device.delegate.mtu)
-              section.add("snmp trap").add("link-status")
+          def add_device(device, bond=false)
+            @result.add("interface #{expand_device_name(device)}", NestedSection) do |section|
               section.add("switchport mode").add("trunk")
+              unless bond
+                section.add("flowcontrol").add("off")
+                section.add("max-rcv-frame-size").add(device.delegate.mtu)
+                section.add("snmp trap").add("link-status")
+              end
             end
           end
 
           def add_bond(bond)
             bond.interfaces.each do |iface|
-              @result.add("interface #{expand_device_name(iface)}") do |section|
+              @result.add("interface #{expand_device_name(iface)}", NestedSection) do |section|
                 section.add("channel-group", ChannelGroupVerb).add({"{+channel}" => [bond.name[2..-1]]})
               end
             end
+            self.add_device(bond, true)
           end
 
           def add_vlan(vlan)
-            @result.add("vlan #{vlan.delegate.vlan_id}") do |section|
+            @result.add("vlan #{vlan.delegate.vlan_id}", NestedSection) do |section|
               next unless vlan.delegate.description && !vlan.delegate.description.empty?
               throw "vlan name too long, max 32 chars" if vlan.delegate.description.length > 32
               section.add("name").add(vlan.delegate.description)
             end
-            @result.add("interface vlan #{vlan.delegate.vlan_id}") do |section|
+            @result.add("interface vlan #{vlan.delegate.vlan_id}", NestedSection) do |section|
               if vlan.delegate.address
                 if vlan.delegate.address.first_ipv4
-                  section.add("ip address").add(vlan.delegate.address.first_ipv4.to_string)
+                  section.add("ip address").add(vlan.delegate.address.first_ipv4.to_string.upcase)
                 elsif vlan.delegate.address.dhcpv4?
                   section.add("ip address").add("dhcp-bootp")
                 end
                 if vlan.delegate.address.first_ipv6
-                  section.add("ipv6 address").add(vlan.delegate.address.first_ipv6.to_string)
+                  section.add("ipv6 address").add(vlan.delegate.address.first_ipv6.to_string.upcase)
                 elsif vlan.delegate.address.dhcpv6?
                   section.add("ipv6 address").add("dhcp-bootp")
                 end
@@ -356,7 +304,7 @@ module Construqt
 
             vlan_id=vlan.delegate.vlan_id
             vlan.interfaces.each do |iface|
-              @result.add("interface #{expand_device_name(iface)}") do |section|
+              @result.add("interface #{expand_device_name(iface)}", NestedSection) do |section|
                 section.add("switchport trunk allowed vlan", Ciscian::RangeVerb).add(vlan_id)
                 unless iface.template.is_tagged?(vlan_id)
                   section.add("switchport trunk native vlan").add(vlan_id)