Repository: cloudstack Updated Branches: refs/heads/master 9334f2608 -> e61dda7d8
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/e61dda7d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e61dda7d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e61dda7d Branch: refs/heads/master Commit: e61dda7d82f24107c878906162aea65a67aa832e Parents: 9334f26 Author: Min Chen <min.c...@citrix.com> Authored: Tue Jun 10 17:23:20 2014 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Tue Jun 10 17:35:15 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/e61dda7d/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());
