xp5k 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgzNjJkOTZkZDk5YzVkZGZkYjM2OTE3ZTU5ZjFkMzlmNjMxMDY5Yw==
+    ODk0OGNhZDYyNmE4OGIwNTdjYTlhYjYxNzZjN2Q1YmY3ZGZiNjFmMA==
   data.tar.gz: !binary |-
-    MmE0NThhMjQ1MzhiOGEwYjQzYTc1Njg1MGRiNjgzYWRhY2Y4MGU2ZA==
+    YzY0YTc1OTk0NTAzMzE4ZTU4ODI0M2VmMTc4ODZiMGU2NDJlMTFmMw==
 SHA512:
   metadata.gz: !binary |-
-    ZDNkN2RiOTczNDI1NjA2NDQ0NGY2Y2E2ZmEyYWNkM2U5MWUyYjI5YWZlOTlm
-    Y2M4NzUzNTJlNmU3OWY5MmQyZGIwZThiZDUzMjY5NmE4ZTU5NmM2NzYzNzU0
-    MzIwYWVjNTIyYzNjYTI3Y2FmMDBmYWNiYzA5ZTcwYTA1ZDIyNWU=
+    MjkwZjViNDRkODllMjIyNmMxMmFlMDJiZmU5YTgyNzU0ODgxZTI3NDY4YTJk
+    M2VhZWM4N2JlMGZhN2E5NzU0ZGNkZDk0Zjk2Zjg1MmIwNWVhMzQ0YWM3NWNm
+    MjBkZmY1ZTdlY2IzYzJlZTMwMTdiODk4Y2ExOTYwYjVhMTBiYjM=
   data.tar.gz: !binary |-
-    ZDAzOGY0NTliZDY0NzNlZDJiYTM4NjhhYTk2ZTllNGI2ZGU3YzJjYjc1Zjkx
-    YTliY2M5YjkzMmNlZTJjNDVmMTFjMDg3ZThlNWRkMmM4ODc1ZGRjMzkwNDFh
-    YWU0NDEyMWExYWM3MmVlNGNiNDk2ZDc2MjhhZWNmMDAwMmNmOGQ=
+    YTEzYjBiYWJjMGQ4YzA1ZjhhYTgyNTY2NjI0MjgwZmFhYzg2ODlmMjI5YmM2
+    NThmYjg5MjQ2NWY5MWEzZjgwYmZiYTI5OTJlM2QwYTY2ZDJiODkzZGFlMWI0
+    NzRlMzE0YzEyNjg3M2FiMzIxYzUxZDBkOGUyZDVkZjU5YjBjMjg=

data/lib/xp5k/version.rb

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

data/lib/xp5k/xp.rb

@@ -66,6 +66,10 @@ module XP5K
         # set retries
         x[:retry] ||= false
         x[:retries] ||= x[:retry]?@retries:1
+        # Manage vlan on primary interface
+        if vlan_from_job = x[:vlan_from_job]
+          x[:vlan] = self.job_with_name(vlan_from_job)['resources_by_type']['vlans'].first.to_i
+        end
       end
       internal_deploy(@retries)
       print_deploy_summary
@@ -160,6 +164,7 @@ module XP5K
       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'
+        log += " (until #{Time.at(job['started_at'].to_i + job['walltime'].to_i).to_datetime})" if job['state'] == 'running'
         logger.info log
       end
     end
@@ -275,6 +280,7 @@ module XP5K
         site = x[:site]
         x.delete(:site)
         x.delete(:roles)
+        x.delete(:vlan_from_job)
         x.delete(:jobs)
         x.delete(:assigned_nodes)
         x.delete(:goal)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restfully