xp5k 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 66269fa663c38a7f293bcea2205b809e677c1332
-  data.tar.gz: 80597c35a94b407e3a9944e3935c46931629e9c9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjgzNjJkOTZkZDk5YzVkZGZkYjM2OTE3ZTU5ZjFkMzlmNjMxMDY5Yw==
+  data.tar.gz: !binary |-
+    MmE0NThhMjQ1MzhiOGEwYjQzYTc1Njg1MGRiNjgzYWRhY2Y4MGU2ZA==
 SHA512:
-  metadata.gz: e28427dd47bdbdd3020dcd2718926ef42fc6ef02314b6123dfd7bf0f97cb2fc7f688c878e39d25fc68f6e6d3e3200aeab9013d1c3d3c0fb2419c1470fafefba3
-  data.tar.gz: 91024c08522a417cc600ae5aab4d00873bedf50162b18dcdb298814fb512485dc946314cff799f0a2e1ce25c898cd77a467bcdeef10cfebdd5627d8e2bcf15b1
+  metadata.gz: !binary |-
+    ZDNkN2RiOTczNDI1NjA2NDQ0NGY2Y2E2ZmEyYWNkM2U5MWUyYjI5YWZlOTlm
+    Y2M4NzUzNTJlNmU3OWY5MmQyZGIwZThiZDUzMjY5NmE4ZTU5NmM2NzYzNzU0
+    MzIwYWVjNTIyYzNjYTI3Y2FmMDBmYWNiYzA5ZTcwYTA1ZDIyNWU=
+  data.tar.gz: !binary |-
+    ZDAzOGY0NTliZDY0NzNlZDJiYTM4NjhhYTk2ZTllNGI2ZGU3YzJjYjc1Zjkx
+    YTliY2M5YjkzMmNlZTJjNDVmMTFjMDg3ZThlNWRkMmM4ODc1ZGRjMzkwNDFh
+    YWU0NDEyMWExYWM3MmVlNGNiNDk2ZDc2MjhhZWNmMDAwMmNmOGQ=

data/README.md

@@ -30,6 +30,7 @@ https://github.com/capistrano/capistrano/wiki
 ## Sample
 
 Here is an example of a ```Capfile``` :
