opennebula-cli 5.6.2 → 5.7.80.pre

data/bin/onezone

@@ -16,31 +16,32 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-ONE_LOCATION=ENV["ONE_LOCATION"]
+ONE_LOCATION = ENV['ONE_LOCATION']
 
 if !ONE_LOCATION
-    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+    RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
 else
-    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+    RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
 end
 
-$: << RUBY_LIB_LOCATION
-$: << RUBY_LIB_LOCATION+"/cli"
+$LOAD_PATH << RUBY_LIB_LOCATION
+$LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
 require 'command_parser'
 require 'one_helper/onezone_helper'
 
-cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "`onezone` <command> [<args>] [<options>]"
+CommandParser::CmdParser.new(ARGV) do
+    usage '`onezone` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneZoneHelper.new
 
     ENDPOINT = {
-        :name => "keep",
-        :short  => "-k",
-        :large => "--keep",
-        :description => "Don't overwrite endpoint file located in home folder, use it as a temporary zone.",
+        :name => 'keep',
+        :short => '-k',
+        :large => '--keep',
+        :description => "Don't overwrite endpoint file located in home folder,"\
+                        ' use it as a temporary zone.',
         :format => String
     }
 
@@ -51,7 +52,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     # Global Options
     ########################################################################
-    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+    set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
     list_options = CLIHelper::OPTIONS
     list_options << OpenNebulaHelper::XML
@@ -82,9 +83,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             begin
                 template = File.read(args[0])
                 zone.allocate(template)
-            rescue => e
+            rescue StandardError => e
                 STDERR.puts e.message
-                exit -1
+                exit(-1)
             end
         end
     end
@@ -94,7 +95,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :rename, rename_desc, :zoneid, :name do
-        helper.perform_action(args[0],options,"renamed") do |o|
+        helper.perform_action(args[0], options, 'renamed') do |o|
             o.rename(args[1])
         end
     end
@@ -104,13 +105,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"server-add", addserver_desc, :zoneid, :options =>
-        [ OneZoneHelper::SERVER_NAME, OneZoneHelper::SERVER_ENDPOINT] do
+        [OneZoneHelper::SERVER_NAME, OneZoneHelper::SERVER_ENDPOINT] do
 
         if options[:server_name].nil? || options[:server_rpc].nil?
-            STDERR.puts "To add a server set:"
+            STDERR.puts 'To add a server set:'
             STDERR.puts "\t-n <server name>"
             STDERR.puts "\t-r <RPC endpoint>"
-            exit -1
+            exit(-1)
         end
 
         template = <<-EOT
@@ -120,10 +121,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             ]
         EOT
 
-        helper.perform_action(args[0], options, "server added") do |o|
+        helper.perform_action(args[0], options, 'server added') do |o|
             o.add_servers(template)
         end
-
     end
 
     delserver_desc = <<-EOT.unindent
@@ -131,10 +131,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"server-del", delserver_desc, :zoneid, :serverid do
-        helper.perform_action(args[0], options, "server deleted") do |o|
+        helper.perform_action(args[0], options, 'server deleted') do |o|
             o.delete_servers(args[1].to_i)
         end
-
     end
 
     resetserver_desc = <<-EOT.unindent
@@ -143,7 +142,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"server-reset", resetserver_desc, :zoneid, :serverid do
-        helper.perform_action(args[0], options, "server reset") do |o|
+        helper.perform_action(args[0], options, 'server reset') do |o|
             o.reset_server(args[1].to_i)
         end
     end
@@ -154,8 +153,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :update, update_desc, :zoneid, [:file, nil],
-    :options=>OpenNebulaHelper::APPEND do
-        helper.perform_action(args[0],options,"modified") do |obj|
+            :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
@@ -174,7 +173,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :delete, delete_desc, [:range, :zoneid_list] do
-        helper.perform_actions(args[0],options,"deleted") do |obj|
+        helper.perform_actions(args[0], options, 'deleted') do |obj|
             obj.delete
         end
     end
@@ -183,7 +182,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Lists Zones in the pool
     EOT
 
-    command :list, list_desc, :options=>list_options do
+    command :list, list_desc, :options => list_options do
         helper.list_pool(options)
     end
 
@@ -191,16 +190,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Zone
     EOT
 
