testlab 1.8.3 → 1.8.4

data/lib/testlab.rb

@@ -1,3 +1,4 @@
+require 'zlib'
 require 'socket'
 
 require 'ztk'

data/lib/testlab/container.rb

@@ -79,7 +79,6 @@ class TestLab
     autoload :ClassMethods,  'testlab/container/class_methods'
     autoload :Clone,         'testlab/container/clone'
     autoload :Configuration, 'testlab/container/configuration'
-    autoload :Generators,    'testlab/container/generators'
     autoload :Interface,     'testlab/container/interface'
     autoload :IO,            'testlab/container/io'
     autoload :LXC,           'testlab/container/lxc'
@@ -93,7 +92,6 @@ class TestLab
     include TestLab::Container::Actions
     include TestLab::Container::Clone
     include TestLab::Container::Configuration
-    include TestLab::Container::Generators
     include TestLab::Container::Interface
     include TestLab::Container::IO
     include TestLab::Container::LXC

data/lib/testlab/interface.rb

@@ -23,25 +23,83 @@ class TestLab
 
       @ui.logger.debug { "Loading Interface" }
       super(*args)
+
+      self.address ||= generate_ip
+      self.mac     ||= generate_mac
+
       @ui.logger.debug { "Interface '#{self.id}' Loaded" }
     end
 
+    # IP address for the interface
     def ip
       TestLab::Utility.ip(self.address)
     end
 
+    # CIDR mask for the interface
     def cidr
       TestLab::Utility.cidr(self.address)
     end
 
+    # Netmask for the interface
     def netmask
       TestLab::Utility.netmask(self.address)
     end
 
+    # PTR record for the interface
     def ptr
       TestLab::Utility.ptr(self.address)
     end
 
+    # Generate IP address
+    #
+    # Generates an RFC compliant private IP address.
+    #
+    # @return [String] A random, private IP address in the 192.168.0.1/24
+    #   range.
+    def generate_ip
+      crc32  = Zlib.crc32(self.id.to_s)
+      offset = crc32.modulo(255)
+
+      octets = [ 192..192,
+                 168..168,
+                 0..254,
+                 1..254 ]
+      ip = Array.new
+      for x in 1..4 do
+        ip << octets[x-1].to_a[offset.modulo(octets[x-1].count)].to_s
+      end
+      "#{ip.join(".")}/24"
+    end
+
+    # Generate MAC address
+    #
+    # Generates an RFC compliant private MAC address.
+    #
+    # @return [String] A random, private MAC address.
+    def generate_mac
+      crc32  = Zlib.crc32(self.id.to_s)
+      offset = crc32.modulo(255)
+
+      digits = [ %w(0),
+                 %w(0),
+                 %w(0),
+                 %w(0),
+                 %w(5),
+                 %w(e),
+                 %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
+                 %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
+                 %w(5 6 7 8 9 a b c d e f),
+                 %w(3 4 5 6 7 8 9 a b c d e f),
+                 %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
+                 %w(0 1 2 3 4 5 6 7 8 9 a b c d e f) ]
+      mac = ""
+      for x in 1..12 do
+        mac += digits[x-1][offset.modulo(digits[x-1].count)]
+        mac += ":" if (x.modulo(2) == 0) && (x != 12)
+      end
+      mac
+    end
+
   end
 
 end

data/lib/testlab/providers/vagrant.rb

@@ -9,7 +9,6 @@ class TestLab
     #
     # @author Zachary Patten <zachary AT jovelabs DOT com>
     class Vagrant
-      require 'zlib'
 
       # States which indicate the VM is running
       RUNNING_STATES  = %w(running).map(&:to_sym)

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "1.8.3"
+    VERSION = "1.8.4"
   end
 end

data/spec/container_spec.rb

@@ -138,20 +138,6 @@ describe TestLab::Container do
       end
     end
 
