construqt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4331146e96ece520a1a1ce639961e821f977fe03
-  data.tar.gz: 278d04395334ee8b7c0ee059d43d0c03123198ca
+  metadata.gz: 2115258ebfdfcd8677388f8d16094791d24c8f73
+  data.tar.gz: 2a0e2a30f18d8c0cca7f8f15db806685e60e517b
 SHA512:
-  metadata.gz: 4547cfc3d2a5a9d98f863dcc4c0d4a73c075e886deb7bed57a97311f5220a37d5a492a771a36c53f61eb2338323e596e1d2b87ec250b754913e86b17da6a359a
-  data.tar.gz: 0a756f1a5ec5e967c88abec431ad6426a86f2bc8b8138c1c55bd6e3bcf557d7ae5109c4e399e53e221caf89adcd87f829b3028dd244c459fc9a74860f96d611b
+  metadata.gz: cdc4dcecb64df68474a1a3475bb39202ba60e1cb02c3ac60607ce85afba3fd9b6d85a4b841ce8325d353a55f8ba592a90a14d150cbe62349c17bb0823cbf95a4
+  data.tar.gz: f0bb62e3236746fd6cccd2333ba213524c86d6fb8169c1371b83175d53704c1337e45f1611acc81cf54ff084e643aebc5fb7269b0460ee98358462f81ff96622

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

@@ -34,6 +34,7 @@ module Construqt
               @to_s = str
               @nr = nr
             end
+
             def <=>(other)
               a = self.to_s
               b = other.to_s
@@ -44,27 +45,33 @@ module Construqt
               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)
             @lines = []
             lines.each_with_index do |line, idx|
               @lines << Line.new(line.strip, idx)
             end
+
             @pos = 0
           end
+
           def shift
             @pos += 1
             @lines[@pos-1]
           end
         end
+
         def parse(lines)
           lines = Lines.new(lines)
           while line = lines.shift
             parse_line(line, lines, self, self)
           end
+
           self
         end
 
@@ -92,6 +99,7 @@ module Construqt
             section = @sections[key]
             block += section.serialize
           end
+
           Util.write_str(block.join("\n"), File.join(@host.name, "#{@host.fname||self.dialect.class.name}.cfg"))
         end
 
@@ -103,7 +111,10 @@ module Construqt
           @sections[section_key] ||= clazz.new(section_key)
           if Result.starts_with_no(section.to_s)
             @sections[section_key].no
+          else
+            @sections[section_key].yes
           end
+
           yield(@sections[section_key])  if block_given?
           @sections[section_key]
         end
@@ -150,6 +161,11 @@ module Construqt
           self
         end
 
+        def yes
+          @no=nil
+          self
+        end
+
         def self.parse_line(line, lines, section, result)
           regexp = line.to_s.strip.end_with?("\"") ? /^(.*) (\"[^"]+\")$/ : /^(.*) ([^\s"]+)$/
           if (line.to_s.strip =~ regexp)
@@ -172,6 +188,7 @@ module Construqt
           #   clazz=verb
           #   verb=clazz.section_key
           # end
+
           self.sections[Result.normalize_section_key(verb.to_s)] ||= clazz.new(verb)
         end
 
@@ -197,6 +214,7 @@ module Construqt
                 end
               end
             end
+
             return true
           end
         end
@@ -207,6 +225,7 @@ module Construqt
             verb = sections[key]
             block << verb.serialize.map{|i| "  #{i}"}
           end
+
           block
         end
 
@@ -220,6 +239,11 @@ module Construqt
           @no
         end
 
+        def yes
+          @no=nil
+          self
+        end
+
         def serialize
           block=[]
           block << "#{@no}#{section.to_s}"
@@ -227,6 +251,7 @@ module Construqt
             block += render_verbs(self.sections)
             block << "exit"
           end
+
           block
         end
 
@@ -250,6 +275,7 @@ module Construqt
                   delta.sections[comp.section] = comp
                 end
               end
+
               return [delta]
             end
           end
