vagrant-g5k 0.0.18 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0d6102f863c7b075de47f50ba049609cfe1e65
-  data.tar.gz: 1a270477aa940ecbb7a7c8ebd157dff3d93538c7
+  metadata.gz: 9e0e51fdb1bc354bce80d807d3b6c7500aa32e61
+  data.tar.gz: f326ea37cee6bc501848b8deafda61af85a320a7
 SHA512:
-  metadata.gz: 9d9ef4b15f56f29adec942817a882d8206c43318513c90ef7edf328fc64c54fcb86780de718458b01000a163cf842e3f579947821202ecea7d30d3c52b8fa156
-  data.tar.gz: 904d7279690347ba64ecc12ba41c205d565c2f0dbc5434aff88717c2b7c791a1e93360d585ea1df04eed5076f57e1b8a8ce73b6ab042887d4d4341cb1042607c
+  metadata.gz: 0e632af665f7c61884dd62b0a105114fbe3a2896f848d66174cf09a79b394c6d365a04be4431e1c9425391c34a8d94d9e85ead25b516f691ef8950fa5175a2f0
+  data.tar.gz: 8a67e80906ff550ed7befb257224cafdc01a613f7bc989889e552b46d4b046758dbb155fade5aca2eca7d3a618f174988255042a8a5f75da5368262b9cb1dd17

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.9.0
+
+  * Code refactoring : 
+    * Introduce oar_driver to handle operation involving oar
+    * Introduce net_driver to configure the network used by the VMs
+    * Introduce disk_driver to configure the disk used by the VMs
+
 # 0.0.18
 
   * Fix update_subnet_use when using nat network

data/README.md

