shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Feature #2828: add new param to java oca

Browse Source
This commit is contained in:
Carlos Martín 2014-04-08 12:17:37 +02:00
parent d773eb690e
commit 0e5a252ffd
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/RequestManagerVirtualMachine.h
View File

@ -176,7 +176,7 @@ public:
VirtualMachineSaveDisk(): VirtualMachineSaveDisk():
RequestManagerVirtualMachine("VirtualMachineSaveDisk", RequestManagerVirtualMachine("VirtualMachineSaveDisk",
"Saves a disk from virtual machine as a new image", "Saves a disk from virtual machine as a new image",
"A:siissb"){}; "A:siissbb"){};
~VirtualMachineSaveDisk(){}; ~VirtualMachineSaveDisk(){};

23
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
View File

@ -365,12 +365,16 @@ public class VirtualMachine extends PoolElement{
* the default type * the default type
* @param hot True to save the disk immediately, false will perform * @param hot True to save the disk immediately, false will perform
* the operation when the VM shuts down * the operation when the VM shuts down
* @param doTemplate True to clone also the VM originating template
* and replace the disk with the saved image
* @return If an error occurs the error message contains the reason. * @return If an error occurs the error message contains the reason.
*/ */
public static OneResponse diskSnapshot(Client client, int id, public static OneResponse diskSnapshot(Client client, int id,
int diskId, String imageName, String imageType, boolean hot) int diskId, String imageName, String imageType,
boolean hot, boolean doTemplate)
{ {
return client.call(SAVEDISK, id ,diskId, imageName, imageType, hot); return client.call(SAVEDISK, id ,diskId, imageName, imageType,
hot, doTemplate);
} }
/** /**
@ -707,12 +711,15 @@ public class VirtualMachine extends PoolElement{
* the default type * the default type
* @param hot True to save the disk immediately, false will perform * @param hot True to save the disk immediately, false will perform
* the operation when the VM shuts down * the operation when the VM shuts down
* @param doTemplate True to clone also the VM originating template
* and replace the disk with the saved image
* @return If an error occurs the error message contains the reason. * @return If an error occurs the error message contains the reason.
*/ */
public OneResponse diskSnapshot(int diskId, String imageName, public OneResponse diskSnapshot(int diskId, String imageName,
String imageType, boolean hot) String imageType, boolean hot, boolean doTemplate)
{ {
return diskSnapshot(client, id, diskId, imageName, imageType, hot); return diskSnapshot(client, id, diskId, imageName, imageType,
hot, doTemplate);
} }
/** /**
@ -725,7 +732,7 @@ public class VirtualMachine extends PoolElement{
*/ */
public OneResponse diskSnapshot(int diskId, String imageName) public OneResponse diskSnapshot(int diskId, String imageName)
{ {
return diskSnapshot(diskId, imageName, "", false); return diskSnapshot(diskId, imageName, "", false, false);
} }
/** /**
@ -739,7 +746,7 @@ public class VirtualMachine extends PoolElement{
*/ */
public OneResponse diskSnapshot(int diskId, String imageName, boolean hot) public OneResponse diskSnapshot(int diskId, String imageName, boolean hot)
{ {
return diskSnapshot(diskId, imageName, "", hot); return diskSnapshot(diskId, imageName, "", hot, false);
} }
/** /**
@ -1136,11 +1143,11 @@ public class VirtualMachine extends PoolElement{
} }
/** /**
* @deprecated Replaced by {@link #diskSnapshot(int,String,String,boolean)} * @deprecated Replaced by {@link #diskSnapshot(int,String,String,boolean,boolean)}
*/ */
public OneResponse savedisk(int diskId, String imageName, String imageType) public OneResponse savedisk(int diskId, String imageName, String imageType)
{ {
return diskSnapshot(diskId, imageName, imageType, false); return diskSnapshot(diskId, imageName, imageType, false, false);
} }
/** /**

1
src/oca/ruby/opennebula/virtual_machine.rb
View File

@ -393,7 +393,6 @@ module OpenNebula
# perform the operation when the VM shuts down # perform the operation when the VM shuts down
# @param do_template [true|false] True to clone also the VM originating # @param do_template [true|false] True to clone also the VM originating
# template and replace the disk with the saved image # template and replace the disk with the saved image
# perform the operation when the VM shuts down
# #
# @return [Integer, OpenNebula::Error] the new Image ID in case of # @return [Integer, OpenNebula::Error] the new Image ID in case of
# success, error otherwise # success, error otherwise