opennebula-cli 4.7.80.beta → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585883a7bcb4f9ac918ccb674a77e40dc14b7883
-  data.tar.gz: ab8c5c867a236d9a78aa65ff4679a85077cf93eb
+  metadata.gz: bbd995e66e10d552bf657f6b740611ca27bd7a59
+  data.tar.gz: 4627696981ec98c2f7e58c3f6b757ebccc361fd7
 SHA512:
-  metadata.gz: 504217b07bc07ee8802598b4090b903f63866ffef10bd24dd76d599bacaab7b292bcad92799dfee336fa5b22b582d6b346ca784b9edb7f6e3e4fac076f8e33ca
-  data.tar.gz: 6de0113350a2d42d773f8b14d009dec444eff62e62820d9ab08e2ecbbc943252656cc251c88855853214c4d7502a807dec3493dda6b6e68aa78d4f966a7a2a3b
+  metadata.gz: 0c6a6a1137b7dcba177260cf1837e3431d8494feb118ed1eb16428a272bfd8cde407fa01943c3ff67b0831d107ac516b8084e80f11d218aabf1590465c35dc96
+  data.tar.gz: 7f592fbda949b2e429d06d72612abb7f1b2a801067b7859841dc162b2c5168b53f770501c96e749acf2e1c41029e293974e38389e1fa0eafcd89f9dc157a1ca5

data/bin/onetemplate

@@ -185,6 +185,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
 
         number = options[:multiple] || 1
+        user_inputs = nil
+
         number.times do |i|
             exit_code=helper.perform_action(args[0], options,
                                             "instantiated") do |t|
@@ -194,11 +196,11 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 on_hold = options[:hold] != nil
 
                 extra_template = ""
+                t.info
 
                 if args[1]
                     extra_template = File.read(args[1])
                 elsif options[:userdata]