@@ -273,6 +299,11 @@ module Construqt
           self
         end
 
+        def yes
+          @no=nil
+          self
+        end
+
         def serialize
           if @no
             ["#{@no}#{section}"]
@@ -301,8 +332,8 @@ module Construqt
         end
 
         def add(value)
-          throw "must be a number \'#{value}\'" unless /^\d+$/.match(value.to_s)
-          self.values << value.to_i
+          #throw "must be a number \'#{value}\'" unless /^\d+$/.match(value.to_s)
+          self.values << value #.to_i
           self
         end
 
@@ -311,6 +342,11 @@ module Construqt
           self
         end
 
+        def yes
+          @no=nil
+          self
+        end
+
         def self.compare(nu, old)
           return [nu] unless old
           return [old.no] unless nu
@@ -339,6 +375,9 @@ module Construqt
           self.changes=[]
         end
 
+        def yes
+        end
+
         def add(entry)
           changes << entry
           self
@@ -355,6 +394,7 @@ module Construqt
           patterns.each do |pattern|
             variables+=find_variables(pattern)
           end
+
           return variables
         end
 
@@ -388,6 +428,7 @@ module Construqt
               var_regex = "#{Construqt::Util::PORTS_DEF_REGEXP}" unless var_regex
               regex=regex.gsub(var, var_regex)
             end
+
             regex=regex.gsub(" ", "\\s+")
             regex="^"+regex+"$"
             if (matchdata=line.match(regex))
@@ -399,9 +440,11 @@ module Construqt
                   values[variables[i-1]]=[matchdata[i]]
                 end
               end
+
               return values
             end
           end
+
           return false
         end
 
@@ -453,6 +496,7 @@ module Construqt
               end
             end
           end
+
           return key_var
         end
 
@@ -533,6 +577,7 @@ module Construqt
               end
             end
           end
+
           output_patterns << empty_pattern if output_patterns.empty? && !empty_pattern.nil?
           return output_patterns
         end
@@ -550,14 +595,18 @@ module Construqt
           sets.each do |key_val,value_sets|
             determine_output_patterns(value_sets).each do |pattern|
               index = 0
-              i=0
+              i = 0
               begin
                 substitution=false
                 result = pattern
-                i+=1
+                i += 1
                 self.class.find_variables(pattern).each do |v|
                   if (group)
-                    result = result.gsub(v, Construqt::Util.createRangeDefinition(value_sets[v])) unless value_sets[v].nil? || value_sets[v].empty?
+                    if 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?
+                    end
                   else
                     if (index < value_sets[v].length)
                       result = result.gsub(v, value_sets[v][index])
@@ -565,11 +614,13 @@ module Construqt
                     end
                   end
                 end
+
                 buffer << result if self.class.find_variables(result).empty?
                 index+=1
               end while substitution
             end
           end
+
           return buffer
         end
       end
@@ -582,6 +633,7 @@ module Construqt
         def header(host)
           "# this is a generated file do not edit!!!!!"
         end
+
         def footer(host)
           "# this is a generated file do not edit!!!!!"
         end

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

@@ -3,6 +3,8 @@ module Construqt
     module Ciscian
       module DlinkDgs15xx
 
+
+
         class HostNameVerb < PatternBasedVerb
           def self.section
             "snmp-server name"
@@ -55,6 +57,44 @@ module Construqt
           end
         end
 
+        class EnablePasswordVerb < SingleValueVerb
+          def self.section
+            "enable password level"
+          end
+
+          def self.patterns
+            ["no channel-group", "enable password level {+admin} {+level} {+pw_hash}"]
+          end
+        end
+
+        class UserNamePasswordVerb < SingleValueVerb
+          def self.section
+            "user XXXXX password"
+          end
+
+          def self.patterns
+          end
+        end
+
+        class UserNamePrivilegeVerb < SingleValueVerb
+          def self.section
+            "user XXXX privilege"
+          end
+
+          def self.patterns
+          end
+        end
+
+        class PasswordVerb < SingleValueVerb
+          def self.section
+            "password"
+          end
+
+          def self.patterns
+          end
+        end
+
+
         class Ipv4RouteVerb < PatternBasedVerb
           def self.section
             "ip route"
