vagrant-g5k 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6e3b8b70409d84ba3e8085e618971fe21a4f96d
-  data.tar.gz: 085ca43afd7c20e6bb268c7e439bb3f148782cc6
+  metadata.gz: 14d213a2e487b13b315432d6743eeb5c07fe877e
+  data.tar.gz: f0fa3704d917e257c0062be78edd16715422c4c7
 SHA512:
-  metadata.gz: 1a0ffe62377539bf6f38bcfbf5bdc2bcc2edcc5766e1a68322090bb15f392104a2138e7b1b015318830ab17e9038a62454b5ea05a1e2688f1cbd4987cd1232bd
-  data.tar.gz: f00e2106f1cd0b8f4aa87f26b9ebe6843de8f69bac1d44fa1101cf8e151707252329f3741956b99e036e7599814de850536cae9641b6182e778bba7a4d1ad50d
+  metadata.gz: ac2fdb41d5a0099d3cd031db5cedd9266c15327faee01f99a70b65f1cadd326e542697fbea0981d2f272b39b551e99f08594d62aac5248a876dc1c013f7cd9d9
+  data.tar.gz: be378516080dc415441b04ac96536a498831f7291c9ad06fe51b88e25ab385783a6cbd2445609a5458c41126c1ddae36ea33d47bd2a9acb9d1b2c18617e0b522

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

@@ -18,7 +18,8 @@ module VagrantPlugins
              :logger => env[:ui],
              :username => env[:machine].provider_config.username,
              :image_location => env[:machine].provider_config.image_location, 
-             :site => env[:machine].provider_config.site
+             :site => env[:machine].provider_config.site,
+             :ports => env[:machine].provider_config.ports
           )
           @app.call(env)
         end

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

@@ -20,7 +20,8 @@ module VagrantPlugins
         def read_ssh_info(conn, machine)
           return nil if machine.id.nil?
 