-                    t.info
                     if t.has_elements?('TEMPLATE/EC2')
                         t.add_element(
                             'TEMPLATE/EC2',
@@ -218,6 +220,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     extra_template = res.last
                 end
 
+                user_inputs = helper.get_user_inputs(t.to_hash) unless user_inputs
+
+                extra_template << "\n" << user_inputs
+
                 res = t.instantiate(name, on_hold, extra_template)
 
                 if !OpenNebula.is_error?(res)

data/bin/onevnet

@@ -112,9 +112,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds an address range to the Virtual Network
     EOT
 
-    command :addar, addar_desc, :vnetid, :options=>STD_OPTIONS + [OneVNetHelper::AR_SIZE,
-        OneVNetHelper::AR_MAC, OneVNetHelper::AR_IP, OneVNetHelper::AR_IP6_GLOBAL,
-        OneVNetHelper::AR_IP6_ULA ] do
+    command :addar, addar_desc, :vnetid, :options=>STD_OPTIONS + [OneVNetHelper::SIZE,
+        OneVNetHelper::MAC, OneVNetHelper::IP, OneVNetHelper::IP6_GLOBAL,
+        OneVNetHelper::IP6_ULA ] do
         helper.perform_action(args[0],options,"lease added") do |vn|
             ar = "AR = [ "
 
@@ -150,6 +150,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    addleases_desc = <<-EOT.unindent
+        (DEPRECATED, use addar) Adds a lease to the Virtual Network
+    EOT
+
+    command :addleases, addleases_desc, :vnetid, :ip, [:mac, nil] do
+        helper.perform_action(args[0],options,"lease added") do |vn|
+            vn.addleases(args[1], args[2])
+        end
+    end
+
     rmar_desc = <<-EOT.unindent
         Removes an address range from the Virtual Network
     EOT
@@ -160,6 +170,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    rmleases_desc = <<-EOT.unindent
+        (DEPRECATED, use rmar) Removes a lease from the Virtual Network
+    EOT
+
+    command :rmleases, rmleases_desc, :vnetid, :ip do
+        helper.perform_action(args[0],options,"lease removed") do |vn|
+            vn.rmleases(args[1])
+        end
+    end
+
     free_desc = <<-EOT.unindent
         Frees a reserved address range from the Virtual Network
     EOT
@@ -177,7 +197,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     command :hold, hold_desc, :vnetid, :ip,
         :options=>STD_OPTIONS + [OneVNetHelper::AR] do
         helper.perform_action(args[0],options,"lease on hold") do |vn|
-            ar  = options[:ar_id] || -1
+            ar = options[:address_range] || -1
 
             vn.hold(args[1], ar)
         end
@@ -190,7 +210,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     command :release, release_desc, :vnetid, :ip,
         :options=>STD_OPTIONS + [OneVNetHelper::AR] do
         helper.perform_action(args[0],options,"lease released") do |vn|
-            ar  = options[:ar_id] || -1
+            ar  = options[:address_range] || -1
 
             vn.release(args[1], ar)
         end
@@ -204,27 +224,27 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :reserve, reserve_desc, :vnetid, [:vnetid, nil],
-        :options=>STD_OPTIONS + [OneVNetHelper::AR, OneVNetHelper::R_NAME,
-            OneVNetHelper::R_SIZE, OneVNetHelper::AR_MAC, OneVNetHelper::AR_IP] do
+        :options=>STD_OPTIONS + [OneVNetHelper::AR, OneVNetHelper::NAME,
+            OneVNetHelper::SIZE, OneVNetHelper::MAC, OneVNetHelper::IP] do
         helper.perform_action(args[0],options,"reservation made") do |vn|
-            rsize = options[:rsize] || -1
-            rname = options[:rname] || -1
+            size = options[:size] || -1
+            name = options[:name] || -1
 
             addr = nil
             addr = options[:mac] if options[:mac]
             addr = options[:ip] if options[:ip]
 
-            if rsize == -1
+            if size == -1
                 STDERR.puts "Specify a size (-s size) for the reservation"
                 exit -1
             end
 
-            if rname == -1 && args[1].nil?
+            if name == -1 && args[1].nil?
                 STDERR.puts "Specify a name (-n name) for the reservation"
                 exit -1
             end
 
-            vn.reserve(rname, rsize, options[:ar_id], addr, args[1])
+            vn.reserve(name, size, options[:address_range], addr, args[1])
         end
     end
 

data/lib/one_helper/onetemplate_helper.rb

@@ -83,6 +83,48 @@ EOT
         table
     end
 
+    def get_user_inputs(template)
+        user_inputs = template['VMTEMPLATE']['TEMPLATE']['USER_INPUTS']
+
+        return "" if !user_inputs
+
+        answers = ""
+
+        puts "There are some parameters that require user input."
+
+        user_inputs.each do |key, val|
+            input_cfg = val.split('|')
+
+            if input_cfg.length != 3
+                STDERR.puts "Malformed user input. It should have 3 parts separated by '|':"
+                STDERR.puts "  #{key}: #{val}"
+                exit(-1)
+            end
+
+            optional, type, description = input_cfg
+            optional.strip!
+            type.strip!
+            description.strip!
+
+            print "  * (#{key}) #{description}: "
+
+            case type
+            when 'text'
+                answer = STDIN.readline.chop
+            when 'password'
+                answer = OpenNebulaHelper::OneHelper.get_password
+            else
+                STDERR.puts "user input types can only be text or password:"
+                STDERR.puts "  #{key}: #{val}"
+                exit(-1)
+            end
+            answers << "#{key} = \""
+            answers << answer.gsub('"', "\\\"") << "\"\n"
+        end
+
+        answers
+    end
+
     private
 
     def factory(id=nil)

data/lib/one_helper/onevm_helper.rb

@@ -126,6 +126,19 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     def format_pool(options)
         config_file = self.class.table_conf
 
+        # Get cluster names to use later in list
+        cluster_pool = OpenNebula::ClusterPool.new(@client)
+        rc = cluster_pool.info
+
+        cluster_names = {}
+        cluster_names["-1"] = "default"
+
+        if !OpenNebula.is_error?(rc)
+            cluster_pool.each do |c|
+                cluster_names[c["ID"]] = c["NAME"]
+            end
+        end
+
         table = CLIHelper::ShowTable.new(config_file, self) do
             column :ID, "ONE identifier for Virtual Machine", :size=>6 do |d|
                 d["ID"]
@@ -171,6 +184,23 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
+            column :CLUSTER, "Cluster where the VM is running", :left,
+                    :size=> 10 do |d|
+                if d["HISTORY_RECORDS"]["HISTORY"]
+                    history = [d["HISTORY_RECORDS"]["HISTORY"]].flatten
+                    cluster_id = history.last["CID"]
+                    cluster = cluster_names[cluster_id]
+
+                    if !cluster
+                        cluster_id
+                    else
+                        cluster
+                    end
+                else
+                    "NONE"
+                end
+            end
+
             column :TIME, "Time since the VM was submitted", :size=>10 do |d|
                 stime = d["STIME"].to_i
                 etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
@@ -236,6 +266,28 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         str_h1="%-80s"
         str="%-20s: %-20s"
 
+        cluster = nil
+
+        if %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
+            cluster_id = vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID']
+        else
+            cluster_id = nil
+        end
+
+        if cluster_id
+            if cluster_id == "-1"
+                cluster = "default"
+            else
+                clu = OpenNebula::Cluster.new(OpenNebula::Cluster.build_xml(cluster_id), @client)
+                rc = clu.info
+                if OpenNebula.is_error?(rc)
+                    cluster = "ERROR"
+                else
+                    cluster = clu["NAME"]
+                end
+            end
+        end
+
         CLIHelper.print_header(
             str_h1 % "VIRTUAL MACHINE #{vm['ID']} INFORMATION")
         puts str % ["ID", vm.id.to_s]
@@ -248,9 +300,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         puts str % ["HOST",
             vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if
                 %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
-        puts str % ["CLUSTER ID",
-            vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] ] if
-                %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
+        puts str % ["CLUSTER ID", cluster_id ] if cluster_id
+        puts str % ["CLUSTER", cluster ] if cluster
         puts str % ["START TIME",
             OpenNebulaHelper.time_to_str(vm['/VM/STIME'])]
         puts str % ["END TIME",

data/lib/one_helper/onevnet_helper.rb

@@ -19,68 +19,68 @@ require 'one_helper/onevm_helper'
 
 class OneVNetHelper < OpenNebulaHelper::OneHelper
     AR = {
-        :name => "ar_id",
+        :name => "address_range",
         :short => "-a ar_id",
         :large => "--address_range ar_id",
         :format => Integer,
         :description => "ID of the address range"
     }
 
-    AR_MAC = {
+    MAC = {
         :name => "mac",
         :short => "-m mac",
-        :large => "--address_range_mac mac",
+        :large => "--mac mac",
         :format => String,
         :description => "First MAC address in : notation"
     }
 
-    AR_IP = {
+    IP = {
         :name => "ip",
         :short => "-i ip",
-        :large => "--address_range_ip ip",
+        :large => "--ip ip",
         :format => String,
         :description => "First IP address in . notation"
     }
 
-    AR_SIZE = {
+    SIZE = {
         :name => "size",
         :short => "-s size",
-        :large => "--address_range_size size",
+        :large => "--size size",
         :format => String,
-        :description => "Number of addresses in the range"
+        :description => "Number of addresses"
     }
 
-    AR_IP6_GLOBAL = {
+    IP6_GLOBAL = {
         :name => "ip6_global",
         :short => "-g ip6_pref",
-        :large => "--address_range_ip6g ip6_pref",
+        :large => "--ip6_global ip6_pref",
         :format => String,
         :description => "IP6 global prefix"
     }
 
-    AR_IP6_ULA = {
+    IP6_ULA = {
         :name => "ip6_ula",
         :short => "-u ip6_pref",
-        :large => "--address_range_ip6u ip6_pref",
+        :large => "--ip6_ula ip6_pref",
         :format => String,
         :description => "IP6 ula prefix"
     }
 
-    R_NAME = {
-        :name => "rname",
+    NAME = {
+        :name => "name",
         :short => "-n reservation name",
         :large => "--name reservation name",
         :format => String,
         :description => "Name of the address reservation"
     }
 
-    R_SIZE = {
-        :name => "rsize",
-        :short => "-s reservation size",
-        :large => "--size reservation size",
-        :format => String,
-        :description => "Number of addresses to reserve"
-    }
+#    R_SIZE = {
+#        :name => "rsize",
+#        :short => "-s reservation size",
+#        :large => "--size reservation size",
+#        :format => String,
+#        :description => "Number of addresses to reserve"
+#    }
 
     def self.rname
         "VNET"
@@ -99,7 +99,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             end
 
             column :USER, "Username of the Virtual Network owner", :left,
-                    :size=>12 do |d|
+                    :size=>15 do |d|
                 helper.user_name(d, options)
             end
 
@@ -109,7 +109,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             end
 
             column :NAME, "Name of the Virtual Network", :left,
-                    :size=>15 do |d|
+                    :size=>19 do |d|
                 d["NAME"]
             end
 
@@ -117,10 +117,6 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.cluster_str(d["CLUSTER"])
             end
 
-            column :SIZE, "Size of the Virtual Network", :size=>5 do |d|
-                d["SIZE"]
-            end
-
             column :BRIDGE, "Bridge associated to the Virtual Network", :left,
                     :size=>8 do |d|
                 d["BRIDGE"]
@@ -131,7 +127,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 d["USED_LEASES"]
             end
 
-            default :ID, :USER, :GROUP, :NAME, :CLUSTER, :TYPE, :BRIDGE, :LEASES
+            default :ID, :USER, :GROUP, :NAME, :CLUSTER, :BRIDGE, :LEASES
         end
 
         table

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.7.80.beta
+  version: 4.8.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,36 +16,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.80.beta
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.80.beta
+        version: 4.8.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
+- oneacct
 - oneacl
-- onehost
-- oneflow-template
-- onevnet
-- oneimage
+- onecluster
 - onedatastore
-- onevm
+- oneflow
+- oneflow-template
 - onegroup
-- onecluster
+- onehost
+- oneimage
 - onetemplate
-- oneflow
 - oneuser
+- onevm
+- onevnet
 - onezone
-- oneacct
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- NOTICE
 - bin/oneacct
 - bin/oneacl
 - bin/onecluster
@@ -76,6 +74,8 @@ files:
 - lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onezone_helper.rb
+- NOTICE
+- LICENSE
 homepage: http://opennebula.org
 licenses: []
 metadata: {}
@@ -85,17 +85,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       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
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: OpenNebula Command Line Interface