opennebula-cli 4.4.0 → 4.5.80.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09217c63aeee7abd11ea62bbce95d89aebf56bbf
-  data.tar.gz: d7f49893d15771de27179a3abbdf5df268b2f395
+  metadata.gz: 0d0a7a6d4a5861896dcea19d5bd0901864e93cf8
+  data.tar.gz: 3348c3fbf038afce1e154ed5d17cf94819c663a1
 SHA512:
-  metadata.gz: 9c3429402c0d4d1dddc85d22d31318b6572839b54f87383f42c7e96c6708e90b3d6d689a7ad4e0cf9372fcd44416d8c191387cedd82ad9e1892fcc629e805f72
-  data.tar.gz: 939acfc80e9e32485bcebbec3944f77b059ad1e4344bce722fc79dfa75df8234a84b7747a1ad319174e050fcd4fa4e67d2f00f60f485ef12386545ca2f56d848
+  metadata.gz: 30d8c96ff0feaffd28f8c13a180d4118e40e12c95f994d4336d72efff7a6fb2f58cd69aa28bb9955c17bba52d51e8c2a95386d33f2777e5997151279c2c94c89
+  data.tar.gz: 3f283c2538ee84ff6f5d4341f8b9f0ff854731de9e358489f73a9be7ba7a6a69dc7573b3340101ea12ae4ed3810c21944d4510a0863db77a1ad0193a89daf3c5

data/NOTICE

@@ -1,6 +1,6 @@
 OpenNebula Open Source Project
 --------------------------------------------------------------------------------
-Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs
+Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs
 --------------------------------------------------------------------------------
 
 You can find  more information about the project, release notes and

data/bin/oneacct

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -44,9 +44,15 @@ cmd = CommandParser::CmdParser.new(ARGV) do
     end
 
     option AcctHelper::ACCT_OPTIONS + CommandParser::OPTIONS +
+        [OpenNebulaHelper::DESCRIBE, CLIHelper::LIST, CLIHelper::CSV] +
         OpenNebulaHelper::CLIENT_OPTIONS
 
     main do
+        if options[:describe]
+            AcctHelper::ACCT_TABLE.describe_columns
+            exit(0)
+        end
+
         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
@@ -81,7 +87,10 @@ cmd = CommandParser::CmdParser.new(ARGV) do
         else
             order_by = Hash.new
             order_by[:order_by_1] = 'VM/UID'
-            order_by[:order_by_2] = 'VM/ID' if options[:split]
+
+            if options[:split] && !options[:csv]
+                order_by[:order_by_2] = 'VM/ID'
+            end
 
             acct_hash = pool.accounting(filter_flag,
                                         common_opts.merge(order_by))
@@ -90,6 +99,21 @@ cmd = CommandParser::CmdParser.new(ARGV) do
                 exit -1
             end
 
+            if options[:csv]
+                a=Array.new
+                acct_hash.each do |user_id, value|
+                    value['HISTORY_RECORDS']['HISTORY'].each do |l|
+                        l['UID']=user_id
+                        a << l
+                    end
+                end
+
+                cols=AcctHelper::ACCT_TABLE.default_columns
+                AcctHelper::ACCT_TABLE.default(:UID, *cols)
+
+                AcctHelper::ACCT_TABLE.show(a, options)
+                exit(0)
+            end
 
             if ( start_time != -1 or end_time != -1 )
                 AcctHelper.print_start_end_time_header(start_time, end_time)
@@ -102,13 +126,13 @@ cmd = CommandParser::CmdParser.new(ARGV) do
                     # Use one table for each VM
                     value.each { |vm_id, history_array|
                         array = history_array['HISTORY_RECORDS']['HISTORY']
-                        AcctHelper::ACCT_TABLE.show(array)
+                        AcctHelper::ACCT_TABLE.show(array, options)
                         puts
                     }
                 else
                     # Use the same table for all the VMs
                     array = value['HISTORY_RECORDS']['HISTORY']
-                    AcctHelper::ACCT_TABLE.show(array)
+                    AcctHelper::ACCT_TABLE.show(array, options)
                     puts
                 end
             }

data/bin/oneacl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -69,10 +69,10 @@ cmd = CommandParser::CmdParser.new(ARGV) do
             if OpenNebula.is_error?(new_args)
                 next -1, new_args.message
             end
