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

Merge branch 'feature-1112' of git.opennebula.org:one into feature-1112

Browse Source
This commit is contained in:
Ruben S. Montero 2012-03-03 03:42:33 +01:00
commit 0e4fd8904c
8 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/one_helper.rb
View File

@ -333,6 +333,11 @@ EOT
when "GROUP" then OpenNebula::GroupPool.new(client)
when "USER" then OpenNebula::UserPool.new(client)
when "DATASTORE" then OpenNebula::DatastorePool.new(client)
when "CLUSTER" then OpenNebula::ClusterPool.new(client)
when "VNET" then OpenNebula::VirtualNetworkPool.new(client)
when "IMAGE" then OpenNebula::ImagePool.new(client)
when "VMTEMPLATE" then OpenNebula::TemplatePool.new(client)
when "VM" then OpenNebula::VirtualMachinePool.new(client)
end
rc = pool.info

1
src/cli/one_helper/onedatastore_helper.rb
View File

@ -68,6 +68,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
puts str % ["NAME", datastore.name]
puts str % ["USER", datastore['UNAME']]
puts str % ["GROUP", datastore['GNAME']]
puts str % ["CLUSTER", datastore['CLUSTER']]
puts str % ["TYPE", datastore['TYPE']]
puts str % ["BASE PATH",datastore['BASE_PATH']]

1
src/cli/one_helper/onehost_helper.rb
View File

@ -118,6 +118,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
puts str % ["ID", host.id.to_s]
puts str % ["NAME", host.name]
puts str % ["CLUSTER", host['CLUSTER']]
puts str % ["STATE", host.state_str]
puts str % ["IM_MAD", host['IM_MAD']]
puts str % ["VM_MAD", host['VM_MAD']]

1
src/cli/one_helper/oneimage_helper.rb
View File

@ -118,6 +118,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
puts str % ["NAME", image.name]
puts str % ["USER", image['UNAME']]
puts str % ["GROUP",image['GNAME']]
puts str % ["DATASTORE",image['DATASTORE']]
puts str % ["TYPE", image.type_str]
puts str % ["REGISTER TIME",
OpenNebulaHelper.time_to_str(image['REGTIME'])]

1
src/cli/one_helper/onevnet_helper.rb
View File

@ -103,6 +103,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
puts str % ["NAME", vn['NAME']]
puts str % ["USER", vn['UNAME']]
puts str % ["GROUP", vn['GNAME']]
puts str % ["CLUSTER", vn['CLUSTER']]
puts str % ["TYPE", vn.type_str]
puts str % ["BRIDGE", vn["BRIDGE"]]
puts str % ["VLAN", OpenNebulaHelper.boolean_to_str(vn['VLAN'])]

22
src/cli/onecluster
View File

@ -56,6 +56,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
helper.list_to_id(arg)
end
set :format, :vnetid, OpenNebulaHelper.rname_to_id_desc("VNET") do |arg|
OpenNebulaHelper.rname_to_id(arg, "VNET")
end
set :format, :hostid, OpenNebulaHelper.rname_to_id_desc("HOST") do |arg|
OpenNebulaHelper.rname_to_id(arg, "HOST")
end
set :format, :datastoreid, OpenNebulaHelper.rname_to_id_desc("DATASTORE") do |arg|
OpenNebulaHelper.rname_to_id(arg, "DATASTORE")
end
########################################################################
# Commands
########################################################################
@ -102,7 +114,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
# TODO: allow the second param to be [:range, :hostid_list]
command :addhost, addhost_desc,:clusterid, :hostid do
helper.perform_actions(args[0],options,"updated") do |cluster|
helper.perform_action(args[0],options,"updated") do |cluster|
cluster.addhost(args[1].to_i)
end
end
@ -113,7 +125,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
# TODO: allow the second param to be [:range, :hostid_list]
command :delhost, delhost_desc, :clusterid, :hostid do
helper.perform_actions(args[0],options,"updated") do |cluster|
helper.perform_action(args[0],options,"updated") do |cluster|
cluster.delhost(args[1].to_i)
end
end
@ -124,7 +136,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
# TODO: allow the second param to be [:range, :datastoreid_list]
command :adddatastore, adddatastore_desc,:clusterid, :datastoreid do
helper.perform_actions(args[0],options,"updated") do |cluster|
helper.perform_action(args[0],options,"updated") do |cluster|
cluster.adddatastore(args[1].to_i)
end
end
@ -135,7 +147,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
# TODO: allow the second param to be [:range, :datastoreid_list]
command :deldatastore, deldatastore_desc, :clusterid, :datastoreid do
helper.perform_actions(args[0],options,"updated") do |cluster|
helper.perform_action(args[0],options,"updated") do |cluster|
cluster.deldatastore(args[1].to_i)
end
end
@ -146,7 +158,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
# TODO: allow the second param to be [:range, :vnetid_list]
command :addvnet, addvnet_desc,:clusterid, :vnetid do
helper.perform_actions(args[0],options,"updated") do |cluster|
helper.perform_action(args[0],options,"updated") do |cluster|
cluster.addvnet(args[1].to_i)
end
end

12
src/cli/onedatastore
View File

@ -56,6 +56,18 @@ 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, :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
########################################################################
# Commands
########################################################################

44
src/datastore/DatastorePool.cc
View File

@ -45,11 +45,7 @@ DatastorePool::DatastorePool(SqlDB * db):
{
DatastoreTemplate * ds_tmpl;
int rc, system_id, default_id;
Nebula& nd = Nebula::instance();
ClusterPool * clpool = nd.get_clpool();
Cluster * cluster;
int rc;
// ---------------------------------------------------------------------
// Create the system datastore
@ -72,12 +68,12 @@ DatastorePool::DatastorePool(SqlDB * db):
UserPool::oneadmin_name,
GroupPool::ONEADMIN_NAME,
ds_tmpl,
&system_id,
ClusterPool::DEFAULT_CLUSTER_ID,
ClusterPool::DEFAULT_CLUSTER_NAME,
&rc,
ClusterPool::NONE_CLUSTER_ID,
ClusterPool::NONE_CLUSTER_NAME,
error_str);
if( system_id < 0 )
if( rc < 0 )
{
goto error_bootstrap;
}
@ -104,38 +100,16 @@ DatastorePool::DatastorePool(SqlDB * db):
UserPool::oneadmin_name,
GroupPool::ONEADMIN_NAME,
ds_tmpl,
&default_id,
ClusterPool::DEFAULT_CLUSTER_ID,
ClusterPool::DEFAULT_CLUSTER_NAME,
&rc,
ClusterPool::NONE_CLUSTER_ID,
ClusterPool::NONE_CLUSTER_NAME,
error_str);
if( default_id < 0 )
if( rc < 0 )
{
goto error_bootstrap;
}
// Add to Cluster
cluster = clpool->get(ClusterPool::DEFAULT_CLUSTER_ID, true);
if( cluster == 0 )
{
error_str = "Could not get default cluster";
goto error_bootstrap;
}
rc = cluster->add_datastore(system_id, error_str);
rc += cluster->add_datastore(default_id, error_str);
if ( rc != 0 )
{
cluster->unlock();
goto error_bootstrap;
}
clpool->update(cluster);
cluster->unlock();
// User created datastores will start from ID 100
set_update_lastOID(99);
}