cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [05/54] [abbrv] Merge branch 'master' into rbac.
Date Fri, 14 Mar 2014 10:37:18 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
index 462219e,8b13c51..26440d4
--- a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
@@@ -35,7 -34,8 +35,8 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.network.router.VirtualRouter;
  import com.cloud.user.Account;
  
- @APICommand(name = "destroyRouter", description = "Destroys a router.", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "destroyRouter", description = "Destroys a router.", responseObject = DomainRouterResponse.class,
++@APICommand(name = "destroyRouter", description = "Destroys a router.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DestroyRouterCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DestroyRouterCmd.class.getName());
      private static final String s_name = "destroyrouterresponse";
@@@ -103,7 -103,7 +104,7 @@@
          if (result != null) {
              DomainRouterResponse response = _responseGenerator.createDomainRouterResponse(result);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to destroy router");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
index c0e54c8,3a5efa2..d55a5f3
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@@ -36,7 -35,8 +36,8 @@@ import org.apache.cloudstack.api.respon
  
  import com.cloud.network.router.VirtualRouter.Role;
  
- @APICommand(name = "listRouters", description = "List routers.", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "listRouters", description = "List routers.", responseObject = DomainRouterResponse.class,
++@APICommand(name = "listRouters", description = "List routers.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListRoutersCmd.class.getName());
  
@@@ -149,6 -149,6 +150,6 @@@
      public void execute() {
          ListResponse<DomainRouterResponse> response = _queryService.searchForRouters(this);
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
index f4200c5,155e3ee..3a89388
--- a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
@@@ -36,7 -35,8 +36,8 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.network.router.VirtualRouter;
  import com.cloud.user.Account;
  
- @APICommand(name = "rebootRouter", description = "Starts a router.", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "rebootRouter", description = "Starts a router.", responseObject = DomainRouterResponse.class,
++@APICommand(name = "rebootRouter", description = "Starts a router.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class RebootRouterCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(RebootRouterCmd.class.getName());
      private static final String s_name = "rebootrouterresponse";
@@@ -98,11 -98,11 +99,11 @@@
      @Override
      public void execute() throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
          CallContext.current().setEventDetails("Router Id: " + getId());
--        VirtualRouter result = _routerService.rebootRouter(this.getId(), true);
++        VirtualRouter result = _routerService.rebootRouter(getId(), true);
          if (result != null) {
              DomainRouterResponse response = _responseGenerator.createDomainRouterResponse(result);
              response.setResponseName("router");
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reboot router");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
index 0c553be,ffafb5d..f83466b
--- a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
@@@ -38,7 -37,8 +38,8 @@@ import com.cloud.network.router.Virtual
  import com.cloud.network.router.VirtualRouter.Role;
  import com.cloud.user.Account;
  
- @APICommand(name = "startRouter", responseObject = DomainRouterResponse.class, description = "Starts a router.", entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "startRouter", responseObject = DomainRouterResponse.class, description = "Starts a router.",
++@APICommand(name = "startRouter", responseObject = DomainRouterResponse.class, description = "Starts a router.", entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class StartRouterCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(StartRouterCmd.class.getName());
      private static final String s_name = "startrouterresponse";
@@@ -114,7 -114,7 +115,7 @@@
          if (result != null) {
              DomainRouterResponse routerResponse = _responseGenerator.createDomainRouterResponse(result);
              routerResponse.setResponseName(getCommandName());
--            this.setResponseObject(routerResponse);
++            setResponseObject(routerResponse);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to start router");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
index 9472e4a,d41cf88..e2d4200
--- a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
@@@ -37,7 -36,8 +37,8 @@@ import com.cloud.network.router.Virtual
  import com.cloud.network.router.VirtualRouter.Role;
  import com.cloud.user.Account;
  
- @APICommand(name = "stopRouter", description = "Stops a router.", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "stopRouter", description = "Stops a router.", responseObject = DomainRouterResponse.class,
++@APICommand(name = "stopRouter", description = "Stops a router.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class StopRouterCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(StopRouterCmd.class.getName());
      private static final String s_name = "stoprouterresponse";
@@@ -117,7 -117,7 +118,7 @@@
          if (result != null) {
              DomainRouterResponse response = _responseGenerator.createDomainRouterResponse(result);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to stop router");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
index e414fc9,de195d9..0b67db9
--- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
@@@ -31,7 -30,8 +31,8 @@@ import org.apache.cloudstack.api.respon
  import com.cloud.network.router.VirtualRouter;
  import com.cloud.user.Account;
  
- @APICommand(name = "changeServiceForRouter", description = "Upgrades domain router to a new service offering", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "changeServiceForRouter", description = "Upgrades domain router to a new service offering", responseObject = DomainRouterResponse.class,
++@APICommand(name = "changeServiceForRouter", description = "Upgrades domain router to a new service offering", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class UpgradeRouterCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName());
      private static final String s_name = "changeserviceforrouterresponse";
@@@ -87,7 -87,7 +88,7 @@@
          if (router != null) {
              DomainRouterResponse routerResponse = _responseGenerator.createDomainRouterResponse(router);
              routerResponse.setResponseName(getCommandName());
--            this.setResponseObject(routerResponse);
++            setResponseObject(routerResponse);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to upgrade router");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
index 24687ec,2b25a0f..bc977a4
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
@@@ -35,7 -32,8 +35,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.user.Account;
  import com.cloud.vm.VirtualMachine;
  
- @APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroyes a system virtual machine.", entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroyes a system virtual machine.",
++@APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroyes a system virtual machine.", entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DestroySystemVmCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DestroySystemVmCmd.class.getName());
  
@@@ -104,7 -101,7 +105,7 @@@
          if (instance != null) {
              SystemVmResponse response = _responseGenerator.createSystemVmResponse(instance);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to destroy system vm");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
index 6add394,e5feec2..bfecd18
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
@@@ -37,7 -36,8 +37,8 @@@ import org.apache.cloudstack.api.respon
  import com.cloud.utils.Pair;
  import com.cloud.vm.VirtualMachine;
  
- @APICommand(name = "listSystemVms", description = "List system virtual machines.", responseObject = SystemVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "listSystemVms", description = "List system virtual machines.", responseObject = SystemVmResponse.class,
++@APICommand(name = "listSystemVms", description = "List system virtual machines.", responseObject = SystemVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListSystemVMsCmd extends BaseListCmd {
      public static final Logger s_logger = Logger.getLogger(ListSystemVMsCmd.class.getName());
  
@@@ -140,6 -140,6 +141,6 @@@
  
          response.setResponses(vmResponses, systemVMs.second());
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
index 44a5586,0da7a53..994635a
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
@@@ -41,7 -38,8 +41,8 @@@ import com.cloud.host.Host
  import com.cloud.user.Account;
  import com.cloud.vm.VirtualMachine;
  
- @APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class,
++@APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class MigrateSystemVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(MigrateSystemVMCmd.class.getName());
  
@@@ -122,7 -119,7 +123,7 @@@
                  // return the generic system VM instance response
                  SystemVmResponse response = _responseGenerator.createSystemVmResponse(migratedVm);
                  response.setResponseName(getCommandName());
--                this.setResponseObject(response);
++                setResponseObject(response);
              } else {
                  throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to migrate the system vm");
              }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
index 68c941c,6663d64..0031d60
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
@@@ -35,7 -32,8 +35,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.user.Account;
  import com.cloud.vm.VirtualMachine;
  
- @APICommand(name = "rebootSystemVm", description = "Reboots a system VM.", responseObject = SystemVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "rebootSystemVm", description = "Reboots a system VM.", responseObject = SystemVmResponse.class,
++@APICommand(name = "rebootSystemVm", description = "Reboots a system VM.", responseObject = SystemVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class RebootSystemVmCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(RebootSystemVmCmd.class.getName());
  
@@@ -111,7 -109,7 +112,7 @@@
          if (result != null) {
              SystemVmResponse response = _responseGenerator.createSystemVmResponse(result);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to reboot system vm");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
index c220e2a,3df6497..f50b2c4
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
@@@ -21,9 -21,6 +21,11 @@@ import java.util.HashMap
  import java.util.Iterator;
  import java.util.Map;
  
++import org.apache.log4j.Logger;
++
 +import org.apache.cloudstack.acl.IAMEntityType;
 +import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 +import org.apache.cloudstack.api.ACL;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiConstants;
  import org.apache.cloudstack.api.ApiErrorCode;
@@@ -34,7 -31,7 +36,6 @@@ import org.apache.cloudstack.api.comman
  import org.apache.cloudstack.api.response.ServiceOfferingResponse;
  import org.apache.cloudstack.api.response.SystemVmResponse;
  import org.apache.cloudstack.context.CallContext;
--import org.apache.log4j.Logger;
  
  import com.cloud.event.EventTypes;
  import com.cloud.exception.ConcurrentOperationException;
@@@ -47,7 -44,8 +48,8 @@@ import com.cloud.user.Account
  import com.cloud.vm.VirtualMachine;
  
  @APICommand(name = "scaleSystemVm", responseObject = SystemVmResponse.class, description = "Scale the service offering for a system vm (console proxy or secondary storage). "
-         + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.", entityType = { IAMEntityType.VirtualMachine })
 -        + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.",
++        + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.", entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ScaleSystemVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
      private static final String s_name = "changeserviceforsystemvmresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
index ce6a47f,925c9cf..6aecc91
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
@@@ -35,7 -32,8 +35,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.user.Account;
  import com.cloud.vm.VirtualMachine;
  
- @APICommand(name = "startSystemVm", responseObject = SystemVmResponse.class, description = "Starts a system virtual machine.", entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "startSystemVm", responseObject = SystemVmResponse.class, description = "Starts a system virtual machine.",
++@APICommand(name = "startSystemVm", responseObject = SystemVmResponse.class, description = "Starts a system virtual machine.", entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class StartSystemVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(StartSystemVMCmd.class.getName());
  
@@@ -115,7 -113,7 +116,7 @@@
          if (instance != null) {
              SystemVmResponse response = _responseGenerator.createSystemVmResponse(instance);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to start system vm");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
index d5e5f00,ef58156..9a049c2
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
@@@ -37,7 -34,8 +37,8 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.user.Account;
  import com.cloud.vm.VirtualMachine;
  
- @APICommand(name = "stopSystemVm", description = "Stops a system VM.", responseObject = SystemVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "stopSystemVm", description = "Stops a system VM.", responseObject = SystemVmResponse.class,
++@APICommand(name = "stopSystemVm", description = "Stops a system VM.", responseObject = SystemVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class StopSystemVmCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(StopSystemVmCmd.class.getName());
  
@@@ -121,7 -118,7 +122,7 @@@
          if (result != null) {
              SystemVmResponse response = _responseGenerator.createSystemVmResponse(result);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Fail to stop system vm");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index c12d6b0,7aff825..033709a
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@@ -21,9 -21,6 +21,11 @@@ import java.util.HashMap
  import java.util.Iterator;
  import java.util.Map;
  
++import org.apache.log4j.Logger;
++
 +import org.apache.cloudstack.acl.IAMEntityType;
 +import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 +import org.apache.cloudstack.api.ACL;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiConstants;
  import org.apache.cloudstack.api.ApiErrorCode;
@@@ -34,15 -31,16 +36,15 @@@ import org.apache.cloudstack.api.comman
  import org.apache.cloudstack.api.response.ServiceOfferingResponse;
  import org.apache.cloudstack.api.response.SystemVmResponse;
  import org.apache.cloudstack.context.CallContext;
--import org.apache.log4j.Logger;
  
  import com.cloud.exception.InvalidParameterValueException;
  import com.cloud.offering.ServiceOffering;
  import com.cloud.user.Account;
  import com.cloud.vm.VirtualMachine;
  
 -  @APICommand(name = "changeServiceForSystemVm", responseObject = SystemVmResponse.class, description = "Changes the service offering for a system vm (console proxy or secondary storage). "
 -        + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.",
 +@APICommand(name = "changeServiceForSystemVm", responseObject = SystemVmResponse.class, description = "Changes the service offering for a system vm (console proxy or secondary storage). "
-         + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.", entityType = { IAMEntityType.VirtualMachine })
++        + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.", entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class UpgradeSystemVMCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
      private static final String s_name = "changeserviceforsystemvmresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
index af214e0,d227232..ce43243
--- a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
@@@ -35,7 -31,8 +35,8 @@@ import org.apache.cloudstack.api.respon
  import com.cloud.template.VirtualMachineTemplate;
  import com.cloud.user.Account;
  
- @APICommand(name = "prepareTemplate", responseObject = TemplateResponse.class, description = "load template into primary storage", entityType = { IAMEntityType.VirtualMachineTemplate })
 -@APICommand(name = "prepareTemplate", responseObject = TemplateResponse.class, description = "load template into primary storage",
++@APICommand(name = "prepareTemplate", responseObject = TemplateResponse.class, description = "load template into primary storage", entityType = {IAMEntityType.VirtualMachineTemplate},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class PrepareTemplateCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(PrepareTemplateCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
index 71ababd,f435f72..dd84ec2
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
@@@ -39,8 -37,10 +39,10 @@@ import com.cloud.uservm.UserVm
  @APICommand(name = "assignVirtualMachine",
              description = "Change ownership of a VM from one account to another. This API is available for Basic zones with security groups and Advanced zones with guest networks. A root administrator can reassign a VM from any account to any other account in any domain. A domain administrator can reassign a VM to any account in the same domain.",
              responseObject = UserVmResponse.class,
-             since = "3.0.0", entityType = { IAMEntityType.VirtualMachine })
 -            since = "3.0.0",
++        since = "3.0.0", entityType = {IAMEntityType.VirtualMachine},
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = true)
 -public class AssignVMCmd extends BaseCmd {
 +public class AssignVMCmd extends BaseCmd  {
      public static final Logger s_logger = Logger.getLogger(AssignVMCmd.class.getName());
  
      private static final String s_name = "assignvirtualmachineresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
index 2fb6a1e,983d25d..623ddb6
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
@@@ -40,7 -37,8 +40,8 @@@ import com.cloud.user.Account
  import com.cloud.uservm.UserVm;
  import com.cloud.utils.exception.CloudRuntimeException;
  
- @APICommand(name = "expungeVirtualMachine", description = "Expunge a virtual machine. Once expunged, it cannot be recoverd.", responseObject = SuccessResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "expungeVirtualMachine", description = "Expunge a virtual machine. Once expunged, it cannot be recoverd.", responseObject = SuccessResponse.class,
++@APICommand(name = "expungeVirtualMachine", description = "Expunge a virtual machine. Once expunged, it cannot be recoverd.", responseObject = SuccessResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ExpungeVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(ExpungeVMCmd.class.getName());
  
@@@ -109,7 -106,7 +110,7 @@@
  
              if (result != null) {
                  SuccessResponse response = new SuccessResponse(getCommandName());
--                this.setResponseObject(response);
++                setResponseObject(response);
              } else {
                  throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to expunge vm");
              }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
index b3615fc,611f698..fe84468
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
@@@ -45,7 -43,9 +45,9 @@@ import com.cloud.vm.VirtualMachine
  
  @APICommand(name = "migrateVirtualMachine",
              description = "Attempts Migration of a VM to a different host or Root volume of the vm to a different storage pool",
-             responseObject = UserVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -            responseObject = UserVmResponse.class,
++        responseObject = UserVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = true)
  public class MigrateVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
index 4920250,7b10239..b5d1ae9
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
@@@ -47,7 -45,9 +47,9 @@@ import com.cloud.vm.VirtualMachine
  
  @APICommand(name = "migrateVirtualMachineWithVolume",
              description = "Attempts Migration of a VM with its volumes to a different host",
-  responseObject = UserVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -            responseObject = UserVmResponse.class,
++        responseObject = UserVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = true)
  public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
index c7917b6,05d7a98..e7fbbdb
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
@@@ -32,7 -30,8 +32,8 @@@ import com.cloud.exception.ResourceAllo
  import com.cloud.user.Account;
  import com.cloud.uservm.UserVm;
  
- @APICommand(name = "recoverVirtualMachine", description = "Recovers a virtual machine.", responseObject = UserVmResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "recoverVirtualMachine", description = "Recovers a virtual machine.", responseObject = UserVmResponse.class,
++@APICommand(name = "recoverVirtualMachine", description = "Recovers a virtual machine.", responseObject = UserVmResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
  public class RecoverVMCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(RecoverVMCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
index 7e2acc5,0000000..16b2d5d
mode 100644,000000..100644
--- a/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
@@@ -1,44 -1,0 +1,45 @@@
 +// Licensed to the Apache Software Foundation (ASF) under one
 +// or more contributor license agreements.  See the NOTICE file
 +// distributed with this work for additional information
 +// regarding copyright ownership.  The ASF licenses this file
 +// to you under the Apache License, Version 2.0 (the
 +// "License"); you may not use this file except in compliance
 +// with the License.  You may obtain a copy of the License at
 +//
 +//   http://www.apache.org/licenses/LICENSE-2.0
 +//
 +// Unless required by applicable law or agreed to in writing,
 +// software distributed under the License is distributed on an
 +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +// KIND, either express or implied.  See the License for the
 +// specific language governing permissions and limitations
 +// under the License.
 +package org.apache.cloudstack.api.command.admin.volume;
 +
 +import org.apache.cloudstack.api.APICommand;
 +import org.apache.cloudstack.api.ApiErrorCode;
 +import org.apache.cloudstack.api.ResponseObject.ResponseView;
 +import org.apache.cloudstack.api.ServerApiException;
 +import org.apache.cloudstack.api.command.user.volume.UpdateVolumeCmd;
 +import org.apache.cloudstack.api.response.VolumeResponse;
 +import org.apache.cloudstack.context.CallContext;
 +
 +import com.cloud.storage.Volume;
 +
 +@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Full)
 +public class UpdateVolumeCmdByAdmin extends UpdateVolumeCmd {
 +
 +    @Override
 +    public void execute(){
 +        CallContext.current().setEventDetails("Volume Id: "+getId());
-         Volume result = _volumeService.updateVolume(getId(), getPath(), getState(), getStorageId(), getDisplayVolume(), getCustomId(), getEntityOwnerId());
++        Volume result = _volumeService.updateVolume(getId(), getPath(), getState(), getStorageId(), getDisplayVolume(),
++                getCustomId(), getEntityOwnerId(), getChainInfo());
 +        if (result != null) {
 +            VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
 +            response.setResponseName(getCommandName());
 +            setResponseObject(response);
 +        } else {
 +            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update volume");
 +        }
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
index 33c9c55,e13ed5b..ff88ada
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
@@@ -43,7 -42,8 +43,8 @@@ import com.cloud.network.vpc.PrivateGat
  import com.cloud.network.vpc.Vpc;
  import com.cloud.user.Account;
  
- @APICommand(name = "createPrivateGateway", description = "Creates a private gateway", responseObject = PrivateGatewayResponse.class, entityType = { IAMEntityType.PrivateGateway })
 -@APICommand(name = "createPrivateGateway", description = "Creates a private gateway", responseObject = PrivateGatewayResponse.class,
++@APICommand(name = "createPrivateGateway", description = "Creates a private gateway", responseObject = PrivateGatewayResponse.class, entityType = {IAMEntityType.PrivateGateway},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(CreatePrivateGatewayCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
index 27e71cf,833044f..dcce58e
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
@@@ -37,7 -36,8 +37,8 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.network.vpc.VpcGateway;
  import com.cloud.user.Account;
  
- @APICommand(name = "deletePrivateGateway", description = "Deletes a Private gateway", responseObject = SuccessResponse.class, entityType = { IAMEntityType.PrivateGateway })
 -@APICommand(name = "deletePrivateGateway", description = "Deletes a Private gateway", responseObject = SuccessResponse.class,
++@APICommand(name = "deletePrivateGateway", description = "Deletes a Private gateway", responseObject = SuccessResponse.class, entityType = {IAMEntityType.PrivateGateway},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeletePrivateGatewayCmd.class.getName());
      private static final String s_name = "deleteprivategatewayresponse";
@@@ -86,7 -86,7 +87,7 @@@
          boolean result = _vpcService.deleteVpcPrivateGateway(id);
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete private gateway");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
index 8ba954c,0000000..3a95e44
mode 100644,000000..100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
@@@ -1,55 -1,0 +1,55 @@@
 +// Licensed to the Apache Software Foundation (ASF) under one
 +// or more contributor license agreements.  See the NOTICE file
 +// distributed with this work for additional information
 +// regarding copyright ownership.  The ASF licenses this file
 +// to you under the Apache License, Version 2.0 (the
 +// "License"); you may not use this file except in compliance
 +// with the License.  You may obtain a copy of the License at
 +//
 +//   http://www.apache.org/licenses/LICENSE-2.0
 +//
 +// Unless required by applicable law or agreed to in writing,
 +// software distributed under the License is distributed on an
 +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +// KIND, either express or implied.  See the License for the
 +// specific language governing permissions and limitations
 +// under the License.
 +package org.apache.cloudstack.api.command.admin.vpc;
 +
 +import java.util.ArrayList;
 +import java.util.List;
 +
 +import org.apache.log4j.Logger;
 +
 +import org.apache.cloudstack.api.APICommand;
 +import org.apache.cloudstack.api.ResponseObject.ResponseView;
 +import org.apache.cloudstack.api.command.user.vpc.ListVPCsCmd;
 +import org.apache.cloudstack.api.response.ListResponse;
 +import org.apache.cloudstack.api.response.VpcResponse;
 +
 +import com.cloud.network.vpc.Vpc;
 +
 +
 +@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class, responseView = ResponseView.Full)
 +public class ListVPCsCmdByAdmin extends ListVPCsCmd {
 +    public static final Logger s_logger = Logger.getLogger(ListVPCsCmdByAdmin.class.getName());
 +
 +    @Override
 +    public void execute() {
-         List<? extends Vpc> vpcs = _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(),
-                 getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(), getDomainId(),
-                 getKeyword(), getStartIndex(), getPageSizeVal(), getZoneId(), isRecursive(),
-                 listAll(), getRestartRequired(), getTags(), getProjectId());
++        List<? extends Vpc> vpcs =
++                _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(), getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(), getDomainId(),
++                        getKeyword(), getStartIndex(), getPageSizeVal(), getZoneId(), isRecursive(), listAll(), getRestartRequired(), getTags(),
++                        getProjectId(), getDisplay());
 +        ListResponse<VpcResponse> response = new ListResponse<VpcResponse>();
 +        List<VpcResponse> offeringResponses = new ArrayList<VpcResponse>();
 +        for (Vpc vpc : vpcs) {
 +            VpcResponse offeringResponse = _responseGenerator.createVpcResponse(ResponseView.Full, vpc);
 +            offeringResponses.add(offeringResponse);
 +        }
 +
 +        response.setResponses(offeringResponses);
 +        response.setResponseName(getCommandName());
 +        setResponseObject(response);
 +    }
 +
 +}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
index 372bb75,0000000..b94cdcf
mode 100644,000000..100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
@@@ -1,47 -1,0 +1,47 @@@
 +// Licensed to the Apache Software Foundation (ASF) under one
 +// or more contributor license agreements.  See the NOTICE file
 +// distributed with this work for additional information
 +// regarding copyright ownership.  The ASF licenses this file
 +// to you under the Apache License, Version 2.0 (the
 +// "License"); you may not use this file except in compliance
 +// with the License.  You may obtain a copy of the License at
 +//
 +//   http://www.apache.org/licenses/LICENSE-2.0
 +//
 +// Unless required by applicable law or agreed to in writing,
 +// software distributed under the License is distributed on an
 +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +// KIND, either express or implied.  See the License for the
 +// specific language governing permissions and limitations
 +// under the License.
 +package org.apache.cloudstack.api.command.admin.vpc;
 +
 +import org.apache.log4j.Logger;
 +
 +import org.apache.cloudstack.api.APICommand;
 +import org.apache.cloudstack.api.ApiErrorCode;
 +import org.apache.cloudstack.api.ResponseObject.ResponseView;
 +import org.apache.cloudstack.api.ServerApiException;
 +import org.apache.cloudstack.api.command.user.vpc.UpdateVPCCmd;
 +import org.apache.cloudstack.api.response.VpcResponse;
 +
 +import com.cloud.network.vpc.Vpc;
 +
 +@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full)
 +public class UpdateVPCCmdByAdmin extends UpdateVPCCmd {
 +    public static final Logger s_logger = Logger.getLogger(UpdateVPCCmdByAdmin.class.getName());
 +
 +    @Override
 +    public void execute(){
-         Vpc result = _vpcService.updateVpc(getId(), getVpcName(), getDisplayText(), getCustomId());
++        Vpc result = _vpcService.updateVpc(getId(), getVpcName(), getDisplayText(), getCustomId(), getDisplayVpc());
 +        if (result != null) {
 +            VpcResponse response = _responseGenerator.createVpcResponse(ResponseView.Full, result);
 +            response.setResponseName(getCommandName());
 +            setResponseObject(response);
 +        } else {
 +            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update VPC");
 +        }
 +    }
 +
 +
 +}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
index 492dd57,f3632c0..65331e4
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
@@@ -27,7 -25,8 +27,8 @@@ import org.apache.cloudstack.api.Respon
  import org.apache.cloudstack.api.response.AccountResponse;
  import org.apache.cloudstack.api.response.ListResponse;
  
- @APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class, responseView = ResponseView.Restricted, entityType = { IAMEntityType.Account })
 -@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts",
 -        responseObject = AccountResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
++@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.Account},
++        requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
  public class ListAccountsCmd extends BaseListDomainResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListAccountsCmd.class.getName());
      private static final String s_name = "listaccountsresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index 1214011,aca9bfc..3f0d246
--- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@@ -18,8 -18,7 +18,9 @@@ package org.apache.cloudstack.api.comma
  
  import java.util.List;
  
 +import org.apache.log4j.Logger;
 +
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiCommandJobType;
  import org.apache.cloudstack.api.ApiConstants;
@@@ -56,7 -55,8 +57,8 @@@ import com.cloud.offering.NetworkOfferi
  import com.cloud.projects.Project;
  import com.cloud.user.Account;
  
- @APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted)
 -@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class,
++@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted,
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmd.class.getName());
      private static final String s_name = "associateipaddressresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index b9ac91b,109dcd0..3218713
--- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@@ -19,8 -19,7 +19,9 @@@ package org.apache.cloudstack.api.comma
  import java.util.ArrayList;
  import java.util.List;
  
 +import org.apache.log4j.Logger;
 +
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiCommandJobType;
  import org.apache.cloudstack.api.ApiConstants;
@@@ -38,7 -37,8 +39,8 @@@ import org.apache.cloudstack.api.respon
  import com.cloud.network.IpAddress;
  import com.cloud.utils.Pair;
  
- @APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted)
 -@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class,
++@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted,
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListPublicIpAddressesCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
index ea55dc4,c2de3a1..cc736d0
--- a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
@@@ -16,8 -16,7 +16,9 @@@
  // under the License.
  package org.apache.cloudstack.api.command.user.address;
  
 +import org.apache.log4j.Logger;
 +
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiConstants;
  import org.apache.cloudstack.api.BaseAsyncCustomIdCmd;
@@@ -116,8 -124,8 +126,8 @@@ public class UpdateIPAddrCmd extends Ba
      public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
              NetworkRuleConflictException {
  
-         IpAddress result = _networkService.updateIP(getId(), getCustomId());
 -        IpAddress result = _networkService.updateIP(getId(), this.getCustomId(), getDisplayIp());
 -        IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(result);
++        IpAddress result = _networkService.updateIP(getId(), getCustomId(), getDisplayIp());
 +        IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(ResponseView.Restricted, result);
          ipResponse.setResponseName(getCommandName());
          setResponseObject(ipResponse);
      }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
index cf00787,41d5823..50573e9
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
@@@ -35,7 -34,8 +35,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.exception.ResourceAllocationException;
  import com.cloud.user.Account;
  
- @APICommand(name = "createAffinityGroup", responseObject = AffinityGroupResponse.class, description = "Creates an affinity/anti-affinity group", entityType = { IAMEntityType.AffinityGroup })
 -@APICommand(name = "createAffinityGroup", responseObject = AffinityGroupResponse.class, description = "Creates an affinity/anti-affinity group",
++@APICommand(name = "createAffinityGroup", responseObject = AffinityGroupResponse.class, description = "Creates an affinity/anti-affinity group", entityType = {IAMEntityType.AffinityGroup},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(CreateAffinityGroupCmd.class.getName());
  
@@@ -126,7 -126,7 +127,7 @@@
          if (group != null) {
              AffinityGroupResponse response = _responseGenerator.createAffinityGroupResponse(group);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create affinity group:" + affinityGroupName);
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
index 2722889,d4d1f2a..eb9145c
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
@@@ -37,7 -34,8 +37,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.exception.InvalidParameterValueException;
  import com.cloud.user.Account;
  
- @APICommand(name = "deleteAffinityGroup", description = "Deletes affinity group", responseObject = SuccessResponse.class, entityType = { IAMEntityType.AffinityGroup })
 -@APICommand(name = "deleteAffinityGroup", description = "Deletes affinity group", responseObject = SuccessResponse.class,
++@APICommand(name = "deleteAffinityGroup", description = "Deletes affinity group", responseObject = SuccessResponse.class, entityType = {IAMEntityType.AffinityGroup},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeleteAffinityGroupCmd.class.getName());
      private static final String s_name = "deleteaffinitygroupresponse";
@@@ -132,7 -129,7 +133,7 @@@
          boolean result = _affinityGroupService.deleteAffinityGroup(id, accountName, domainId, name);
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete affinity group");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
index 5e209dc,9dbf727..e469eab
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
@@@ -17,7 -17,6 +17,8 @@@
  package org.apache.cloudstack.api.command.user.affinitygroup;
  
  import org.apache.log4j.Logger;
++
 +import org.apache.cloudstack.acl.IAMEntityType;
  import org.apache.cloudstack.affinity.AffinityGroupResponse;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiCommandJobType;
@@@ -27,7 -26,8 +28,8 @@@ import org.apache.cloudstack.api.Parame
  import org.apache.cloudstack.api.response.ListResponse;
  import org.apache.cloudstack.api.response.UserVmResponse;
  
- @APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class, entityType = { IAMEntityType.AffinityGroup })
 -@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class,
++@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class, entityType = {IAMEntityType.AffinityGroup},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListAffinityGroupsCmd.class.getName());
  
@@@ -80,10 -80,10 +82,10 @@@
      public void execute() {
  
          ListResponse<AffinityGroupResponse> response = _queryService.listAffinityGroups(id, affinityGroupName,
--                affinityGroupType, virtualMachineId, this.getAccountName(), this.getDomainId(), this.isRecursive(),
--                this.listAll(), this.getStartIndex(), this.getPageSizeVal(), this.getKeyword());
++                affinityGroupType, virtualMachineId, getAccountName(), getDomainId(), isRecursive(),
++                listAll(), getStartIndex(), getPageSizeVal(), getKeyword());
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
  
      }
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
index 75f01c1,0c3f296..4bfcddb
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
@@@ -45,8 -42,12 +45,14 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.user.Account;
  import com.cloud.uservm.UserVm;
  
- @APICommand(name = "updateVMAffinityGroup", description = "Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the "
-         + "new properties to take effect.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = { IAMEntityType.VirtualMachine })
+ @APICommand(name = "updateVMAffinityGroup",
+             description = "Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the "
+                 + "new properties to take effect.",
+             responseObject = UserVmResponse.class,
++        responseView = ResponseView.Restricted,
++        entityType = {IAMEntityType.VirtualMachine},
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = true)
  public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmd.class.getName());
      private static final String s_name = "updatevirtualmachineresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
index e722a6e,04130b5..8b5708d
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
@@@ -40,7 -39,9 +40,9 @@@ import com.cloud.user.Account
  
  @APICommand(name = "createAutoScalePolicy",
              description = "Creates an autoscale policy for a provision or deprovision action, the action is taken when the all the conditions evaluates to true for the specified duration. The policy is in effect once it is attached to a autscale vm group.",
-  responseObject = AutoScalePolicyResponse.class, entityType = { IAMEntityType.AutoScalePolicy })
 -            responseObject = AutoScalePolicyResponse.class,
++        responseObject = AutoScalePolicyResponse.class, entityType = {IAMEntityType.AutoScalePolicy},
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = false)
  public class CreateAutoScalePolicyCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(CreateAutoScalePolicyCmd.class.getName());
  
@@@ -164,15 -165,15 +166,15 @@@
          AutoScalePolicy result = _entityMgr.findById(AutoScalePolicy.class, getEntityId());
          AutoScalePolicyResponse response = _responseGenerator.createAutoScalePolicyResponse(result);
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  
      @Override
      public void create() throws ResourceAllocationException {
          AutoScalePolicy result = _autoScaleService.createAutoScalePolicy(this);
          if (result != null) {
--            this.setEntityId(result.getId());
--            this.setEntityUuid(result.getUuid());
++            setEntityId(result.getId());
++            setEntityUuid(result.getUuid());
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create AutoScale Policy");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
index 65bbafa,c519219..43a7f18
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
@@@ -18,9 -18,7 +18,10 @@@ package org.apache.cloudstack.api.comma
  
  import java.util.List;
  
 +import org.apache.log4j.Logger;
 +
 +import org.apache.cloudstack.acl.IAMEntityType;
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiCommandJobType;
  import org.apache.cloudstack.api.ApiConstants;
@@@ -41,7 -40,9 +42,9 @@@ import com.cloud.network.rules.LoadBala
  
  @APICommand(name = "createAutoScaleVmGroup",
              description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.",
-  responseObject = AutoScaleVmGroupResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup })
 -            responseObject = AutoScaleVmGroupResponse.class,
++            responseObject = AutoScaleVmGroupResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup },
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = false)
  public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(CreateAutoScaleVmGroupCmd.class.getName());
  
@@@ -183,8 -191,8 +193,8 @@@
      public void create() throws ResourceAllocationException {
          AutoScaleVmGroup result = _autoScaleService.createAutoScaleVmGroup(this);
          if (result != null) {
--            this.setEntityId(result.getId());
--            this.setEntityUuid(result.getUuid());
++            setEntityId(result.getId());
++            setEntityUuid(result.getUuid());
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Autoscale Vm Group");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
index 617b335,570e018..5d78593
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
@@@ -19,9 -19,7 +19,10 @@@ package org.apache.cloudstack.api.comma
  import java.util.HashMap;
  import java.util.Map;
  
 +import org.apache.log4j.Logger;
 +
 +import org.apache.cloudstack.acl.IAMEntityType;
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiCommandJobType;
  import org.apache.cloudstack.api.ApiConstants;
@@@ -45,7 -44,9 +46,9 @@@ import com.cloud.user.User
  
  @APICommand(name = "createAutoScaleVmProfile",
              description = "Creates a profile that contains information about the virtual machine which will be provisioned automatically by autoscale feature.",
-  responseObject = AutoScaleVmProfileResponse.class, entityType = { IAMEntityType.AutoScaleVmProfile })
 -            responseObject = AutoScaleVmProfileResponse.class,
++            responseObject = AutoScaleVmProfileResponse.class, entityType = { IAMEntityType.AutoScaleVmProfile },
+             requestHasSensitiveInfo = false,
+             responseHasSensitiveInfo = false)
  @SuppressWarnings("rawtypes")
  public class CreateAutoScaleVmProfileCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(CreateAutoScaleVmProfileCmd.class.getName());
@@@ -236,7 -244,7 +246,7 @@@
          AutoScaleVmProfile result = _entityMgr.findById(AutoScaleVmProfile.class, getEntityId());
          AutoScaleVmProfileResponse response = _responseGenerator.createAutoScaleVmProfileResponse(result);
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  
      @Override
@@@ -244,8 -252,8 +254,8 @@@
  
          AutoScaleVmProfile result = _autoScaleService.createAutoScaleVmProfile(this);
          if (result != null) {
--            this.setEntityId(result.getId());
--            this.setEntityUuid(result.getUuid());
++            setEntityId(result.getId());
++            setEntityUuid(result.getUuid());
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Autoscale Vm Profile");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
index f99aecc,356b836..a3358b2
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
@@@ -36,7 -35,8 +36,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.exception.ResourceAllocationException;
  import com.cloud.network.as.Condition;
  
- @APICommand(name = "createCondition", description = "Creates a condition", responseObject = ConditionResponse.class, entityType = { IAMEntityType.Condition })
 -@APICommand(name = "createCondition", description = "Creates a condition", responseObject = ConditionResponse.class,
++@APICommand(name = "createCondition", description = "Creates a condition", responseObject = ConditionResponse.class, entityType = {IAMEntityType.Condition},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class CreateConditionCmd extends BaseAsyncCreateCmd {
      public static final Logger s_logger = Logger.getLogger(CreateConditionCmd.class.getName());
      private static final String s_name = "conditionresponse";
@@@ -70,8 -70,8 +71,8 @@@
          condition = _autoScaleService.createCondition(this);
  
          if (condition != null) {
--            this.setEntityId(condition.getId());
--            this.setEntityUuid(condition.getUuid());
++            setEntityId(condition.getId());
++            setEntityUuid(condition.getUuid());
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create condition.");
          }
@@@ -82,7 -82,7 +83,7 @@@
          Condition condition = _entityMgr.findById(Condition.class, getEntityId());
          ConditionResponse response = _responseGenerator.createConditionResponse(condition);
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  
      // /////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
index 7d5741e,903ac59..779ee0a
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
@@@ -36,7 -33,8 +36,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.network.as.AutoScalePolicy;
  import com.cloud.user.Account;
  
- @APICommand(name = "deleteAutoScalePolicy", description = "Deletes a autoscale policy.", responseObject = SuccessResponse.class, entityType = { IAMEntityType.AutoScalePolicy })
 -@APICommand(name = "deleteAutoScalePolicy", description = "Deletes a autoscale policy.", responseObject = SuccessResponse.class,
++@APICommand(name = "deleteAutoScalePolicy", description = "Deletes a autoscale policy.", responseObject = SuccessResponse.class, entityType = {IAMEntityType.AutoScalePolicy},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeleteAutoScalePolicyCmd.class.getName());
      private static final String s_name = "deleteautoscalepolicyresponse";
@@@ -97,7 -94,7 +98,7 @@@
  
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              s_logger.warn("Failed to delete autoscale policy " + getId());
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete AutoScale Policy");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
index c8d32bd,44f2cd8..5a43abe
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
@@@ -36,7 -33,8 +36,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.network.as.AutoScaleVmGroup;
  import com.cloud.user.Account;
  
- @APICommand(name = "deleteAutoScaleVmGroup", description = "Deletes a autoscale vm group.", responseObject = SuccessResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup })
 -@APICommand(name = "deleteAutoScaleVmGroup", description = "Deletes a autoscale vm group.", responseObject = SuccessResponse.class,
++@APICommand(name = "deleteAutoScaleVmGroup", description = "Deletes a autoscale vm group.", responseObject = SuccessResponse.class, entityType = {IAMEntityType.AutoScaleVmGroup},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmGroupCmd.class.getName());
      private static final String s_name = "deleteautoscalevmgroupresponse";
@@@ -97,7 -94,7 +98,7 @@@
  
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              s_logger.warn("Failed to delete autoscale vm group " + getId());
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete autoscale vm group");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
index 79e0a17,d2dccc1..2391a93
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
@@@ -36,7 -33,8 +36,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.network.as.AutoScaleVmProfile;
  import com.cloud.user.Account;
  
- @APICommand(name = "deleteAutoScaleVmProfile", description = "Deletes a autoscale vm profile.", responseObject = SuccessResponse.class, entityType = { IAMEntityType.AutoScaleVmProfile })
 -@APICommand(name = "deleteAutoScaleVmProfile", description = "Deletes a autoscale vm profile.", responseObject = SuccessResponse.class,
++@APICommand(name = "deleteAutoScaleVmProfile", description = "Deletes a autoscale vm profile.", responseObject = SuccessResponse.class, entityType = {IAMEntityType.AutoScaleVmProfile},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmProfileCmd.class.getName());
      private static final String s_name = "deleteautoscalevmprofileresponse";
@@@ -96,7 -93,7 +97,7 @@@
          boolean result = _autoScaleService.deleteAutoScaleVmProfile(id);
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              s_logger.warn("Failed to delete autoscale vm profile " + getId());
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete autoscale vm profile");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
index 9d12149,a029f15..9a7d2d7
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
@@@ -37,7 -34,8 +37,8 @@@ import com.cloud.exception.ResourceInUs
  import com.cloud.network.as.Condition;
  import com.cloud.user.Account;
  
- @APICommand(name = "deleteCondition", description = "Removes a condition", responseObject = SuccessResponse.class, entityType = { IAMEntityType.Condition })
 -@APICommand(name = "deleteCondition", description = "Removes a condition", responseObject = SuccessResponse.class,
++@APICommand(name = "deleteCondition", description = "Removes a condition", responseObject = SuccessResponse.class, entityType = {IAMEntityType.Condition},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeleteConditionCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeleteConditionCmd.class.getName());
      private static final String s_name = "deleteconditionresponse";
@@@ -65,7 -62,7 +66,7 @@@
          }
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              s_logger.warn("Failed to delete condition " + getId());
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete condition.");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
index a6e736a,dccb016..6575d27
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
@@@ -35,7 -32,8 +35,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.network.as.AutoScaleVmGroup;
  import com.cloud.user.Account;
  
- @APICommand(name = "disableAutoScaleVmGroup", description = "Disables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup })
 -@APICommand(name = "disableAutoScaleVmGroup", description = "Disables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class,
++@APICommand(name = "disableAutoScaleVmGroup", description = "Disables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class, entityType = {IAMEntityType.AutoScaleVmGroup},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DisableAutoScaleVmGroupCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DisableAutoScaleVmGroupCmd.class.getName());
      private static final String s_name = "disableautoscalevmGroupresponse";
@@@ -62,7 -59,7 +63,7 @@@
          if (result != null) {
              AutoScaleVmGroupResponse response = _responseGenerator.createAutoScaleVmGroupResponse(result);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disable AutoScale Vm Group");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
index 49a6cee,d9326d0..6b9f2c3
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
@@@ -35,7 -32,8 +35,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.network.as.AutoScaleVmGroup;
  import com.cloud.user.Account;
  
- @APICommand(name = "enableAutoScaleVmGroup", description = "Enables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup })
 -@APICommand(name = "enableAutoScaleVmGroup", description = "Enables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class,
++@APICommand(name = "enableAutoScaleVmGroup", description = "Enables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class, entityType = {IAMEntityType.AutoScaleVmGroup},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class EnableAutoScaleVmGroupCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(EnableAutoScaleVmGroupCmd.class.getName());
      private static final String s_name = "enableautoscalevmGroupresponse";
@@@ -62,7 -59,7 +63,7 @@@
          if (result != null) {
              AutoScaleVmGroupResponse response = _responseGenerator.createAutoScaleVmGroupResponse(result);
              response.setResponseName(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to enable AutoScale Vm Group");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
index c6eb40c,615ed47..43c4c72
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
@@@ -33,7 -32,8 +33,8 @@@ import org.apache.cloudstack.api.respon
  
  import com.cloud.network.as.AutoScalePolicy;
  
- @APICommand(name = "listAutoScalePolicies", description = "Lists autoscale policies.", responseObject = AutoScalePolicyResponse.class, entityType = { IAMEntityType.AutoScalePolicy })
 -@APICommand(name = "listAutoScalePolicies", description = "Lists autoscale policies.", responseObject = AutoScalePolicyResponse.class,
++@APICommand(name = "listAutoScalePolicies", description = "Lists autoscale policies.", responseObject = AutoScalePolicyResponse.class, entityType = {IAMEntityType.AutoScalePolicy},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListAutoScalePoliciesCmd extends BaseListAccountResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListAutoScalePoliciesCmd.class.getName());
  
@@@ -100,7 -100,7 +101,7 @@@
          }
          response.setResponses(responses);
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
index 5e35e63,a5d3cdb..2e88c27
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
@@@ -19,9 -19,7 +19,10 @@@ package org.apache.cloudstack.api.comma
  import java.util.ArrayList;
  import java.util.List;
  
 +import org.apache.log4j.Logger;
 +
 +import org.apache.cloudstack.acl.IAMEntityType;
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.api.APICommand;
  import org.apache.cloudstack.api.ApiConstants;
  import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
@@@ -36,7 -35,8 +37,8 @@@ import org.apache.cloudstack.api.respon
  import com.cloud.exception.InvalidParameterValueException;
  import com.cloud.network.as.AutoScaleVmGroup;
  
- @APICommand(name = "listAutoScaleVmGroups", description = "Lists autoscale vm groups.", responseObject = AutoScaleVmGroupResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup })
 -@APICommand(name = "listAutoScaleVmGroups", description = "Lists autoscale vm groups.", responseObject = AutoScaleVmGroupResponse.class,
++@APICommand(name = "listAutoScaleVmGroups", description = "Lists autoscale vm groups.", responseObject = AutoScaleVmGroupResponse.class, entityType = { IAMEntityType.AutoScaleVmGroup },
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListAutoScaleVmGroupsCmd extends BaseListProjectAndAccountResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmGroupsCmd.class.getName());
  
@@@ -111,6 -122,6 +124,6 @@@
          }
          response.setResponses(responses);
          response.setResponseName(getCommandName());
--        this.setResponseObject(response);
++        setResponseObject(response);
      }
  }


Mime
View raw message