@@ -68,6 +68,8 @@ config.vm.provider "g5k" do |g5k|
 end
 ```
 
+> Due to the dynamic nature of the subnet reserved on Grid'5000, IPs of the VMs will change accross reboots
+
 
 ## Supported operations
 

data/Vagrantfile

@@ -17,49 +17,44 @@ Vagrant.configure(2) do |config|
       g5k.walltime = "01:00:00"
 
       # Image backed by the ceph cluster
-#          g5k.image = {
-#             "pool"     => "msimonin_rbds",
-#             "rbd"      => "bases/alpine_docker",
-#             "snapshot" => "parent",
-#             "id"       => "$USER",
-#            "conf"      => "$HOME/.ceph/config",
-#            "backing"   => "snapshot"
-#           }
+          g5k.image = {
+             :pool      => "msimonin_rbds",
+             :rbd       => "bases/ubuntu1404-9p",
+             :snapshot  => "parent",
+             :id        => "$USER",
+             :conf      => "$HOME/.ceph/config",
+             :backing   => "copy"
+          }
 #
       # Image backed on the frontend filesystem           
-      g5k.image = {
-        "path"    => "/grid5000/virt-images/alpine_docker.qcow2",
-        "backing" => "snapshot"
-      }
+#      g5k.image = {
+#        :path    => "/grid5000/virt-images/alpine_docker.qcow2",
+#        :backing => "copy"
+#      }
 
-#      g5k.net = {
-#        "type" => "bridge"
+#       g5k.net = {
+#        :type => "bridge"
 #      }
-        g5k.net = {
-          "type" => "nat",
-          "ports" => ["2222-:22"]
-        }
+      g5k.net = {
+        :type => "nat",
+        :ports => ["2222-:22"]
+      }
 
 
       # oar selection of resource
       g5k.oar = "virtual != 'none'"
     end #g5k
 
-    config.vm.define "vm1" do |my|
-      my.vm.box = "dummy"
-
-      my.ssh.username = "root"
-      my.ssh.password = ""
 
-    end #vm
-    
-#    config.vm.define "vm2" do |my|
-#      my.vm.box = "dummy"
+    (1..1).each do |i|
+      config.vm.define "vm#{i}" do |my|
+        my.vm.box = "dummy"
 
-#      my.ssh.username = "root"
-#      my.ssh.password = ""
+#        my.ssh.username = "root"
+#        my.ssh.password = ""
 
-#    end #vm
+      end #vm
+    end
     # Repeat block to define another vm 
     # config.vm.define "vm2" do |my|
     #   

data/lib/vagrant-g5k/action.rb

@@ -26,8 +26,6 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectG5K
-          # read the state to find the enclosing ressource
-          b.use ReadState
           b.use ReadSSHInfo
         end
       end
@@ -144,7 +142,6 @@ module VagrantPlugins
 
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectG5K, action_root.join("connect_g5k")
-      autoload :CloseG5K, action_root.join("close_g5k")
       autoload :CreateLocalWorkingDir, action_root.join("create_local_working_dir")
       autoload :DeleteJob, action_root.join("delete_job")
       autoload :DeleteDisk, action_root.join("delete_disk")

data/lib/vagrant-g5k/action/connect_g5k.rb

@@ -1,6 +1,11 @@
 require "log4r"
-require "vagrant-g5k/util/g5k_utils"
+require "vagrant-g5k/g5k_connection"
 require "vagrant-g5k/driver"
+require "vagrant-g5k/oar"
+require "vagrant-g5k/network/nat"
+require "vagrant-g5k/network/bridge"
+require "vagrant-g5k/disk/local"
+require "vagrant-g5k/disk/rbd"
 require 'thread'
 
 
@@ -22,8 +27,12 @@ module VagrantPlugins
         end
 
         def call(env)
+          cwd = File.join('.vagrant', env[:machine].provider_config.project_id)
           driver = _get_driver(env)
-          env[:g5k_connection] = Connection.new(env, driver)
+          oar_driver = VagrantPlugins::G5K::Oar.new(env[:ui], driver)
+          net_driver = _get_net_driver(env, driver, oar_driver)
+          disk_driver = _get_disk_driver(env, cwd, driver)
+          env[:g5k_connection] = Connection.new(env, cwd, driver, oar_driver, net_driver, disk_driver)
           @app.call(env)
         end
 
@@ -59,6 +68,28 @@ module VagrantPlugins
           end
           return VagrantPlugins::G5K.pool[key]
         end
+
+        def _get_net_driver(env, driver, oar_driver)
+          net_type = env[:machine].provider_config.net[:type]
+          if net_type == "bridge"
+            klass = VagrantPlugins::G5K::Network::Bridge
+          else
+            klass = VagrantPlugins::G5K::Network::Nat
+          end
+          klass.new(env, driver, oar_driver)
+        end
+
+        def _get_disk_driver(env, cwd, driver)
+          image = env[:machine].provider_config.image
+          if image[:pool].nil?
+            klass = VagrantPlugins::G5K::Disk::Local
+          else
+            klass = VagrantPlugins::G5K::Disk::RBD
+          end
+          klass.new(env, cwd, driver)
+        end
+
+
       end
     end
   end

data/lib/vagrant-g5k/action/read_ssh_info.rb

@@ -12,46 +12,27 @@ module VagrantPlugins
         end
 
         def call(env)
-          net = env[:machine].provider_config.net
-          # Note: better to encapsulate this in a NetDriver
-          if net["type"] == 'bridge'
-            env[:machine_ssh_info] = read_ssh_info(env[:g5k_connection], env[:machine])
-          else
-            ports = net["ports"]
-            ssh_fwd = ports.select{ |x| x.split(':')[1] == '22'}.first
-            if ssh_fwd.nil?
-              env[:ui].error "SSH port 22 must be forwarded"
-              raise Error "SSh port 22 isn't forwarded"
-            end
-            ssh_fwd = ssh_fwd.split('-:')[0]
-            env[:machine_ssh_info] = read_ssh_info(env[:g5k_connection], env[:machine], ssh_fwd)
+          conn = env[:g5k_connection]
+          ssh_info = conn.vm_ssh_info(env[:machine].id)
+          username = env[:machine].provider_config.username
+          gateway = env[:machine].provider_config.gateway
+          if !env[:machine].provider_config.gateway.nil?
+            ssh_info[:proxy_command] = "ssh #{username}@#{gateway} #{ssh_key(env)} nc %h %p"
           end
+          env[:machine_ssh_info] = ssh_info
+
           @app.call(env)
         end
 
-        def ssh_key(conn)
-          if conn.private_key.nil?
+        def ssh_key(env)
+          private_key = env[:machine].provider_config.private_key
+          if private_key.nil?
             ""
           else
-             "-i #{conn.private_key}"
-          end
-        end
-
-
-        def read_ssh_info(conn, machine, ssh_fwd = nil)
-          return nil if machine.id.nil?
-
-          ssh_info = {
-                   :host          => conn.node,
-          }
-
-          ssh_info[:port] = ssh_fwd unless ssh_fwd.nil?
-
-          if !conn.gateway.nil?
-            ssh_info[:proxy_command] = "ssh #{conn.username}@#{conn.gateway} #{ssh_key(conn)} nc %h %p"
+             "-i #{private_key}"
           end
-          return ssh_info
         end
+      
       end
     end
   end

data/lib/vagrant-g5k/action/read_state.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
           machine = env[:machine]
           conn = env[:g5k_connection]
           id = machine.id
-          local_storage = conn.check_local_storage(env)
+          local_storage = conn.check_storage(env)
           if id.nil? and local_storage.nil?
             return :not_created
           end
@@ -35,13 +35,9 @@ module VagrantPlugins
             if job.nil?
               return :not_created
             end
-            if env[:machine].provider_config.net["type"] == "bridge"
-              # is the subnet still there ?
-              subnet_id = conn._find_subnet(id)
-              if subnet_id.nil?
-                return :subnet_missing
-              end
-            end
+            
+            net_state = conn.check_net(id)
+            return net_state.to_sym unless net_state.nil?
 
             return job["state"].to_sym
           end

data/lib/vagrant-g5k/command.rb

@@ -1,5 +1,5 @@
 require 'net/ssh/multi'
-require 'vagrant-g5k/util/g5k_utils'
+require 'vagrant-g5k/util/g5k_connection'
 include Process
 
 module VagrantPlugins
@@ -15,7 +15,7 @@ module VagrantPlugins
         # TODO
         options = {}
         opts = OptionParser.new do |o|
-          o.banner = 'Usage: vagrant g(k [vm-name]'
+          o.banner = 'Usage: vagrant g5k [vm-name]'
           o.separator ''
           o.version = VagrantPlugins::G5K::VERSION
           o.program_name = 'vagrant g5k'

data/lib/vagrant-g5k/config.rb

@@ -60,8 +60,8 @@ module VagrantPlugins
         @walltime         = "01:00:00"
         @oar              = ""
         @net              = {
-          'type' => 'nat',
-          'ports' => ['2222-,22']
+          :type => 'nat',
+          :ports => ['2222-:22']
         }
       end
 
@@ -77,7 +77,8 @@ module VagrantPlugins
         errors << "g5k site is required" if @site.nil?
         errors << "g5k image is required" if @image.nil?
         errors << "g5k image must be a Hash" if !@image.is_a?(Hash)
-        
+        errors << "g5k net must be a Hash" if !@net.is_a?(Hash)
+
         { "G5K Provider" => errors }
       end
 

data/lib/vagrant-g5k/disk/local.rb

@@ -0,0 +1,68 @@
+require 'log4r'
+
+module VagrantPlugins
+  module G5K
+    module Disk
+
+      class Local
+
+        def initialize(env, cwd,  driver)
+          @logger = Log4r::Logger.new("vagrant::network::nat")
+          # command driver is unused
+          @cwd = cwd
+          @driver = driver
+          @env = env
+          @image = env[:machine].provider_config.image
+          @project_id = env[:machine].provider_config.project_id
+          @ui = env[:ui]
+        end
+
+        def generate_drive()
+          strategy = @image[:backing]
+          if [STRATEGY_SNAPSHOT, STRATEGY_DIRECT].include?(strategy)
+            file = @image[:path]
+          elsif strategy == STRATEGY_COW
+            file = _clone_or_copy_image(clone = true)
+          elsif strategy == STRATEGY_COPY
+            file = _clone_or_copy_image(clone = false)
+          end
+          return file
+        end
+
+        def check_storage()
+          strategy = @image[:backing]
+          file_to_check = ""
+          if [STRATEGY_SNAPSHOT, STRATEGY_DIRECT].include?(strategy)
+            file_to_check = @image[:path]
+          else
+            file_to_check = File.join(@cwd, @env[:machine].name.to_s)
+          end
+            @driver.exec("[ -f \"#{file_to_check}\" ] && echo #{file_to_check} || echo \"\"")
+        end
+
+        def delete_disk()
+          disk = File.join(@cwd, @env[:machine].name.to_s)
+          @driver.exec("rm -f #{disk}")
+        end
+        
+        def _clone_or_copy_image( clone = true)
+          @ui.info("Clone the file image")
+          file = File.join(@cwd, @env[:machine].name.to_s)
+          exists = check_storage()
+          if exists == ""
+            if clone 
+              @driver.exec("qemu-img create -f qcow2 -b #{@image[:path]} #{file}")
+            else
+              @driver.exec("cp #{@image[:path]} #{file}")
+            end
+          end
+          return file
+        end
+
+ 
+      end
+    end
+  end
+end
+
+  

data/lib/vagrant-g5k/disk/rbd.rb

@@ -0,0 +1,92 @@
+require 'log4r'
+
+module VagrantPlugins
+  module G5K
+    module Disk
+
+      class RBD
+      
+        include Vagrant::Util::Retryable
+
+        def initialize(env, cwd,  driver)
+          @logger = Log4r::Logger.new("vagrant::network::nat")
+          # command driver is unused
+          @cwd = cwd
+          @driver = driver
+          @env = env
+          @image = env[:machine].provider_config.image
+          @project_id = env[:machine].provider_config.project_id
+          @ui = env[:ui]
+        end
+
+      def generate_drive()
+        strategy = @image[:backing]
+        @logger.debug(@image)
+        if [STRATEGY_SNAPSHOT, STRATEGY_DIRECT].include?(strategy)
+          @logger.debug(@image)
+          file = File.join(@image[:pool], @image[:rbd])
+          @logger.debug(file)
+        elsif strategy == STRATEGY_COW
+          file = _clone_or_copy_image(clone = true)
+        elsif strategy == STRATEGY_COPY
+          file = _clone_or_copy_image(clone = false)
+        end
+        # encapsulate the file to a qemu ready disk description
+        file = "rbd:#{file}:id=#{@image[:id]}:conf=#{@image[:conf]}:rbd_cache=true,cache=writeback"
+        @logger.debug("Generated drive string : #{file}")
+        return file
+      end
+
+      def check_storage()
+        strategy = @image[:backing]
+        file_to_check = ""
+        if [STRATEGY_SNAPSHOT, STRATEGY_DIRECT].include?(strategy)
+          file_to_check = @image[:rbd]
+        else
+          file_to_check = File.join(@cwd, @env[:machine].name.to_s)
+        end
+        @driver.exec("(rbd --pool #{@image[:pool]} --id #{@image[:id]} --conf #{@image[:conf]} ls | grep \"^#{file_to_check}$\") || echo \"\"")
+      end
+
+      def delete_disk()   
+        disk = File.join(@image[:pool], @cwd, @env[:machine].name.to_s)
+        begin
+          retryable(:on => VagrantPlugins::G5K::Errors::CommandError, :tries => 10, :sleep => 5) do
+            @driver.exec("rbd rm  #{disk} --conf #{@image[:conf]} --id #{@image[:id]}" )
+            break
+          end
+        rescue VagrantPlugins::G5K::Errors::CommandError
+          @ui.error("Reach max attempt while trying to remove the rbd")
+          raise VagrantPlugins::G5K::Errors::CommandError
+        end
+      end
+
+
+
+      def _clone_or_copy_image(clone = true)
+        # destination in the same pool under the .vagrant ns
+        destination = File.join(@image[:pool], @cwd, @env[:machine].name.to_s)
+        # Even if nothing bad will happen when the destination already exist, we should test it before
+        exists = check_storage()
+        if exists == ""
+          # we create the destination
+          if clone
+            # parent = pool/rbd@snap
+            @ui.info("Cloning the rbd image")
+            parent = File.join(@image[:pool], "#{@image[:rbd]}@#{@image[:snapshot]}")
+            @driver.exec("rbd clone #{parent} #{destination} --conf #{@image[:conf]} --id #{@image[:id]}" )
+          else
+            @ui.info("Copying the rbd image (This may take some time)")
+            # parent = pool/rbd@snap
+            parent = File.join(@image[:pool], "#{@image[:rbd]}")
+            @driver.exec("rbd cp #{parent} #{destination} --conf #{@image[:conf]} --id #{@image[:id]}" )
+          end
+        end
+        return destination
+      end
+
+
+      end
+    end
+  end
+end