opennebula-cli 4.10.2 → 4.11.80.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b27f616d275440e4bfb83d9ec0b519361ed4abf
-  data.tar.gz: c104259923ec8765e0e1cefcdf504204ec743ea4
+  metadata.gz: 6e4f0451ba3ef3e474e98228a2a9b1868f1a27d3
+  data.tar.gz: 1dd02015422f89b681ba391dd50b5b12d611c010
 SHA512:
-  metadata.gz: 1ea168960417e9bf0efd193f4f9cc89a9faa88ffe7a459ae438051ba5944828ae2407f4002ac032be8ad713ac2c1be6a9e1274fd4bbc6454cfe67b8fd4c479ff
-  data.tar.gz: 598dc916b8552ada376587ac6940fccb443efe8401bb912d1aa7074e7461bcc2ad2f2edadc7fe9d1c1403d737618f986f1546ab7aa0bc4f13bb18a02655c1297
+  metadata.gz: 5cfcc2c25006feb5fc24d715d759fa8e920699a413472f29dff1eb8ab9a1cc01e6c5d7f2d385f002e32807a5a6247b2bbc5425b5ec7b7232258235369a74e6a4
+  data.tar.gz: dba097702f2bac297a871367aca4345ad97ad245c921591f5cdae8bd646e1433ca0fe612ed2fb2d4036a254d21091eec4db8eaaa2c69cbcef8727b9c241c36bb

data/bin/oneacct

@@ -55,7 +55,21 @@ cmd = CommandParser::CmdParser.new(ARGV) do
 
         filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
         start_time  = options[:start_time] ? options[:start_time].to_i : -1
-        end_time    = options[:end_time] ? options[:end_time].to_i : -1
+
+        end_time = -1
+
+        if (!options[:end_time].nil?)
+            # Not the safest way to add a day, but since managing date/time
+            # in ruby is... not entirely convenient, this will do
+
+            t = options[:end_time]
+
+            if (t.hour == 0 && t.min == 0 && t.sec == 0)
+                t += 24*60*60
+            end
+
+            end_time = t.to_i
+        end
 
         common_opts = {
             :start_time => start_time,
@@ -70,7 +84,7 @@ cmd = CommandParser::CmdParser.new(ARGV) do
         if options[:json] || options[:xml]
             xml_str = pool.accounting_xml(filter_flag, common_opts)
             if OpenNebula.is_error?(xml_str)
-                puts acct_hash.message
+                puts xml_str.message
                 exit -1
             end
 

data/bin/onedatastore

@@ -184,4 +184,24 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             o.rename(args[1])
         end
     end
+
+    enable_desc = <<-EOT.unindent
+        Enables the given Datastore. Only available for System Datastores
+    EOT
+
+    command :enable, enable_desc, [:range,:datastoreid_list] do
+        helper.perform_actions(args[0],options,"enabled") do |obj|
+            obj.enable
+        end
+    end
+
+    disable_desc = <<-EOT.unindent
+        Disables the given Datastore. Only available for System Datastores
+    EOT
+
+    command :disable, disable_desc, [:range,:datastoreid_list] do
+        helper.perform_actions(args[0],options,"disabled") do |obj|
+            obj.disable
+        end
+    end
 end

data/bin/onegroup

@@ -61,12 +61,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.list_to_id(arg)
     end
 
-    set :format, :clusterid, OpenNebulaHelper.rname_to_id_desc("CLUSTER") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "CLUSTER")
-    end
-
-    set :format, :zoneid, OpenNebulaHelper.rname_to_id_desc("ZONE") do |arg|
-        OpenNebulaHelper.rname_to_id(arg, "ZONE")
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "USER")
     end
 
     ########################################################################
@@ -75,18 +71,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     create_desc = <<-EOT.unindent
         Creates a new Group. A group name can be passed as the only argument,
-        or a file containing a group template or via command line arguments
+        or via command line arguments
 
         Examples:
 
-          - create a group with admin user and allow group users
-            to only create new templates and VMs, and group admin to manage
-            templates, vms, images and virtual networks
+          - create a group with an admin user and allow group users
+            to only create new templates and VMs
 
             onegroup create --name groupA
                             --admin_user admin_userA --admin_password somestr
                             --resources TEMPLATE+VM
