cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [41/53] [abbrv] git commit: updated refs/heads/resize-root to f52c743
Date Fri, 14 Mar 2014 05:34:33 GMT
Merge branch 'rbac' to master


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ff94601
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ff94601
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ff94601

Branch: refs/heads/resize-root
Commit: 8ff94601f1b7dc3c6c92b083d343e392325e860e
Parents: 6c23e20 d3fd66e
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Mar 13 16:42:22 2014 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Mar 13 16:42:22 2014 -0700

----------------------------------------------------------------------
 .../cloud/network/vpc/StaticRouteProfile.java   |    2 +-
 api/src/com/cloud/storage/VolumeApiService.java |    4 +-
 api/src/com/cloud/user/Account.java             |    4 +-
 api/src/com/cloud/user/AccountService.java      |   14 +-
 .../com/cloud/user/ResourceLimitService.java    |    2 +-
 api/src/org/apache/cloudstack/acl/Role.java     |   34 -
 api/src/org/apache/cloudstack/acl/RoleType.java |    2 +-
 .../apache/cloudstack/acl/SecurityChecker.java  |   13 +-
 api/src/org/apache/cloudstack/api/ACL.java      |    4 +-
 .../org/apache/cloudstack/api/APICommand.java   |    3 +
 .../org/apache/cloudstack/api/ApiConstants.java |    3 +-
 api/src/org/apache/cloudstack/api/BaseCmd.java  |    9 +-
 .../BaseListTemplateOrIsoPermissionsCmd.java    |   21 +-
 .../cloudstack/api/ResponseGenerator.java       |   44 +-
 .../apache/cloudstack/api/ResponseObject.java   |    5 +
 .../command/admin/account/CreateAccountCmd.java |    9 +-
 .../command/admin/account/DeleteAccountCmd.java |    9 +-
 .../admin/account/DisableAccountCmd.java        |   15 +-
 .../command/admin/account/EnableAccountCmd.java |   13 +-
 .../admin/account/ListAccountsCmdByAdmin.java   |   26 +
 .../command/admin/account/LockAccountCmd.java   |    3 +-
 .../command/admin/account/UpdateAccountCmd.java |   14 +-
 .../address/AssociateIPAddrCmdByAdmin.java      |   65 +
 .../ListPublicIpAddressesCmdByAdmin.java        |   53 +
 .../UpdateVMAffinityGroupCmdByAdmin.java        |   63 +
 .../admin/internallb/ListInternalLBVMsCmd.java  |    5 +-
 .../admin/internallb/StartInternalLBVMCmd.java  |    9 +-
 .../admin/internallb/StopInternalLBVMCmd.java   |    9 +-
 .../command/admin/iso/AttachIsoCmdByAdmin.java  |   53 +
 .../command/admin/iso/DetachIsoCmdByAdmin.java  |   47 +
 .../admin/iso/ListIsoPermissionsCmdByAdmin.java |   31 +
 .../command/admin/iso/ListIsosCmdByAdmin.java   |   26 +
 .../admin/iso/RegisterIsoCmdByAdmin.java        |   53 +
 .../command/admin/iso/UpdateIsoCmdByAdmin.java  |   45 +
 ...ListLoadBalancerRuleInstancesCmdByAdmin.java |   57 +
 .../admin/network/CreateNetworkCmdByAdmin.java  |   66 +
 .../admin/network/ListNetworksCmdByAdmin.java   |   50 +
 .../admin/network/UpdateNetworkCmdByAdmin.java  |   63 +
 .../command/admin/router/DestroyRouterCmd.java  |    5 +-
 .../command/admin/router/ListRoutersCmd.java    |    5 +-
 .../command/admin/router/RebootRouterCmd.java   |    7 +-
 .../command/admin/router/StartRouterCmd.java    |    5 +-
 .../api/command/admin/router/StopRouterCmd.java |    5 +-
 .../command/admin/router/UpgradeRouterCmd.java  |    5 +-
 .../admin/systemvm/DestroySystemVmCmd.java      |    8 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |    5 +-
 .../admin/systemvm/MigrateSystemVMCmd.java      |    8 +-
 .../admin/systemvm/RebootSystemVmCmd.java       |    9 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |    9 +-
 .../admin/systemvm/StartSystemVMCmd.java        |    9 +-
 .../command/admin/systemvm/StopSystemVmCmd.java |    8 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |   11 +-
 .../admin/template/CopyTemplateCmdByAdmin.java  |   63 +
 .../template/CreateTemplateCmdByAdmin.java      |   62 +
 .../ListTemplatePermissionsCmdByAdmin.java      |   32 +
 .../admin/template/ListTemplatesCmdByAdmin.java |   28 +
 .../admin/template/PrepareTemplateCmd.java      |   11 +-
 .../template/RegisterTemplateCmdByAdmin.java    |   57 +
 .../template/UpdateTemplateCmdByAdmin.java      |   47 +
 .../command/admin/vm/AddNicToVMCmdByAdmin.java  |   55 +
 .../api/command/admin/vm/AssignVMCmd.java       |    8 +-
 .../command/admin/vm/DeployVMCmdByAdmin.java    |   79 +
 .../command/admin/vm/DestroyVMCmdByAdmin.java   |   57 +
 .../api/command/admin/vm/ExpungeVMCmd.java      |    8 +-
 .../api/command/admin/vm/ListVMsCmdByAdmin.java |   69 +
 .../api/command/admin/vm/MigrateVMCmd.java      |    8 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java  |   10 +-
 .../command/admin/vm/RebootVMCmdByAdmin.java    |   51 +
 .../api/command/admin/vm/RecoverVMCmd.java      |   10 +-
 .../admin/vm/RemoveNicFromVMCmdByAdmin.java     |   55 +
 .../admin/vm/ResetVMPasswordCmdByAdmin.java     |   54 +
 .../admin/vm/ResetVMSSHKeyCmdByAdmin.java       |   57 +
 .../command/admin/vm/RestoreVMCmdByAdmin.java   |   54 +
 .../api/command/admin/vm/ScaleVMCmdByAdmin.java |   69 +
 .../api/command/admin/vm/StartVMCmdByAdmin.java |   80 +
 .../api/command/admin/vm/StopVMCmdByAdmin.java  |   53 +
 .../vm/UpdateDefaultNicForVMCmdByAdmin.java     |   56 +
 .../command/admin/vm/UpdateVMCmdByAdmin.java    |   53 +
 .../command/admin/vm/UpgradeVMCmdByAdmin.java   |   59 +
 .../RevertToVMSnapshotCmdByAdmin.java           |   57 +
 .../admin/volume/AttachVolumeCmdByAdmin.java    |   47 +
 .../admin/volume/CreateVolumeCmdByAdmin.java    |   61 +
 .../admin/volume/DetachVolumeCmdByAdmin.java    |   48 +
 .../admin/volume/ListVolumesCmdByAdmin.java     |   63 +
 .../admin/volume/MigrateVolumeCmdByAdmin.java   |   47 +
 .../admin/volume/ResizeVolumeCmdByAdmin.java    |   47 +
 .../admin/volume/UpdateVolumeCmdByAdmin.java    |   45 +
 .../admin/volume/UploadVolumeCmdByAdmin.java    |   57 +
 .../admin/vpc/CreatePrivateGatewayCmd.java      |    3 +-
 .../command/admin/vpc/CreateVPCCmdByAdmin.java  |   64 +
 .../admin/vpc/DeletePrivateGatewayCmd.java      |    5 +-
 .../command/admin/vpc/ListVPCsCmdByAdmin.java   |   55 +
 .../command/admin/vpc/UpdateVPCCmdByAdmin.java  |   47 +
 .../api/command/admin/zone/CreateZoneCmd.java   |    7 +-
 .../command/admin/zone/ListZonesCmdByAdmin.java |   26 +
 .../zone/MarkDefaultZoneForAccountCmd.java      |   10 +-
 .../api/command/admin/zone/UpdateZoneCmd.java   |    5 +-
 .../command/user/account/ListAccountsCmd.java   |    8 +-
 .../user/address/AssociateIPAddrCmd.java        |   10 +-
 .../user/address/ListPublicIpAddressesCmd.java  |   10 +-
 .../command/user/address/UpdateIPAddrCmd.java   |   12 +-
 .../affinitygroup/CreateAffinityGroupCmd.java   |    8 +-
 .../affinitygroup/DeleteAffinityGroupCmd.java   |   12 +-
 .../affinitygroup/ListAffinityGroupsCmd.java    |   10 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java |   13 +-
 .../autoscale/CreateAutoScalePolicyCmd.java     |    9 +-
 .../autoscale/CreateAutoScaleVmGroupCmd.java    |   10 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |   12 +-
 .../user/autoscale/CreateConditionCmd.java      |   12 +-
 .../autoscale/DeleteAutoScalePolicyCmd.java     |    8 +-
 .../autoscale/DeleteAutoScaleVmGroupCmd.java    |    8 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java  |    8 +-
 .../user/autoscale/DeleteConditionCmd.java      |    8 +-
 .../autoscale/DisableAutoScaleVmGroupCmd.java   |    8 +-
 .../autoscale/EnableAutoScaleVmGroupCmd.java    |    8 +-
 .../autoscale/ListAutoScalePoliciesCmd.java     |    5 +-
 .../autoscale/ListAutoScaleVmGroupsCmd.java     |    8 +-
 .../autoscale/ListAutoScaleVmProfilesCmd.java   |    8 +-
 .../autoscale/UpdateAutoScalePolicyCmd.java     |    8 +-
 .../autoscale/UpdateAutoScaleVmGroupCmd.java    |   15 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java  |   15 +-
 .../command/user/event/ArchiveEventsCmd.java    |    5 +-
 .../api/command/user/event/DeleteEventsCmd.java |    5 +-
 .../api/command/user/event/ListEventsCmd.java   |    5 +-
 .../firewall/CreateEgressFirewallRuleCmd.java   |   18 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |    6 +-
 .../firewall/CreatePortForwardingRuleCmd.java   |   20 +-
 .../firewall/DeleteEgressFirewallRuleCmd.java   |    8 +-
 .../user/firewall/DeleteFirewallRuleCmd.java    |    9 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |    6 +-
 .../firewall/ListEgressFirewallRulesCmd.java    |    8 +-
 .../user/firewall/ListFirewallRulesCmd.java     |    8 +-
 .../firewall/ListPortForwardingRulesCmd.java    |    8 +-
 .../firewall/UpdatePortForwardingRuleCmd.java   |   14 +-
 .../api/command/user/iso/AttachIsoCmd.java      |   23 +-
 .../api/command/user/iso/DetachIsoCmd.java      |   18 +-
 .../command/user/iso/ListIsoPermissionsCmd.java |   10 +-
 .../api/command/user/iso/ListIsosCmd.java       |    8 +-
 .../api/command/user/iso/RegisterIsoCmd.java    |   20 +-
 .../api/command/user/iso/UpdateIsoCmd.java      |    7 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |   13 +-
 .../command/user/network/CreateNetworkCmd.java  |   13 +-
 .../command/user/network/DeleteNetworkCmd.java  |    9 +-
 .../command/user/network/ListNetworksCmd.java   |   11 +-
 .../command/user/network/RestartNetworkCmd.java |    9 +-
 .../command/user/network/UpdateNetworkCmd.java  |   31 +-
 .../AuthorizeSecurityGroupEgressCmd.java        |   24 +-
 .../AuthorizeSecurityGroupIngressCmd.java       |   23 +-
 .../securitygroup/CreateSecurityGroupCmd.java   |    8 +-
 .../securitygroup/DeleteSecurityGroupCmd.java   |   16 +-
 .../securitygroup/ListSecurityGroupsCmd.java    |    5 +-
 .../RevokeSecurityGroupEgressCmd.java           |   11 +-
 .../RevokeSecurityGroupIngressCmd.java          |   10 +-
 .../user/snapshot/CreateSnapshotCmd.java        |   17 +-
 .../user/snapshot/DeleteSnapshotCmd.java        |   13 +-
 .../command/user/snapshot/ListSnapshotsCmd.java |    5 +-
 .../user/snapshot/RevertSnapshotCmd.java        |   14 +-
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |    8 +-
 .../command/user/ssh/DeleteSSHKeyPairCmd.java   |    9 +-
 .../command/user/ssh/ListSSHKeyPairsCmd.java    |    5 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java |    8 +-
 .../api/command/user/tag/CreateTagsCmd.java     |    5 +-
 .../api/command/user/tag/DeleteTagsCmd.java     |    5 +-
 .../api/command/user/tag/ListTagsCmd.java       |    5 +-
 .../command/user/template/CopyTemplateCmd.java  |    9 +-
 .../user/template/CreateTemplateCmd.java        |   40 +-
 .../template/ListTemplatePermissionsCmd.java    |   11 +-
 .../command/user/template/ListTemplatesCmd.java |    9 +-
 .../user/template/RegisterTemplateCmd.java      |   16 +-
 .../user/template/UpdateTemplateCmd.java        |    9 +-
 .../template/UpdateTemplatePermissionsCmd.java  |    3 +-
 .../api/command/user/vm/AddNicToVMCmd.java      |   21 +-
 .../api/command/user/vm/DeployVMCmd.java        |   37 +-
 .../api/command/user/vm/DestroyVMCmd.java       |   18 +-
 .../api/command/user/vm/GetVMPasswordCmd.java   |   11 +-
 .../api/command/user/vm/ListVMsCmd.java         |   28 +-
 .../api/command/user/vm/RebootVMCmd.java        |   20 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |   14 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java |   21 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java |   27 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java   |   14 +-
 .../api/command/user/vm/RestoreVMCmd.java       |   21 +-
 .../api/command/user/vm/ScaleVMCmd.java         |   27 +-
 .../api/command/user/vm/StartVMCmd.java         |   19 +-
 .../api/command/user/vm/StopVMCmd.java          |   14 +-
 .../user/vm/UpdateDefaultNicForVMCmd.java       |   20 +-
 .../api/command/user/vm/UpdateVMCmd.java        |   25 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |   26 +-
 .../command/user/vmgroup/CreateVMGroupCmd.java  |    8 +-
 .../command/user/vmgroup/DeleteVMGroupCmd.java  |    8 +-
 .../command/user/vmgroup/ListVMGroupsCmd.java   |    5 +-
 .../command/user/vmgroup/UpdateVMGroupCmd.java  |    9 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java    |   10 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java    |    8 +-
 .../user/vmsnapshot/ListVMSnapshotCmd.java      |    5 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java  |   13 +-
 .../command/user/volume/AttachVolumeCmd.java    |   23 +-
 .../command/user/volume/CreateVolumeCmd.java    |   21 +-
 .../command/user/volume/DeleteVolumeCmd.java    |   14 +-
 .../command/user/volume/DetachVolumeCmd.java    |   21 +-
 .../command/user/volume/ExtractVolumeCmd.java   |   13 +-
 .../api/command/user/volume/ListVolumesCmd.java |    9 +-
 .../command/user/volume/MigrateVolumeCmd.java   |   20 +-
 .../command/user/volume/ResizeVolumeCmd.java    |   20 +-
 .../command/user/volume/UpdateVolumeCmd.java    |   18 +-
 .../command/user/volume/UploadVolumeCmd.java    |   29 +-
 .../command/user/vpc/CreateStaticRouteCmd.java  |    3 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |   23 +-
 .../command/user/vpc/DeleteStaticRouteCmd.java  |    9 +-
 .../api/command/user/vpc/DeleteVPCCmd.java      |    9 +-
 .../user/vpc/ListPrivateGatewaysCmd.java        |    5 +-
 .../command/user/vpc/ListStaticRoutesCmd.java   |    5 +-
 .../api/command/user/vpc/ListVPCsCmd.java       |   14 +-
 .../api/command/user/vpc/RestartVPCCmd.java     |    9 +-
 .../api/command/user/vpc/UpdateVPCCmd.java      |   21 +-
 .../api/command/user/vpn/AddVpnUserCmd.java     |    8 +-
 .../user/vpn/CreateRemoteAccessVpnCmd.java      |   12 +-
 .../user/vpn/CreateVpnConnectionCmd.java        |    7 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |    8 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |    6 +-
 .../user/vpn/DeleteRemoteAccessVpnCmd.java      |    4 +-
 .../user/vpn/DeleteVpnConnectionCmd.java        |    5 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java   |    8 +-
 .../command/user/vpn/DeleteVpnGatewayCmd.java   |    5 +-
 .../user/vpn/ListRemoteAccessVpnsCmd.java       |    8 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java |    8 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java    |    5 +-
 .../command/user/vpn/ListVpnGatewaysCmd.java    |    8 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java   |    5 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java  |    6 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java |    8 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |    8 +-
 .../api/command/user/zone/ListZonesByCmd.java   |  133 --
 .../api/command/user/zone/ListZonesCmd.java     |  134 ++
 .../api/response/AccountResponse.java           |    9 +
 .../apache/cloudstack/query/QueryService.java   |   18 +-
 .../api/command/test/ScaleVMCmdTest.java        |    4 +-
 client/pom.xml                                  |   16 +-
 client/tomcatconf/applicationContext.xml.in     |  951 ++++++++
 client/tomcatconf/commands.properties.in        |   16 +
 client/tomcatconf/componentContext.xml.in       |  317 +++
 client/tomcatconf/nonossComponentContext.xml.in |  422 ++++
 .../tomcatconf/simulatorComponentContext.xml.in |  286 +++
 ...g-core-lifecycle-api-context-inheritable.xml |    5 +
 .../core/spring-core-registry-core-context.xml  |    9 +-
 .../src/com/cloud/network/addr/PublicIp.java    |    4 +-
 .../orchestration/NetworkOrchestrator.java      |  168 +-
 engine/schema/src/com/cloud/event/EventVO.java  |    1 -
 .../cloud/network/as/AutoScaleVmGroupVO.java    |    1 -
 .../cloud/network/dao/RemoteAccessVpnVO.java    |    2 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java |    1 +
 .../network/dao/Site2SiteVpnConnectionVO.java   |    1 +
 .../network/dao/Site2SiteVpnGatewayVO.java      |    1 +
 .../com/cloud/network/rules/FirewallRuleVO.java |    2 +-
 .../schema/src/com/cloud/network/vpc/VpcVO.java |    1 +
 .../schema/src/com/cloud/storage/VolumeVO.java  |    1 +
 .../src/com/cloud/tags/ResourceTagVO.java       |    1 +
 .../com/cloud/upgrade/dao/Upgrade430to440.java  |   52 +-
 engine/schema/src/com/cloud/user/AccountVO.java |    1 -
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |   16 +-
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |   10 +-
 .../storage/snapshot/SnapshotObject.java        |    2 +-
 .../db/src/com/cloud/utils/db/SearchBase.java   |   12 +-
 .../ratelimit/ApiRateLimitServiceImpl.java      |    4 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java  |   10 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java |    9 +-
 .../contrail/management/MockAccountManager.java |   63 +-
 .../commands/ListSrxFirewallNetworksCmd.java    |    9 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java   |    9 +-
 .../ListNiciraNvpDeviceNetworksCmd.java         |    5 +-
 .../ListPaloAltoFirewallNetworksCmd.java        |    5 +-
 .../api/command/LdapCreateAccountCmd.java       |   20 +-
 .../spring-server-core-managers-context.xml     |    3 +-
 .../cloud/acl/AffinityGroupAccessChecker.java   |    6 +-
 server/src/com/cloud/acl/DomainChecker.java     |   41 +-
 server/src/com/cloud/api/ApiDBUtils.java        |   49 +-
 server/src/com/cloud/api/ApiDispatcher.java     |   37 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   96 +-
 server/src/com/cloud/api/ApiServer.java         |  129 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |  653 +++---
 .../com/cloud/api/query/ViewResponseHelper.java |   53 +-
 .../com/cloud/api/query/dao/AccountJoinDao.java |    3 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java |  100 +-
 .../cloud/api/query/dao/DataCenterJoinDao.java  |    3 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java    |   11 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |   10 +-
 .../cloud/api/query/dao/TemplateJoinDao.java    |   11 +-
 .../api/query/dao/TemplateJoinDaoImpl.java      |   52 +-
 .../com/cloud/api/query/dao/UserVmJoinDao.java  |    5 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |   21 +-
 .../com/cloud/api/query/dao/VolumeJoinDao.java  |    5 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |   18 +-
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java  |   34 +-
 .../cloud/api/query/vo/DomainRouterJoinVO.java  |    1 -
 .../src/com/cloud/api/query/vo/EventJoinVO.java |    1 -
 .../cloud/api/query/vo/InstanceGroupJoinVO.java |    1 -
 .../api/query/vo/ProjectInvitationJoinVO.java   |    1 -
 .../cloud/api/query/vo/ResourceTagJoinVO.java   |    1 -
 .../cloud/api/query/vo/SecurityGroupJoinVO.java |    1 -
 .../com/cloud/api/query/vo/TemplateJoinVO.java  |    5 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |    1 -
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |    2 +-
 .../api/response/ApiResponseSerializer.java     |   10 +-
 .../configuration/ConfigurationManagerImpl.java |  544 ++---
 .../deploy/DeploymentPlanningManagerImpl.java   | 2204 +++++++++---------
 .../src/com/cloud/deploy/FirstFitPlanner.java   |   10 +-
 .../com/cloud/network/IpAddressManagerImpl.java |  670 +++---
 .../com/cloud/network/NetworkServiceImpl.java   |  482 ++--
 .../cloud/network/as/AutoScaleManagerImpl.java  |  485 ++--
 .../network/firewall/FirewallManagerImpl.java   |  174 +-
 .../lb/LoadBalancingRulesManagerImpl.java       |   29 +-
 .../cloud/network/rules/RulesManagerImpl.java   |   47 +-
 .../security/SecurityGroupManagerImpl.java      |    3 +-
 .../network/vpc/NetworkACLServiceImpl.java      |   34 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |  419 ++--
 .../network/vpn/RemoteAccessVpnManagerImpl.java |   43 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |   49 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |  228 +-
 .../com/cloud/resource/ResourceManagerImpl.java |  250 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |  243 +-
 .../com/cloud/server/ManagementServerImpl.java  |  219 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |   57 +-
 .../com/cloud/storage/StorageManagerImpl.java   |   47 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |  280 +--
 .../storage/snapshot/SnapshotManagerImpl.java   |   42 +-
 .../cloud/tags/TaggedResourceManagerImpl.java   |   14 +-
 .../template/HypervisorTemplateAdapter.java     |   26 +-
 .../com/cloud/template/TemplateAdapterBase.java |   15 +-
 .../com/cloud/template/TemplateManagerImpl.java |   99 +-
 .../src/com/cloud/usage/UsageServiceImpl.java   |    9 +-
 server/src/com/cloud/user/AccountManager.java   |   53 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |  526 +++--
 .../src/com/cloud/user/DomainManagerImpl.java   |   52 +-
 .../com/cloud/uuididentity/UUIDManagerImpl.java |    2 +-
 server/src/com/cloud/vm/UserVmManager.java      |   24 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  439 ++--
 .../vm/snapshot/VMSnapshotManagerImpl.java      |  138 +-
 .../affinity/AffinityGroupServiceImpl.java      |  998 ++++----
 .../lb/ApplicationLoadBalancerManagerImpl.java  |   18 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |   21 +-
 .../GlobalLoadBalancingRulesServiceImpl.java    |   12 +-
 .../com/cloud/user/MockAccountManagerImpl.java  |   88 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |   35 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java |    2 +-
 .../affinity/AffinityApiUnitTest.java           |    6 +
 .../iam/AddIAMPermissionToIAMPolicyCmd.java     |    3 -
 .../api/response/iam/IAMPermissionResponse.java |    8 +-
 .../cloudstack/iam/IAMApiServiceImpl.java       |   22 +-
 .../iam/RoleBasedEntityAccessChecker.java       |   13 +-
 services/pom.xml                                |    2 +-
 setup/db/db/schema-430to440.sql                 |  113 +-
 test/integration/smoke/test_vm_iam.py           |  717 ++++++
 tools/apidoc/gen_toc.py                         |   15 +-
 tools/marvin/marvin/integration/lib/base.py     |  130 +-
 354 files changed, 12593 insertions(+), 6294 deletions(-)
----------------------------------------------------------------------



Mime
View raw message