opennebula-cli 4.10.2 → 4.11.80.beta

data/bin/onetemplate

@@ -171,7 +171,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     instantiate_desc = <<-EOT.unindent
         Creates a new VM instance from the given Template. This VM can be
-        managed with the 'onevm' command
+        managed with the 'onevm' command.
+
+        The source Template can be modified adding or replacing attributes with
+        the optional file argument, or with the options.
     EOT
 
     command :instantiate, instantiate_desc, :templateid, [:file, nil],

data/bin/onevcenter

@@ -215,6 +215,87 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         exit 0
     end
 
+    vms_desc = <<-EOT.unindent
+        Import vCenter running Virtual Machines into OpenNebula
+    EOT
+
+    command :vms, vms_desc, :options=>[ VCENTER, USER, PASS ] do
+        if  options[:vuser].nil? ||
+            options[:vpass].nil? ||
+            options[:vcenter].nil?
+            STDERR.puts "vCenter connection parameters are mandatory to import"\
+                        " VM templates:\n"\
+                        "\t --vcenter vCenter hostname\n"\
+                        "\t --vuser username to login in vcenter\n"\
+                        "\t --vpass password for the user"
+            exit -1
+        end
+
+        begin
+            STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
+
+            vc = VCenterDriver::VIClient.new_connection(
+                    :user     => options[:vuser],
+                    :password => options[:vpass],
+                    :host     => options[:vcenter])
+
+            STDOUT.print "done!\n\n"
+
+            STDOUT.print "Looking for running Virtual Machines..."
+
+            rs = vc.running_vms
+
+            STDOUT.print "done!\n"
+
+            rs.each {|dc, tmps|
+                STDOUT.print "\nDo you want to process datacenter #{dc} [y/n]? "
+
+                next if STDIN.gets.strip.downcase != 'y'
+
+                if tmps.empty?
+                    STDOUT.print "    No new running Virtual Machines found in"\
+                                 " #{dc}...\n\n"
+                    next
+                end
+
+                tmps.each{ |v|
+                    STDOUT.print "\n  * Running Virtual Machine found:\n"\
+                                 "      - Name   : #{v[:name]}\n"\
+                                 "      - UUID   : #{v[:uuid]}\n"\
+                                 "      - Cluster: #{v[:host]}\n"\
+                                 "    Import this Virtual Machine [y/n]? "
+
+                    next if STDIN.gets.strip.downcase != 'y'
+
+                    one_v = ::OpenNebula::VirtualMachine.new(
+                                ::OpenNebula::VirtualMachine.build_xml, vc.one)
+
+                    rc = one_v.allocate(v[:one])
+
+                    if ::OpenNebula.is_error?(rc)
+                        STDOUT.puts "    Error creating Virtual Machine: "\
+                                    "#{rc.message}\n"
+                    end
+
+                    rc = one_v.deploy v[:host_id]
+
+                    if ::OpenNebula.is_error?(rc)
+                        STDOUT.puts "    Error creating Virtual Machine: "\
+                                    "#{rc.message}\n"
+                    else
+                        STDOUT.puts "    OpenNebula VM #{one_v.id} "\
+                                    "created!\n"
+                    end
+                }
+            }
+        rescue Exception => e
+            STDOUT.puts "error: #{e.message}"
+            exit -1
+        end
+
+        exit 0
+    end
+
     network_desc = <<-EOT.unindent
         Import vCenter networks into OpenNebula
     EOT

data/bin/onevdc

