opennebula-cli 6.1.80.pre → 6.1.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2306988d8afeaa179ef65f89fbb07a27746a370b
-  data.tar.gz: 443a4f8d1aa6fcbfb886c14c2fe3228e3d67bff8
+  metadata.gz: a63f6a8df097aa2f01d3d2055ab3ac6ac9d7c760
+  data.tar.gz: d80893cb835b7cc47929fbf7df1b4ff57b383e80
 SHA512:
-  metadata.gz: c1df610ba16fd464d6429e9ebf26fcecb1872319ff6795cca452917c6258df631b688f59fb8cd416143da7cf40e16c4bdbd73db052f4c2faa9b4da4b011fb920
-  data.tar.gz: 8bfc858b932ec71fdc86e6bef789957d55401190bc780f90c1630b6808651cbdd2a02dc970bf79f2bf17d406422268804ff1954be9ae46a0087bb88d28fc518d
+  metadata.gz: fa4b67191d1c4eac4018a357bd79789fae7ae70acfbdecd892b62b19f353e83f1f1854a1a8e56a1e1a6b84d65b84b806a6419a49cfb15ff6572bcb8e4619d47a
+  data.tar.gz: 45aa93131d687f5473d18514828630eafa933668877e4563aa560e7a3fda6d74ee18cd6b93270a02bf390c8d1fd5b342d388491983829dbfe291b73ffdfadb0c

data/bin/oneflow

@@ -82,6 +82,12 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Force flow necover delete'
     }
 
+    APPEND = {
+        :name  => 'append',
+        :large => '--append',
+        :description => 'Append template to the current one'
+    }
+
     FORMAT = [OpenNebulaHelper::JSON, OpenNebulaHelper::YAML]
 
     # create helper object
@@ -364,7 +370,11 @@ CommandParser::CmdParser.new(ARGV) do
         be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :service_id, [:file, nil] do
+    command :update,
+            update_desc,
+            :service_id,
+            [:file, nil],
+            :options => APPEND do
         service_id = args[0]
         client     = helper.client(options)
 
@@ -382,8 +392,10 @@ CommandParser::CmdParser.new(ARGV) do
                 tmp  = Tempfile.new(service_id.to_s)
                 path = tmp.path
 
-                tmp.write(JSON.pretty_generate(template))
-                tmp.flush
+                unless options[:append]
+                    tmp.write(JSON.pretty_generate(template))
+                    tmp.flush
+                end
 
                 if ENV['EDITOR']
                     editor_path = ENV['EDITOR']
@@ -402,7 +414,17 @@ CommandParser::CmdParser.new(ARGV) do
             end
         end
 
-        response = client.put("#{RESOURCE_PATH}/#{service_id}", File.read(path))
+        if options[:append]
+            req             = {}
+            req['append']   = true
+            req['template'] = File.read(path)
+
+            response = client.put("#{RESOURCE_PATH}/#{service_id}",
+                                  req.to_json)
+        else
+            response = client.put("#{RESOURCE_PATH}/#{service_id}",
+                                  File.read(path))
+        end
 
         if CloudClient.is_error?(response)
             [response.code.to_i, response.to_s]

data/lib/one_helper/oneacct_helper.rb

@@ -216,11 +216,15 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             d["HOURS"]
         end
 
+        column :RUNNING_HOURS, "Running hours", :size=>7 do |d|
+            d["RHOURS"] || '-'
+        end
+
         column :COST, "Cost", :size=>15 do |d|
             d["TOTAL_COST"]
         end
 
-        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :COST
+        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :RUNNING_HOURS, :COST
     end
 
     def self.print_start_end_time_header(start_time, end_time)

data/lib/one_helper.rb

@@ -616,10 +616,9 @@ EOT
             page     = ""
 
             if options[:xml]
-                pool.each {|e|
-                    elements += 1
-                    page << e.to_xml(true) << "\n"
-                }
+                elements += 1
+
+                page << pool.to_xml(true)
             else
                 pname = pool.pool_name
                 ename = pool.element_name

data/share/schemas/xsd/showback.xsd

@@ -20,6 +20,7 @@
               <xs:element name="DISK_COST" type="xs:float"/>
               <xs:element name="TOTAL_COST" type="xs:float"/>
               <xs:element name="HOURS" type="xs:float"/>
+              <xs:element name="RHOURS" type="xs:float" minOccurs="0" maxOccurs="1"/>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.1.80.pre
+  version: 6.1.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.80.pre
+        version: 6.1.90.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.80.pre
+        version: 6.1.90.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement