opennebula-cli 4.14.0 → 4.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f021e0f83f6580d56e6587d61c28fa12898a45e1
-  data.tar.gz: e21a399eed3bf9d059b9c3444db074a9a1e9766b
+  metadata.gz: 8c8b0d34aa27f09011a52b0ac589242fdbc8c497
+  data.tar.gz: e798b9a08d35fa05ebf9637a35fa0ccfff817be2
 SHA512:
-  metadata.gz: df381c3007c1dec4232f22bbe3cbac85b0f18791a0d554bdc4d76c9dee5b0da3981531cbf4a97098bf83a208b7157891fb0f630f2f7d57c7a4284a7b829c3c9d
-  data.tar.gz: a10e321ef6ae24a8822801245408214b36007d2e2575738218a54cedcc87b2320a0637f4dee1a135e125f8d27acbbd0b1d70f128da6233f5090ac787b1b685c8
+  metadata.gz: 38bf76e873ef7b2722e4bbcaaa5cca317a14010aac0f1eba7345c3cc2d644a80377d419b5d45ba9adce8c4b70520551c63339d62dd6c8dcb001a4625c2c8486b
+  data.tar.gz: 9983b5712e6a5c975b32b4b9e8db3a68c30699afa6336e4b191c7f3a2289ce1181cc181ad317c47a4f41ddce2c627c4730aea0f4192f214683c9f91675b7f612

data/bin/onevcenter

@@ -273,6 +273,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                                  "      - Name    : #{n[:name]}\n"\
                                  "      - Type    : #{n[:type]}\n"
                     print_str += "      - VLAN ID : #{n[:vlan]}\n" if n[:vlan]
+                    print_str += "      - Cluster : #{n[:cluster]}\n"
                     print_str += "    Import this Network [y/n]? "
 
                     STDOUT.print print_str

data/bin/onevm

@@ -127,6 +127,12 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "ID of the Snapshot to save."
     }
 
+    PERSISTENT={
+        :name  => "persistent",
+        :large => "--persistent",
+        :description => "Make the new images persistent"
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -916,9 +922,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: POWEROFF
     EOT
 
-    command :save, save_desc, :vmid, :name do
+    command :save, save_desc, :vmid, :name, :options=>[PERSISTENT] do
         helper.perform_action(args[0],options,"Saving VM") do |vm|
-            res = vm.save_as_template(args[1])
+            res = vm.save_as_template(args[1], options[:persistent] )
 
             if !OpenNebula.is_error?(res)
                 puts "Template ID: #{res}"

data/lib/one_helper.rb

@@ -828,39 +828,46 @@ EOT
     end
 
     def OpenNebulaHelper.update_template_helper(append, id, resource, path, xpath, update=true)
-        unless path
-            require 'tempfile'
+        if path
+            return File.read(path)
+        elsif append
+            return editor_input()
+        else
+            if update
+                rc = resource.info
 
-            tmp  = Tempfile.new(id.to_s)
-            path = tmp.path
+                if OpenNebula.is_error?(rc)
+                    puts rc.message
+                    exit -1
+                end
+            end
 
-            if !append
-                if update
-                    rc = resource.info
+            return editor_input(resource.template_like_str(xpath))
+        end
+    end
 
-                    if OpenNebula.is_error?(rc)
-                        puts rc.message
-                        exit -1
-                    end
-                end
+    def OpenNebulaHelper.editor_input(contents=nil)
+        require 'tempfile'
 
-                tmp << resource.template_like_str(xpath)
-                tmp.flush
-            end
+        tmp  = Tempfile.new("one_cli")
 
-            editor_path = ENV["EDITOR"] ? ENV["EDITOR"] : EDITOR_PATH
-            system("#{editor_path} #{path}")
+        if contents
+            tmp << contents
+            tmp.flush
+        end
 
-            unless $?.exitstatus == 0
-                puts "Editor not defined"
-                exit -1
-            end
+        editor_path = ENV["EDITOR"] ? ENV["EDITOR"] : EDITOR_PATH
+        system("#{editor_path} #{tmp.path}")
 
-            tmp.close
+        unless $?.exitstatus == 0
+            puts "Editor not defined"
+            exit -1
         end
 
-        str = File.read(path)
-        str
+        tmp.close
+
+        str = File.read(tmp.path)
+        return str
     end
 
     def self.parse_user_object(user_object)

data/lib/one_helper/onehost_helper.rb

@@ -433,7 +433,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header("WILD VIRTUAL MACHINES", false)
         puts
 
-        format = "%30s %36s %4s %10s"
+        format = "%-30.30s %36s %4s %10s"
         CLIHelper.print_header(format % ["NAME", "IMPORT_ID", "CPU", "MEMORY"],
                                true)
 

data/lib/one_helper/onetemplate_helper.rb

@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'base64'
 
 class OneTemplateHelper < OpenNebulaHelper::OneHelper
     VM_NAME={
@@ -117,7 +118,7 @@ EOT
 
         answers = ""
 
-        puts "There are some parameters that require user input."
+        puts "There are some parameters that require user input. Use the string <<EDITOR>> to launch an editor (e.g. for multi-line inputs)"
 
         user_inputs.each do |key, val|
             input_cfg = val.split('|')
@@ -136,8 +137,16 @@ EOT
             print "  * (#{key}) #{description}: "
 
             case type
-            when 'text'
+            when 'text', 'text64'
                 answer = STDIN.readline.chop
+
+                if answer == "<<EDITOR>>"
+                    answer = OpenNebulaHelper.editor_input()
+                end
+
+                if type == 'text64'
+                    answer = Base64::encode64(answer).strip.delete("\n")
+                end
             when 'password'
                 answer = OpenNebulaHelper::OneHelper.get_password
             else

data/lib/one_helper/onevm_helper.rb

@@ -701,7 +701,23 @@ in the frontend machine.
             end
         end
 
-        if vm.has_elements?("/VM/TEMPLATE/NIC") and !isHybrid
+        # This variable holds the extra IP's got from monitoring. Right
+        # now it adds GUEST_IP and GUEST_IP_ADDRESSES from vcenter
+        # monitoring. If other variables hold IPs just add them to this
+        # array. Duplicate IPs are not shown.
+        extra_ips = []
+
+        if val=vm["/VM/MONITORING/GUEST_IP"]
+            extra_ips << val if val && !val.empty?
+        end
+
+        if val=vm["/VM/MONITORING/GUEST_IP_ADDRESSES"]
+            extra_ips += val.split(',') if val && !val.empty?
+        end
+
+        extra_ips.uniq!
+
+        if vm.has_elements?("/VM/TEMPLATE/NIC") || !extra_ips.empty?
             puts
             CLIHelper.print_header(str_h1 % "VM NICS",false)
 
@@ -711,13 +727,17 @@ in the frontend machine.
                            "VLAN"=>"no",
                            "BRIDGE"=>"-"}
 
+            shown_ips = []
+
             array_id = 0
-            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
+            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten.compact
             vm_nics.each {|nic|
 
                 next if nic.has_key?("CLI_DONE")
 
                 if nic.has_key?("IP6_LINK")
+                    shown_ips << nic["IP6_LINK"]
+
                     ip6_link = {"IP"           => nic.delete("IP6_LINK"),
                                 "CLI_DONE"     => true,
                                 "DOUBLE_ENTRY" => true}
@@ -727,6 +747,8 @@ in the frontend machine.
                 end
 
                 if nic.has_key?("IP6_ULA")
+                    shown_ips << nic["IP6_ULA"]
+
                     ip6_link = {"IP"           => nic.delete("IP6_ULA"),
                                 "CLI_DONE"     => true,
                                 "DOUBLE_ENTRY" => true}
@@ -736,6 +758,8 @@ in the frontend machine.
                 end
 
                 if nic.has_key?("IP6_GLOBAL")
+                    shown_ips << nic["IP6_GLOBAL"]
+
                     ip6_link = {"IP"           => nic.delete("IP6_GLOBAL"),
                                 "CLI_DONE"     => true,
                                 "DOUBLE_ENTRY" => true}
@@ -744,10 +768,25 @@ in the frontend machine.
                     array_id += 1
                 end
 
+                shown_ips << nic["IP"] if nic.has_key?("IP")
+
                 nic.merge!(nic_default) {|k,v1,v2| v1}
                 array_id += 1
             }
 
+            extra_ips -= shown_ips
+
+            # Add extra IPs to the VM NICS table
+            extra_ips.each do |ip|
+                vm_nics << {
+                    "NIC_ID"        => "-",
+                    "IP"            => ip,
+                    "NETWORK"       => "Additional IP",
+                    "BRIDGE"        => "-",
+                    "VLAN"          => "-"
+                }
+            end
+
             CLIHelper::ShowTable.new(nil, self) do
                 column :ID, "", :size=>3 do |d|
                     if d["DOUBLE_ENTRY"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.14.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.0
+        version: 4.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.0
+        version: 4.14.2
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -34,17 +34,17 @@ executables:
 - oneflow
 - oneflow-template
 - onegroup
-- onehost
 - oneimage
 - onesecgroup
 - oneshowback
 - onetemplate
 - oneuser
-- onevcenter
 - onevdc
-- onevm
 - onevnet
 - onezone
+- onevcenter
+- onevm
+- onehost
 extensions: []
 extra_rdoc_files: []
 files: