construqt 0.0.5 → 0.0.6

data/lib/construqt/tags.rb

@@ -25,37 +25,43 @@ module Construqt
 
     def self.find(tag, clazz = nil)
       #binding.pry
-      ret = (@tags[tag] || []).select{|o| clazz.nil? || o.kind_of?(clazz) }
+      ret = (@tags[tag] || []).select{|o| clazz.nil? || o.instance_of?(clazz.class) || (clazz.kind_of?(Proc) && clazz.call(o)) }
       Construqt.logger.warn("tag #{tag} #{clazz.inspect} empty result") if ret.empty?
       ret
     end
 
-    def self.ips_net(tag, family)
-      ip_module = family==Construqt::Addresses::IPV4 ? IPAddress::IPv4: IPAddress::IPv6
-      IPAddress::IPv4::summarize(*(@tags[tag]||[]).map do |obj|
-        if obj.kind_of?(IPAddress)
+    def self.ips_adr(tag, family)
+      (@tags[tag]||[]).map do |obj|
+        if obj.kind_of?(IPAddress) || obj.kind_of?(Construqt::Addresses::CqIpAddress)
           obj
         elsif obj.respond_to? :ips
           obj.ips
         elsif obj.kind_of?(Construqt::Flavour::HostDelegate)
-          #binding.pry
           res = obj.interfaces.values.map do |i|
             i.delegate.address.ips.map do |a|
-              prefix = a.ipv4? ? 32 : 128
-              ret = IPAddress.parse("#{a.to_s}/#{prefix}")
-              puts "ADR=#{tag} #{ret.to_string} #{a.to_s}"
-              ret
+              #prefix = a.ipv4? ? 32 : 128
+              #ret = IPAddress.parse("#{a.to_s}/#{prefix}")
+              #ret
+              a
             end
-          end.flatten
-          puts "HOST=>#{tag} #{res.map{|i| i.to_string }}"
+          end
+          #puts "HOST=>#{tag} #{res.map{|i| i.to_string }}"
           res
         else
           nil
         end
       end.flatten.compact.select do |i|
-        (family==Construqt::Addresses::IPV4 && i.ipv4?) ||
-          (family==Construqt::Addresses::IPV6 && i.ipv6?)
-      end)
+        (((family==Construqt::Addresses::IPV4||family==IPAddress::IPv4) && i.ipv4?) ||
+         ((family==Construqt::Addresses::IPV6||family==IPAddress::IPv6) && i.ipv6?))
+      end
+    end
+
+    def self.ips_hosts(tag, family)
+      IPAddress.summarize(ips_adr(tag, family).map{|i| IPAddress.parse("#{i.to_s}/#{i.ipv4? ? 32 : 128}") })
+    end
+
+    def self.ips_net(tag, family)
+      IPAddress.summarize(ips_adr(tag, family).map{|i| i.network })
     end
   end
 end

data/lib/construqt/templates.rb

@@ -18,6 +18,23 @@ module Construqt
 
         throw "vlan with id #{vlan_id} not found in template #{self}"
       end
+
+      def is_untagged?(vlan_id)
+        self.vlans.each do |vlan|
+          return vlan.untagged? if vlan.vlan_id == vlan_id
+        end
+
+        throw "vlan with id #{vlan_id} not found in template #{self}"
+      end
+
+      def is_nountagged?(vlan_id)
+        self.vlans.each do |vlan|
+          return vlan.nountagged? if vlan.vlan_id == vlan_id
+        end
+
+        throw "vlan with id #{vlan_id} not found in template #{self}"
+      end
+
     end
 
     def find(name)

data/lib/construqt/users.rb

@@ -12,6 +12,10 @@ module Construqt
       @users[name] = OpenStruct.new(cfg)
     end
 
+    def find(name)
+      @users[name]
+    end
+
     def all
       @users.values
     end

data/lib/construqt/util.rb

@@ -128,7 +128,7 @@ module Construqt
       ranges.join(",")
     end
 
-    PORTS_DEF_REGEXP = "([^\\d\\s]*[\\d,-]+)+"
+    PORTS_DEF_REGEXP = "((?:[^\\d\\s]*[\\d,-]+)+)"
     PORT_NAME_REGEXP="^(.*?)(\\d+)$"
     def self.expandRangeDefinition(list_str)
       ports = list_str.strip.split(",").map do |range_def|

data/lib/construqt/version.rb

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

data/lib/construqt/vlans.rb

@@ -13,20 +13,31 @@ module Construqt
       end
 
       def tagged?
-        @tagged
+        !@nountagged && @tagged
       end
 
       def tagged
         @tagged=true
+        @nountagged=false
         self
       end
 
       def untagged?
-        !@tagged
+        !@nountagged && !@tagged
       end
 
       def untagged
         @tagged = false
+        @nountagged=false
+        self
+      end
+
+      def nountagged?
+        @nountagged
+      end
+
+      def nountagged
+        @nountagged=true
         self
       end
     end

data/lib/construqt.rb

@@ -13,7 +13,8 @@ require 'securerandom'
 module Construqt
 
   @logger = Logger.new(STDOUT)
-  @logger.level = Logger::DEBUG
+  @LOGLEVEL||=Logger::DEBUG
+  @logger.level = @LOGLEVEL
 
   def self.log_level(level)
     @logger.level = level

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: construqt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Meno Abels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: construqt-ipaddress
@@ -51,6 +51,7 @@ files:
 - lib/construqt/cables.rb
 - lib/construqt/firewalls.rb
 - lib/construqt/flavour/ciscian/ciscian.rb
+- lib/construqt/flavour/ciscian/deploy_template.rb
 - lib/construqt/flavour/ciscian/dialect_dlink-dgs15xx.rb
 - lib/construqt/flavour/ciscian/dialect_hp-2510g.rb
 - lib/construqt/flavour/delegates.rb
@@ -77,6 +78,7 @@ files:
 - lib/construqt/interfaces.rb
 - lib/construqt/ipsecs.rb
 - lib/construqt/networks.rb
+- lib/construqt/rack.rb
 - lib/construqt/regions.rb
 - lib/construqt/resource.rb
 - lib/construqt/reverse.rb