opennebula-cli 4.0.1 → 4.1.80.beta

data/bin/oneimage

@@ -212,10 +212,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :imageid, [:file, nil] do
-        helper.perform_action(args[0],options,"modified") do |image|
-            str = OpenNebulaHelper.update_template(args[0], image, args[1])
-            image.update(str)
+    command :update, update_desc, :imageid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
         end
     end
 

data/bin/onetemplate

@@ -259,10 +259,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :templateid, [:file, nil] do
-        helper.perform_action(args[0],options,"modified") do |template|
-            str = OpenNebulaHelper.update_template(args[0], template, args[1])
-            template.update(str)
+    command :update, update_desc, :templateid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
         end
     end
 

data/bin/oneuser

@@ -192,10 +192,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :userid, [:file, nil] do
-        helper.perform_action(args[0],options,"modified") do |user|
-            str = OpenNebulaHelper.update_template(args[0], user, args[1])
-            user.update(str)
+    command :update, update_desc, :userid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
         end
     end
 

data/bin/onevm

@@ -208,11 +208,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         editor will be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :vmid, [:file, nil] do
-        helper.perform_action(args[0],options,"modified") do |vm|
-            str = OpenNebulaHelper.update_template(args[0], vm, args[1],
-                                                   'USER_TEMPLATE')
-            vm.update(str)
+    command :update, update_desc, :vmid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1], 'USER_TEMPLATE')
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1], 'USER_TEMPLATE')
+            end
+
+            obj.update(str, options[:append])
         end
     end
 

data/bin/onevnet

@@ -199,10 +199,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         be launched to modify the current content.
     EOT
 
-    command :update, update_desc, :vnetid, [:file, nil] do
-        helper.perform_action(args[0],options,"modified") do |vnet|
-            str = OpenNebulaHelper.update_template(args[0], vnet, args[1])
-            vnet.update(str)
+    command :update, update_desc, :vnetid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
         end
     end
 

data/lib/one_helper.rb

@@ -67,6 +67,13 @@ EOT
         :description => "Describe list columns"
     }
 