-    command :show, show_desc,:zoneid, :options=>OpenNebulaHelper::XML do
-        helper.show_resource(args[0],options)
+    command :show, show_desc, :zoneid, :options => OpenNebulaHelper::XML do
+        helper.show_resource(args[0], options)
     end
 
     set_desc = <<-EOT.unindent
         Set shell session access point for the CLI to the given Zone
     EOT
 
-    command :set, set_desc,:zoneid, :options=>ENDPOINT do
-        if options.has_key? :keep
+    command :set, set_desc, :zoneid, :options => ENDPOINT do
+        if options.key? :keep
             helper.set_zone(args[0], true)
         else
             helper.set_zone(args[0], false)

data/lib/one_helper.rb

@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'cli_helper'
-
 require 'open3'
 require 'io/console'
 
@@ -179,6 +178,20 @@ EOT
         }
     ]
 
+    AS_USER = {
+            :name   => 'as_uid',
+            :large  => '--as_uid uid',
+            :format => Integer,
+            :description => 'The User ID to instantiate the VM'
+    }
+
+    AS_GROUP = {
+            :name   => 'as_gid',
+            :large  => '--as_gid gid',
+            :format => Integer,
+            :description => 'The Group ID to instantiate the VM'
+    }
+    
     #NOTE: Other options defined using this array, add new options at the end
     TEMPLATE_OPTIONS=[
         {
@@ -246,7 +259,8 @@ EOT
             :description => "Networks to attach. To use a network owned by"<<
                             " other user use user[network]. Additional"<<
                             " attributes are supported like with the --disk"<<
-                            " option.",
+                            " option. Also you can use auto if you want that" <<
+                            " OpenNebula select automatically the network",
             :format => Array
         },
         {
@@ -367,18 +381,8 @@ EOT
             :description => "In a vCenter environment sets the the VMs and Template folder where the VM will be placed in." \
             " The path uses slashes to separate folders. For example: --vcenter_vm_folder \"/Management/VMs\""
         },
-        {
-            :name   => 'as_uid',
-            :large  => '--as_uid uid',
-            :format => Integer,
-            :description => 'The User ID to instantiate the VM'
-        },
-        {
-            :name   => 'as_gid',
-            :large  => '--as_gid gid',
-            :format => Integer,
-            :description => 'The Group ID to instantiate the VM'
-        }
+        AS_GROUP,
+        AS_USER
     ]
 
     FORCE={
@@ -1241,15 +1245,19 @@ EOT
             user, object=*res
 
             template<<"#{section.upcase}=[\n"
-            template<<"  #{name.upcase}_UNAME=\"#{user}\",\n" if user
-            extra_attributes.each do |extra_attribute|
-                key, value = extra_attribute.split("=")
-                template<<"  #{key.upcase}=\"#{value}\",\n"
-            end
-            if object.match(/^\d+$/)
-                template<<"  #{name.upcase}_ID=#{object}\n"
+            if object.downcase == "auto"
+                template<<"  NETWORK_MODE=\"#{object}\"\n"
             else
-                template<<"  #{name.upcase}=\"#{object}\"\n"
+                template<<"  #{name.upcase}_UNAME=\"#{user}\",\n" if user
+                extra_attributes.each do |extra_attribute|
+                    key, value = extra_attribute.split("=")
+                    template<<"  #{key.upcase}=\"#{value}\",\n"
+                end
+                if object.match(/^\d+$/)
+                    template<<"  #{name.upcase}_ID=#{object}\n"
+                else
+                    template<<"  #{name.upcase}=\"#{object}\"\n"
+                end
             end
             template<<"]\n"
         end if objects
@@ -1404,6 +1412,82 @@ EOT
         [0, template]
     end
 
+    def self.create_ar(options)
+        ar = 'AR = [ '
+
+        if options[:ip]
+            if options[:ip6_global] || options[:ip6_ula]
+                ar << 'TYPE="IP4_6"'
+            elsif options[:ip6]
+                ar << 'TYPE="IP4_6_STATIC"'
+            else
+                ar << 'TYPE="IP4"'
+            end
+        elsif options[:ip6]
+            ar << 'TYPE="IP6_STATIC"'
+        elsif options[:ip6_global] || options[:ip6_ula]
+            ar << 'TYPE="IP6"'
+        else
+            ar << 'TYPE="ETHER"'
+        end
+
+        if options[:size]
+            ar << ', SIZE = ' << options[:size]
+        else
+            STDERR.puts 'Address range needs to specify size (-s size)'
+            exit(-1)
+        end
+
+        if options[:ip6]
+            m = %r{([\h:]*)\/(\d.*)$}.match(options[:ip6])
+
+            if m.nil? || m[1].nil?
+                STDERR.puts 'Missing or wrong IP6'
+                exit(-1)
+            else
+                begin
+                    require 'ipaddr'
+
+                    ip = IPAddr.new(m[1])
+
+                    if !ip.ipv6?
+                        STDERR.puts 'Wrong IP6 format address'
+                        exit(-1)
+                    end
+                rescue StandardError
+                    STDERR.puts 'Wrong IP6 format address'
+                    exit(-1)
+                end
+
+            end
+
+            if m[2].nil?
+                STDERR.puts 'IP6 address need to set the prefix length'
+                exit(-1)
+            end
+
+            ar << ", PREFIX_LENGTH=\"#{m[2]}\""
+
+            options[:ip6] = m[1]
+        end
+
+        ar << ', IP = ' << options[:ip] if options[:ip]
+        ar << ', IP6 = ' << options[:ip6] if options[:ip6]
+        ar << ', MAC = ' << options[:mac] if options[:mac]
+        if options[:ip6_global]
+            ar << ', GLOBAL_PREFIX = ' << options[:ip6_global]
+        end
+        if options[:ip6_ula]
+            ar << ', ULA_PREFIX = ' << options[:ip6_ula]
+        end
+        ar << ', GATEWAY = ' << options[:gateway] if options[:gateway]
+        ar << ', MASK = '    << options[:netmask] if options[:netmask]
+        ar << ', VN_MAD = '  << options[:vn_mad]  if options[:vn_mad]
+        ar << ', VLAN_ID = ' << options[:vlanid]  if options[:vlanid]
+
+        ar << ']'
+    end
+
     def self.create_template_options_used?(options)
         # Get the template options names as symbols. options hash
         # uses symbols

data/lib/one_helper/oneacl_helper.rb

@@ -44,7 +44,7 @@ private
     def self.resource_mask(str)
         resource_type=str.split("/")[0]
 
-        mask = "-----------------"
+        mask = "------------------"
 
         resource_type.split("+").each{|type|
             case type
@@ -82,6 +82,8 @@ private
                     mask[15] = "A"
                 when "VMGROUP"
                     mask[16] = "P"
+                when "VNTEMPLATE"
+                    mask[17] = "t"
             end
         }
         mask
@@ -121,8 +123,8 @@ private
                 d['STRING'].split(" ")[0]
             end
 
-            column :RES_VHNIUTGDCOZSvRMAP, "Resource to which the rule applies",
-                            :size => 21 do |d|
+            column :RES_VHNIUTGDCOZSvRMAPt, "Resource to which the rule applies",
+                            :size => 22 do |d|
                OneAclHelper::resource_mask d['STRING'].split(" ")[1]
             end
 
@@ -139,7 +141,7 @@ private
                 OneAclHelper::right_mask d['STRING'].split(" ")[2]
             end
 
-            default :ID, :USER, :RES_VHNIUTGDCOZSvRMAP, :RID, :OPE_UMAC, :ZONE
+            default :ID, :USER, :RES_VHNIUTGDCOZSvRMAPt, :RID, :OPE_UMAC, :ZONE
         end
 
         table

data/lib/one_helper/onevcenter_helper.rb

@@ -359,7 +359,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     end
 
     def self.network_dialogue(n)
-        ask = -> (question, default = ""){
+        ask = ->(question, default = ""){
             STDOUT.print question
             answer = STDIN.gets.strip
 

data/lib/one_helper/onevm_helper.rb

@@ -171,6 +171,33 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :description=> "Does not communicate with the guest OS"
     }
 
+    POFF = {
+        :name        => "poweroff",
+        :large       => "--poff",
+        :description => "Do the migrate by poweringoff the vm"
+    }
+
+    POFFHARD = {
+        :name        => "poweroff_hard",
+        :large       => "--poff-hard",
+        :description => "Do the migrate by poweringoff hard the vm"
+    }
+
+    ALIAS = {
+        :name       => "alias",
+        :short      => "-a alias",
+        :large      => "--alias alias",
+        :description=> "Attach the NIC as an ALIAS",
+        :format     => String
+    }
+
+    NIC_NAME = {
+        :name       => "nic_name",
+        :large      => "--nic_name name",
+        :description=> "Name of the NIC",
+        :format     => String
+    }
+
     def self.rname
         "VM"
     end
@@ -529,6 +556,16 @@ in the frontend machine.
         puts
     end
 
+    def get_migration_type(options)
+        if options[:poweroff]
+            return 1
+        elsif options[:poweroff_hard]
+            return 2
+        else
+            return 0
+        end
+    end
+
     private
 
     def factory(id=nil)
@@ -800,132 +837,138 @@ in the frontend machine.
 
         extra_ips.uniq!
 
-        if vm.has_elements?("/VM/TEMPLATE/NIC") ||
-           vm.has_elements?("/VM/TEMPLATE/PCI[NIC_ID>-1]") || !extra_ips.empty?
+        ['NIC', 'NIC_ALIAS'].each do |type|
+            if vm.has_elements?("/VM/TEMPLATE/#{type}") ||
+               vm.has_elements?("/VM/TEMPLATE/PCI[NIC_ID>-1]") || !extra_ips.empty?
 
-            puts
-            CLIHelper.print_header(str_h1 % "VM NICS",false)
+                puts
+                CLIHelper.print_header(str_h1 % "VM #{type == 'NIC' ? 'NICS' : 'ALIAS'}",false)
 
-            nic_default = {"NETWORK" => "-",
-                           "IP" => "-",
-                           "MAC"=> "-",
-                           "BRIDGE"=>"-"}
+                nic_default = {"NETWORK" => "-",
+                               "IP" => "-",
+                               "MAC"=> "-",
+                               "BRIDGE"=>"-"}
 
-            shown_ips = []
+                shown_ips = []
 
-            array_id = 0
-            vm_nics = [vm_hash['VM']['TEMPLATE']['NIC']]
+                array_id = 0
+                vm_nics = [vm_hash['VM']['TEMPLATE'][type]]
 
-            vm_pcis = [vm_hash['VM']['TEMPLATE']['PCI']].flatten.compact
+                if type == 'NIC'
+                    vm_pcis = [vm_hash['VM']['TEMPLATE']['PCI']].flatten.compact
 
-            vm_pcis.each do |pci|
-                if !pci['NIC_ID'].nil?
-                    vm_nics << pci
+                    vm_pcis.each do |pci|
+                        if !pci['NIC_ID'].nil?
+                            vm_nics << pci
+                        end
+                    end
                 end
-            end
 
-            vm_nics.flatten!
-            vm_nics.compact!
+                vm_nics.flatten!
+                vm_nics.compact!
 
-            vm_nics.each {|nic|
+                vm_nics.each {|nic|
 
-                next if nic.has_key?("CLI_DONE")
+                    next if nic.has_key?("CLI_DONE")
 
-                ["IP6_LINK", "IP6_ULA", "IP6_GLOBAL", "IP6"].each do |attr|
-                    if nic.has_key?(attr)
-                        shown_ips << nic[attr]
+                    ["IP6_LINK", "IP6_ULA", "IP6_GLOBAL", "IP6"].each do |attr|
+                        if nic.has_key?(attr)
+                            shown_ips << nic[attr]
 
-                        ipstr = {"IP"           => nic.delete(attr),
-                                 "CLI_DONE"     => true,
-                                 "DOUBLE_ENTRY" => true}
-                        vm_nics.insert(array_id+1,ipstr)
+                            ipstr = {"IP"           => nic.delete(attr),
+                                     "CLI_DONE"     => true,
+                                     "DOUBLE_ENTRY" => true}
+                            vm_nics.insert(array_id+1,ipstr)
 
-                        array_id += 1
+                            array_id += 1
+                        end
                     end
-                end
 
-                ["VROUTER_IP", "VROUTER_IP6_LINK",
-                 "VROUTER_IP6_ULA", "VROUTER_IP6_GLOBAL"].each do |attr|
-                    if nic.has_key?(attr)
-                        shown_ips << nic[attr]
+                    ["VROUTER_IP", "VROUTER_IP6_LINK",
+                     "VROUTER_IP6_ULA", "VROUTER_IP6_GLOBAL"].each do |attr|
+                        if nic.has_key?(attr)
+                            shown_ips << nic[attr]
 
-                        ipstr = {"IP"           => nic.delete(attr) + " (VRouter)",
-                                 "CLI_DONE"     => true,
-                                 "DOUBLE_ENTRY" => true}
-                        vm_nics.insert(array_id+1,ipstr)
+                            ipstr = {"IP"           => nic.delete(attr) + " (VRouter)",
+                                     "CLI_DONE"     => true,
+                                     "DOUBLE_ENTRY" => true}
+                            vm_nics.insert(array_id+1,ipstr)
 
-                        array_id += 1
+                            array_id += 1
+                        end
                     end
-                end
 
-                shown_ips << nic["IP"] if nic.has_key?("IP")
+                    shown_ips << nic["IP"] if nic.has_key?("IP")
 
-                nic.merge!(nic_default) {|k,v1,v2| v1}
-                array_id += 1
-            }
+                    nic.merge!(nic_default) {|k,v1,v2| v1}
+                    array_id += 1
+                }
 
-            extra_ips -= shown_ips
+                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"        => "-"
-                }
-            end
+                # Add extra IPs to the VM NICS table
+                extra_ips.each do |ip|
+                    vm_nics << {
+                        "NIC_ID"        => "-",
+                        "IP"            => ip,
+                        "NETWORK"       => "Additional IP",
+                        "BRIDGE"        => "-"
+                    }
+                end
 
-            CLIHelper::ShowTable.new(nil, self) do
-                column :ID, "", :size=>3 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
-                    else
-                        d["NIC_ID"]
+                CLIHelper::ShowTable.new(nil, self) do
+                    column :ID, "", :size=>3 do |d|
+                        if d["DOUBLE_ENTRY"]
+                            ""
+                        else
+                            d["NIC_ID"]
+                        end
                     end
-                end
 
-                column :NETWORK, "", :left, :size=>20 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
-                    else
-                        d["NETWORK"]
+                    column :NETWORK, "", :left, :size=>20 do |d|
+                        if d["DOUBLE_ENTRY"]
+                            ""
+                        else
+                            d["NETWORK"]
+                        end
                     end
-                end
 
-                column :BRIDGE, "", :left, :size=>12 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
-                    else
-                        d["BRIDGE"]
+                    column :BRIDGE, "", :left, :size=>12 do |d|
+                        if d["DOUBLE_ENTRY"]
+                            ""
+                        else
+                            d["BRIDGE"]
+                        end
                     end
-                end
 
-                column :IP, "",:left, :donottruncate, :size=>15 do |d|
-                    d["IP"]
-                end
+                    column :IP, "",:left, :donottruncate, :size=>15 do |d|
+                        d["IP"]
+                    end
 
-                column :MAC, "", :left, :size=>17 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
-                    else
-                        d["MAC"]
+                    column :MAC, "", :left, :size=>17 do |d|
+                        if d["DOUBLE_ENTRY"]
+                            ""
+                        else
+                            d["MAC"]
+                        end
                     end
-                end
 
-                column :PCI_ID, "", :left, :size=>8 do |d|
-                    if d["DOUBLE_ENTRY"]
-                        ""
-                    else
-                        d["PCI_ID"]
+                    if type == 'NIC'
+                        column :PCI_ID, "", :left, :size=>8 do |d|
+                            if d["DOUBLE_ENTRY"]
+                                ""
+                            else
+                                d["PCI_ID"]
+                            end
+                        end
                     end
-                end
 
-            end.show(vm_nics,{})
+                end.show(vm_nics,{})
 
-            while vm.has_elements?("/VM/TEMPLATE/NIC")
-                vm.delete_element("/VM/TEMPLATE/NIC")
-            end if !options[:all]
+                while vm.has_elements?("/VM/TEMPLATE/#{type}")
+                    vm.delete_element("/VM/TEMPLATE/#{type}")
+                end if !options[:all]
+            end
         end
 
         while vm.has_elements?("/VM/TEMPLATE/NIC")