-                            --admin_resources TEMPLATE+VM+IMAGE+NET
 
     EOT
 
@@ -95,7 +89,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
 
         if !args[0] && options.empty?
-            STDERR.puts "Please use either a group name or command arguments"
+            STDERR.puts "Please use either a group name or command arguments."<<
+            " Run onegroup create -h for more information"
             next -1
         end
 
@@ -109,7 +104,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             admin_user[:name]       = options[:admin_user]
             admin_user[:password]   = options[:admin_password]
             admin_user[:auth_driver]= options[:admin_driver] if options[:admin_driver]
-            admin_user[:resources]  = options[:admin_resources] if options[:admin_resources]
 
             options[:group_admin] = admin_user
         end
@@ -167,6 +161,26 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         helper.show_resource(group,options)
     end
 
+    add_admin_desc = <<-EOT.unindent
+        Adds a User to the Group administrators set
+    EOT
+
+    command :addadmin, add_admin_desc, [:range, :groupid_list], :userid do
+        helper.perform_actions(args[0],options,"admin added") do |obj|
+            obj.add_admin(args[1].to_i)
+        end
+    end
+
+    del_admin_desc = <<-EOT.unindent
+        Removes a User from the Group administrators set
+    EOT
+
+    command :deladmin, del_admin_desc, [:range, :groupid_list], :userid do
+        helper.perform_actions(args[0],options,"admin deleted") do |obj|
+            obj.del_admin(args[1].to_i)
+        end
+    end
+
     quota_desc = <<-EOT.unindent
         Set the quota limits for the group. If a path is not provided the
         editor will be launched to modify the current quotas.
@@ -239,33 +253,4 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         exit 0
     end
-
-    add_provider_desc = <<-EOT.unindent
-        Adds a resource provider (cluster of a zone) to the given group.
-        clusterid can be set to ALL
-    EOT
-
-    command :add_provider, add_provider_desc, [:range, :groupid_list], :zoneid, :clusterid do
-        if args[2] and args[2].class != Fixnum and args[2].upcase == "ALL"
-            args[2]=10
-        end
-
-        helper.perform_actions(args[0],options,"resource provider added") do |obj|
-            obj.add_provider(args[1].to_i, args[2].to_i)
-        end
-    end
-
-    del_provider_desc = <<-EOT.unindent
-        Deletes a resource provider (cluster of a zone) from the given group
-        clusterid can be set to ALL
-    EOT
-
-    command :del_provider, del_provider_desc, [:range, :groupid_list], :zoneid, :clusterid do
-        if args[2] and args[2].class != Fixnum and args[2].upcase == "ALL"
-            args[2]=10
-        end
-        helper.perform_actions(args[0],options,"resource provider deleted") do |obj|
-            obj.del_provider(args[1].to_i, args[2].to_i)
-        end
-    end
 end

data/bin/onesecgroup

