lib/testlab/container/lxc.rb in testlab-0.2.1 vs lib/testlab/container/lxc.rb in testlab-0.3.0

@@ -1,33 +1,42 @@
 class TestLab
   class Container
 
     module LXC
 
-      # Our LXC Container class
+      # LXC::Container object
       #
+      # Returns a *LXC::Container* class instance configured for this container.
+      #
       # @return [LXC] An instance of LXC::Container configured for this
       #   container.
       def lxc
         @lxc ||= self.node.lxc.container(self.id)
       end
 
-      # SSH to the container
+      # ZTK:SSH object
+      #
+      # Returns a *ZTK:SSH* class instance configured for this container.
+      #
+      # @return [ZTK::SSH] An instance of ZTK::SSH configured for this
+      #   container.
       def ssh(options={})
         self.node.container_ssh(self, options)
       end
 
       # Does the container exist?
+      #
+      # @return [Boolean] True if the containers exists, false otherwise.
       def exists?
         @ui.logger.debug { "Container Exists?: #{self.id} " }
 
         self.lxc.exists?
       end
 
       # Returns arguments for lxc-create based on our distro
       #
-      # @return [Array] An array of arguments for lxc-create
+      # @return [Array<String>] An array of arguments for lxc-create
       def create_args
         case self.distro.downcase
         when "ubuntu" then
           %W(-f /etc/lxc/#{self.id} -t #{self.distro} -- --release #{self.release} --arch #{self.arch})
         when "fedora" then
@@ -47,24 +56,29 @@
         when "fedora" then
           ((self.node.arch =~ /x86_64/) ? "amd64" : "i686")
         end
       end
 
+      # LXC Network Configuration
+      #
       # Builds an array of hashes containing the lxc configuration options for
-      # our networks
+      # our network interfaces.
+      #
+      # @return [Array<Hash>] An array of hashes defining the containers
+      #   interfaces for use in configuring LXC.
       def build_lxc_network_conf(interfaces)
         networks = Array.new
 
-        interfaces.each do |network, network_config|
+        interfaces.each do |interface|
           networks << Hash[
             'lxc.network.type'         => :veth,
             'lxc.network.flags'        => :up,
-            'lxc.network.link'         => TestLab::Network.first(network).bridge,
-            'lxc.network.name'         => network_config[:name],
-            'lxc.network.hwaddr'       => network_config[:mac],
-            'lxc.network.ipv4'         => network_config[:ip]
+            'lxc.network.link'         => interface.network.bridge,
+            'lxc.network.name'         => interface.name,
+            'lxc.network.hwaddr'       => interface.mac,
+            'lxc.network.ipv4'         => "#{interface.ip}/#{interface.cidr} #{interface.netmask}"
           ]
-          if (network_config[:primary] == true) || (interfaces.count == 1)
+          if (interface.primary == true) || (interfaces.count == 1)
             networks.last.merge!('lxc.network.ipv4.gateway' => :auto)
           end
         end
 
         networks