shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

bug #730: Add zone and vdc id format

Browse Source
This commit is contained in:
Daniel Molina 2011-09-08 15:26:22 +02:00
parent 0e9ecc5655
commit 28e5fb3813
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ozones/Client/bin/onevdc
View File

@ -18,6 +18,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
usage "`onevdc` command [<args>] [<options>]"
version OpenNebulaHelper::ONE_VERSION
set :format, :vdcid, "VDC ID" do |arg|
arg.match(/^[0123456789]+$/) ? [0,arg] : [-1]
end
########################################################################
# Global Options
########################################################################
@ -34,7 +38,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
helper.create_resource(args[0])
end
command :show, 'Show information of a particular VDC', :text do
command :show, 'Show information of a particular VDC', :vdcid do
helper.show_resource(args[0],options)
end

46
src/ozones/Client/bin/onezone
View File

@ -17,15 +17,19 @@ require 'ozones_helper/zones_helper.rb'
cmd=CommandParser::CmdParser.new(ARGV) do
usage "`onezone` <command> [<args>] [<options>]"
version OpenNebulaHelper::ONE_VERSION
set :format, :zoneid, "Zone ID" do |arg|
arg.match(/^[0123456789]+$/) ? [0,arg] : [-1]
end
########################################################################
# Global Options
########################################################################
########################################################################
set :option, CommandParser::OPTIONS
begin
helper = ZonesHelper.new "zone"
rescue Exception => e
rescue Exception => e
warn e.message
exit -1
end
@ -33,8 +37,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
command :create, 'Create a new Zone', :file do
helper.create_resource(args[0])
end
command :show, 'Show information of a particular Zone', :text, [:text, nil] do
show_desc = <<-EOT.unindent
Show information of a particular Zone
Available resources: host, vm, image, vn, template, user
Examples:
onezone show 4
onezone show 4 host
EOT
command :show, show_desc, :zoneid, [:resource, nil] do
zone=helper.show_resource(args[0],options)[1]
case args[1]
@ -44,54 +56,54 @@ cmd=CommandParser::CmdParser.new(ARGV) do
zone['endpoint'],
false)
aux_helper.list_pool(options)
aux_helper.list_pool(options)
when "vm"
aux_helper = OneVMHelper.new(
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'],
false)
aux_helper.list_pool(options)
aux_helper.list_pool(options)
when "image"
aux_helper = OneImageHelper.new(
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'],
false)
aux_helper.list_pool(options)
aux_helper.list_pool(options)
when "vn"
aux_helper = OneVNetHelper.new(
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'],
false)
aux_helper.list_pool(options)
aux_helper.list_pool(options)
when "template"
aux_helper = OneTemplateHelper.new(
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'],
false)
aux_helper.list_pool(options)
aux_helper.list_pool(options)
when "user"
aux_helper = OneUserHelper.new(
zone['onename'] + ":" + zone['onepass'],
zone['endpoint'],
false)
aux_helper.list_pool(options)
aux_helper.list_pool(options)
end
0
end
command :list, 'Lists Zones in the pool',
command :list, 'Lists Zones in the pool',
:options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
helper.list_pool(options)
end
command :delete, 'Deletes a Zone', :zoneid do
helper.delete_resource(args[0],options)
helper.delete_resource(args[0],options)
end
end