@@ -0,0 +1,198 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs        #
+#                                                                            #
+# 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/onesecgroup_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onesecgroup` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneSecurityGroupHelper.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, :secgroupid, OneSecurityGroupHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :secgroupid_list, OneSecurityGroupHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :filterflag, OneSecurityGroupHelper.filterflag_to_i_desc do |arg|
+        helper.filterflag_to_i(arg)
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new Security 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
+
+    clone_desc = <<-EOT.unindent
+        Creates a new Security Group from an existing one
+    EOT
+
+    command :clone, clone_desc, :secgroupid, :name do
+        helper.perform_action(args[0],options,"cloned") do |obj|
+            res = obj.clone(args[1])
+
+            if !OpenNebula.is_error?(res)
+                puts "ID: #{res}"
+            else
+                puts res.message
+            end
+        end
+    end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given Security Group
+    EOT
+
+    command :delete, delete_desc, [:range, :secgroupid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    chgrp_desc = <<-EOT.unindent
+        Changes the Security Group's group
+    EOT
+
+    command :chgrp, chgrp_desc,[:range, :secgroupid_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 Security Group's owner and group
+    EOT
+
+    command :chown, chown_desc, [:range, :secgroupid_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 Security Group permissions
+    EOT
+
+    command :chmod, chmod_desc, [:range, :secgroupid_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, :secgroupid, [: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
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Security Group
+    EOT
+
+    command :rename, rename_desc, :secgroupid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists Security 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 Security Group
+    EOT
+
+    command :show, show_desc, :secgroupid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+end

data/bin/oneshowback

@@ -0,0 +1,178 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs        #
+#                                                                            #
+# 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/oneacct_helper'
+
+require 'json'
+
+cmd = CommandParser::CmdParser.new(ARGV) do
+
+    @formats = Hash.new
+
+    usage "`oneshowback` <command> [<options>]"
+    description ""
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper=OpenNebulaHelper::OneHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    command :list, "Returns the showback records", :options =>
+        AcctHelper::SHOWBACK_OPTIONS + CommandParser::OPTIONS +
+        [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV_OPT] +
+        OpenNebulaHelper::CLIENT_OPTIONS do
+
+        if options[:describe]
+            AcctHelper::SHOWBACK_TABLE.describe_columns
+            exit(0)
+        end
+
+        filter_flag = (options[:userfilter] || VirtualMachinePool::INFO_ALL)
+
+        start_month = -1
+        start_year  = -1
+
+        if (options[:start_time])
+            start_month = options[:start_time].month
+            start_year  = options[:start_time].year
+        end
+
+        end_month = -1
+        end_year  = -1
+
+        if (options[:end_time])
+            end_month = options[:end_time].month
+            end_year  = options[:end_time].year
+        end
+
+        common_opts = {
+            :start_month => start_month,
+            :start_year  => start_year,
+            :end_month   => end_month,
+            :end_year    => end_year,
+            :group      => options[:group],
+            :xpath      => options[:xpath]
+        }
+
+        pool = OpenNebula::VirtualMachinePool.new(helper.client)
+
+        if options[:json] || options[:xml]
+            xml_str = pool.showback_xml(filter_flag, common_opts)
+            if OpenNebula.is_error?(xml_str)
+                puts xml_str.message
+                exit -1
+            end
+
+            if options[:json]
+                xmldoc = XMLElement.new
+                xmldoc.initialize_xml(xml_str, 'SHOWBACK_RECORDS')
+
+                puts JSON.pretty_generate(xmldoc.to_hash)
+            elsif options[:xml]
+                puts xml_str
+            end
+
+            exit_code 0
+        else
+
+            order_by = Hash.new
+            if !options[:csv]
+                order_by[:order_by_1] = 'YEAR'
+                order_by[:order_by_2] = 'MONTH'
+            end
+
+            data_hash = pool.showback(filter_flag,
+                                        common_opts.merge(order_by))
+            if OpenNebula.is_error?(data_hash)
+                puts data_hash.message
+                exit -1
+            end
+
+            if options[:csv]
+                a = Array.new
+
+                if data_hash['SHOWBACK_RECORDS']
+                    a = data_hash['SHOWBACK_RECORDS']['SHOWBACK']
+                end
+
+                AcctHelper::SHOWBACK_TABLE.show(a, options)
+                exit(0)
+            end
+
+            data_hash.each { |year, value|
+                value.each { |month, showback_array|
+                    AcctHelper.print_month_header(year, month)
+
+                    array = showback_array['SHOWBACK_RECORDS']['SHOWBACK']
+                    AcctHelper::SHOWBACK_TABLE.show(array, options)
+                    puts
+                }
+
+            }
+
+            exit_code 0
+        end
+    end
+
+    command :"calculate", "Calculates the showback records", :options =>
+            [AcctHelper::START_TIME_SHOWBACK, AcctHelper::END_TIME_SHOWBACK] do
+
+
+        start_month = -1
+        start_year  = -1
+
+        if (options[:start_time])
+            start_month = options[:start_time].month
+            start_year  = options[:start_time].year
+        end
+
+        end_month = -1
+        end_year  = -1
+
+        if (options[:end_time])
+            end_month = options[:end_time].month
+            end_year  = options[:end_time].year
+        end
+
+        rc = OpenNebula::VirtualMachinePool.new(helper.client).
+                calculate_showback(start_month, start_year, end_month, end_year)
+
+        if OpenNebula.is_error?(rc)
+            warn rc.message
+            exit -1
+        else
+            puts rc
+            exit_code 0
+        end
+
+    end
+end