Feature #3471: Add methods to manage VDC resources to CLI

This commit is contained in:
Carlos Martín committed 2014-12-23 17:51:49 +01:00
1 parent 18232fd967
commit e29d3210a2
3 files changed
+311 -2

No files matched your search

+33 -1
View File
@@ -66,8 +66,40 @@ class OneVdcHelper < OpenNebulaHelper::OneHelper
CLIHelper.print_header(str_h1 % "VDC #{vdc['ID']} INFORMATION")
puts str % ["ID", vdc.id.to_s]
puts str % ["NAME", vdc.name]
puts
vdc_hash = vdc.to_hash
groups = vdc_hash['VDC']['GROUPS']['ID']
if(groups != nil)
puts
#CLIHelper.print_header(str_h1 % "GROUPS", false)
CLIHelper::ShowTable.new(nil, self) do
column :"GROUPS", "", :right, :size=>7 do |d|
d
end
end.show([groups].flatten, {})
end
['CLUSTER', 'HOST', 'DATASTORE', 'VNET'].each do |resource|
res_array = vdc_hash['VDC']["#{resource}S"][resource]
if(res_array != nil)
puts
CLIHelper.print_header(str_h1 % "#{resource}S", false)
CLIHelper::ShowTable.new(nil, self) do
column :"ZONE", "", :right, :size=>7 do |d|
d['ZONE_ID']
end
column :"#{resource}", "", :right, :size=>9 do |d|
d["#{resource}_ID"] == Vdc::ALL_RESOURCES ? 'ALL' : d["#{resource}_ID"]
end
end.show([res_array].flatten, {})
end
end
puts
CLIHelper.print_header(str_h1 % "VDC TEMPLATE", false)
puts vdc.template_str
end
+148
View File
@@ -61,6 +61,54 @@ cmd=CommandParser::CmdParser.new(ARGV) do
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
########################################################################
@@ -119,6 +167,106 @@ cmd=CommandParser::CmdParser.new(ARGV) do
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
+130 -1
View File
@@ -23,12 +23,25 @@ module OpenNebula
# Constants and Class Methods
#######################################################################
ALL_RESOURCES = "-10"
VDC_METHODS = {
:info => "vdc.info",
:allocate => "vdc.allocate",
:update => "vdc.update",
:rename => "vdc.rename",
:delete => "vdc.delete"
:delete => "vdc.delete",
:add_group => "vdc.addgroup",
:del_group => "vdc.delgroup",
:add_cluster => "vdc.addcluster",
:del_cluster => "vdc.delcluster",
:add_host => "vdc.addhost",
:del_host => "vdc.delhost",
:add_datastore => "vdc.adddatastore",
:del_datastore => "vdc.deldatastore",
:add_vnet => "vdc.addvnet",
:del_vnet => "vdc.delvnet",
}
# Creates a Vdc description with just its identifier
@@ -103,5 +116,121 @@ module OpenNebula
def rename(name)
return call(VDC_METHODS[:rename], @pe_id, name)
end
# Adds a group to this VDC
# @param group_id [Integer] Group ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def add_group(group_id)
return call(VDC_METHODS[:add_group], @pe_id, group_id.to_i)
end
# Deletes a group from this VDC
# @param group_id [Integer] Group ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def del_group(group_id)
return call(VDC_METHODS[:del_group], @pe_id, group_id.to_i)
end
# Adds a cluster to this VDC
# @param zone_id [Integer] Zone ID
# @param cluster_id [Integer] Cluster ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def add_cluster(zone_id, cluster_id)
return call(VDC_METHODS[:add_cluster], @pe_id, zone_id.to_i, cluster_id.to_i)
end
# Deletes a cluster from this VDC
# @param zone_id [Integer] Zone ID
# @param cluster_id [Integer] Cluster ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def del_cluster(zone_id, cluster_id)
return call(VDC_METHODS[:del_cluster], @pe_id, zone_id.to_i, cluster_id.to_i)
end
# Adds a host to this VDC
# @param zone_id [Integer] Zone ID
# @param host_id [Integer] Host ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def add_host(zone_id, host_id)
return call(VDC_METHODS[:add_host], @pe_id, zone_id.to_i, host_id.to_i)
end
# Deletes a host from this VDC
# @param zone_id [Integer] Zone ID
# @param host_id [Integer] Host ID # Adds a host to this VDC
# @param zone_id [Integer] Zone ID
# @param host_id [Integer] Host ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def add_host(zone_id, host_id)
return call(VDC_METHODS[:add_host], @pe_id, zone_id.to_i, host_id.to_i)
end
# Deletes a host from this VDC
# @param zone_id [Integer] Zone ID
# @param host_id [Integer] Host ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def del_host(zone_id, host_id)
return call(VDC_METHODS[:del_host], @pe_id, zone_id.to_i, host_id.to_i)
end
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def del_host(zone_id, host_id)
return call(VDC_METHODS[:del_host], @pe_id, zone_id.to_i, host_id.to_i)
end
# Adds a datastore to this VDC
# @param zone_id [Integer] Zone ID
# @param datastore_id [Integer] Datastore ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def add_datastore(zone_id, datastore_id)
return call(VDC_METHODS[:add_datastore], @pe_id, zone_id.to_i, datastore_id.to_i)
end
# Deletes a datastore from this VDC
# @param zone_id [Integer] Zone ID
# @param datastore_id [Integer] Datastore ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def del_datastore(zone_id, datastore_id)
return call(VDC_METHODS[:del_datastore], @pe_id, zone_id.to_i, datastore_id.to_i)
end
# Adds a vnet to this VDC
# @param zone_id [Integer] Zone ID
# @param vnet_id [Integer] Vnet ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def add_vnet(zone_id, vnet_id)
return call(VDC_METHODS[:add_vnet], @pe_id, zone_id.to_i, vnet_id.to_i)
end
# Deletes a vnet from this VDC
# @param zone_id [Integer] Zone ID
# @param vnet_id [Integer] Vnet ID
#
# @return [nil, OpenNebula::Error] nil in case of success, Error
# otherwise
def del_vnet(zone_id, vnet_id)
return call(VDC_METHODS[:del_vnet], @pe_id, zone_id.to_i, vnet_id.to_i)
end
end
end