xp5k 0.0.1 → 0.0.4

data/README.md

@@ -1,2 +1,82 @@
-Work in progress.
+## Capistrano sample
+
+    require 'xp5k'
+    
+    XP5K::Config.load
+    
+    @myxp = XP5K::XP.new(:logger => logger)
+    
+    @myxp.define_job({
+      :resources  => "nodes=2,walltime=1",
+      :site       => XP5K::Config[:site] || 'rennes',
+      :types      => ["deploy"],
+      :name       => "job1",
+      :command    => "sleep 86400"
+    })
+    
+    @myxp.define_job({
+      :resources  => "nodes=6,walltime=1",
+      :site       => XP5K::Config[:site] || 'rennes',
+      :types      => ["deploy"],
+      :name       => "job2",
+	  :roles 	  => [
+	  	XP5K::Role.new({ :name => 'server', :size => 1 }),
+		XP5K::Role.new({ :name => 'nodes', :size => 5 })
+	  ]
+      :command    => "sleep 86400"
+    })
+    
+    @myxp.define_deployment({
+      :site           => XP5K::Config[:site] || 'rennes',
+      :environment    => "squeeze-x64-nfs",
+      :jobs           => %w{ job1 },
+	  :roles          => %w{ server }
+      :key            => File.read(XP5K::Config[:public_key])
+    })
+    
+    role :job1 do
+      @myxp.job_with_name('job1')['assigned_nodes'].first
+    end
+    
+    role :job2 do
+      @myxp.job_with_name('job2')['assigned_nodes'].first
+    end
+	
+	role :nodes do
+	  @myxp.role_with_name('nodes').servers
+	end
+	  
+    desc 'Submit jobs'
+    task :submit do
+      @myxp.submit
+    end
+    
+    desc 'Deploy with Kadeplopy'
+    task :deploy do
+      @myxp.deploy
+    end
+    
+    desc 'Status'
+    task :status do
+      @myxp.status
+    end
+    
+    desc 'Remove all running jobs'
+    task :clean do
+      logger.debug "Clean all Grid'5000 running jobs..."
+      @myxp.clean
+    end
+    
+    desc 'Run date command'
+    task :date, :roles => [:job1, :job2] do
+      set :user, 'root'
+      run 'date'
+    end
+
+
+## _xp.conf_ sample file
+
+    site        'rennes'
+    public_key  '/Users/pmorillon/.ssh/id_rsa_g5k.pub'
+
 

data/lib/xp5k/config.rb

@@ -14,8 +14,8 @@ module XP5K
       if File.exist?(File.expand_path(File.join(Dir.pwd, 'xp.conf')))
         file_path = File.expand_path(File.join(Dir.pwd, 'xp.conf'))
         self.instance_eval(IO.read(file_path),file_path, 1)
+        @@config[:loaded] = true
       end
-      @@config[:loaded] = true
     end # def:: self.load
 
     def self.loaded?

data/lib/xp5k/exceptions.rb

@@ -0,0 +1,7 @@
+module XP5K
+  class Exceptions
+    class Role < RuntimeError; end
+    class Config < RuntimeError; end
+  end
+end
+

data/lib/xp5k/role.rb

@@ -0,0 +1,23 @@
+class XP5K::Role
+
+  attr_accessor :name, :size, :desc, :servers, :jobid
+
+  def initialize(options = {})
+    # Required parameters
+    @name = ""
+    @size = 0
+    %w{ name size }.each do |param|
+      if options[param.to_sym].nil?
+        raise XP5K::Exceptions::Role, "#{self.to_s}: #{param.to_sym} needed at initialization"
+      else
+        instance_variable_set("@#{param}", options[param.to_sym])
+      end
+    end
+
+    # Optional parameters
+    %w{ desc servers }.each do |param|
+      instance_variable_set("@#{param}", options[param.to_sym])
+    end
+  end
+
+end

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.1'
+  VERSION='0.0.4'
 end

data/lib/xp5k/xp.rb

@@ -8,22 +8,23 @@ module XP5K
 
     include Term::ANSIColor
 
-    attr_accessor :jobs, :jobs2submit, :deployments, :todeploy, :connection
+    attr_accessor :jobs, :jobs2submit, :deployments, :todeploy, :connection, :roles
     attr_reader :starttime
 
     def initialize(options = {})
-      @jobs = []
+      @jobs        = []
       @jobs2submit = []
       @deployments = []