-        when 3
+        when 3, 4
             new_args=args
         else
-            next -1, "Wrong number of arguments, must be 1 or 3"
+            next -1, "Wrong number of arguments, must be 1 or 4"
         end
 
         helper.create_resource(options) do |rule|

data/bin/onecluster

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #

data/bin/onedatastore

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #

data/bin/oneflow

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2010-2013, C12G Labs S.L.                                        #
+# Copyright 2010-2014, C12G Labs S.L.                                        #
 #                                                                            #
 # 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    #

data/bin/oneflow-template

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2010-2013, C12G Labs S.L.                                        #
+# Copyright 2010-2014, C12G Labs S.L.                                        #
 #                                                                            #
 # 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    #

data/bin/onegroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -61,20 +61,89 @@ 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")
+    end
+
     ########################################################################
     # Commands
     ########################################################################
 
     create_desc = <<-EOT.unindent
-        Creates a new Group
+        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
+
+        Examples:
+
+          - using a template description file:
+
+            onegroup create group_description.tmpl
+
+          - create a group with admin group, admin user and allow group users
+            to only create new templates and VMs, and group admins to manage
+            templates, vms, images and virtual networks
+
+            onegroup create --name groupA --admin_group admin_groupA 
+                            --admin_user admin_userA --admin_password somestr
+                            --resource TEMPLATE+VM 
+                            --admin_resources TEMPLATE+VM+IMAGE+NET
+
     EOT
 
-    command :create, create_desc, :name do
-        helper.create_resource(options) do |group|
-            group.allocate(args[0])
+    command :create, create_desc, [:group_name, nil], :options =>
+            OpenNebulaHelper::GROUP_OPTIONS do
+
+
+        if !args[0] && options.empty?
+            STDERR.puts "Please use either a group name or command arguments"
+            next -1
+        end
+
+        if options && options[:admin_user]
+            if !options[:admin_password]
+                STDERR.puts "Admin user needs password"
+                next -1
+            end
+
+            admin_user=Hash.new
+            admin_user[:name]      = options[:admin_user]
+            admin_user[:password]  = options[:admin_password]
+            if options[:admin_driver]
+                admin_user[:auth_driver] = options[:admin_driver]
+            end
+            options[:user] = admin_user
+        end
+
+        if !options.empty?
+            helper.create_complete_resource(options)
+        elsif args[0]
+            options[:name] = args[0]
+            helper.create_complete_resource(options)
         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, :groupid, [: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    
+
     delete_desc = <<-EOT.unindent
         Deletes the given Group
     EOT
@@ -174,4 +243,33 @@ 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/onehost

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -20,7 +20,7 @@ ONE_LOCATION=ENV["ONE_LOCATION"]
 
 if !ONE_LOCATION
     RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-    REMOTES_LOCATION="/var/lib/one/remotes"
+    REMOTES_LOCATION="/var/lib/one/remotes/"
 else
     RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
     REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"

data/bin/oneimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #

data/bin/onetemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #

data/bin/oneuser

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #
@@ -40,7 +40,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     helper = OneUserHelper.new
 
     before_proc do
-        helper.set_client(options)
+        helper.set_client(options) if @comm_name != :login
     end
 
     ########################################################################

data/bin/onevm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #

data/bin/onevnet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2014, 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    #

data/bin/onezone

@@ -0,0 +1,145 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2014, 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/onezone_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onezone` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneZoneHelper.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, :zoneid, OneZoneHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :zoneid_list, OneZoneHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new Zone
+    EOT
+
+    command :create, create_desc, :file do
+        helper.create_resource(options) do |zone|
+            begin
+                template = File.read(args[0])
+                zone.allocate(template)
+            rescue => e
+                STDERR.puts e.message
+                exit -1
+            end
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Zone
+    EOT
+
+    command :rename, rename_desc, :zoneid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(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, :zoneid, [: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
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given Zone
+    EOT
+
+    command :delete, delete_desc, [:range, :zoneid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists Zones in the pool
+    EOT
+
+    command :list, list_desc, :options=>list_options do
+        helper.list_pool(options)
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows information for the given Zone
+    EOT
+
+    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 do
+        helper.set_zone(args[0])
+    end
+end