From b6c469169645f187838165f97ca4b6ce706957ec Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Thu, 18 Jun 2020 13:51:08 +0200 Subject: [PATCH] B OpenNebula/one#668: support POSIX timestamp (#20) (cherry picked from commit fa68f685a9d9a429e6721d55347e7f54502a4a2a) --- src/cli/one_helper/oneflow_helper.rb | 6 +++++- src/flow/lib/models/role.rb | 6 +++++- src/flow/lib/models/service_template.rb | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/cli/one_helper/oneflow_helper.rb b/src/cli/one_helper/oneflow_helper.rb index bc2f9066fb..9372890460 100644 --- a/src/cli/one_helper/oneflow_helper.rb +++ b/src/cli/one_helper/oneflow_helper.rb @@ -406,7 +406,11 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper column :TIME, '', :left, :size => 67 do |d| if d['start_time'] - Time.parse(d['start_time']).to_s + if !d['start_time'].match(/^\d+$/) + Time.parse(d['start_time']).to_s + else + d['start_time'] + end else d['recurrence'] end diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb index d945ed199b..12dd8cd04c 100644 --- a/src/flow/lib/models/role.rb +++ b/src/flow/lib/models/role.rb @@ -916,7 +916,11 @@ module OpenNebula if !(start_time.nil? || start_time.empty?) begin - start_time = Time.parse(start_time).to_i + if !start_time.match(/^\d+$/) + start_time = Time.parse(start_time).to_i + else + start_time = start_time.to_i + end rescue ArgumentError # TODO: error msg return 0 diff --git a/src/flow/lib/models/service_template.rb b/src/flow/lib/models/service_template.rb index e840d435a9..1b4814c5b8 100644 --- a/src/flow/lib/models/service_template.rb +++ b/src/flow/lib/models/service_template.rb @@ -468,6 +468,8 @@ module OpenNebula end begin + next if start_time.match(/^\d+$/) + Time.parse(start_time) rescue ArgumentError raise Validator::ParseException,