-      @todeploy = []
-      @starttime = Time.now
-      @logger = options[:logger] || Logger.new(STDOUT)
+      @todeploy    = []
+      @roles       = []
+      @starttime   = Time.now
+      @logger      = options[:logger] || Logger.new(STDOUT)
       XP5K::Config.load unless XP5K::Config.loaded?
 
       @connection = Restfully::Session.new(
         :configuration_file => "~/.restfully/api.grid5000.fr.yml",
         :logger => begin
-          tmplogger = ::Logger.new(STDERR)
+          tmplogger       = ::Logger.new(STDERR)
           tmplogger.level = ::Logger::WARN
           tmplogger
         end
@@ -35,6 +36,8 @@ module XP5K
     end
 
     def define_deployment(deployment_hash)
+      deployment_hash[:jobs] ||= []
+      deployment_hash[:roles] ||= []
       self.todeploy << deployment_hash
     end
 
@@ -46,16 +49,19 @@ module XP5K
           job = self.job_with_name(jobname)
           x[:nodes] += job["assigned_nodes"]
         end
+        x[:roles].each do |rolename|
+          x[:nodes] += role_with_name(rolename).servers
+        end
         deployment = @connection.root.sites[x[:site].to_sym].deployments.submit(x)
         self.deployments << { :uid => deployment["uid"], :site => deployment["site_uid"] }
-        update_cache
+        #update_cache
         puts "Waiting for the deployment ##{deployment['uid']} to be terminated..."
         while deployment.reload['status'] == 'processing'
           print(".")
           sleep 10
         end
         print(" [#{green("OK")}]\n")
-        update_cache
+        #update_cache
       end
     end
 
@@ -68,9 +74,10 @@ module XP5K
         uid = datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first["uid"]
         unless uid.nil?
           job = @connection.root.sites[job_hash[:site].to_sym].jobs["#{uid}".to_sym]
-          unless (job.nil? or job["state"] != "running")
+          if (not job.nil? or job["state"] == "running")
             j = job.reload
             self.jobs << j
+            create_roles(j, job_hash) unless job_hash[:roles].nil?
           end
         end
       end
@@ -81,23 +88,45 @@ module XP5K
         job = self.job_with_name(job2submit[:name])
         if job.nil?
           job = @connection.root.sites[job2submit[:site].to_sym].jobs.submit(job2submit)
-          self.jobs << job
+          self.jobs << { :uid => job.properties['uid'], :name => job.properties['name'] }
           update_cache
           logger.info "Waiting for the job #{job["name"]} ##{job['uid']} to be running at #{job2submit[:site]}..."
           while job.reload["state"] != "running"
             print(".")
             sleep 3
           end
+          create_roles(job, job2submit) unless job2submit[:roles].nil?
           print(" [#{green("OK")}]\n")
-          update_cache
+        else
+          logger.info "Job #{job["name"]} already submitted ##{job["uid"]}"
         end
       end
     end
 
+    def create_roles(job, job_definition)
+      count_needed_nodes = 0
+      job_definition[:roles].each { |role| count_needed_nodes += role.size }
+      if job['assigned_nodes'].length < count_needed_nodes
+        self.clean
+        raise "Job ##{job['uid']} require more nodes for required roles"
+      end
+      available_nodes = job['assigned_nodes'].sort
+      job_definition[:roles].each do |role|
+        role.servers = available_nodes[0..(role.size - 1)]
+        available_nodes -= role.servers
+        role.jobid = job['uid']
+        self.roles << role
+      end
+    end
+
     def job_with_name(name)
       self.jobs.select { |x| x["name"] == name }.first
     end
 
+    def role_with_name(name)
+      self.roles.select { |x| x.name == name}.first
+    end
+
     def status
       # self.jobs2submit.each do |job2submit|
       #   job = self.job_with_name(job2submit[:name])
@@ -125,9 +154,7 @@ module XP5K
     end
 
     def update_cache
-      cache = { :jobs => self.jobs.collect { |x| x.properties },
-                :deployments => self.deployments
-      }
+      cache = { :jobs => self.jobs.map { |x| { :uid => x[:uid], :name => x[:name] } } }
       open(".xp_cache", "w") do |f|
         f.puts cache.to_json
       end

data/lib/xp5k.rb

@@ -1,5 +1,7 @@
+require 'xp5k/exceptions'
 require 'xp5k/config'
 require 'xp5k/xp'
+require 'xp5k/role'
 
 module XP5K
   Config.load

data/xp5k.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pascal Morillon']
   s.email       = ['pascal.morillon@irisa.fr']
+  s.license     = 'MIT'
   s.homepage    = 'https://github.com/pmorillon/xp5k'
   s.summary     = %q{A small Grid'5000 helper to submit jobs and deploy environments via REST API}
   s.description = %q{A small Grid'5000 helper to submit jobs and deploy environments via REST API}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restfully
@@ -90,11 +90,14 @@ files:
 - README.md
 - lib/xp5k.rb
 - lib/xp5k/config.rb
+- lib/xp5k/exceptions.rb
+- lib/xp5k/role.rb
 - lib/xp5k/version.rb
 - lib/xp5k/xp.rb
 - xp5k.gemspec
 homepage: https://github.com/pmorillon/xp5k
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: