From 98eb58bf848cbc5ae5daf2c8ada89cb1c2918d62 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Sat, 4 Dec 2010 17:58:16 -0800 Subject: [PATCH] callCreate to create --- api/src/com/cloud/api/BaseAsyncCreateCmd.java | 2 +- api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java | 2 +- api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java | 2 +- api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java | 2 +- api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java | 2 +- api/src/com/cloud/api/commands/CreateSnapshotCmd.java | 2 +- api/src/com/cloud/api/commands/CreateTemplateCmd.java | 2 +- api/src/com/cloud/api/commands/CreateVolumeCmd.java | 2 +- api/src/com/cloud/api/commands/DeployVMCmd.java | 2 +- server/src/com/cloud/api/ApiDispatcher.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/src/com/cloud/api/BaseAsyncCreateCmd.java b/api/src/com/cloud/api/BaseAsyncCreateCmd.java index e605e3bdee3..d6f6a75ddb1 100644 --- a/api/src/com/cloud/api/BaseAsyncCreateCmd.java +++ b/api/src/com/cloud/api/BaseAsyncCreateCmd.java @@ -6,7 +6,7 @@ public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd { @Parameter(name="id", type=CommandType.LONG) private Long id; - public abstract void callCreate(); + public abstract void create(); public Long getEntityId() { return id; diff --git a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java index 78f3094def5..00d5c97e8e3 100644 --- a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java @@ -95,7 +95,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Por } @Override - public void callCreate() { + public void create() { PortForwardingRule rule; try { rule = _rulesService.createPortForwardingRule(this, virtualMachineId); diff --git a/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java b/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java index 678398533f4..345530e6d7d 100644 --- a/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java @@ -189,7 +189,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements Lo } @Override - public void callCreate() { + public void create() { // TODO Auto-generated method stub } diff --git a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java index 6d347cc6a72..bc3e2063da6 100644 --- a/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java +++ b/api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java @@ -187,7 +187,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements } @Override - public void callCreate() { + public void create() { try { PortForwardingRule result = _rulesService.createPortForwardingRule(this, virtualMachineId); setEntityId(result.getId()); diff --git a/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java b/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java index 334250156f0..cebffef0aba 100644 --- a/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java +++ b/api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java @@ -134,7 +134,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { } @Override - public void callCreate(){ + public void create(){ try { RemoteAccessVpn vpn = _networkService.createRemoteAccessVpn(this); if (vpn != null) { diff --git a/api/src/com/cloud/api/commands/CreateSnapshotCmd.java b/api/src/com/cloud/api/commands/CreateSnapshotCmd.java index 64b583faf5a..abb1e4ef800 100644 --- a/api/src/com/cloud/api/commands/CreateSnapshotCmd.java +++ b/api/src/com/cloud/api/commands/CreateSnapshotCmd.java @@ -119,7 +119,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { } @Override - public void callCreate(){ + public void create(){ long id = _snapshotMgr.getNextInSequence(this); this.setEntityId(id); } diff --git a/api/src/com/cloud/api/commands/CreateTemplateCmd.java b/api/src/com/cloud/api/commands/CreateTemplateCmd.java index 71d8cbae877..b4706e8f94f 100644 --- a/api/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/api/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -168,7 +168,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { } @Override - public void callCreate(){ + public void create(){ VirtualMachineTemplate template = _userVmService.createPrivateTemplateRecord(this); if (template != null){ this.setEntityId(template.getId()); diff --git a/api/src/com/cloud/api/commands/CreateVolumeCmd.java b/api/src/com/cloud/api/commands/CreateVolumeCmd.java index ebbbfcad779..c01d8851c5e 100644 --- a/api/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/api/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -144,7 +144,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { } @Override - public void callCreate(){ + public void create(){ try { Volume volume = _storageMgr.allocVolume(this); if (volume != null) { diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java index e4e4fe6cee6..ac644975b9a 100644 --- a/api/src/com/cloud/api/commands/DeployVMCmd.java +++ b/api/src/com/cloud/api/commands/DeployVMCmd.java @@ -230,7 +230,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { } @Override - public void callCreate() { + public void create() { try { UserVm result = _userVmService.createVirtualMachine(this); if (result != null){ diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java index 080d82c2a38..23059e1d703 100644 --- a/server/src/com/cloud/api/ApiDispatcher.java +++ b/server/src/com/cloud/api/ApiDispatcher.java @@ -65,7 +65,7 @@ public class ApiDispatcher { setupParameters(cmd, params); try { - cmd.callCreate(); + cmd.create(); } catch (Throwable t) { if (t instanceof InvalidParameterValueException || t instanceof IllegalArgumentException) { s_logger.info(t.getMessage());