+    APPEND = {
+        :name => "append",
+        :short => "-a",
+        :large => "--append",
+        :description => "Append new attributes to the current template"
+    }
+
     # Command line VM template options
     TEMPLATE_NAME_VM={
         :name   => 'name',
@@ -655,21 +662,31 @@ EOT
     end
 
     def OpenNebulaHelper.update_template(id, resource, path=nil, xpath='TEMPLATE')
+        return update_template_helper(false, id, resource, path, xpath)
+    end
+
+    def OpenNebulaHelper.append_template(id, resource, path=nil, xpath='TEMPLATE')
+        return update_template_helper(true, id, resource, path, xpath)
+    end
+
+    def OpenNebulaHelper.update_template_helper(append, id, resource, path, xpath)
         unless path
             require 'tempfile'
 
             tmp  = Tempfile.new(id.to_s)
             path = tmp.path
 
-            rc = resource.info
+            if !append
+                rc = resource.info
 
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit -1
-            end
+                if OpenNebula.is_error?(rc)
+                    puts rc.message
+                    exit -1
+                end
 
-            tmp << resource.template_like_str(xpath)
-            tmp.flush
+                tmp << resource.template_like_str(xpath)
+                tmp.flush
+            end
 
             editor_path = ENV["EDITOR"] ? ENV["EDITOR"] : EDITOR_PATH
             system("#{editor_path} #{path}")
@@ -743,26 +760,8 @@ EOT
                 end
             end
 
-            if options[:net_context] && options[:nic]
-                nets=options[:nic].map {|n| parse_user_object(n).last }
-
-                if nets!=nets.uniq
-                    STDERR.puts "Network context generation from command "<<
-                        "line is not supported for VMs with\n"<<
-                        "more than one network with the same name."
-                    exit(-1)
-                end
-
-                nets.each_with_index do |name, index|
-                    lines<<"ETH#{index}_IP = \"$NIC[IP, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_NETWORK = \"$NETWORK[NETWORK_ADDRESS, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_MASK = \"$NETWORK[NETWORK_MASK, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_GATEWAY = \"$NETWORK[GATEWAY, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_DNS = \"$NETWORK[DNS, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_IPV6 = \"$NIC[IP6_GLOBAL, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_GATEWAY6 = \"$NETWORK[GATEWAY6, NETWORK=\\\"#{name}\\\"]\""
-                    lines<<"ETH#{index}_CONTEXT_FORCE_IPV4 = \"$NETWORK[CONTEXT_FORCE_IPV4, NETWORK=\\\"#{name}\\\"]\""
-                end
+            if options[:net_context]
+                    lines << "NETWORK = \"YES\""
             end
 
             lines+=options[:context] if options[:context]

data/lib/one_helper/onedatastore_helper.rb

@@ -44,11 +44,27 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
                 d["ID"]
             end
 
-            column :NAME, "Name of the Datastore", :left, :size=>25 do |d|
+            column :NAME, "Name of the Datastore", :left, :size=>13 do |d|
                 d["NAME"]
             end
 
-            column :CLUSTER, "Name of the Cluster", :left, :size=>15 do |d|
+            column :SIZE, "Datastore total size", :size =>10 do |d|
+                if d['TEMPLATE']['TYPE'] == 'SYSTEM_DS'
+                    "-"
+                else
+                    OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M')
+                end
+            end
+
+            column :AVAIL, "Datastore free size", :left, :size =>5 do |d|
+                if d['TOTAL_MB'].to_i == 0
+                    "-"
+                else
+                    "#{((d['FREE_MB'].to_f/d['TOTAL_MB'].to_f) * 100).round()}%"
+                end
+            end
+
+            column :CLUSTER, "Name of the Cluster", :left, :size=>12 do |d|
                 OpenNebulaHelper.cluster_str(d["CLUSTER"])
             end
 
@@ -73,7 +89,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
                 d["TM_MAD"]
             end
 
-            default :ID, :NAME, :CLUSTER, :IMAGES, :TYPE, :DS, :TM
+            default :ID, :NAME, :SIZE, :AVAIL, :CLUSTER, :IMAGES, :TYPE, :DS, :TM
         end
 
         table
@@ -99,6 +115,8 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         str="%-15s: %-20s"
         str_h1="%-80s"
 
+        system = datastore.type == 1
+
         CLIHelper.print_header(str_h1 % "DATASTORE #{datastore['ID']} INFORMATION")
         puts str % ["ID",       datastore.id.to_s]
         puts str % ["NAME",     datastore.name]
@@ -113,6 +131,12 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         puts str % ["DISK_TYPE",Image::DISK_TYPES[datastore['DISK_TYPE'].to_i]]
         puts
 
+        CLIHelper.print_header(str_h1 % "DATASTORE CAPACITY", false)
+        puts str % ["TOTAL:", system ? '-' : OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')]
+        puts str % ["USED: ", system ? '-' : OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')]
+        puts str % ["FREE:",  system ? '-' : OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')]
+        puts
+
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
 
         ["OWNER", "GROUP", "OTHER"].each { |e|

metadata

@@ -1,45 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: opennebula-cli
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
-  segments: 
-  - 4
-  - 0
-  - 1
-  version: 4.0.1
+version: !ruby/object:Gem::Version
+  version: 4.1.80.beta
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: opennebula
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 4
-        - 0
-        - 1
-        version: 4.0.1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.80.beta
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.80.beta
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
-executables: 
+executables:
 - oneacct
 - oneacl
 - onecluster
 - onedatastore
+- oneflow
+- oneflow-template
 - onegroup
 - onehost
 - oneimage
@@ -48,14 +44,14 @@ executables:
 - onevm
 - onevnet
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/oneacct
 - bin/oneacl
 - bin/onecluster
 - bin/onedatastore
+- bin/oneflow
+- bin/oneflow-template
 - bin/onegroup
 - bin/onehost
 - bin/oneimage
@@ -82,36 +78,27 @@ files:
 - LICENSE
 homepage: http://opennebula.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OpenNebula Command Line Interface
 test_files: []
-
+has_rdoc: