opennebula-cli 5.12.12 → 5.13.80.pre

data/lib/one_helper/oneflow_helper.rb

@@ -57,11 +57,18 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
                 d['NAME']
             end
 
+            column :STARTTIME, 'Start time of the Service', :size => 15 do |d|
+                d.extend(CLIHelper::HashWithSearch)
+                d = d.dsearch('TEMPLATE/BODY')
+
+                OpenNebulaHelper.time_to_str(d['start_time'])
+            end
+
             column :STAT, 'State', :size => 11, :left => true do |d|
                 Service.state_str(d['TEMPLATE']['BODY']['state'])
             end
 
-            default :ID, :USER, :GROUP, :NAME, :STAT
+            default :ID, :USER, :GROUP, :NAME, :STARTTIME, :STAT
         end
     end
 
@@ -74,6 +81,8 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
 
         if CloudClient.is_error?(response)
             [response.code.to_i, response.to_s]
+        elsif options[:yaml]
+            [0, JSON.parse(response.body).to_yaml(:indent => 4)]
         else
             array_list = JSON.parse(response.body)
             array_list = array_list['DOCUMENT_POOL']['DOCUMENT']
@@ -93,6 +102,8 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
                 else
                     [0, JSON.pretty_generate(array_list)]
                 end
+            elsif options[:yaml]
+                [0, array_list.to_yaml(:indent => 4)]
             else
                 format_service_pool.show(array_list)
 
@@ -139,6 +150,8 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
         else
             if options[:json]
                 [0, response.body]
+            elsif options[:yaml]
+                [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
                 str_h1   = '%-80s'
                 document = JSON.parse(response.body)['DOCUMENT']
@@ -260,9 +273,10 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
     #
     # @param document [Hash] Service document information
     def print_service_info(document)
-        str      = '%-20s: %-20s'
-        str_h1   = '%-80s'
-        template = document['TEMPLATE']['BODY']
+        str        = '%-20s: %-20s'
+        str_h1     = '%-80s'
+        template   = document['TEMPLATE']['BODY']
+        start_time = OpenNebulaHelper.time_to_str(template['start_time'])
 
         puts Kernel.format(str, 'ID', document['ID'])
         puts Kernel.format(str, 'NAME', document['NAME'])
@@ -273,6 +287,7 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
         puts Kernel.format(str,
                            'SERVICE STATE',
                            Service.state_str(template['state']))
+        puts Kernel.format(str, 'START TIME', start_time)
 
         if template['shutdown_action']
             puts Kernel.format(str, 'SHUTDOWN', template['shutdown_action'])

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -57,7 +57,16 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 d['NAME']
             end
 
-            default :ID, :USER, :GROUP, :NAME
+            column :REGTIME,
+                   'Registration time of the Service Template',
+                   :size => 15 do |d|
+                d.extend(CLIHelper::HashWithSearch)
+                d = d.dsearch('TEMPLATE/BODY')
+
+                OpenNebulaHelper.time_to_str(d['registration_time'])
+            end
+
+            default :ID, :USER, :GROUP, :NAME, :REGTIME
         end
     end
 
@@ -73,6 +82,8 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         else
             if options[:json]
                 [0, response.body]
+            elsif options[:yaml]
+                [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
                 documents = JSON.parse(response.body)['DOCUMENT_POOL']
                 format_service_template_pool.show(documents['DOCUMENT'])
@@ -120,12 +131,17 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         else
             if options[:json]
                 [0, response.body]
+            elsif options[:yaml]
+                [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
                 str    = '%-20s: %-20s'
                 str_h1 = '%-80s'
 
                 document = JSON.parse(response.body)['DOCUMENT']
                 template = document['TEMPLATE']['BODY']
+                reg_time = OpenNebulaHelper.time_to_str(
+                    template['registration_time']
+                )
 
                 CLIHelper.print_header(
                     str_h1 % "SERVICE TEMPLATE #{document['ID']} INFORMATION"
@@ -135,6 +151,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 puts Kernel.format str, 'NAME', document['NAME']
                 puts Kernel.format str, 'USER', document['UNAME']
                 puts Kernel.format str, 'GROUP', document['GNAME']
+                puts Kernel.format str, 'REGISTRATION TIME', reg_time
 
                 puts
 
@@ -309,4 +326,13 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
         answers
     end
 
+    def factory(id = nil)
+        if id
+            OpenNebula::ServiceTemplate.new_with_id(id, @client)
+        else
+            xml = OpenNebula::ServiceTemplate.build_xml
+            OpenNebula::ServiceTemplate.new(xml, @client)
+        end
+    end
+
 end

data/lib/one_helper/onehost_helper.rb

@@ -222,10 +222,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            column :PROVIDER, 'Host provider', :left, :size => 6 do |d|
-                d['TEMPLATE']['PM_MAD'].nil? ? '-' : d['TEMPLATE']['PM_MAD']
-            end
-
             column :STAT, 'Host status', :left, :size => 6 do |d|
                 OneHostHelper.state_to_str(d['STATE'])
             end

data/lib/one_helper/oneimage_helper.rb

@@ -22,7 +22,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
     # This list contains prefixes that should skip adding user home to the path
     # This must have the same content as the case $FROM in downloader.sh
-    PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker]
+    PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker dockerfile]
 
     TEMPLATE_OPTIONS=[
         {
@@ -98,9 +98,9 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             end
         },
         {
-            :name => 'driver',
-            :large => '--driver driver',
-            :description => 'Driver to use image (raw, qcow2, tap:aio:...)',
+            :name => 'format',
+            :large => '--format format',
+            :description => 'Format of the image (raw, qcow2, ...)',
             :format => String
         },
         {
@@ -295,7 +295,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         str_h1='%-80s'
 
         path = image['PATH']
-        fstype = image['FSTYPE']
+        iformat = image['FORMAT']
 
         size = OpenNebulaHelper.unit_to_str(image['SIZE'].to_i, {}, 'M')
         lock = OpenNebulaHelper.level_lock_to_str(image['LOCK/LOCKED'])
@@ -314,7 +314,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         puts format(str, 'PERSISTENT', pers)
         puts format(str, 'SOURCE', image['SOURCE'])
         puts format(str, 'PATH', path) if path && !path.empty?
-        puts format(str, 'FSTYPE', fstype) if fstype && !fstype.empty?
+        puts format(str, 'FORMAT', iformat) if iformat && !iformat.empty?
         puts format(str, 'SIZE', size)
         puts format(str, 'STATE', image.short_state_str)
         puts format(str, 'RUNNING_VMS', image['RUNNING_VMS'])