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

Remove TM_MAD from OCA and CLI

Browse Source
This commit is contained in:
Ruben S. Montero 2012-02-24 16:50:12 +01:00
parent f4743b6077
commit 3e09376ac3
6 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/acct/watch_helper.rb
View File

@ -151,7 +151,7 @@ module WatchHelper
String :name
String :im_mad
String :vm_mad
String :tm_mad
String :vn_mad
end
DB.create_table? :vm_timestamps do
@ -422,7 +422,7 @@ module WatchHelper
h.name = host['NAME']
h.im_mad = host['IM_MAD']
h.vm_mad = host['VM_MAD']
h.tm_mad = host['TM_MAD']
h.vn_mad = host['VN_MAD']
}
end

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

@ -122,7 +122,6 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
puts str % ["IM_MAD", host['IM_MAD']]
puts str % ["VM_MAD", host['VM_MAD']]
puts str % ["VN_MAD", host['VN_MAD']]
puts str % ["TM_MAD", host['TM_MAD']]
puts str % ["LAST MONITORING TIME", host['LAST_MON_TIME']]
puts

4
src/cli/onehost
View File

@ -61,9 +61,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
EOT
command :create, create_desc, :hostname, :im_mad, :vmm_mad,
:tm_mad, :vnm_mad do
:vnm_mad do
helper.create_resource(options) do |host|
host.allocate(args[0], args[1], args[2], args[4], args[3])
host.allocate(args[0], args[1], args[2], args[3])
end
end

6
src/oca/java/src/org/opennebula/client/host/Host.java
View File

@ -75,7 +75,6 @@ public class Host extends PoolElement{
* @param vnm The name of the virtual network manager mad name
* (vnm_mad_name), this values are taken from the oned.conf with the
* tag name VN_MAD (name)
* @param tm The transfer manager mad name to be used with this host
* @return If successful the message contains the associated
* id generated for this host
*/
@ -83,10 +82,9 @@ public class Host extends PoolElement{
String hostname,
String im,
String vmm,
String vnm,
String tm)
String vnm)
{
return client.call(ALLOCATE, hostname, im, vmm, vnm, tm);
return client.call(ALLOCATE, hostname, im, vmm, vnm);
}
/**

6
src/oca/java/test/HostTest.java
View File

@ -63,8 +63,7 @@ public class HostTest
@Before
public void setUp() throws Exception
{
res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vnm_dummy",
"tm_dummy");
res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vnm_dummy");
int hid = !res.isError() ? Integer.parseInt(res.getMessage()) : -1;
host = new Host(hid, client);
@ -84,8 +83,7 @@ public class HostTest
{
String name = "allocate_test";
res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vmm_dummy",
"tm_dummy");
res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vmm_dummy");
assertTrue( !res.isError() );
// assertTrue( res.getMessage().equals("0") );

10
src/oca/ruby/OpenNebula/Host.rb
View File

@ -79,14 +79,14 @@ module OpenNebula
# Allocates a new Host in OpenNebula
#
# @param hostname [String] Name of the new Host.
# @param im [String] Name of the im_driver
# @param vmm [String] Name of the vmm_driver
# @param tm [String] Name of the tm_driver
# @param im [String] Name of the im_driver (information/monitoring)
# @param vmm [String] Name of the vmm_driver (hypervisor)
# @param tm [String] Name of the vnm_driver (networking)
#
# @return [Integer, OpenNebula::Error] the new ID in case of
# success, error otherwise
def allocate(hostname,im,vmm,vnm,tm)
super(HOST_METHODS[:allocate],hostname,im,vmm,vnm,tm)
def allocate(hostname,im,vmm,vnm)
super(HOST_METHODS[:allocate],hostname,im,vmm,vnm)
end
# Deletes the Host