opennebula-cli 4.10.0 → 4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05fa308b8f2c58298b60be958f695dccc82e6c36
-  data.tar.gz: 395c2eb2342e174591e5ebeac94fd4e858c261f9
+  metadata.gz: 4dccabe5f373b31c2629fe27f64edef81d2169a5
+  data.tar.gz: 8b52bea0dacb43cae5fd9c93a914f6405e9f9af5
 SHA512:
-  metadata.gz: b953cd8e8fd60c8ede738615546e3837e492573c0c6a954e5e409b84549ad5fc62afe7fb89c540e5e601d263aa4efdddad2129f8b28935513f7c9af13e1d4be6
-  data.tar.gz: b4424db533f4082e05d52beefdb45a79a423590234a66905edcf9b8c5b42550abf7731a89deb1e131cee6f8460263b112560533bb4510a35a736ccc55a87dafa
+  metadata.gz: 9a203047edd0f7453663ee8dbcc3eb79a56eb7ef51ab2728696855bb42da08491ecf1aacdf6ef3aac6ee36a8e5ebc0aef3520f95653fbf655ce88b171191ef68
+  data.tar.gz: 1cb04d2679abf318b21c60ee253b3bc5006a80a8a5a7c2d966b91c59569f8a98fecb42b506861be686c2b86d44d4d54d0d04687a1d803f6531d4e38e3ae1e1aa

data/lib/one_helper.rb

@@ -370,7 +370,16 @@ EOT
                     endpoint=options[:endpoint]
                 end
 
-                @@client=OpenNebula::Client.new(secret, endpoint, :sync => true)
+                # This breaks the CLI SSL support for Ruby 1.8.7, but is necessary
+                # in order to do template updates, otherwise you get the broken pipe
+                # error (bug #3341)
+                if RUBY_VERSION < '1.9'
+                    sync = false
+                else
+                    sync = true
+                end
+
+                @@client=OpenNebula::Client.new(secret, endpoint, :sync => sync)
             end
         end
 
@@ -411,8 +420,8 @@ EOT
             def self.get_password
                 print "Password: "
                 system("stty", "-echo")
-                @@password=gets.chop
                 begin
+                    @@password = STDIN.gets.chop
                     return @@password
                 ensure
                     system("stty", "echo")

data/lib/one_helper/oneacct_helper.rb

@@ -52,7 +52,6 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :description => "Group name or id to filter the results",
         :format => String,
         :proc => lambda { |o, options|
-            puts o
             OpenNebulaHelper.rname_to_id(o, "GROUP")
         }
     }

data/lib/one_helper/onehost_helper.rb

@@ -16,6 +16,7 @@
 
 require 'one_helper'
 require 'one_helper/onevm_helper'
+require 'rubygems'
 
 class OneHostHelper < OpenNebulaHelper::OneHelper
     TEMPLATE_XPATH  = '//HOST/TEMPLATE'
@@ -178,6 +179,12 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             exit(-1)
         end
 
+        begin
+            current_version = Gem::Version.new(current_version)
+        rescue
+            STDERR.puts "VERSION file is malformed, use semantic versioning."
+        end
+
         cluster_id = options[:cluster]
 
         # Get remote_dir (implies oneadmin group)
@@ -218,8 +225,17 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
             host_version=host['TEMPLATE/VERSION']
 
+            begin
+                host_version = Gem::Version.new(host_version)
+            rescue
+            end
+
             if !options[:force]
-                next if host_version && host_version >= current_version
+                begin
+                    next if host_version && host_version >= current_version
+                rescue
+                    STDERR.puts "Error comparing versions for host #{host['NAME']}."
+                end
             end
 
             puts "* Adding #{host['NAME']} to upgrade"

data/lib/one_helper/oneuser_helper.rb

@@ -162,10 +162,20 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         # Authenticate with oned using the token/passwd and set/generate the
         # authentication token for the user
         #-----------------------------------------------------------------------
+
+        # This breaks the CLI SSL support for Ruby 1.8.7, but is necessary
+        # in order to do template updates, otherwise you get the broken pipe
+        # error (bug #3341)
+        if RUBY_VERSION < '1.9'
+            sync = false
+        else
+            sync = true
+        end
+
         token        = auth.login_token(username, options[:time])
         login_client = OpenNebula::Client.new("#{username}:#{token}",
                                               nil,
-                                              :sync => true)
+                                              :sync => sync)
 
         user = OpenNebula::User.new(User.build_xml, login_client)
 

data/lib/one_helper/onevm_helper.rb

@@ -419,13 +419,13 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
                 case hybridvisor
                     when "vcenter"
-                        nic.IP = vm_tmplt['GUEST_IP'] if vm_tmplt['GUEST_IP']
+                        nic["IP"] = vm_tmplt['GUEST_IP'] if vm_tmplt['GUEST_IP']
                     when "ec2"
-                        nic.IP = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS']
+                        nic["IP"] = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS']
                     when "azure"
-                        nic.IP = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS']
+                        nic["IP"] = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS']
                     when "softlayer"
-                        nic.IP = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS']
+                        nic["IP"] = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS']
                     else
                         isHybrid = false
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.10.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,32 +16,32 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.10.1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
+- oneacct
 - oneacl
-- onehost
-- oneflow-template
-- onevnet
-- oneimage
-- onevcenter
+- onecluster
 - onedatastore
-- onevm
+- oneflow
+- oneflow-template
 - onegroup
-- onecluster
+- onehost
+- oneimage
 - onetemplate
-- oneflow
 - oneuser
+- onevcenter
+- onevm
+- onevnet
 - onezone
-- oneacct
 extensions: []
 extra_rdoc_files: []
 files: