You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/06/11 02:31:41 UTC
git commit: updated refs/heads/4.4-forward to 09a357f
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 64825549d -> 09a357fb9
CLOUDSTACK-6890:createVPC invoked by admin does not observe start flag.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09a357fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09a357fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09a357fb
Branch: refs/heads/4.4-forward
Commit: 09a357fb90b48ed6e2725ea60e632a2ad5529f79
Parents: 6482554
Author: Min Chen <mi...@citrix.com>
Authored: Tue Jun 10 17:23:20 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Jun 10 17:23:20 2014 -0700
----------------------------------------------------------------------
.../api/command/admin/vpc/CreateVPCCmdByAdmin.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09a357fb/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
index f063cdb..25e6325 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.vpc;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
@@ -37,10 +38,14 @@ public class CreateVPCCmdByAdmin extends CreateVPCCmd {
@Override
public void execute() {
Vpc vpc = null;
+ boolean success = true;
try {
- if (_vpcService.startVpc(getEntityId(), true)) {
- vpc = _entityMgr.findById(Vpc.class, getEntityId());
+ if (isStart()) {
+ success = _vpcService.startVpc(getEntityId(), true);
+ } else {
+ s_logger.debug("Not starting VPC as " + ApiConstants.START + "=false was passed to the API");
}
+ vpc = _entityMgr.findById(Vpc.class, getEntityId());
} catch (ResourceUnavailableException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());