@@ -167,6 +207,105 @@ module Construqt
           end
 
           def commit
+            [
+              "aaa",
+              "service password-encryption",
+              "no ip http server",
+              "debug reboot on-error",
+              "no debug enable"
+            ].each do |verb|
+              @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.host.interfaces.values.each do |iface|
               next unless iface.delegate.address
@@ -218,9 +357,8 @@ module Construqt
             vlan_id=vlan.delegate.vlan_id
             vlan.interfaces.each do |iface|
               @result.add("interface #{expand_device_name(iface)}") do |section|
-                if iface.template.is_tagged?(vlan_id)
-                  section.add("switchport trunk allowed vlan", Ciscian::RangeVerb).add(vlan_id)
-                else
+                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)
                 end
               end

data/lib/construqt/flavour/ciscian/dialect_hp-2510g.rb

@@ -13,12 +13,13 @@ module Construqt
         def commit
         end
 
-        def expand_device_name(device)
+        def expand_vlan_device_name(device)
+          expand_device_name(device, { "po" => "Trk%s", "ge" => "%s" })
+        end
+
+        def expand_device_name(device, map={ "po" => "Trk%s", "ge" => "ethernet %s" })
           return device.delegate.dev_name if device.delegate.dev_name
-          pattern = (({
-                        "po" => "Trk%s",
-                        "ge" => "ethernet %s"
-          })[device.name[0..1]])
+          pattern = map[device.name[0..1]]
           throw "device not expandable #{device.name}" unless pattern
           pattern%device.name[2..-1]
         end
@@ -39,21 +40,21 @@ module Construqt
         end
 
         def add_bond(bond)
-          throw "not implemented yet"
+          @result.add("trunk", TrunkVerb).add("{+ports}" => bond.interfaces.map{|i| i.delegate.number }, "{*channel}" => bond.delegate.number)
+          @result.add("spanning-tree #{expand_vlan_device_name(bond)} priority 4")
         end
 
         def add_vlan(vlan)
-          @result.add("vlan #{vlan.delegate.vlan_id}") do |section|
+          @result.add("vlan #{vlan.delegate.vlan_id} jumbo") 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", Ciscian::SingleValueVerb).add(vlan.delegate.description)
-
-
             vlan.interfaces.each do |port|
+
               section.add({
                             true => "tagged",
                             false => "untagged"
-              }[port.template.is_tagged?(vlan.vlan_id)], Ciscian::RangeVerb).add(port.delegate.number)
+              }[port.template.is_tagged?(vlan.vlan_id)], Ciscian::RangeVerb).add(expand_vlan_device_name(port))
             end
 
             if vlan.delegate.address
@@ -104,8 +105,6 @@ module Construqt
             ["no trunk {-ports}", "trunk {+ports} Trk{*channel} Trunk"]
           end
         end
-
-
       end
 
       Construqt::Flavour::Ciscian.add_dialect(Hp2510g)

data/lib/construqt/flavour/ubuntu/flavour_ubuntu.rb

@@ -282,6 +282,7 @@ auth requisite pam_deny.so
 PAM
           #binding.pry
           host.delegate.files && host.delegate.files.each do |file|
+            next if file.kind_of?(Construqt::Resources::SkipFile)
             if host.result.replace(nil, file.data, file.right, *file.path)
               Construqt.logger.warn("the file #{file.path} was overriden!")
             end

data/lib/construqt/flavour/ubuntu/flavour_ubuntu_result.rb

@@ -553,6 +553,9 @@ then
 fi
 BASH
           out += @result.map do |fname, block|
+            if host.files
+              next [] if host.files.find{|file| file.path == fname && file.kind_of?(Construqt::Resources::SkipFile) }
+            end
             text = block.flatten.select{|i| !(i.nil? || i.strip.empty?) }.join("\n")
             next if text.strip.empty?
             Util.write_str(text, @host.name, fname)