+
 ```ruby
 require 'xp5k'
 require 'capistrano'
@@ -114,7 +115,6 @@ For instance you can launch : ```cap submit deploy date```
 ### Xp5k Roles
 
 You can define specific roles in you job submission.
-This all
 
 ```ruby
 @myxp.define_job({
@@ -157,6 +157,46 @@ role :server do
   @myxp.role_with_name('clients').servers
 end
 ```
+
+#### Nested roles
+
+You can also define nested roles (only 1 level) :
+
+```ruby
+@myxp.define_job({
+  :resources  => "nodes=4,walltime=1",
+  :site       => XP5K::Config[:site] || 'rennes',
+  :types      => ["deploy"],
+  :name       => "ceph_cluster",
+  :roles      => [
+    XP5K::Role.new({ :name => 'ceph_nodes', :size => 4 }),
+    XP5K::Role.new({ :name => 'ceph_monitor', :size => 1, :inner => 'ceph_nodes' }),
+  ],
+  :command    => "sleep 86400"
+})
+
+```
+
+#### Pattern
+
+You can select nodes matching a pattern (`String` or `Regexp`) :
+
+```Ruby
+roles = []
+scenario['clusters'].each do |cluster|
+  roles << XP5K::Role.new({
+    :name    => "ceph_nodes_#{cluster['name']}",
+    :size    => cluster['ceph_nodes_count'],
+    :pattern => cluster['name']
+  })
+  roles << XP5K::Role.new({
+    :name => "ceph_monitor_#{cluster['name']}",
+    :size => 1,
+    :inner => "ceph_nodes_#{cluster['name']}"
+  })
+end
+```
+
 ### Get the deployed nodes
 
 Some time nodes fail to be deployed. You can get the exact set

data/lib/xp5k/role.rb

@@ -1,6 +1,6 @@
 class XP5K::Role
 
-  attr_accessor :name, :size, :desc, :servers, :jobid, :inner
+  attr_accessor :name, :size, :desc, :servers, :jobid, :inner, :pattern
 
   @@roles = []
 
@@ -20,7 +20,7 @@ class XP5K::Role
     end
 
     # Optional parameters
-    %w{ desc servers inner }.each do |param|
+    %w{ desc servers inner pattern }.each do |param|
       instance_variable_set("@#{param}", options[param.to_sym]) if options[param.to_sym]
     end
   end
@@ -47,6 +47,13 @@ class XP5K::Role
       a <=> b
     end
 
+    # Sort roles to manage roles with pattern first
+    defined_roles = defined_roles.sort do |x,y|
+      a = x.pattern ? 0 : 1
+      b = y.pattern ? 0 : 1
+      a <=> b
+    end
+
     # Attributes nodes to roles
     defined_roles.each do |role|
       next if self.exists?(role.name)
@@ -55,7 +62,12 @@ class XP5K::Role
         role.servers = available_nodes[role.inner][0..(role.size - 1)]
         available_nodes[role.inner] -= role.servers
       else
-        role.servers = available_nodes['job'][0..(role.size - 1)]
+        if not role.pattern
+          role.servers = available_nodes['job'][0..(role.size - 1)]
+        else
+          filtered_nodes = available_nodes['job'].select { |x| x.match role.pattern }
+          role.servers = filtered_nodes[0..(role.size - 1)]
+        end
         available_nodes['job'] -= role.servers
       end
       role.jobid = job['uid']

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.7'
+  VERSION='0.0.8'
 end

data/lib/xp5k/xp.rb

@@ -98,10 +98,10 @@ module XP5K
         if job.nil?
           job = @connection.root.sites[job2submit[:site].to_sym].jobs.submit(job2submit)
           update_cache
-          logger.info "Job \"#{job['name']}\" submitted with id ##{job['uid']} at #{job2submit[:site]}"
+          logger.info "Job \"#{job['name']}\" submitted with id #{job['uid']}@#{job2submit[:site]}"
           self.jobs << job
         else
-          logger.info "Job \"#{job["name"]}\" already submitted ##{job["uid"]}"
+          logger.info "Job \"#{job["name"]}\" already submitted #{job["uid"]}@#{job2submit[:site]}"
         end
       end
       update_cache()
@@ -121,11 +121,11 @@ module XP5K
           case jobs_status[id]
           when "running"
             self.roles += Role.create_roles(job, jobs2submit[id]) unless jobs2submit[id][:roles].nil?
-            logger.info "Job #{job['uid']} is running"
+            logger.info "Job #{job['uid']}@#{jobs2submit[id][:site]} is running"
           when /terminated|error/
-            logger.info "Job #{job['uid']} is terminated"
+            logger.info "Job #{job['uid']}@#{jobs2submit[id][:site]} is terminated"
           else
-            logger.info "Job #{job['uid']} will be scheduled at #{Time.at(job['scheduled_at'].to_i).to_datetime}"
+            logger.info "Job #{job['uid']}@#{jobs2submit[id][:site]} will be scheduled at #{Time.at(job['scheduled_at'].to_i).to_datetime}"
           end
         end
         ready = true if jobs_status.uniq == ["running"]
@@ -157,8 +157,10 @@ module XP5K
     end
 
     def status
-      self.jobs.each do |job|
-        logger.info "Job \"#{job["name"]}\" ##{job["uid"]} status : #{job["state"]}"
+      self.jobs.each.with_index do |job, id|
+        log = "Job \"#{job["name"]}\" #{job["uid"]}@#{jobs2submit[id][:site]} status : #{job["state"]}"
+        log += " (#{Time.at(job['scheduled_at'].to_i).to_datetime})" if job['state'] == 'waiting'
+        logger.info log
       end
     end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restfully
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: A small Grid'5000 helper to submit jobs and deploy environments via REST
@@ -96,17 +96,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A small Grid'5000 helper to submit jobs and deploy environments via REST