-    describe "#generate_ip" do
-      it "should generate a random RFC compliant private IP address" do
-        subject.generate_ip.should_not be_nil
-        subject.generate_ip.should be_kind_of(String)
-      end
-    end
-
-    describe "#generate_mac" do
-      it "should generate a random RFC compliant private MAC address" do
-        subject.generate_mac.should_not be_nil
-        subject.generate_mac.should be_kind_of(String)
-      end
-    end
-
     describe "#create" do
       it "should create the container" do
         subject.node.stub(:alive?) { true }

data/spec/interface_spec.rb

@@ -0,0 +1,62 @@
+################################################################################
+#
+#      Author: Zachary Patten <zachary AT jovelabs DOT com>
+#   Copyright: Copyright (c) Zachary Patten
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+require "spec_helper"
+
+describe TestLab::Interface do
+
+  subject {
+    @logger = ZTK::Logger.new('/tmp/test.log')
+    @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new, :logger => @logger)
+    @testlab = TestLab.new(:repo_dir => REPO_DIR, :labfile_path => LABFILE_PATH, :ui => @ui)
+    @testlab.boot
+    @testlab.containers.first.interfaces.first
+  }
+
+  describe "class" do
+
+    it "should be an instance of TestLab::Interface" do
+      subject.should be_an_instance_of TestLab::Interface
+    end
+
+    describe "methods" do
+
+    end
+
+  end
+
+  describe "methods" do
+
+    describe "#generate_ip" do
+      it "should generate a random RFC compliant private IP address" do
+        subject.generate_ip.should_not be_nil
+        subject.generate_ip.should be_kind_of(String)
+      end
+    end
+
+    describe "#generate_mac" do
+      it "should generate a random RFC compliant private MAC address" do
+        subject.generate_mac.should_not be_nil
+        subject.generate_mac.should be_kind_of(String)
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -244,7 +244,6 @@ files:
 - lib/testlab/container/class_methods.rb
 - lib/testlab/container/clone.rb
 - lib/testlab/container/configuration.rb
-- lib/testlab/container/generators.rb
 - lib/testlab/container/interface.rb
 - lib/testlab/container/io.rb
 - lib/testlab/container/lxc.rb
@@ -318,6 +317,7 @@ files:
 - lib/testlab/utility/misc.rb
 - lib/testlab/version.rb
 - spec/container_spec.rb
+- spec/interface_spec.rb
 - spec/network_spec.rb
 - spec/node_spec.rb
 - spec/provider_spec.rb
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2852140378552631871
+      hash: -284786399860132132
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2852140378552631871
+      hash: -284786399860132132
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -370,6 +370,7 @@ test_files:
 - features/support/env.rb
 - features/testlab.feature
 - spec/container_spec.rb
+- spec/interface_spec.rb
 - spec/network_spec.rb
 - spec/node_spec.rb
 - spec/provider_spec.rb

data/lib/testlab/container/generators.rb

@@ -1,53 +0,0 @@
-class TestLab
-  class Container
-
-    module Generators
-
-      # Generate IP address
-      #
-      # Generates an RFC compliant private IP address.
-      #
-      # @return [String] A random, private IP address in the 192.168.0.1/24
-      #   range.
-      def generate_ip
-        octets = [ 192..192,
-                   168..168,
-                   0..254,
-                   1..254 ]
-        ip = Array.new
-        for x in 1..4 do
-          ip << octets[x-1].to_a[rand(octets[x-1].count)].to_s
-        end
-        ip.join(".")
-      end
-
-      # Generate MAC address
-      #
-      # Generates an RFC compliant private MAC address.
-      #
-      # @return [String] A random, private MAC address.
-      def generate_mac
-        digits = [ %w(0),
-                   %w(0),
-                   %w(0),
-                   %w(0),
-                   %w(5),
-                   %w(e),
-                   %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
-                   %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
-                   %w(5 6 7 8 9 a b c d e f),
-                   %w(3 4 5 6 7 8 9 a b c d e f),
-                   %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
-                   %w(0 1 2 3 4 5 6 7 8 9 a b c d e f) ]
-        mac = ""
-        for x in 1..12 do
-          mac += digits[x-1][rand(digits[x-1].count)]
-          mac += ":" if (x.modulo(2) == 0) && (x != 12)
-        end
-        mac
-      end
-
-    end
-
-  end
-end