opennebula-cli 4.9.80.beta → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751cd526db8f21c281fd935cef7f1be0b5aec0ce
-  data.tar.gz: ec2aa2b08bb3f73ad0ee15262a4ac3e51d9727d8
+  metadata.gz: 05fa308b8f2c58298b60be958f695dccc82e6c36
+  data.tar.gz: 395c2eb2342e174591e5ebeac94fd4e858c261f9
 SHA512:
-  metadata.gz: acb5b7a32bb0a16c1acc42844a4e14c57a54ef518caa0d6d1e25c55cd70dfffa5dd14d8cc0b45aeb685ff85a168527a70bb2cbdc0efe6aee48d19e3183ae4d91
-  data.tar.gz: 0ceb58e0181f649b89f6c858a1da819e214699b94b9cccbc201ee834196525d59409baccb4f612cc9aaf4c7162be31f8901c439ccf8068d3d1fa84bf70c5d861
+  metadata.gz: b953cd8e8fd60c8ede738615546e3837e492573c0c6a954e5e409b84549ad5fc62afe7fb89c540e5e601d263aa4efdddad2129f8b28935513f7c9af13e1d4be6
+  data.tar.gz: b4424db533f4082e05d52beefdb45a79a423590234a66905edcf9b8c5b42550abf7731a89deb1e131cee6f8460263b112560533bb4510a35a736ccc55a87dafa

data/bin/onetemplate

@@ -196,7 +196,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 on_hold = options[:hold] != nil
 
                 extra_template = ""
-                t.info
+                rc = t.info
+
+                if OpenNebula.is_error?(rc)
+                    STDERR.puts rc.message
+                    exit(-1)
+                end
 
                 if args[1]
                     extra_template = File.read(args[1])

data/bin/onevnet

@@ -112,43 +112,49 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds an address range to the Virtual Network
     EOT
 
-    command :addar, addar_desc, :vnetid,
+    command :addar, addar_desc, :vnetid, [:file, nil],
             :options => STD_OPTIONS + OneVNetHelper::ADDAR_OPTIONS do
         helper.perform_action(args[0],options,"lease added") do |vn|
-            ar = "AR = [ "
-
-            if options[:ip]
-                if options[:ip6_global] || options[:ip6_ula]
-                    ar << "TYPE=\"IP4_6\""
+            if args[1]
+                ar = File.read(args[1])
+            else
+                ar = "AR = [ "
+
+                if options[:ip]
+                    if options[:ip6_global] || options[:ip6_ula]
+                        ar << "TYPE=\"IP4_6\""
+                    else
+                        ar << "TYPE=\"IP4\""
+                    end
                 else
-                    ar << "TYPE=\"IP4\""
+                    if options[:ip6_global] || options[:ip6_ula]
+                        ar << "TYPE=\"IP6\""
+                    else
+                        ar << "TYPE=\"ETHER\""
+                    end
                 end
-            else
-                if options[:ip6_global] || options[:ip6_ula]
-                    ar << "TYPE=\"IP6\""
+
+                if options[:size]
+                    ar << ", SIZE = " << options[:size]
                 else
-                    ar << "TYPE=\"ETHER\""
+                    STDERR.puts "Address range needs to specify size (-s size)"
+                    exit -1
                 end
-            end
 
-            if options[:size]
-                ar << ", SIZE = " << options[:size]
-            else
-                STDERR.puts "Address range needs to specify size (-s size)"
-                exit -1
+                ar << ", IP = " << options[:ip] if options[:ip]
+                ar << ", MAC = " << options[:mac] if options[:mac]
+                ar << ", GLOBAL_PREFIX = " <<
+                      options[:ip6_global] if options[:ip6_global]
+                ar << ", ULA_PREFIX = " <<
+                      options[:ip6_ula] if options[:ip6_ula]
+                ar << ", GATEWAY = " << options[:gateway] if options[:gateway]
+                ar << ", MASK = " << options[:netmask] if options[:netmask]
+                ar << ", VLAN = YES" if options[:vlan]
+                ar << ", VLAN_ID = " << options[:vlanid] if options[:vlanid]
+
+                ar << "]"
             end
 
-            ar << ", IP = " << options[:ip] if options[:ip]
-            ar << ", MAC = " << options[:mac] if options[:mac]
-            ar << ", GLOBAL_PREFIX = " << options[:ip6_global] if options[:ip6_global]
-            ar << ", ULA_PREFIX = " << options[:ip6_ula] if options[:ip6_ula]
-            ar << ", GATEWAY = " << options[:gateway] if options[:gateway]
-            ar << ", MASK = " << options[:netmask] if options[:netmask]
-            ar << ", VLAN = YES" if options[:vlan]
-            ar << ", VLAN_ID = " << options[:vlanid] if options[:vlanid]
-
-            ar << "]"
-
             vn.add_ar(ar)
         end
     end