-          return { :host          => conn.ip,
+          return { :host          => conn.node,
+                   :port          => 2222,
                    :proxy_command => "ssh #{conn.username}@access.grid5000.fr nc %h %p",
 }
         end

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

@@ -19,10 +19,6 @@ module VagrantPlugins
         def read_state(machine, conn)
           return :not_created if machine.id.nil?
           # is there a job running for this vm ?
-          subnet = conn.check_or_reserve_subnet()
-          if subnet.nil? 
-            return :missing_subnet
-          end
           job = conn.check_job(machine.id)
           if job.nil? # TODO or fraged
             return :not_created

data/lib/vagrant-g5k/config.rb

@@ -29,6 +29,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :image_strategy
 
+      # G5K ports mapping
+      # 
+      #
+      # @return [Array]
+      attr_accessor :ports
 
       def initialize()
         @username     = nil

data/lib/vagrant-g5k/util/g5k_utils.rb

@@ -5,7 +5,7 @@ require 'json'
 require 'vagrant/util/retryable'
 
 WORKING_DIR = ".vagrant-g5k"
-LAUNCHER_SCRIPT = "launch_vm.sh"
+LAUNCHER_SCRIPT = "launch_vm_fwd.sh"
 JOB_SUBNET_NAME = "vagrant-g5k-subnet"
 WALLTIME="01:00:00"
 
@@ -28,9 +28,7 @@ module VagrantPlugins
       
       attr_accessor :pool
 
-      attr_accessor :ip
-
-      attr_accessor :mac
+      attr_accessor :ports
 
       @@locations = [
         {
@@ -44,9 +42,10 @@ module VagrantPlugins
         args.each do |k,v|
           instance_variable_set("@#{k}", v) unless v.nil?
         end
+        @logger.info("connecting with #{@username} on site #{@site}")
+        gateway = Net::SSH::Gateway.new("access.grid5000.fr", @username, :forward_agent => true)
 
-        gateway = Net::SSH::Gateway.new("access.grid5000.fr", "msimonin", :forward_agent => true)
-        @session = gateway.ssh(@site, "msimonin")
+        @session = gateway.ssh(@site, @username)
       end
 
       def list_images()
@@ -86,52 +85,22 @@ module VagrantPlugins
         return r
       end
 
-      def check_or_reserve_subnet()
-        @logger.info("Checking if a subnet has been reserved")
-        oarstat = exec("oarstat --json")
-        oarstat = JSON.load(oarstat)
-        job = oarstat.select!{ |k,v| v["owner"] == @username && v["name"] == JOB_SUBNET_NAME }.values.first
-        if job.nil?
-          # we have to reserve a subnet
-          @logger.info("Reserving a subnet")
-          job_id = exec("oarsub -l \"slash_22=1, walltime=#{WALLTIME}\" --name #{JOB_SUBNET_NAME} \"sleep 3600\" | grep OAR_JOB_ID | cut -d '='  -f2").chomp
-          begin
-            retryable(:on => VagrantPlugins::G5K::Errors::JobNotRunning, :tries => 100, :sleep => 3) do
-              @logger.info("Waiting for the job to be running")
-              job = check_job(job_id)
-              if job.nil? or job["state"] != "Running"
-                raise VagrantPlugins::G5K::Errors::JobNotRunning 
-              end
-              break
-            end
-          rescue VagrantPlugins::G5K::Errors::JobNotRunning
-            @logger.error("Tired of waiting")
-            raise VagrantPlugins::G5K::Errors::JobNotRunning
-          end
-        end
-        # get the macs ips addresses pool
-        im = exec("g5k-subnets -j #{job["Job_Id"]} -im")
-        @pool = im.split("\n").map{|i| i.split("\t")}
-        @ip, @mac = @pool[0]
-        @logger.info("Get the mac #{mac} and the corresponding ip #{ip} from the subnet")
-      end
-
-
       def launch_vm(env)
         launcher_path = File.join(File.dirname(__FILE__), LAUNCHER_SCRIPT)
-        @logger.info("Launching the VM on Grid'5000")
+        @logger.info("Launching the VM on Grid'50001")
         # Checking the subnet job
-        subnet = check_or_reserve_subnet()
         @logger.info("Uploading launcher")
         # uploading the launcher
         launcher_remote_path = File.join("/home", @username , WORKING_DIR, LAUNCHER_SCRIPT)
         upload(launcher_path, launcher_remote_path)
-        # creating the params file
-        params_path = File.join("/home", @username, WORKING_DIR, 'params')
-        exec("echo #{@image_location} #{@mac} > #{params_path}")
+
+        # Generate partial arguments for the kvm command
+        drive = _generate_drive()
+        net = _generate_net()
+        args = [drive, net].join(" ")
         # Submitting a new job
         @logger.info("Starting a new job")
-        job_id = exec("oarsub -t allow_classic_ssh -l \"{virtual!=\'none\'}/nodes=1,walltime=#{WALLTIME}\" --name #{env[:machine].name} --checkpoint 60 --signal 12  --array-param-file #{params_path} #{launcher_remote_path} | grep OAR_JOB_ID | cut -d '='  -f2").chomp
+        job_id = exec("oarsub -t allow_classic_ssh -l \"{virtual!=\'none\'}/nodes=1,walltime=#{WALLTIME}\" --name #{env[:machine].name} --checkpoint 60 --signal 12  \"#{launcher_remote_path} #{args}\" | grep OAR_JOB_ID | cut -d '='  -f2").chomp
         
 
         begin
@@ -167,7 +136,19 @@ module VagrantPlugins
         @session.scp.upload!(src, dst)
       end
 
+      def _generate_drive()
+        return "-drive file=#{@image_location},if=virtio"
+      end
 
+      def _generate_net()
+        # default port to use for ssh
+        @ports << "2222-:22"
+        fwd_ports = @ports.map do |p|
+          "hostfwd=tcp::#{p}"
+        end.join(',')
+        net = "-net nic,model=virtio -net user,#{fwd_ports}"
+        return net
+      end
 
 
     end

data/lib/vagrant-g5k/util/launch_vm_fwd.sh

@@ -6,7 +6,6 @@
 # Directory for qcow2 snapshots
 export TMPDIR=/tmp
 #IMAGE=/grid5000/virt-images/alpine-docker.qcow2
-IMAGE=$1
 
 # GET Virtual IP information
 IP_ADDR=$(/usr/local/bin/g5k-subnets -im | head -1 | awk '{print $1}')
@@ -38,7 +37,7 @@ trap clean_shutdown 12
 # Launch virtual machine
 #kvm -m $VM_MEM -smp $SMP -drive file=/grid5000/images/KVM/alpine_docker.qcow2,if=virtio -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no -monitor unix:/tmp/alpine_docker_vm.mon,server,nowait -localtime -enable-kvm &
 #kvm -m $VM_MEM -smp $SMP -drive file=$IMAGE,if=virtio -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm &
-kvm -m $VM_MEM -smp $SMP -drive file=$IMAGE,if=virtio -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -net nic,model=virtio -net user,hostfwd=tcp::2222-:22  -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm &
+kvm -m $VM_MEM -smp $SMP -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm $@ &
 
 wait
 

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -129,7 +129,6 @@ files:
 - lib/vagrant-g5k.rb
 - lib/vagrant-g5k/.config.rb.swp
 - lib/vagrant-g5k/action.rb
-- lib/vagrant-g5k/action/.message_not_created.rb.swp
 - lib/vagrant-g5k/action/connect_g5k.rb
 - lib/vagrant-g5k/action/create_local_working_dir.rb
 - lib/vagrant-g5k/action/is_created.rb
@@ -144,8 +143,8 @@ files:
 - lib/vagrant-g5k/plugin.rb
 - lib/vagrant-g5k/provider.rb
 - lib/vagrant-g5k/util/.g5k_utils.rb.swp
+- lib/vagrant-g5k/util/.launch_vm_fwd.sh.swp
 - lib/vagrant-g5k/util/g5k_utils.rb
-- lib/vagrant-g5k/util/launch_vm.sh
 - lib/vagrant-g5k/util/launch_vm_fwd.sh
 - lib/vagrant-g5k/version.rb
 - locales/en.yml

data/lib/vagrant-g5k/util/launch_vm.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-#OAR -l slash_22=1+{virtual!='none'}/nodes=1,walltime=06:00:00
-#OAR --checkpoint 60
-#OAR --signal 12
-
-# Directory for qcow2 snapshots
-export TMPDIR=/tmp
-#IMAGE=/grid5000/virt-images/alpine-docker.qcow2
-IMAGE=$1
-MAC_ADDR=$2
-
-echo "VM IP informations :"
-echo "MAC address: $MAC_ADDR"
-
-# Create tap
-TAP=$(sudo create_tap)
-
-# Memory allocation
-KEEP_SYSTEM_MEM=1 # Gb
-TOTAL_MEM=$(cat /proc/meminfo | grep -e '^MemTotal:' | awk '{print $2}')
-VM_MEM=$(( ($TOTAL_MEM / 1024) - $KEEP_SYSTEM_MEM * 1024 ))
-
-# CPU
-SMP=$(nproc)
-
-# Clean shutdown of the VM at the end of the OAR job
-clean_shutdown() {
-  echo "Caught shutdown signal at $(date)"
-  echo "system_powerdown" | nc -U /tmp/vagrant-g5k.mon
-}
-
-trap clean_shutdown 12
-
-# Launch virtual machine
-kvm -m $VM_MEM -smp $SMP -drive file=$IMAGE,if=virtio -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm &
-
-wait
-