@@ -0,0 +1,280 @@
+#!/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/onevdc_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onevdc` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneVdcHelper.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, :vdcid, OneVdcHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :vdcid_list, OneVdcHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    end
+
+    set :format, :zoneid, OpenNebulaHelper.rname_to_id_desc("ZONE") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "ZONE")
+    end
+
+    set :format, :clusterid,
+        "#{OpenNebulaHelper.rname_to_id_desc('CLUSTER')}. Can be set to ALL" do |arg|
+
+        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+            [0, Vdc::ALL_RESOURCES]
+        else
+            OpenNebulaHelper.rname_to_id(arg, "CLUSTER")
+        end
+    end
+
+    set :format, :hostid,
+        "#{OpenNebulaHelper.rname_to_id_desc('HOST')}. Can be set to ALL" do |arg|
+
+        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+            [0, Vdc::ALL_RESOURCES]
+        else
+            OpenNebulaHelper.rname_to_id(arg, "HOST")
+        end
+    end
+
+    set :format, :datastoreid,
+        "#{OpenNebulaHelper.rname_to_id_desc('DATASTORE')}. Can be set to ALL" do |arg|
+
+        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+            [0, Vdc::ALL_RESOURCES]
+        else
+            OpenNebulaHelper.rname_to_id(arg, "DATASTORE")
+        end
+    end
+
+    set :format, :vnetid,
+        "#{OpenNebulaHelper.rname_to_id_desc('VNET')}. Can be set to ALL" do |arg|
+
+        if !arg.nil? and arg.class != Fixnum and arg.upcase == "ALL"
+            [0, Vdc::ALL_RESOURCES]
+        else
+            OpenNebulaHelper.rname_to_id(arg, "VNET")
+        end
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new VDC
+    EOT
+
+    command :create, create_desc, :name do
+        helper.create_resource(options) do |vdc|
+            template = "NAME = \"#{args[0]}\""
+            vdc.allocate(template)
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the VDC
+    EOT
+
+    command :rename, rename_desc, :vdcid, :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, :vdcid, [: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 VDC
+    EOT
+
+    command :delete, delete_desc, [:range, :vdcid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    add_group_desc = <<-EOT.unindent
+        Adds a Group to the given VDC
+    EOT
+
+    command :addgroup, add_group_desc, [:range, :vdcid_list], :groupid do
+        helper.perform_actions(args[0],options,"group added") do |obj|
+            obj.add_group(args[1].to_i)
+        end
+    end
+
+    del_group_desc = <<-EOT.unindent
+        Deletes a Group from the given VDC
+    EOT
+
+    command :delgroup, del_group_desc, [:range, :vdcid_list], :groupid do
+        helper.perform_actions(args[0],options,"group deleted") do |obj|
+            obj.del_group(args[1].to_i)
+        end
+    end
+
+    add_cluster_desc = <<-EOT.unindent
+        Adds a Cluster (from a specific Zone) to the given VDC
+    EOT
+
+    command :addcluster, add_cluster_desc, [:range, :vdcid_list], :zoneid, :clusterid do
+        helper.perform_actions(args[0],options,"cluster added") do |obj|
+            obj.add_cluster(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    del_cluster_desc = <<-EOT.unindent
+        Deletes a Cluster (from a specific Zone) from the given VDC
+    EOT
+
+    command :delcluster, del_cluster_desc, [:range, :vdcid_list], :zoneid, :clusterid do
+        helper.perform_actions(args[0],options,"cluster deleted") do |obj|
+            obj.del_cluster(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    add_host_desc = <<-EOT.unindent
+        Adds a Host (from a specific Zone) to the given VDC
+    EOT
+
+    command :addhost, add_host_desc, [:range, :vdcid_list], :zoneid, :hostid do
+        helper.perform_actions(args[0],options,"host added") do |obj|
+            obj.add_host(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    del_host_desc = <<-EOT.unindent
+        Deletes a Host (from a specific Zone) from the given VDC
+    EOT
+
+    command :delhost, del_host_desc, [:range, :vdcid_list], :zoneid, :hostid do
+        helper.perform_actions(args[0],options,"host deleted") do |obj|
+            obj.del_host(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    add_datastore_desc = <<-EOT.unindent
+        Adds a Datastore (from a specific Zone) to the given VDC
+    EOT
+
+    command :adddatastore, add_datastore_desc, [:range, :vdcid_list], :zoneid, :datastoreid do
+        helper.perform_actions(args[0],options,"datastore added") do |obj|
+            obj.add_datastore(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    del_datastore_desc = <<-EOT.unindent
+        Deletes a Datastore (from a specific Zone) from the given VDC
+    EOT
+
+    command :deldatastore, del_datastore_desc, [:range, :vdcid_list], :zoneid, :datastoreid do
+        helper.perform_actions(args[0],options,"datastore deleted") do |obj|
+            obj.del_datastore(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    add_vnet_desc = <<-EOT.unindent
+        Adds a Virtual Network (from a specific Zone) to the given VDC
+    EOT
+
+    command :addvnet, add_vnet_desc, [:range, :vdcid_list], :zoneid, :vnetid do
+        helper.perform_actions(args[0],options,"vnet added") do |obj|
+            obj.add_vnet(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    del_vnet_desc = <<-EOT.unindent
+        Deletes a Virtual Network (from a specific Zone) from the given VDC
+    EOT
+
+    command :delvnet, del_vnet_desc, [:range, :vdcid_list], :zoneid, :vnetid do
+        helper.perform_actions(args[0],options,"vnet deleted") do |obj|
+            obj.del_vnet(args[1].to_i, args[2].to_i)
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists VDCs 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 VDC
+    EOT
+
+    command :show, show_desc,:vdcid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+end

data/bin/onevnet

@@ -253,7 +253,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 exit -1
             end
 
-            vn.reserve(name, size, options[:address_range], addr, args[1])
+            res = vn.reserve(name, size, options[:address_range], addr, args[1])
+
+            if !OpenNebula.is_error?(res)
+                puts "Reservation VNET ID: #{res}"
+            end
+
+            res
         end
     end
 
@@ -343,9 +349,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             obj.delete_element("AR_POOL/AR[AR_ID!=#{args[1]}]")
             obj.delete_element("AR_POOL/AR/LEASES")
             obj.delete_element("AR_POOL/AR/USED_LEASES")
+            obj.delete_element("AR_POOL/AR/MAC_END")
+            obj.delete_element("AR_POOL/AR/IP_END")
+            obj.delete_element("AR_POOL/AR/IP6_ULA")
+            obj.delete_element("AR_POOL/AR/IP6_ULA_END")
+            obj.delete_element("AR_POOL/AR/IP6_GLOBAL")
+            obj.delete_element("AR_POOL/AR/IP6_GLOBAL_END")
 
             if obj.template_like_str("AR_POOL").empty?
-                puts "Address Range #{args[1]} does not exit for "<<
+                puts "Address Range #{args[1]} does not exist for "<<
                     "Virtual Network #{args[0]}"
                 exit -1
             end

data/lib/cli_helper.rb

@@ -211,7 +211,7 @@ module CLIHelper
                 pool=@data.keys.first
                 return print_table(nil, options) if !pool
 
-                element=pool.split('_').first
+                element=pool.split('_')[0..-2].join('_')
 
                 pool_data=@data.dsearch("#{pool}/#{element}")
                 pool_data=[pool_data].flatten if pool_data

data/lib/one_helper.rb

@@ -169,15 +169,6 @@ EOT
                 "Which resources can be created by group users "<<
                 "(VM+NET+IMAGE+TEMPLATE by default)",
             :format => String
-        },
-        {
-            :name   => 'admin_resources',
-            :large  => '--admin_resources res_str',
-            :short => "-o",
-            :description =>
-                "Which resources can be created by the admin user "<<
-                "(VM+NET+IMAGE+TEMPLATE by default)",
-            :format => String
         }
     ]
 

data/lib/one_helper/oneacct_helper.rb

@@ -18,19 +18,35 @@ require 'one_helper'
 require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
-    START_TIME = {
+    START_TIME_ACCT = {
         :name   => "start_time",
         :short  => "-s TIME",
         :large  => "--start TIME" ,
-        :description => "Start date and time to take into account",
+        :description => "First day of the data to retrieve",
         :format => Time
     }
 
-    END_TIME = {
+    END_TIME_ACCT = {
         :name   => "end_time",
         :short  => "-e TIME",
         :large  => "--end TIME" ,
-        :description => "End date and time",
+        :description => "Last day of the data to retrieve",
+        :format => Time
+    }
+
+    START_TIME_SHOWBACK = {
+        :name   => "start_time",
+        :short  => "-s TIME",
+        :large  => "--start TIME" ,
+        :description => "First month of the data",
+        :format => Time
+    }
+
+    END_TIME_SHOWBACK = {
+        :name   => "end_time",
+        :short  => "-e TIME",
+        :large  => "--end TIME" ,
+        :description => "Last month of the data",
         :format => Time
     }
 
@@ -95,8 +111,8 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         :description => "Split the output in a table for each VM"
     }
 
-    ACCT_OPTIONS = [START_TIME, END_TIME, USERFILTER, GROUP, HOST, XPATH, XML, JSON, SPLIT]
-
+    ACCT_OPTIONS     = [START_TIME_ACCT, END_TIME_ACCT, USERFILTER, GROUP, HOST, XPATH, XML, JSON, SPLIT]
+    SHOWBACK_OPTIONS = [START_TIME_SHOWBACK, END_TIME_SHOWBACK, USERFILTER, GROUP, XML, JSON]
 
     ACCT_TABLE = CLIHelper::ShowTable.new("oneacct.yaml", nil) do
         column :UID, "User ID", :size=>4 do |d|
@@ -152,6 +168,50 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         default :VID, :HOSTNAME, :ACTION, :REASON, :START_TIME, :END_TIME, :MEMORY, :CPU, :NET_RX, :NET_TX
     end
 
+    SHOWBACK_TABLE = CLIHelper::ShowTable.new("oneshowback.yaml", nil) do
+        column :UID, "User ID", :size=>4 do |d|
+            d["UID"]
+        end
+
+        column :USER_NAME, "User name", :left, :size=>12 do |d|
+            d["UNAME"]
+        end
+
+        column :GID, "Group ID", :size=>4 do |d|
+            d["GID"]
+        end
+
+        column :GROUP_NAME, "Group name", :left, :size=>12 do |d|
+            d["GNAME"]
+        end
+
+        column :VM_ID, "Virtual Machine ID", :size=>6 do |d|
+            d["VMID"]
+        end
+
+        column :VM_NAME, "Virtual Machine name", :left, :size=>12 do |d|
+            d["VMNAME"]
+        end
+
+        column :MONTH, "Month", :size=>5 do |d|
+            d["MONTH"]
+        end
+
+        column :YEAR, "Year", :size=>5 do |d|
+            d["YEAR"]
+        end
+
+        column :HOURS, "Hours", :size=>6 do |d|
+            d["HOURS"]
+        end
+
+        column :COST, "Cost", :size=>15 do |d|
+            d["TOTAL_COST"]
+        end
+
+        default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :COST
+    end
+
     def self.print_start_end_time_header(start_time, end_time)
         print "Showing active history records from "
 
@@ -184,4 +244,12 @@ class AcctHelper < OpenNebulaHelper::OneHelper
         CLIHelper.scr_restore
         puts
     end
+
+    def self.print_month_header(year, month)
+        CLIHelper.scr_bold
+        CLIHelper.scr_underline
+        puts "# Showback for #{month}/#{year}".ljust(80)
+        CLIHelper.scr_restore
+        puts
+    end
 end