opennebula-cli 5.2.1 → 5.3.80.beta1

data/bin/onevm

@@ -177,6 +177,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         format_int(arg)
     end
 
+    set :format, :size, "Disk size in MiB" do |arg|
+        OpenNebulaHelper.size_in_mb(arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -843,6 +847,29 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    disk_resize_desc = <<-EOT.unindent
+        Resizes a VM disk. The new size should be larger than the old one.
+
+        States: RUNNING, POWEROFF
+    EOT
+
+    command :"disk-resize", disk_resize_desc,
+      :vmid, :diskid, :size do
+        helper.perform_action(args[0],options,"disk resized") do |o|
+            o.info
+            size = o["/VM/TEMPLATE/DISK[DISK_ID='#{args[1]}']/SIZE"].to_i
+
+            new_size = args[2]
+
+            if size < new_size
+                o.disk_resize(args[1].to_i, args[2])
+            else
+                OpenNebula::Error.new("New size '#{new_size}' must be larger " \
+                                      "than current size '#{size}'")
+            end
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists VMs in the pool
     EOT

data/bin/onevmgroup

@@ -0,0 +1,185 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+ONE_LOCATION=ENV["ONE_LOCATION"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+end
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+
+require 'command_parser'
+require 'one_helper/onevmgroup_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onevmgroup` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneVMGroupHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+
+    list_options = CLIHelper::OPTIONS
+    list_options << OpenNebulaHelper::XML
+    list_options << OpenNebulaHelper::NUMERIC
+    list_options << OpenNebulaHelper::DESCRIBE
+
+    ########################################################################
+    # Formatters for arguments
+    ########################################################################
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    end
+
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "USER")
+    end
+
+    set :format, :vmgroupid, OneVMGroupHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :vmgroupid_list, OneVMGroupHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :filterflag, OneVMGroupHelper.filterflag_to_i_desc do |arg|
+        helper.filterflag_to_i(arg)
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new VM Group from the given description
+    EOT
+
+    command :create, create_desc, :file do
+        helper.create_resource(options) do |obj|
+            begin
+                template = File.read(args[0])
+
+                obj.allocate(template)
+            rescue => e
+                STDERR.puts e.messsage
+                exit -1
+            end
+        end
+    end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the VM Group
+    EOT
+
+    command :delete, delete_desc, [:range, :vmgroupid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists VM Group in the pool
+    EOT
+
+    command :list, list_desc, [:filterflag, nil], :options=>list_options do
+        helper.list_pool(options, false, args[0])
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows information for the given VM Group
+    EOT
+
+    command :show, show_desc, :vmgroupid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+
+    chgrp_desc = <<-EOT.unindent
+        Changes the VM Group's group
+    EOT
+
+    command :chgrp, chgrp_desc,[:range, :vmgroupid_list], :groupid do
+        helper.perform_actions(args[0],options,"Group changed") do |obj|
+            obj.chown(-1, args[1].to_i)
+        end
+    end
+
+    chown_desc = <<-EOT.unindent
+        Changes the VM Group's owner and group
+    EOT
+
+    command :chown, chown_desc, [:range, :vmgroupid_list], :userid,
+            [:groupid,nil] do
+        gid = args[2].nil? ? -1 : args[2].to_i
+        helper.perform_actions(args[0],options,"Owner/Group changed") do |obj|
+            obj.chown(args[1].to_i, gid)
+        end
+    end
+
+    chmod_desc = <<-EOT.unindent
+        Changes the VM Group permissions
+    EOT
+
+    command :chmod, chmod_desc, [:range, :vmgroupid_list], :octet do
+        helper.perform_actions(args[0],options, "Permissions changed") do |t|
+            t.chmod_octet(args[1])
+        end
+    end
+
+    update_desc = <<-EOT.unindent
+        Update the template contents. If a path is not provided the editor will
+        be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :vmgroupid, [:file, nil],
+    :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
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the VM Group
+    EOT
+
+    command :rename, rename_desc, :vmgroupid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+end

data/bin/onevnet

@@ -123,15 +123,17 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 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
-                    if options[:ip6_global] || options[:ip6_ula]
-                        ar << "TYPE=\"IP6\""
-                    else
-                        ar << "TYPE=\"ETHER\""
-                    end
+                    ar << "TYPE=\"ETHER\""
                 end
 
                 if options[:size]
@@ -141,7 +143,41 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                     exit -1
                 end
 
+                if options[:ip6]
+                    m = /([\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
+                            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]
                 ar << ", GLOBAL_PREFIX = " <<
                       options[:ip6_global] if options[:ip6_global]
@@ -234,7 +270,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :reserve, reserve_desc, :vnetid, [:vnetid, nil],
         :options=>STD_OPTIONS + [OneVNetHelper::AR, OneVNetHelper::NAME,
-            OneVNetHelper::SIZE, OneVNetHelper::MAC, OneVNetHelper::IP] do
+            OneVNetHelper::SIZE, OneVNetHelper::MAC, OneVNetHelper::IP,
+            OneVNetHelper::IP6 ] do
         helper.perform_action(args[0],options,"reservation made") do |vn|
             size = options[:size] || -1
             name = options[:name] || -1
@@ -242,6 +279,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             addr = nil
             addr = options[:mac] if options[:mac]
             addr = options[:ip] if options[:ip]
+            addr = options[:ip6] if options[:ip6]
 
             if size == -1
                 STDERR.puts "Specify a size (-s size) for the reservation"

data/bin/onezone

@@ -91,6 +91,43 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    addserver_desc = <<-EOT.unindent
+        Add an OpenNebula server to this zone.
+    EOT
+
+    command :"server-add", addserver_desc, :zoneid, :options =>
+        [ 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 "\t-n <server name>"
+            STDERR.puts "\t-r <RPC endpoint>"
+            exit -1
+        end
+
+        template = <<-EOT
+            SERVER = [
+              NAME="#{options[:server_name]}",
+              ENDPOINT="#{options[:server_rpc]}"
+            ]
+        EOT
+
+        helper.perform_action(args[0], options, "server added") do |o|
+            o.add_servers(template)
+        end
+
+    end
+
+    delserver_desc = <<-EOT.unindent
+        Delete an OpenNebula server from this zone.
+    EOT
+
+    command :"server-del", delserver_desc, :zoneid, :serverid do
+        helper.perform_action(args[0], options, "server deleted") do |o|
+            o.delete_servers(args[1].to_i)
+        end
+
+    end
     update_desc = <<-EOT.unindent
         Update the template contents. If a path is not provided the editor will
         be launched to modify the current content.

data/lib/one_helper.rb

@@ -37,8 +37,10 @@ EOT
 
     if ONE_LOCATION
         TABLE_CONF_PATH=ONE_LOCATION+"/etc/cli"
+        VAR_LOCATION=ONE_LOCATION+"/var" if !defined?(VAR_LOCATION)
     else
         TABLE_CONF_PATH="/etc/one/cli"
+        VAR_LOCATION="/var/lib/one" if !defined?(VAR_LOCATION)
     end
 
     EDITOR_PATH='/usr/bin/vi'
@@ -352,6 +354,13 @@ EOT
             :name   => 'report_ready',
             :large  => '--report_ready',
             :description => 'Sends READY=YES to OneGate, useful for OneFlow'
+        },
+        {
+            :name   => 'vcenter_vm_folder',
+            :large  => '--vcenter_vm_folder path',
+            :format => String,
+            :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\""
         }
     ]
 
@@ -482,6 +491,21 @@ EOT
             end
         end
 
+
+        # receive a object key => value format
+        # returns hashed values
+        def encrypt(opts, token)
+            res = {}
+            opts.each do |key, value|
+                cipher = OpenSSL::Cipher::AES.new(256,:CBC)
+                cipher.encrypt.key = token[0..31]
+                encrypted = cipher.update(value) + cipher.final
+                res[key] = Base64::encode64(encrypted) 
+            end
+            
+            return res
+        end
+
         def list_pool(options, top=false, filter_flag=nil)
             if options[:describe]
                 table = format_pool(options)
@@ -771,6 +795,27 @@ EOT
         OneHelper.name_to_id(name, pool, poolname)
     end
 
+    def OpenNebulaHelper.size_in_mb(size)
+        m = size.match(/^(\d+(?:\.\d+)?)(m|mb|g|gb)?$/i)
+
+        if !m
+            # return OpenNebula::Error.new('Size value malformed')
+            return -1, 'Size value malformed'
+        else
+            multiplier=case m[2]
+            when /(g|gb)/i
+                1024
+            else
+                1
+            end
+
+            value=m[1].to_f*multiplier
+
+            # return value.ceil
+            return 0, value.ceil
+        end
+    end
+
     def OpenNebulaHelper.rname_to_id_desc(poolname)
         "OpenNebula #{poolname} name or id"
     end
@@ -1105,6 +1150,8 @@ EOT
             template<<' ]' << "\n"
         end
 
+        template<<"VCENTER_VM_FOLDER=#{options[:vcenter_vm_folder]}\n" if options[:vcenter_vm_folder]
+
         context=create_context(options)
         template<<context if context
 

data/lib/one_helper/oneacct_helper.rb

@@ -135,10 +135,6 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             VirtualMachine.get_history_action d["ACTION"]
         end
 
-        column :REASON, "VM state change reason", :left, :size=>4 do |d|
-            VirtualMachine.get_reason d["REASON"]
-        end
-
         column :START_TIME, "Start time", :size=>14 do |d|
             OpenNebulaHelper.time_to_str(d['STIME'])
         end
@@ -187,7 +183,7 @@ class AcctHelper < OpenNebulaHelper::OneHelper
             OpenNebulaHelper.unit_to_str(total_disk_size * 1024.0, {})
         end
 
-        default :VID, :HOSTNAME, :ACTION, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NETRX, :NETTX, :DISK
+        default :VID, :HOSTNAME, :ACTION, :START_TIME, :END_TIME, :MEMORY, :CPU, :NETRX, :NETTX, :DISK
     end
 
     SHOWBACK_TABLE = CLIHelper::ShowTable.new(self.table_conf("oneshowback.yaml"), nil) do