@@ -299,7 +305,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vnetid,
-            :options=>OpenNebulaHelper::XML do
+            :options=>[OpenNebulaHelper::XML, OneVNetHelper::SHOW_AR] do
         helper.show_resource(args[0],options)
     end
 

data/lib/command_parser.rb

@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'optparse'
-require 'optparse/time'
 require 'pp'
 
 class String
@@ -29,17 +28,6 @@ class String
     end
 end
 
-if RUBY_VERSION > '1.8.7'
-    OptionParser.accept(Time) do |s,|
-        begin
-            (Time.strptime(s, "%m/%d/%Y %H:%M:%S")) if s
-        rescue
-            raise OptionParser::InvalidArgument, s
-        end
-    end
-end
-
-
 module CommandParser
     OPTIONS = [
         VERBOSE={

data/lib/one_helper.rb

@@ -370,7 +370,7 @@ EOT
                     endpoint=options[:endpoint]
                 end
 
-                @@client=OpenNebula::Client.new(secret, endpoint)
+                @@client=OpenNebula::Client.new(secret, endpoint, :sync => true)
             end
         end
 

data/lib/one_helper/oneacct_helper.rb

@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
     START_TIME = {

data/lib/one_helper/oneuser_helper.rb

@@ -163,7 +163,9 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         # authentication token for the user
         #-----------------------------------------------------------------------
         token        = auth.login_token(username, options[:time])
-        login_client = OpenNebula::Client.new("#{username}:#{token}")
+        login_client = OpenNebula::Client.new("#{username}:#{token}",
+                                              nil,
+                                              :sync => true)
 
         user = OpenNebula::User.new(User.build_xml, login_client)
 

data/lib/one_helper/onevm_helper.rb

@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'optparse/time'
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={

data/lib/one_helper/onevnet_helper.rb

@@ -26,6 +26,12 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         :description => "ID of the address range"
     }
 
+    SHOW_AR = {
+        :name => "show_ar",
+        :large => "--show-ar",
+        :description => "Show also AR templates"
+    }
+
     MAC = {
         :name => "mac",
         :short => "-m mac",
@@ -163,6 +169,19 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         table
     end
 
+    def show_ar(vn, ar_id)
+        CLIHelper.print_header("%-80s" % ["TEMPLATE FOR AR #{ar_id}"], false)
+
+        begin
+            template = vn.template_like_str("AR_POOL/AR[AR_ID=#{ar_id}]")
+        rescue
+            STDERR.puts "Can not get template for AR #{ar_id}"
+            return
+        end
+
+        puts template
+    end
+
     private
 
     def factory(id=nil)
@@ -179,6 +198,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
     end
 
     def format_resource(vn, options = {})
+        vn_hash = vn.to_hash
+
         str_h1="%-80s"
         CLIHelper.print_header(str_h1 %
             ["VIRTUAL NETWORK #{vn.id.to_s} INFORMATION"])
@@ -217,8 +238,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % ["ADDRESS RANGE POOL"], false)
 
-        if !vn.to_hash['VNET']['AR_POOL']['AR'].nil?
-            arlist = [vn.to_hash['VNET']['AR_POOL']['AR']].flatten
+        if !vn_hash['VNET']['AR_POOL']['AR'].nil?
+            arlist = [vn_hash['VNET']['AR_POOL']['AR']].flatten
         end
 
         CLIHelper::ShowTable.new(nil, self) do
@@ -255,12 +276,16 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         puts
         CLIHelper.print_header(str_h1 % ["LEASES"], false)
 
-        if !vn.to_hash['VNET']['AR_POOL']['AR'].nil?
-            lease_list = [vn.to_hash['VNET']['AR_POOL']['AR']].flatten
+        ar_list = []
+
+        if !vn_hash['VNET']['AR_POOL']['AR'].nil?
+            lease_list = [vn_hash['VNET']['AR_POOL']['AR']].flatten
             leases     = Array.new
 
             lease_list.each do |ar|
                 id = ar['AR_ID']
+                ar_list << id
+
                 if ar['LEASES'] && !ar['LEASES']['LEASE'].nil?
                     lease = [ar['LEASES']['LEASE']].flatten
                     lease.each do |l|
@@ -294,9 +319,16 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                     d["IP"]||"-"
             end
 
-            column :IP6_GLOBAL, "", :size=>31 do |d|
+            column :IP6_GLOBAL, "", :donottruncate, :size=>31 do |d|
                     d["IP6_GLOBAL"]||"-"
             end
         end.show(leases, {})
+
+        if options[:show_ar]
+            ar_list.each do |ar_id|
+                puts
+                show_ar(vn, ar_id)
+            end
+        end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.9.80.beta
+  version: 4.10.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.80.beta
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.80.beta
+        version: 4.10.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -79,7 +79,8 @@ files:
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onezone_helper.rb
 homepage: http://opennebula.org
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -92,9 +93,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2