data/lib/construqt/networks.rb

@@ -61,7 +61,7 @@ module Construqt
 
       def fqdn(name)
         throw "name must set" unless name
-        _name = name.gsub(/[\s_]+/, '-')
+        _name = name.gsub(/[\s_\.]+/, '-')
         return "#{_name}.#{self.domain}" unless _name.include?('.')
         return _name
       end

data/lib/construqt/resource.rb

@@ -12,6 +12,10 @@ module Construqt
       attr_accessor :data
     end
 
+    class SkipFile
+      attr_accessor :path
+    end
+
     def initialize(region)
       @region = region
       @files = {}
@@ -21,6 +25,12 @@ module Construqt
       add_file(IO.read(src_fname), right, key, *path)
     end
 
+    def add_skip_file(fname)
+      sf = SkipFile.new
+      sf.path = fname
+      sf
+    end
+
     def add_file(data, right, key, *path)
       throw "need a key" unless key
       throw "need a path #{key}" if path.empty?

data/lib/construqt/reverse.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'linux/ip/addr'
+require 'linux/ip/route'
+CONSTRUQT_PATH=ENV['CONSTRUQT_PATH']||'..'
+["#{CONSTRUQT_PATH}/construqt/lib","#{CONSTRUQT_PATH}/ipaddress/lib"].each{|path| $LOAD_PATH.unshift(path) }
+require 'construqt'
+
+# ruby lib/construqt/reverse.rb addr ~/addrs routes ~/routes
+if cp = ARGV.index("addr")
+  addr = Linux::Ip::Addr.parse_from_lines(IO.read(ARGV[cp+1]).lines)
+else
+  addr = Linux::Ip::Addr.parse
+end
+if cp = ARGV.index("routes")
+  routes = Linux::Ip::Route.parse_from_lines(IO.read(ARGV[cp+1]).lines)
+else
+  routes = Linux::Ip::Route.parse
+end
+
+def render_iface(ifaces, routes)
+  ifaces.interfaces.map do |iface|
+    next [] if iface.name == 'lo'
+    next [] if iface.ips.empty?
+    out = <<RUBY
+  region.interfaces.add_device(host, "#{iface.name}", "mtu" => 1500,
+      'mac_address' => #{iface.mac_address},
+      'address' => region.network.addresses.
+#{Construqt::Util.indent((
+    iface.ips.map{|i| "add_ip('#{i.to_s}')" }+
+    (routes.interfaces[iface.name] ? routes.interfaces[iface.name].select{|i| i.kind_of?(Linux::Ip::Route::IpRoute::ViaRoute) }.map{|i| "add_route('#{i.dst.to_s}', '#{i.via.to_s}')" } : [])).join(".\n"), 22)})
+RUBY
+  end.join("\n")
+end
+
+puts <<RUBY
+region.hosts.add("REVERSE-HOST", "flavour" => "ubuntu") do |host|
+  region.interfaces.add_device(host, "lo", "mtu" => "1500", :description=>"loopback",
+                                    "address" => region.network.addresses.add_ip(Construqt::Addresses::LOOOPBACK))
+
+#{render_iface(addr, routes)}
+
+end
+RUBY

data/lib/construqt/util.rb

@@ -157,6 +157,9 @@ module Construqt
     end
 
     def self.indent(body, ident)
+      if ident.kind_of?(Fixnum)
+        ident = (1..ident).to_a.map{' '}.join('')
+      end
       body.lines.map { |line| ident+line.chomp.strip }.join("\n")
     end
   end

data/lib/construqt/version.rb

@@ -1,3 +1,3 @@
 module Construqt
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: construqt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Meno Abels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: construqt-ipaddress
@@ -79,6 +79,7 @@ files:
 - lib/construqt/networks.rb
 - lib/construqt/regions.rb
 - lib/construqt/resource.rb
+- lib/construqt/reverse.rb
 - lib/construqt/services.rb
 - lib/construqt/tags.rb
 - lib/construqt/templates.rb