cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [06/54] [abbrv] git commit: updated refs/heads/distributedrouter to 42b553e
Date Fri, 14 Mar 2014 10:37:19 GMT
Merge branch 'master' into rbac.


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

Branch: refs/heads/distributedrouter
Commit: 48e08fe676c40c968bccc417efe393ef254b4478
Parents: 695d689 63e3eea
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Mar 6 14:02:20 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Mar 6 14:02:20 2014 -0800

----------------------------------------------------------------------
 .../SYSCONFDIR/rc.d/init.d/cloud-agent.in       |     8 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-agent.in       |     8 +-
 .../sles/SYSCONFDIR/init.d/cloud-agent.in       |     8 +-
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in  |     8 +-
 .../sles/SYSCONFDIR/init.d/cloud-agent.in       |     8 +-
 api/src/com/cloud/event/EventTypes.java         |     1 +
 api/src/com/cloud/network/IpAddress.java        |     2 +
 api/src/com/cloud/network/NetworkService.java   |     4 +-
 api/src/com/cloud/network/RemoteAccessVpn.java  |     2 +
 .../cloud/network/Site2SiteVpnConnection.java   |     2 +
 .../com/cloud/network/Site2SiteVpnGateway.java  |     5 +-
 .../com/cloud/network/as/AutoScaleVmGroup.java  |     2 +
 .../cloud/network/as/AutoScaleVmProfile.java    |     2 +
 .../cloud/network/firewall/FirewallService.java |     2 +-
 .../network/lb/LoadBalancingRulesService.java   |     5 +-
 .../com/cloud/network/rules/FirewallRule.java   |     2 +
 .../com/cloud/network/rules/RulesService.java   |     5 +-
 api/src/com/cloud/network/vpc/NetworkACL.java   |     2 +
 .../com/cloud/network/vpc/NetworkACLItem.java   |     2 +
 .../cloud/network/vpc/NetworkACLService.java    |     8 +-
 .../cloud/network/vpc/StaticRouteProfile.java   |     1 -
 api/src/com/cloud/network/vpc/Vpc.java          |     1 +
 api/src/com/cloud/network/vpc/VpcService.java   |     9 +-
 .../network/vpn/RemoteAccessVpnService.java     |     4 +-
 .../cloud/network/vpn/Site2SiteVpnService.java  |     4 +-
 api/src/com/cloud/serializer/Param.java         |     4 +
 api/src/com/cloud/server/ManagementService.java |     4 +-
 .../cloud/server/ResourceMetaDataService.java   |     3 +-
 api/src/com/cloud/storage/Storage.java          |     3 +-
 api/src/com/cloud/storage/Volume.java           |     2 +
 api/src/com/cloud/storage/VolumeApiService.java |     2 +-
 api/src/com/cloud/uservm/UserVm.java            |     1 +
 api/src/com/cloud/vm/VirtualMachine.java        |     5 +-
 .../apache/cloudstack/acl/SecurityChecker.java  |     1 +
 .../org/apache/cloudstack/api/APICommand.java   |     6 +-
 .../org/apache/cloudstack/api/ApiConstants.java |     2 +
 .../org/apache/cloudstack/api/BaseAsyncCmd.java |     6 +-
 api/src/org/apache/cloudstack/api/BaseCmd.java  |     8 +
 .../api/BaseListAccountResourcesCmd.java        |    12 +
 .../command/admin/account/CreateAccountCmd.java |     4 +-
 .../command/admin/account/DeleteAccountCmd.java |     5 +-
 .../admin/account/DisableAccountCmd.java        |     3 +-
 .../command/admin/account/EnableAccountCmd.java |     3 +-
 .../command/admin/account/LockAccountCmd.java   |     3 +-
 .../command/admin/account/UpdateAccountCmd.java |     3 +-
 .../command/admin/alert/GenerateAlertCmd.java   |     3 +-
 .../admin/autoscale/CreateCounterCmd.java       |     3 +-
 .../admin/autoscale/DeleteCounterCmd.java       |     3 +-
 .../command/admin/cluster/AddClusterCmd.java    |     3 +-
 .../command/admin/cluster/DeleteClusterCmd.java |     3 +-
 .../command/admin/cluster/ListClustersCmd.java  |     3 +-
 .../command/admin/cluster/UpdateClusterCmd.java |     3 +-
 .../api/command/admin/config/ListCfgsByCmd.java |     3 +-
 .../admin/config/ListDeploymentPlannersCmd.java |     3 +-
 .../config/ListHypervisorCapabilitiesCmd.java   |     4 +-
 .../api/command/admin/config/UpdateCfgCmd.java  |     3 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java |     4 +-
 .../command/admin/domain/CreateDomainCmd.java   |     3 +-
 .../command/admin/domain/DeleteDomainCmd.java   |     3 +-
 .../admin/domain/ListDomainChildrenCmd.java     |     3 +-
 .../command/admin/domain/ListDomainsCmd.java    |     3 +-
 .../command/admin/domain/UpdateDomainCmd.java   |     3 +-
 .../api/command/admin/host/AddHostCmd.java      |     3 +-
 .../admin/host/AddSecondaryStorageCmd.java      |     3 +-
 .../admin/host/CancelMaintenanceCmd.java        |     3 +-
 .../api/command/admin/host/DeleteHostCmd.java   |     3 +-
 .../admin/host/FindHostsForMigrationCmd.java    |     3 +-
 .../api/command/admin/host/ListHostsCmd.java    |     3 +-
 .../admin/host/PrepareForMaintenanceCmd.java    |     3 +-
 .../command/admin/host/ReconnectHostCmd.java    |     3 +-
 .../admin/host/ReleaseHostReservationCmd.java   |     3 +-
 .../api/command/admin/host/UpdateHostCmd.java   |     3 +-
 .../admin/host/UpdateHostPasswordCmd.java       |     3 +-
 ...ConfigureInternalLoadBalancerElementCmd.java |     4 +-
 .../CreateInternalLoadBalancerElementCmd.java   |     4 +-
 .../admin/internallb/ListInternalLBVMsCmd.java  |     5 +-
 .../ListInternalLoadBalancerElementsCmd.java    |     4 +-
 .../admin/internallb/StartInternalLBVMCmd.java  |     5 +-
 .../admin/internallb/StopInternalLBVMCmd.java   |     5 +-
 .../admin/network/AddNetworkDeviceCmd.java      |     3 +-
 .../network/AddNetworkServiceProviderCmd.java   |     4 +-
 .../admin/network/CreateNetworkOfferingCmd.java |     3 +-
 .../admin/network/CreatePhysicalNetworkCmd.java |     3 +-
 .../network/CreateStorageNetworkIpRangeCmd.java |     4 +-
 .../network/DedicateGuestVlanRangeCmd.java      |     3 +-
 .../admin/network/DeleteNetworkDeviceCmd.java   |     3 +-
 .../admin/network/DeleteNetworkOfferingCmd.java |     3 +-
 .../DeleteNetworkServiceProviderCmd.java        |     3 +-
 .../admin/network/DeletePhysicalNetworkCmd.java |     3 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java |     3 +-
 .../ListDedicatedGuestVlanRangesCmd.java        |     3 +-
 .../admin/network/ListNetworkDeviceCmd.java     |     3 +-
 .../network/ListNetworkIsolationMethodsCmd.java |     4 +-
 .../network/ListNetworkServiceProvidersCmd.java |     4 +-
 .../admin/network/ListPhysicalNetworksCmd.java  |     3 +-
 .../network/ListStorageNetworkIpRangeCmd.java   |     3 +-
 .../ListSupportedNetworkServicesCmd.java        |     4 +-
 .../ReleaseDedicatedGuestVlanRangeCmd.java      |     3 +-
 .../admin/network/UpdateNetworkOfferingCmd.java |     3 +-
 .../UpdateNetworkServiceProviderCmd.java        |     4 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java |     3 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java |     4 +-
 .../admin/offering/CreateDiskOfferingCmd.java   |     3 +-
 .../offering/CreateServiceOfferingCmd.java      |     3 +-
 .../admin/offering/DeleteDiskOfferingCmd.java   |     3 +-
 .../offering/DeleteServiceOfferingCmd.java      |     3 +-
 .../admin/offering/UpdateDiskOfferingCmd.java   |     3 +-
 .../offering/UpdateServiceOfferingCmd.java      |     3 +-
 .../api/command/admin/pod/CreatePodCmd.java     |     3 +-
 .../api/command/admin/pod/DeletePodCmd.java     |     3 +-
 .../api/command/admin/pod/ListPodsByCmd.java    |     3 +-
 .../api/command/admin/pod/UpdatePodCmd.java     |     3 +-
 .../api/command/admin/region/AddRegionCmd.java  |     3 +-
 .../admin/region/CreatePortableIpRangeCmd.java  |     4 +-
 .../admin/region/DeletePortableIpRangeCmd.java  |     3 +-
 .../admin/region/ListPortableIpRangesCmd.java   |     3 +-
 .../command/admin/region/RemoveRegionCmd.java   |     3 +-
 .../command/admin/region/UpdateRegionCmd.java   |     3 +-
 .../admin/resource/ArchiveAlertsCmd.java        |     3 +-
 .../admin/resource/CleanVMReservationsCmd.java  |     3 +-
 .../command/admin/resource/DeleteAlertsCmd.java |     3 +-
 .../command/admin/resource/ListAlertsCmd.java   |     3 +-
 .../command/admin/resource/ListCapacityCmd.java |     3 +-
 .../resource/UploadCustomCertificateCmd.java    |     3 +-
 .../admin/router/ConfigureOvsElementCmd.java    |     3 +-
 .../ConfigureVirtualRouterElementCmd.java       |     3 +-
 .../router/CreateVirtualRouterElementCmd.java   |     3 +-
 .../command/admin/router/DestroyRouterCmd.java  |     5 +-
 .../admin/router/ListOvsElementsCmd.java        |     3 +-
 .../command/admin/router/ListRoutersCmd.java    |     5 +-
 .../router/ListVirtualRouterElementsCmd.java    |     3 +-
 .../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/router/UpgradeRouterTemplateCmd.java  |     3 +-
 .../command/admin/storage/AddImageStoreCmd.java |     3 +-
 .../api/command/admin/storage/AddS3Cmd.java     |     3 +-
 .../CancelPrimaryStorageMaintenanceCmd.java     |     3 +-
 .../storage/CreateSecondaryStagingStoreCmd.java |     3 +-
 .../admin/storage/CreateStoragePoolCmd.java     |     3 +-
 .../admin/storage/DeleteImageStoreCmd.java      |     3 +-
 .../command/admin/storage/DeletePoolCmd.java    |     3 +-
 .../storage/DeleteSecondaryStagingStoreCmd.java |     3 +-
 .../FindStoragePoolsForMigrationCmd.java        |     3 +-
 .../admin/storage/ListImageStoresCmd.java       |     3 +-
 .../api/command/admin/storage/ListS3sCmd.java   |     3 +-
 .../storage/ListSecondaryStagingStoresCmd.java  |     3 +-
 .../admin/storage/ListStoragePoolsCmd.java      |     3 +-
 .../admin/storage/ListStorageProvidersCmd.java  |     3 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java |     3 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java |     3 +-
 .../admin/storage/UpdateStoragePoolCmd.java     |     3 +-
 .../api/command/admin/swift/AddSwiftCmd.java    |     3 +-
 .../api/command/admin/swift/ListSwiftsCmd.java  |     3 +-
 .../admin/systemvm/DestroySystemVmCmd.java      |     5 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |     5 +-
 .../admin/systemvm/MigrateSystemVMCmd.java      |     5 +-
 .../admin/systemvm/RebootSystemVmCmd.java       |     5 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |     6 +-
 .../admin/systemvm/StartSystemVMCmd.java        |     5 +-
 .../command/admin/systemvm/StopSystemVmCmd.java |     5 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |     6 +-
 .../admin/template/PrepareTemplateCmd.java      |     3 +-
 .../admin/usage/AddTrafficMonitorCmd.java       |     3 +-
 .../command/admin/usage/AddTrafficTypeCmd.java  |     3 +-
 .../admin/usage/DeleteTrafficMonitorCmd.java    |     3 +-
 .../admin/usage/DeleteTrafficTypeCmd.java       |     3 +-
 .../admin/usage/GenerateUsageRecordsCmd.java    |     4 +-
 .../command/admin/usage/GetUsageRecordsCmd.java |     3 +-
 .../admin/usage/ListTrafficMonitorsCmd.java     |     3 +-
 .../usage/ListTrafficTypeImplementorsCmd.java   |     4 +-
 .../admin/usage/ListTrafficTypesCmd.java        |     3 +-
 .../command/admin/usage/ListUsageTypesCmd.java  |     3 +-
 .../admin/usage/UpdateTrafficTypeCmd.java       |     3 +-
 .../api/command/admin/user/CreateUserCmd.java   |     3 +-
 .../api/command/admin/user/DeleteUserCmd.java   |     3 +-
 .../api/command/admin/user/DisableUserCmd.java  |     3 +-
 .../api/command/admin/user/EnableUserCmd.java   |     3 +-
 .../api/command/admin/user/GetUserCmd.java      |     3 +-
 .../api/command/admin/user/ListUsersCmd.java    |     3 +-
 .../api/command/admin/user/LockUserCmd.java     |     3 +-
 .../api/command/admin/user/RegisterCmd.java     |     3 +-
 .../api/command/admin/user/UpdateUserCmd.java   |     3 +-
 .../admin/vlan/CreateVlanIpRangeCmd.java        |     3 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java    |     3 +-
 .../admin/vlan/DeleteVlanIpRangeCmd.java        |     3 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java |     3 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java     |     3 +-
 .../api/command/admin/vm/AssignVMCmd.java       |     4 +-
 .../api/command/admin/vm/ExpungeVMCmd.java      |     5 +-
 .../api/command/admin/vm/GetVMUserDataCmd.java  |     3 +-
 .../api/command/admin/vm/MigrateVMCmd.java      |     4 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java  |     4 +-
 .../api/command/admin/vm/RecoverVMCmd.java      |     3 +-
 .../admin/volume/UpdateVolumeCmdByAdmin.java    |     3 +-
 .../admin/vpc/CreatePrivateGatewayCmd.java      |     3 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java |     3 +-
 .../admin/vpc/DeletePrivateGatewayCmd.java      |     5 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java |     3 +-
 .../command/admin/vpc/ListVPCsCmdByAdmin.java   |     8 +-
 .../command/admin/vpc/UpdateVPCCmdByAdmin.java  |     2 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java |     3 +-
 .../api/command/admin/zone/CreateZoneCmd.java   |     3 +-
 .../api/command/admin/zone/DeleteZoneCmd.java   |     3 +-
 .../zone/MarkDefaultZoneForAccountCmd.java      |     3 +-
 .../api/command/admin/zone/UpdateZoneCmd.java   |     3 +-
 .../user/account/AddAccountToProjectCmd.java    |     3 +-
 .../account/DeleteAccountFromProjectCmd.java    |     3 +-
 .../command/user/account/ListAccountsCmd.java   |     3 +-
 .../user/account/ListProjectAccountsCmd.java    |     3 +-
 .../user/address/AssociateIPAddrCmd.java        |    13 +-
 .../user/address/DisassociateIPAddrCmd.java     |     3 +-
 .../user/address/ListPublicIpAddressesCmd.java  |    15 +-
 .../command/user/address/UpdateIPAddrCmd.java   |    14 +-
 .../affinitygroup/CreateAffinityGroupCmd.java   |     5 +-
 .../affinitygroup/DeleteAffinityGroupCmd.java   |     5 +-
 .../ListAffinityGroupTypesCmd.java              |     3 +-
 .../affinitygroup/ListAffinityGroupsCmd.java    |    10 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java |    10 +-
 .../autoscale/CreateAutoScalePolicyCmd.java     |    10 +-
 .../autoscale/CreateAutoScaleVmGroupCmd.java    |    16 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |    18 +-
 .../user/autoscale/CreateConditionCmd.java      |     9 +-
 .../autoscale/DeleteAutoScalePolicyCmd.java     |     5 +-
 .../autoscale/DeleteAutoScaleVmGroupCmd.java    |     5 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java  |     5 +-
 .../user/autoscale/DeleteConditionCmd.java      |     5 +-
 .../autoscale/DisableAutoScaleVmGroupCmd.java   |     5 +-
 .../autoscale/EnableAutoScaleVmGroupCmd.java    |     5 +-
 .../autoscale/ListAutoScalePoliciesCmd.java     |     5 +-
 .../autoscale/ListAutoScaleVmGroupsCmd.java     |    17 +-
 .../autoscale/ListAutoScaleVmProfilesCmd.java   |    22 +-
 .../user/autoscale/ListConditionsCmd.java       |     3 +-
 .../command/user/autoscale/ListCountersCmd.java |     3 +-
 .../autoscale/UpdateAutoScalePolicyCmd.java     |     5 +-
 .../autoscale/UpdateAutoScaleVmGroupCmd.java    |    11 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java  |    11 +-
 .../user/config/ListCapabilitiesCmd.java        |     3 +-
 .../command/user/event/ArchiveEventsCmd.java    |     5 +-
 .../api/command/user/event/DeleteEventsCmd.java |     5 +-
 .../command/user/event/ListEventTypesCmd.java   |     3 +-
 .../api/command/user/event/ListEventsCmd.java   |     5 +-
 .../firewall/CreateEgressFirewallRuleCmd.java   |    18 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |    17 +-
 .../firewall/CreatePortForwardingRuleCmd.java   |    21 +-
 .../firewall/DeleteEgressFirewallRuleCmd.java   |     5 +-
 .../user/firewall/DeleteFirewallRuleCmd.java    |     5 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |     3 +-
 .../firewall/ListEgressFirewallRulesCmd.java    |     5 +-
 .../user/firewall/ListFirewallRulesCmd.java     |    17 +-
 .../firewall/ListPortForwardingRulesCmd.java    |    17 +-
 .../firewall/UpdateEgressFirewallRuleCmd.java   |    13 +-
 .../user/firewall/UpdateFirewallRuleCmd.java    |    13 +-
 .../firewall/UpdatePortForwardingRuleCmd.java   |    13 +-
 .../user/guest/ListGuestOsCategoriesCmd.java    |     3 +-
 .../api/command/user/guest/ListGuestOsCmd.java  |     3 +-
 .../api/command/user/iso/AttachIsoCmd.java      |     3 +-
 .../api/command/user/iso/CopyIsoCmd.java        |     3 +-
 .../api/command/user/iso/DeleteIsoCmd.java      |     3 +-
 .../api/command/user/iso/DetachIsoCmd.java      |     3 +-
 .../api/command/user/iso/ExtractIsoCmd.java     |     3 +-
 .../command/user/iso/ListIsoPermissionsCmd.java |     4 +-
 .../api/command/user/iso/ListIsosCmd.java       |     3 +-
 .../api/command/user/iso/RegisterIsoCmd.java    |     3 +-
 .../api/command/user/iso/UpdateIsoCmd.java      |     3 +-
 .../user/iso/UpdateIsoPermissionsCmd.java       |     3 +-
 .../api/command/user/job/ListAsyncJobsCmd.java  |     3 +-
 .../user/job/QueryAsyncJobResultCmd.java        |     3 +-
 .../AssignCertToLoadBalancerCmd.java            |     3 +-
 .../AssignToLoadBalancerRuleCmd.java            |     4 +-
 .../CreateApplicationLoadBalancerCmd.java       |    15 +-
 .../CreateLBHealthCheckPolicyCmd.java           |     4 +-
 .../CreateLBStickinessPolicyCmd.java            |     3 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |    16 +-
 .../DeleteApplicationLoadBalancerCmd.java       |     3 +-
 .../DeleteLBHealthCheckPolicyCmd.java           |     3 +-
 .../DeleteLBStickinessPolicyCmd.java            |     3 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java |     3 +-
 .../user/loadbalancer/DeleteSslCertCmd.java     |     3 +-
 .../ListApplicationLoadBalancersCmd.java        |    18 +-
 .../ListLBHealthCheckPoliciesCmd.java           |     3 +-
 .../ListLBStickinessPoliciesCmd.java            |     3 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |     4 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java  |     3 +-
 .../user/loadbalancer/ListSslCertsCmd.java      |     3 +-
 .../RemoveCertFromLoadBalancerCmd.java          |     3 +-
 .../RemoveFromLoadBalancerRuleCmd.java          |     4 +-
 .../UpdateApplicationLoadBalancerCmd.java       |    13 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java |    11 +-
 .../user/loadbalancer/UploadSslCertCmd.java     |     3 +-
 .../user/nat/CreateIpForwardingRuleCmd.java     |     8 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java     |     3 +-
 .../command/user/nat/DisableStaticNatCmd.java   |     3 +-
 .../command/user/nat/EnableStaticNatCmd.java    |     3 +-
 .../user/nat/ListIpForwardingRulesCmd.java      |     3 +-
 .../user/network/CreateNetworkACLCmd.java       |    16 +-
 .../user/network/CreateNetworkACLListCmd.java   |    16 +-
 .../command/user/network/CreateNetworkCmd.java  |     6 +-
 .../user/network/DeleteNetworkACLCmd.java       |     3 +-
 .../user/network/DeleteNetworkACLListCmd.java   |     3 +-
 .../command/user/network/DeleteNetworkCmd.java  |     5 +-
 .../user/network/ListNetworkACLListsCmd.java    |    17 +-
 .../user/network/ListNetworkACLsCmd.java        |    18 +-
 .../user/network/ListNetworkOfferingsCmd.java   |     3 +-
 .../command/user/network/ListNetworksCmd.java   |    14 +-
 .../user/network/ReplaceNetworkACLListCmd.java  |     3 +-
 .../command/user/network/RestartNetworkCmd.java |     6 +-
 .../user/network/UpdateNetworkACLItemCmd.java   |    12 +-
 .../user/network/UpdateNetworkACLListCmd.java   |    13 +-
 .../command/user/network/UpdateNetworkCmd.java  |     6 +-
 .../user/offering/ListDiskOfferingsCmd.java     |     3 +-
 .../user/offering/ListServiceOfferingsCmd.java  |     3 +-
 .../user/project/ActivateProjectCmd.java        |     3 +-
 .../command/user/project/CreateProjectCmd.java  |     3 +-
 .../command/user/project/DeleteProjectCmd.java  |     3 +-
 .../project/DeleteProjectInvitationCmd.java     |     3 +-
 .../user/project/ListProjectInvitationsCmd.java |     4 +-
 .../command/user/project/ListProjectsCmd.java   |     4 +-
 .../command/user/project/SuspendProjectCmd.java |     3 +-
 .../command/user/project/UpdateProjectCmd.java  |     3 +-
 .../project/UpdateProjectInvitationCmd.java     |     3 +-
 .../api/command/user/region/ListRegionsCmd.java |     3 +-
 .../gslb/AssignToGlobalLoadBalancerRuleCmd.java |     4 +-
 .../gslb/CreateGlobalLoadBalancerRuleCmd.java   |     3 +-
 .../gslb/DeleteGlobalLoadBalancerRuleCmd.java   |     3 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java  |     3 +-
 .../RemoveFromGlobalLoadBalancerRuleCmd.java    |     4 +-
 .../gslb/UpdateGlobalLoadBalancerRuleCmd.java   |     3 +-
 .../user/resource/GetCloudIdentifierCmd.java    |     3 +-
 .../user/resource/ListHypervisorsCmd.java       |     3 +-
 .../user/resource/ListResourceLimitsCmd.java    |     3 +-
 .../user/resource/UpdateResourceCountCmd.java   |     3 +-
 .../user/resource/UpdateResourceLimitCmd.java   |     3 +-
 .../AuthorizeSecurityGroupEgressCmd.java        |     4 +-
 .../AuthorizeSecurityGroupIngressCmd.java       |     4 +-
 .../securitygroup/CreateSecurityGroupCmd.java   |     3 +-
 .../securitygroup/DeleteSecurityGroupCmd.java   |     3 +-
 .../securitygroup/ListSecurityGroupsCmd.java    |     5 +-
 .../RevokeSecurityGroupEgressCmd.java           |     4 +-
 .../RevokeSecurityGroupIngressCmd.java          |     3 +-
 .../user/snapshot/CreateSnapshotCmd.java        |     3 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java  |     3 +-
 .../user/snapshot/DeleteSnapshotCmd.java        |     3 +-
 .../snapshot/DeleteSnapshotPoliciesCmd.java     |     3 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java  |     3 +-
 .../command/user/snapshot/ListSnapshotsCmd.java |     3 +-
 .../user/snapshot/RevertSnapshotCmd.java        |     3 +-
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |     5 +-
 .../command/user/ssh/DeleteSSHKeyPairCmd.java   |     5 +-
 .../command/user/ssh/ListSSHKeyPairsCmd.java    |     5 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java |     5 +-
 .../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  |     3 +-
 .../user/template/CreateTemplateCmd.java        |     5 +-
 .../user/template/DeleteTemplateCmd.java        |     3 +-
 .../user/template/ExtractTemplateCmd.java       |     3 +-
 .../template/ListTemplatePermissionsCmd.java    |     4 +-
 .../command/user/template/ListTemplatesCmd.java |     3 +-
 .../user/template/RegisterTemplateCmd.java      |     3 +-
 .../user/template/UpdateTemplateCmd.java        |     3 +-
 .../template/UpdateTemplatePermissionsCmd.java  |     3 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java    |     3 +-
 .../api/command/user/vm/AddNicToVMCmd.java      |     3 +-
 .../api/command/user/vm/DeployVMCmd.java        |     6 +-
 .../api/command/user/vm/DestroyVMCmd.java       |     4 +-
 .../api/command/user/vm/GetVMPasswordCmd.java   |     3 +-
 .../api/command/user/vm/ListNicsCmd.java        |    16 +-
 .../api/command/user/vm/ListVMsCmd.java         |    22 +-
 .../api/command/user/vm/RebootVMCmd.java        |     3 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |     4 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java |     3 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java |     3 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java   |     3 +-
 .../api/command/user/vm/RestoreVMCmd.java       |     4 +-
 .../api/command/user/vm/ScaleVMCmd.java         |     3 +-
 .../api/command/user/vm/StartVMCmd.java         |     3 +-
 .../api/command/user/vm/StopVMCmd.java          |     3 +-
 .../user/vm/UpdateDefaultNicForVMCmd.java       |     4 +-
 .../api/command/user/vm/UpdateVMCmd.java        |    24 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |     3 +-
 .../command/user/vmgroup/CreateVMGroupCmd.java  |     5 +-
 .../command/user/vmgroup/DeleteVMGroupCmd.java  |     5 +-
 .../command/user/vmgroup/ListVMGroupsCmd.java   |     5 +-
 .../command/user/vmgroup/UpdateVMGroupCmd.java  |     5 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java    |     7 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java    |     5 +-
 .../user/vmsnapshot/ListVMSnapshotCmd.java      |     5 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java  |     3 +-
 .../user/volume/AddResourceDetailCmd.java       |    16 +-
 .../command/user/volume/AttachVolumeCmd.java    |    12 +-
 .../command/user/volume/CreateVolumeCmd.java    |    16 +-
 .../command/user/volume/DeleteVolumeCmd.java    |     3 +-
 .../command/user/volume/DetachVolumeCmd.java    |     3 +-
 .../command/user/volume/ExtractVolumeCmd.java   |     3 +-
 .../user/volume/ListResourceDetailsCmd.java     |     5 +-
 .../api/command/user/volume/ListVolumesCmd.java |    25 +-
 .../command/user/volume/MigrateVolumeCmd.java   |     4 +-
 .../user/volume/RemoveResourceDetailCmd.java    |     3 +-
 .../command/user/volume/ResizeVolumeCmd.java    |     5 +-
 .../command/user/volume/UpdateVolumeCmd.java    |    17 +-
 .../command/user/volume/UploadVolumeCmd.java    |     3 +-
 .../command/user/vpc/CreateStaticRouteCmd.java  |     3 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |    15 +-
 .../command/user/vpc/DeleteStaticRouteCmd.java  |     5 +-
 .../api/command/user/vpc/DeleteVPCCmd.java      |     5 +-
 .../user/vpc/ListPrivateGatewaysCmd.java        |     5 +-
 .../command/user/vpc/ListStaticRoutesCmd.java   |     5 +-
 .../command/user/vpc/ListVPCOfferingsCmd.java   |     3 +-
 .../api/command/user/vpc/ListVPCsCmd.java       |    25 +-
 .../api/command/user/vpc/RestartVPCCmd.java     |     5 +-
 .../api/command/user/vpc/UpdateVPCCmd.java      |    13 +-
 .../api/command/user/vpn/AddVpnUserCmd.java     |     5 +-
 .../user/vpn/CreateRemoteAccessVpnCmd.java      |    20 +-
 .../user/vpn/CreateVpnConnectionCmd.java        |    12 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |     5 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |    11 +-
 .../user/vpn/DeleteRemoteAccessVpnCmd.java      |     3 +-
 .../user/vpn/DeleteVpnConnectionCmd.java        |     5 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java   |     5 +-
 .../command/user/vpn/DeleteVpnGatewayCmd.java   |     5 +-
 .../user/vpn/ListRemoteAccessVpnsCmd.java       |    17 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java |    17 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java    |     5 +-
 .../command/user/vpn/ListVpnGatewaysCmd.java    |    17 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java   |     5 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java  |     3 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java |     5 +-
 .../user/vpn/UpdateRemoteAccessVpnCmd.java      |    13 +-
 .../user/vpn/UpdateVpnConnectionCmd.java        |    13 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |     5 +-
 .../command/user/vpn/UpdateVpnGatewayCmd.java   |    13 +-
 .../api/command/user/zone/ListZonesCmd.java     |     4 +-
 ...ApplicationLoadBalancerInstanceResponse.java |     3 +-
 .../ApplicationLoadBalancerResponse.java        |    12 +-
 .../api/response/AutoScaleVmGroupResponse.java  |    12 +-
 .../response/AutoScaleVmProfileResponse.java    |    13 +-
 .../api/response/FirewallResponse.java          |    12 +-
 .../api/response/FirewallRuleResponse.java      |    12 +-
 .../api/response/IPAddressResponse.java         |    12 +-
 .../api/response/LoadBalancerResponse.java      |    12 +-
 .../api/response/NetworkACLItemResponse.java    |    12 +-
 .../api/response/NetworkACLResponse.java        |    12 +-
 .../api/response/NetworkResponse.java           |     6 +-
 .../api/response/RemoteAccessVpnResponse.java   |    11 +-
 .../api/response/ResourceTagResponse.java       |    31 +
 .../Site2SiteVpnConnectionResponse.java         |     9 +
 .../response/Site2SiteVpnGatewayResponse.java   |    11 +-
 .../cloudstack/api/response/UserVmResponse.java |     3 +-
 .../cloudstack/api/response/VolumeResponse.java |    30 +-
 .../cloudstack/api/response/VpcResponse.java    |    12 +-
 .../apache/cloudstack/context/CallContext.java  |    28 +-
 .../cloudstack/context/CallContextListener.java |     3 +-
 .../lb/ApplicationLoadBalancerService.java      |     4 +-
 awsapi/pom.xml                                  |     5 -
 .../classes/resources/messages.properties       |    86 +-
 .../classes/resources/messages_es.properties    |     3 -
 .../classes/resources/messages_ja_JP.properties |   122 +-
 .../classes/resources/messages_nl_NL.properties |    50 +-
 .../classes/resources/messages_pl.properties    |    12 +-
 .../classes/resources/messages_pt_BR.properties |    11 +-
 .../classes/resources/messages_zh_CN.properties |   116 +-
 client/pom.xml                                  |    39 +-
 client/tomcatconf/catalina.properties.in        |     2 +-
 .../com/cloud/agent/api/CheckRouterCommand.java |     5 +
 .../api/CheckS2SVpnConnectionsCommand.java      |     9 +-
 .../com/cloud/agent/api/GetDomRVersionCmd.java  |     5 +
 .../agent/api/SetupGuestNetworkAnswer.java      |    26 -
 .../cloud/agent/api/routing/GroupAnswer.java    |    40 +
 .../cloud/agent/api/routing/IpAssocCommand.java |     4 +
 .../agent/api/routing/IpAssocVpcCommand.java    |     6 +
 .../api/routing/NetworkElementCommand.java      |     9 +
 .../api/routing/SetFirewallRulesCommand.java    |     9 +-
 .../agent/api/routing/SetNetworkACLCommand.java |    11 +-
 .../routing/SetPortForwardingRulesCommand.java  |    10 +-
 .../SetPortForwardingRulesVpcCommand.java       |     4 +-
 .../api/routing/SetStaticNatRulesCommand.java   |     9 +-
 .../agent/api/routing/SetStaticRouteAnswer.java |    13 +-
 .../api/routing/SetStaticRouteCommand.java      |    13 +-
 .../virtualnetwork/VirtualRoutingResource.java  |   801 +-
 .../VirtualRoutingResourceTest.java             |   799 ++
 deps/XenServerJava/Makefile                     |    44 -
 deps/XenServerJava/pom.xml                      |     2 +-
 deps/XenServerJava/src/LICENSE.Apache-2.0.txt   |   201 +
 deps/XenServerJava/src/LICENSE.txt              |    26 +
 deps/XenServerJava/src/README.txt               |    57 +
 .../src/com/xensource/xenapi/APIVersion.java    |    73 +-
 .../src/com/xensource/xenapi/Auth.java          |    34 +-
 .../src/com/xensource/xenapi/Blob.java          |   149 +-
 .../src/com/xensource/xenapi/Bond.java          |   191 +-
 .../src/com/xensource/xenapi/Connection.java    |   118 +-
 .../src/com/xensource/xenapi/Console.java       |   135 +-
 .../src/com/xensource/xenapi/Crashdump.java     |   113 +-
 .../src/com/xensource/xenapi/DRTask.java        |    93 +-
 .../src/com/xensource/xenapi/DataSource.java    |    19 +-
 .../src/com/xensource/xenapi/Event.java         |    87 +-
 .../src/com/xensource/xenapi/GPUGroup.java      |   338 +-
 .../src/com/xensource/xenapi/Host.java          |  1208 +-
 .../src/com/xensource/xenapi/HostCpu.java       |   182 +-
 .../src/com/xensource/xenapi/HostCrashdump.java |   133 +-
 .../src/com/xensource/xenapi/HostMetrics.java   |   120 +-
 .../src/com/xensource/xenapi/HostPatch.java     |   195 +-
 .../src/com/xensource/xenapi/Marshalling.java   |    60 +-
 .../src/com/xensource/xenapi/Message.java       |   110 +-
 .../src/com/xensource/xenapi/Network.java       |   275 +-
 .../src/com/xensource/xenapi/PBD.java           |   183 +-
 .../src/com/xensource/xenapi/PCI.java           |   133 +-
 .../src/com/xensource/xenapi/PGPU.java          |   373 +-
 .../src/com/xensource/xenapi/PIF.java           |   636 +-
 .../src/com/xensource/xenapi/PIFMetrics.java    |   173 +-
 .../src/com/xensource/xenapi/Pool.java          |   942 +-
 .../src/com/xensource/xenapi/PoolPatch.java     |   237 +-
 .../src/com/xensource/xenapi/Role.java          |   123 +-
 .../src/com/xensource/xenapi/SM.java            |   199 +-
 .../src/com/xensource/xenapi/SR.java            |   767 +-
 .../src/com/xensource/xenapi/Secret.java        |   125 +-
 .../src/com/xensource/xenapi/Session.java       |   227 +-
 .../src/com/xensource/xenapi/Subject.java       |   129 +-
 .../src/com/xensource/xenapi/Task.java          |   235 +-
 .../src/com/xensource/xenapi/Tunnel.java        |   165 +-
 .../src/com/xensource/xenapi/Types.java         | 10869 +++++++++--------
 .../src/com/xensource/xenapi/User.java          |   135 +-
 .../src/com/xensource/xenapi/VBD.java           |   421 +-
 .../src/com/xensource/xenapi/VBDMetrics.java    |   109 +-
 .../src/com/xensource/xenapi/VDI.java           |   853 +-
 .../src/com/xensource/xenapi/VGPU.java          |   225 +-
 .../src/com/xensource/xenapi/VGPUType.java      |   461 +
 .../src/com/xensource/xenapi/VIF.java           |   409 +-
 .../src/com/xensource/xenapi/VIFMetrics.java    |   109 +-
 .../src/com/xensource/xenapi/VLAN.java          |   135 +-
 .../src/com/xensource/xenapi/VM.java            |  2182 ++--
 .../src/com/xensource/xenapi/VMAppliance.java   |   241 +-
 .../com/xensource/xenapi/VMGuestMetrics.java    |   157 +-
 .../src/com/xensource/xenapi/VMMetrics.java     |   165 +-
 .../src/com/xensource/xenapi/VMPP.java          |   437 +-
 .../src/com/xensource/xenapi/VTPM.java          |    85 +-
 .../src/com/xensource/xenapi/XenAPIObject.java  |    44 +-
 developer/pom.xml                               |    23 +-
 .../src/com/cloud/vm/VirtualMachineManager.java |     7 +-
 .../service/NetworkOrchestrationService.java    |     2 +-
 .../api/storage/type/VolumeTypeBase.java        |    39 +-
 .../api/storage/type/VolumeTypeHelper.java      |    25 +-
 .../api/storage/type/VolumeTypeHelperTest.java  |   101 +
 .../com/cloud/ha/HighAvailabilityManager.java   |     3 +
 .../src/com/cloud/network/IpAddressManager.java |     2 +-
 .../src/com/cloud/network/addr/PublicIp.java    |     5 +
 .../network/lb/LoadBalancingRulesManager.java   |     2 +-
 .../cloud/network/rules/StaticNatRuleImpl.java  |     8 +-
 .../cloud/network/vpc/NetworkACLManager.java    |     9 +-
 .../src/com/cloud/template/TemplateManager.java |    10 +
 .../com/cloud/agent/manager/AgentAttache.java   |    40 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |    65 +-
 .../agent/manager/ClusteredAgentAttache.java    |    18 +-
 .../agent/manager/ConnectedAgentAttache.java    |    33 +-
 .../cloud/agent/manager/DirectAgentAttache.java |     2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  1229 +-
 .../vm/VirtualMachinePowerStateSyncImpl.java    |    31 +
 .../src/com/cloud/vm/VmWorkJobDispatcher.java   |    12 +-
 .../src/com/cloud/vm/VmWorkMigrateAway.java     |    36 +
 .../com/cloud/vm/VmWorkStorageMigration.java    |    12 +-
 .../engine/orchestration/CloudOrchestrator.java |    16 +-
 .../orchestration/NetworkOrchestrator.java      |    67 +-
 .../orchestration/VolumeOrchestrator.java       |    17 +-
 .../service/api/ProvisioningServiceImpl.java    |    34 +-
 .../manager/ConnectedAgentAttacheTest.java      |    82 +
 .../cloud/vm/VirtualMachineManagerImplTest.java |    71 +-
 .../orchestration/NetworkOrchestratorTest.java  |   164 +
 engine/pom.xml                                  |    13 +
 .../src/com/cloud/dc/DataCenterDetailVO.java    |     5 +-
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |     2 +-
 .../cloud/dc/dao/DataCenterDetailsDaoImpl.java  |     4 +-
 engine/schema/src/com/cloud/event/EventVO.java  |    11 +
 .../com/cloud/network/as/AutoScalePolicyVO.java |     6 +-
 .../cloud/network/as/AutoScaleVmGroupVO.java    |    12 +
 .../cloud/network/as/AutoScaleVmProfileVO.java  |    12 +
 .../src/com/cloud/network/as/ConditionVO.java   |     5 +-
 .../network/dao/FirewallRulesCidrsDaoImpl.java  |     1 -
 .../com/cloud/network/dao/IPAddressDaoImpl.java |     1 +
 .../src/com/cloud/network/dao/IPAddressVO.java  |    12 +
 .../cloud/network/dao/MonitoringServiceVO.java  |     1 -
 .../com/cloud/network/dao/NetworkDetailVO.java  |     5 +-
 .../network/dao/NetworkDetailsDaoImpl.java      |     4 +-
 .../src/com/cloud/network/dao/NetworkVO.java    |     2 +-
 .../cloud/network/dao/RemoteAccessVpnVO.java    |    12 +
 .../network/dao/Site2SiteVpnConnectionVO.java   |    12 +
 .../network/dao/Site2SiteVpnGatewayVO.java      |    12 +
 .../com/cloud/network/rules/FirewallRuleVO.java |    29 +-
 .../com/cloud/network/vpc/NetworkACLItemVO.java |    12 +
 .../src/com/cloud/network/vpc/NetworkACLVO.java |    12 +
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |    10 +-
 .../schema/src/com/cloud/network/vpc/VpcVO.java |    13 +
 .../cloud/service/ServiceOfferingDetailsVO.java |     5 +-
 .../service/dao/ServiceOfferingDaoImpl.java     |     2 +-
 .../dao/ServiceOfferingDetailsDaoImpl.java      |     4 +-
 .../com/cloud/storage/VMTemplateDetailVO.java   |     5 +-
 .../src/com/cloud/storage/VMTemplateVO.java     |     1 -
 .../src/com/cloud/storage/VolumeDetailVO.java   |     5 +-
 .../schema/src/com/cloud/storage/VolumeVO.java  |    11 +-
 .../storage/dao/SnapshotDetailsDaoImpl.java     |     4 +-
 .../cloud/storage/dao/SnapshotDetailsVO.java    |     9 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |     4 +-
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |    11 +-
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |     4 +-
 .../src/com/cloud/storage/dao/VolumeDao.java    |     8 +
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |    20 +
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |     4 +-
 .../com/cloud/upgrade/dao/Upgrade430to440.java  |     2 +-
 .../schema/src/com/cloud/user/SSHKeyPairVO.java |     1 -
 engine/schema/src/com/cloud/vm/NicDetailVO.java |     5 +-
 .../schema/src/com/cloud/vm/UserVmDetailVO.java |     5 +-
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |     7 +-
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java |     1 -
 .../src/com/cloud/vm/dao/NicDetailsDaoImpl.java |     4 +-
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |     1 -
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java  |     4 -
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |     3 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |     7 +-
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |     4 +-
 .../cloud/vm/snapshot/VMSnapshotDetailsVO.java  |     9 +-
 .../snapshot/dao/VMSnapshotDetailsDaoImpl.java  |     4 +-
 .../cloudstack/affinity/AffinityGroupVO.java    |     2 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java  |     1 -
 .../AutoScaleVmGroupDetailVO.java               |     5 +-
 .../AutoScaleVmProfileDetailVO.java             |     5 +-
 .../resourcedetail/DiskOfferingDetailVO.java    |     3 +-
 .../resourcedetail/FirewallRuleDetailVO.java    |     5 +-
 .../resourcedetail/NetworkACLItemDetailVO.java  |     5 +-
 .../resourcedetail/NetworkACLListDetailVO.java  |     5 +-
 .../resourcedetail/RemoteAccessVpnDetailVO.java |     5 +-
 .../resourcedetail/ResourceDetailsDao.java      |     2 +-
 .../Site2SiteCustomerGatewayDetailVO.java       |     5 +-
 .../Site2SiteVpnConnectionDetailVO.java         |     5 +-
 .../Site2SiteVpnGatewayDetailVO.java            |     5 +-
 .../cloudstack/resourcedetail/UserDetailVO.java |     2 +-
 .../resourcedetail/UserIpAddressDetailVO.java   |     5 +-
 .../cloudstack/resourcedetail/VpcDetailVO.java  |     5 +-
 .../resourcedetail/VpcGatewayDetailVO.java      |     5 +-
 .../dao/AutoScaleVmGroupDetailsDaoImpl.java     |     4 +-
 .../dao/AutoScaleVmProfileDetailsDaoImpl.java   |     4 +-
 .../dao/DiskOfferingDetailsDaoImpl.java         |     4 +-
 .../dao/FirewallRuleDetailsDaoImpl.java         |     4 +-
 .../dao/NetworkACLItemDetailsDaoImpl.java       |     4 +-
 .../dao/NetworkACLListDetailsDaoImpl.java       |     4 +-
 .../dao/RemoteAccessVpnDetailsDaoImpl.java      |     4 +-
 .../Site2SiteCustomerGatewayDetailsDaoImpl.java |     4 +-
 .../Site2SiteVpnConnectionDetailsDaoImpl.java   |     4 +-
 .../dao/Site2SiteVpnGatewayDetailsDaoImpl.java  |     4 +-
 .../resourcedetail/dao/UserDetailsDaoImpl.java  |     2 +-
 .../dao/UserIpAddressDetailsDaoImpl.java        |     4 +-
 .../resourcedetail/dao/VpcDetailsDaoImpl.java   |     4 +-
 .../dao/VpcGatewayDetailsDaoImpl.java           |     4 +-
 .../storage/datastore/db/ImageStoreVO.java      |     3 -
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |     4 +-
 .../datastore/db/PrimaryDataStoreDetailVO.java  |     5 +-
 .../datastore/db/StoragePoolDetailVO.java       |     5 +-
 .../storage/datastore/db/StoragePoolVO.java     |     3 -
 .../storage/image/store/TemplateObject.java     |     1 -
 engine/storage/integration-test/pom.xml         |     5 -
 .../vm/snapshot/dao/VmSnapshotDaoTest.java      |     2 +-
 .../storage/allocator/StorageAllocatorTest.java |     4 +-
 .../storage/image/TemplateEntityImpl.java       |     4 +-
 .../image/datastore/ImageStoreHelper.java       |    26 +
 .../storage/snapshot/SnapshotEntityImpl.java    |     1 -
 .../datastore/PrimaryDataStoreHelper.java       |    28 +
 .../db/PrimaryDataStoreDetailsDaoImpl.java      |     4 +-
 .../cloudstack/storage/volume/VolumeObject.java |     5 +
 .../storage/volume/VolumeServiceImpl.java       |     1 +
 framework/db/pom.xml                            |     5 -
 .../db/src/com/cloud/dao/EntityManagerImpl.java |     1 +
 framework/db/src/com/cloud/utils/db/Filter.java |     2 +-
 .../src/com/cloud/utils/db/GenericDaoBase.java  |    59 +-
 .../db/src/com/cloud/utils/db/GroupBy.java      |    31 +-
 .../db/src/com/cloud/utils/db/SearchBase.java   |    87 +-
 .../src/com/cloud/utils/db/StaticStrategy.java  |   131 -
 .../db/test/com/cloud/utils/db/GroupByTest.java |    81 +
 .../jobs/AsyncJobExecutionContext.java          |    21 +-
 .../framework/jobs/dao/SyncQueueItemDao.java    |     1 +
 .../jobs/dao/SyncQueueItemDaoImpl.java          |    35 +-
 .../jobs/impl/AsyncJobManagerImpl.java          |    54 +-
 .../framework/jobs/impl/AsyncJobMonitor.java    |    30 +-
 .../framework/jobs/impl/AsyncJobVO.java         |     2 +-
 .../jobs/impl/SyncQueueManagerImpl.java         |    21 +-
 .../managed/context/ManagedContextRunnable.java |     2 +-
 framework/pom.xml                               |    13 +
 packaging/centos63/cloud-agent.rc               |     8 +-
 packaging/centos63/cloud-ipallocator.rc         |     8 +-
 packaging/centos63/package.sh                   |   170 +-
 .../api/command/user/discovery/ListApisCmd.java |     4 +-
 .../admin/ratelimit/ResetApiLimitCmd.java       |     3 +-
 .../command/user/ratelimit/GetApiLimitCmd.java  |     3 +-
 plugins/database/mysql-ha/pom.xml               |    28 +
 .../src/com/cloud/utils/db/StaticStrategy.java  |   131 +
 .../api/commands/DedicateClusterCmd.java        |     3 +-
 .../api/commands/DedicateHostCmd.java           |     3 +-
 .../cloudstack/api/commands/DedicatePodCmd.java |     3 +-
 .../api/commands/DedicateZoneCmd.java           |     3 +-
 .../api/commands/ListDedicatedClustersCmd.java  |     3 +-
 .../api/commands/ListDedicatedHostsCmd.java     |     3 +-
 .../api/commands/ListDedicatedPodsCmd.java      |     3 +-
 .../api/commands/ListDedicatedZonesCmd.java     |     3 +-
 .../commands/ReleaseDedicatedClusterCmd.java    |     3 +-
 .../api/commands/ReleaseDedicatedHostCmd.java   |     3 +-
 .../api/commands/ReleaseDedicatedPodCmd.java    |     3 +-
 .../api/commands/ReleaseDedicatedZoneCmd.java   |     3 +-
 .../dedicated/DedicatedResourceManagerImpl.java |    38 +-
 .../mom/inmemory/InMemoryEventBus.java          |    53 +-
 .../mom/inmemory/InMemoryEventBusTest.java      |   162 +
 .../api/commands/netapp/AssociateLunCmd.java    |     3 +-
 .../cloud/api/commands/netapp/CreateLunCmd.java |     3 +-
 .../commands/netapp/CreateVolumeOnFilerCmd.java |     3 +-
 .../commands/netapp/CreateVolumePoolCmd.java    |     3 +-
 .../commands/netapp/DeleteVolumePoolCmd.java    |     3 +-
 .../api/commands/netapp/DestroyLunCmd.java      |     3 +-
 .../netapp/DestroyVolumeOnFilerCmd.java         |     3 +-
 .../api/commands/netapp/DissociateLunCmd.java   |     3 +-
 .../cloud/api/commands/netapp/ListLunsCmd.java  |     3 +-
 .../api/commands/netapp/ListVolumePoolsCmd.java |     3 +-
 .../commands/netapp/ListVolumesOnFilerCmd.java  |     3 +-
 .../commands/netapp/ModifyVolumePoolCmd.java    |     3 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |     3 +-
 .../cloudstack/api/AddBaremetalHostCmd.java     |     3 +-
 .../api/AddBaremetalKickStartPxeCmd.java        |     3 +-
 .../api/AddBaremetalPxePingServerCmd.java       |     3 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |     3 +-
 .../api/ListBaremetalPxeServersCmd.java         |     3 +-
 .../HypervResource/CloudStackTypes.cs           |    17 +-
 .../HypervResource/HypervResourceController.cs  |    86 +-
 .../HypervResource/IWmiCallsV2.cs               |     1 +
 .../ServerResource/HypervResource/WmiCallsV2.cs |    25 +
 .../resource/HypervDirectConnectResource.java   |    51 +-
 .../kvm/resource/KVMGuestOsMapper.java          |     2 +
 .../hypervisor/kvm/resource/KVMHABase.java      |    13 +-
 .../kvm/resource/LibvirtComputingResource.java  |   190 +-
 .../kvm/resource/LibvirtDomainXMLParser.java    |    12 +-
 .../kvm/resource/LibvirtStoragePoolDef.java     |    29 +-
 .../resource/LibvirtStoragePoolXMLParser.java   |    20 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    18 +-
 .../kvm/storage/KVMStorageProcessor.java        |    27 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |    60 +-
 .../apache/cloudstack/utils/qemu/QemuImg.java   |     6 +-
 .../cloudstack/utils/qemu/QemuImgFile.java      |     1 -
 .../resource/LibvirtComputingResourceTest.java  |     7 +
 .../cloud/agent/manager/MockNetworkManager.java |     3 +-
 .../agent/manager/MockNetworkManagerImpl.java   |     9 +-
 .../agent/manager/SimulatorManagerImpl.java     |     6 +-
 .../api/commands/ConfigureSimulatorCmd.java     |     3 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |     6 +
 .../apache/cloudstack/api/AddUcsManagerCmd.java |     3 +-
 .../api/AssociateUcsProfileToBladeCmd.java      |     3 +-
 .../cloudstack/api/DeleteUcsManagerCmd.java     |     3 +-
 .../apache/cloudstack/api/ListUcsBladeCmd.java  |     3 +-
 .../cloudstack/api/ListUcsManagerCmd.java       |     3 +-
 .../cloudstack/api/ListUcsProfileCmd.java       |     3 +-
 .../api/commands/DeleteCiscoNexusVSMCmd.java    |     3 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java   |     3 +-
 .../api/commands/EnableCiscoNexusVSMCmd.java    |     3 +-
 .../api/commands/ListCiscoNexusVSMsCmd.java     |     3 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |    25 +-
 .../vmware/VmwareServerDiscoverer.java          |     6 -
 .../vmware/manager/VmwareManagerImpl.java       |     6 +-
 .../vmware/resource/VmwareResource.java         |   176 +-
 .../resource/VmwareStorageProcessor.java        |    72 +-
 .../api/command/admin/zone/AddVmwareDcCmd.java  |     3 +-
 .../command/admin/zone/ListVmwareDcsCmd.java    |     3 +-
 .../command/admin/zone/RemoveVmwareDcCmd.java   |     3 +-
 .../motion/VmwareStorageMotionStrategy.java     |    36 +-
 .../xen/src/com/cloud/ha/XenServerFencer.java   |     1 -
 .../xen/discoverer/XcpServerDiscoverer.java     |    35 +-
 .../hypervisor/xen/resource/CitrixHelper.java   |   339 +
 .../xen/resource/CitrixResourceBase.java        |    67 +-
 .../xen/resource/Xenserver625Resource.java      |    15 +-
 .../xenserver/XenServerResourceNewBase.java     |    27 +-
 .../test/com/cloud/ha/XenServerFencerTest.java  |    39 +
 .../xen/resource/CitrixResourceBaseTest.java    |    16 +
 .../api/commands/AddBigSwitchVnsDeviceCmd.java  |     3 +-
 .../commands/DeleteBigSwitchVnsDeviceCmd.java   |     3 +-
 .../commands/ListBigSwitchVnsDevicesCmd.java    |     3 +-
 .../commands/AddCiscoAsa1000vResourceCmd.java   |     3 +-
 .../api/commands/AddCiscoVnmcResourceCmd.java   |     3 +-
 .../DeleteCiscoAsa1000vResourceCmd.java         |     3 +-
 .../commands/DeleteCiscoVnmcResourceCmd.java    |     3 +-
 .../commands/ListCiscoAsa1000vResourcesCmd.java |     3 +-
 .../api/commands/ListCiscoVnmcResourcesCmd.java |     3 +-
 .../cloud/network/element/CiscoVnmcElement.java |     5 +-
 .../network/cisco/CiscoVnmcConnectionTest.java  |   209 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |   486 +-
 .../network/lb/LoadBalanceRuleHandler.java      |   467 +
 .../lb/ElasticLoadBalancerManagerImplTest.java  |   101 +
 .../network/lb/LoadBalanceRuleHandlerTest.java  |   215 +
 .../commands/AddExternalLoadBalancerCmd.java    |     3 +-
 .../api/commands/AddF5LoadBalancerCmd.java      |     3 +-
 .../commands/ConfigureF5LoadBalancerCmd.java    |     3 +-
 .../commands/DeleteExternalLoadBalancerCmd.java |     3 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java   |     3 +-
 .../commands/ListExternalLoadBalancersCmd.java  |     3 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java |     3 +-
 .../api/commands/ListF5LoadBalancersCmd.java    |     3 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    18 +-
 ...ring-contrail-system-context-inheritable.xml |    41 +
 .../api/command/CreateServiceInstanceCmd.java   |     4 +-
 .../management/ContrailManagerImpl.java         |    68 +-
 .../network/contrail/management/EventUtils.java |    56 +-
 .../contrail/management/ServiceManagerImpl.java |    16 +-
 .../network/contrail/model/ModelObject.java     |    10 +-
 .../contrail/model/ServiceInstanceModel.java    |    21 +-
 .../contrail/model/VirtualMachineModel.java     |    78 +-
 .../contrail/model/VirtualNetworkModel.java     |   171 +-
 .../contrail/model/VirtualMachineModelTest.java |     9 +-
 .../contrail/model/VirtualNetworkModelTest.java |   143 +-
 .../test/resources/log4j.properties             |     2 +-
 .../api/commands/AddExternalFirewallCmd.java    |     3 +-
 .../cloud/api/commands/AddSrxFirewallCmd.java   |     3 +-
 .../api/commands/ConfigureSrxFirewallCmd.java   |     3 +-
 .../api/commands/DeleteExternalFirewallCmd.java |     3 +-
 .../api/commands/DeleteSrxFirewallCmd.java      |     3 +-
 .../api/commands/ListExternalFirewallsCmd.java  |     3 +-
 .../commands/ListSrxFirewallNetworksCmd.java    |     3 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java |     3 +-
 .../commands/AddNetscalerLoadBalancerCmd.java   |     3 +-
 .../ConfigureNetscalerLoadBalancerCmd.java      |     3 +-
 .../DeleteNetscalerLoadBalancerCmd.java         |     3 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java   |     3 +-
 .../commands/ListNetscalerLoadBalancersCmd.java |     3 +-
 .../api/commands/AddNiciraNvpDeviceCmd.java     |     3 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |     3 +-
 .../ListNiciraNvpDeviceNetworksCmd.java         |     3 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java   |     3 +-
 .../network/nicira/AccessConfiguration.java     |    90 +-
 .../src/com/cloud/network/nicira/Acl.java       |     1 -
 .../cloud/network/nicira/BaseNiciraEntity.java  |    85 +
 .../network/nicira/BaseNiciraNamedEntity.java   |    44 +
 .../com/cloud/network/nicira/LogicalRouter.java |    71 +
 .../network/nicira/LogicalRouterConfig.java     |    65 -
 .../cloud/network/nicira/LogicalRouterPort.java |    41 +-
 .../com/cloud/network/nicira/LogicalSwitch.java |    68 +-
 .../cloud/network/nicira/LogicalSwitchPort.java |    50 +-
 .../com/cloud/network/nicira/NiciraNvpApi.java  |   750 +-
 .../nicira/RoutingTableRoutingConfig.java       |    30 +
 ...SingleDefaultRouteImplicitRoutingConfig.java |    40 +
 .../SingleDefaultRouteImplictRoutingConfig.java |    40 -
 .../com/cloud/network/nicira/VifAttachment.java |    35 +-
 .../network/resource/NiciraNvpResource.java     |    20 +-
 .../network/element/NiciraNvpElementTest.java   |    42 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |   154 +-
 .../com/cloud/network/nicira/NatRuleTest.java   |    12 +-
 .../cloud/network/nicira/NiciraNvpApiIT.java    |   200 +-
 .../cloud/network/nicira/NiciraNvpApiTest.java  |   367 +-
 .../com/cloud/network/nicira/NiciraTagTest.java |     8 +-
 .../network/resource/NiciraNvpResourceTest.java |   258 +-
 .../commands/AddOpenDaylightControllerCmd.java  |     3 +-
 .../DeleteOpenDaylightControllerCmd.java        |     3 +-
 .../ListOpenDaylightControllersCmd.java         |     3 +-
 .../com/cloud/network/element/OvsElement.java   |   283 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java |     4 -
 .../com/cloud/network/ovs/OvsTunnelManager.java |     4 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |   148 +-
 .../api/commands/AddPaloAltoFirewallCmd.java    |     3 +-
 .../commands/ConfigurePaloAltoFirewallCmd.java  |     3 +-
 .../api/commands/DeletePaloAltoFirewallCmd.java |     3 +-
 .../ListPaloAltoFirewallNetworksCmd.java        |     3 +-
 .../api/commands/ListPaloAltoFirewallsCmd.java  |     3 +-
 .../cloudstack/api/commands/AddSspCmd.java      |     3 +-
 .../cloudstack/api/commands/DeleteSspCmd.java   |     3 +-
 plugins/pom.xml                                 |    24 +
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    30 +-
 .../CloudStackPrimaryDataStoreProviderImpl.java |     9 +-
 .../cloudstack/api/command/LDAPConfigCmd.java   |     4 +-
 .../cloudstack/api/command/LDAPRemoveCmd.java   |     3 +-
 .../api/command/LdapAddConfigurationCmd.java    |     3 +-
 .../api/command/LdapCreateAccountCmd.java       |     3 +-
 .../api/command/LdapDeleteConfigurationCmd.java |     3 +-
 .../api/command/LdapImportUsersCmd.java         |     3 +-
 .../api/command/LdapListConfigurationCmd.java   |     3 +-
 .../api/command/LdapListUsersCmd.java           |     3 +-
 .../api/command/LdapUserSearchCmd.java          |     3 +-
 pom.xml                                         |    39 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in |     8 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in |     8 +-
 .../SYSCONFDIR/init.d/cloud-ipallocator.in      |     8 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in |     8 +-
 .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in |     8 +-
 .../SYSCONFDIR/init.d/cloud-ipallocator.in      |     8 +-
 scripts/vm/systemvm/injectkeys.sh               |     2 +-
 .../com/cloud/api/ApiAsyncJobDispatcher.java    |    14 +-
 server/src/com/cloud/api/ApiDispatcher.java     |     3 +-
 server/src/com/cloud/api/ApiGsonHelper.java     |     4 +-
 .../com/cloud/api/ApiResponseGsonHelper.java    |    39 +-
 server/src/com/cloud/api/ApiResponseHelper.java |    18 +-
 server/src/com/cloud/api/ApiServer.java         |    22 +-
 .../cloud/api/ResponseObjectTypeAdapter.java    |     7 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |    39 +-
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |     4 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |     3 +-
 .../cloud/api/query/vo/AffinityGroupJoinVO.java |     2 +-
 .../src/com/cloud/api/query/vo/EventJoinVO.java |     7 +
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |     8 +
 .../api/response/ApiResponseSerializer.java     |    24 +
 .../api/response/SecurityGroupResultObject.java |     2 +-
 server/src/com/cloud/configuration/Config.java  |     6 +
 .../configuration/ConfigurationManagerImpl.java |    11 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |     7 +-
 .../com/cloud/event/ActionEventInterceptor.java |    19 +-
 .../src/com/cloud/event/ActionEventUtils.java   |    34 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    48 +-
 .../metadata/ResourceMetaDataManagerImpl.java   |     8 +-
 .../com/cloud/network/IpAddressManagerImpl.java |    37 +-
 .../src/com/cloud/network/NetworkModelImpl.java |     2 +-
 .../com/cloud/network/NetworkServiceImpl.java   |    48 +-
 .../cloud/network/as/AutoScaleManagerImpl.java  |    30 +
 .../network/firewall/FirewallManagerImpl.java   |    34 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |     4 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |     4 +-
 .../lb/LoadBalancingRulesManagerImpl.java       |    19 +-
 .../router/VirtualNetworkApplianceManager.java  |     4 +
 .../VirtualNetworkApplianceManagerImpl.java     |   137 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    33 +-
 .../cloud/network/rules/RulesManagerImpl.java   |    19 +-
 .../network/vpc/NetworkACLManagerImpl.java      |    20 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    31 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |    26 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |    12 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |    33 +-
 .../com/cloud/resource/ResourceManagerImpl.java |     3 +-
 server/src/com/cloud/server/Criteria.java       |     2 +
 .../com/cloud/server/ManagementServerImpl.java  |    14 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |   108 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |    10 +-
 .../template/HypervisorTemplateAdapter.java     |    25 +-
 .../com/cloud/template/TemplateManagerImpl.java |    50 +-
 server/src/com/cloud/user/DomainManager.java    |     1 -
 server/src/com/cloud/vm/UserVmManager.java      |     2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   267 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    34 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    24 +-
 .../metadata/ResourceMetaDataManagerTest.java   |     2 +-
 .../cloud/network/MockFirewallManagerImpl.java  |     2 +-
 .../cloud/template/TemplateManagerImplTest.java |    37 +
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |     9 +-
 .../cloud/vpc/MockSite2SiteVpnManagerImpl.java  |     4 +-
 .../com/cloud/vpc/NetworkACLManagerTest.java    |     4 +-
 .../com/cloud/vpc/NetworkACLServiceTest.java    |    16 +-
 .../network/lb/ApplicationLoadBalancerTest.java |    14 +-
 services/console-proxy-rdp/rdpconsole/pom.xml   |     2 +-
 .../rdpconsole/src/main/java/common/Client.java |    92 +-
 .../src/main/java/streamer/ByteBuffer.java      |   122 +-
 .../src/test/java/common/ClientTest.java        |    43 +
 .../src/test/java/rdpclient/MockServerTest.java |     5 +
 .../src/test/java/streamer/ByteBufferTest.java  |   152 +
 .../consoleproxy/ConsoleProxyRdpClient.java     |    12 +-
 .../consoleproxy/ConsoleProxyVncClient.java     |    89 +-
 .../consoleproxy/ConsoleProxyRdpClientTest.java |    62 +
 services/pom.xml                                |    16 +
 .../PremiumSecondaryStorageManagerImpl.java     |    28 +-
 .../SecondaryStorageManagerImpl.java            |    12 +-
 setup/db/db/schema-421to430.sql                 |     3 +
 setup/db/db/schema-430to440.sql                 |   127 +-
 setup/db/templates.sql                          |     5 +
 .../rc.d/init.d/cloud-console-proxy.in          |     8 +-
 .../rc.d/init.d/cloud-console-proxy.in          |     8 +-
 .../rc.d/init.d/cloud-console-proxy.in          |     8 +-
 .../SYSCONFDIR/init.d/cloud-console-proxy.in    |     8 +-
 .../patches/debian/config/etc/dnsmasq.conf.tmpl |     4 +-
 .../patches/debian/config/opt/cloud/bin/ilb.sh  |    12 +-
 .../debian/config/opt/cloud/bin/loadbalancer.sh |     7 +-
 .../config/opt/cloud/bin/monitor_service.sh     |    27 +-
 .../debian/config/opt/cloud/bin/vpc_acl.sh      |    19 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh  |    44 +-
 .../config/opt/cloud/bin/vpc_loadbalancer.sh    |    13 +-
 .../patches/debian/config/root/reconfigLB.sh    |     7 +-
 .../component/test_multiple_ips_per_nic.py      |   853 ++
 .../component/test_persistent_networks.py       |  2045 +++-
 test/integration/component/test_portable_ip.py  |   132 +-
 test/integration/smoke/test_vm_life_cycle.py    |    84 +-
 test/selenium/browser/__init__.py               |    16 +
 test/selenium/browser/firefox.py                |    56 +
 test/selenium/common/Global_Locators.py         |   230 +
 test/selenium/common/__init__.py                |    18 +
 test/selenium/common/shared.py                  |   151 +
 test/selenium/cspages/__init__.py               |    18 +
 test/selenium/cspages/dashboard/__init__.py     |    18 +
 .../selenium/cspages/dashboard/dashboardpage.py |    73 +
 test/selenium/cspages/login/__init__.py         |    18 +
 test/selenium/cspages/login/loginpage.py        |   106 +
 test/selenium/cstests/__init__.py               |    17 +
 .../cstests/regressiontests/__init__.py         |    17 +
 test/selenium/cstests/smoketests/__init__.py    |    17 +
 .../cstests/smoketests/global_settings_test.py  |    69 +
 .../cstests/smoketests/login_logout_test.py     |   190 +
 .../cstests/smoketests/navigation_test.py       |    79 +
 test/selenium/cstests/smoketests/smokecfg.py    |    40 +
 tools/appliance/build.sh                        |    52 +-
 .../systemvm64template/definition.rb            |     6 +-
 .../definitions/systemvmtemplate/definition.rb  |     6 +-
 .../devcloud-kvm-advanced-fusion.cfg            |   139 +
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg    |     4 +-
 tools/devcloud-kvm/pom.xml                      |     2 +-
 tools/devcloud/pom.xml                          |     2 +-
 tools/marvin/marvin/codes.py                    |     4 +
 tools/marvin/marvin/config/config.cfg           |   235 +-
 tools/marvin/marvin/integration/lib/base.py     |    40 +-
 tools/marvin/marvin/integration/lib/common.py   |   107 +-
 ui/css/cloudstack3.css                          |   231 +-
 ui/css/cloudstack3.ja.css                       |    66 -
 ui/css/cloudstack3.ja_JP.css                    |    76 +
 ui/dictionary.jsp                               |    89 +-
 ui/images/icons.png                             |   Bin 50052 -> 61164 bytes
 ui/images/infrastructure-icons.png              |   Bin 62059 -> 66823 bytes
 ui/images/sprites.png                           |   Bin 207810 -> 212515 bytes
 ui/index.jsp                                    |    20 +-
 ui/lib/jquery.validate.js                       |    34 +-
 ui/scripts/accounts.js                          |     2 +-
 ui/scripts/autoscaler.js                        |    26 +-
 ui/scripts/cloudStack.js                        |     8 +-
 ui/scripts/configuration.js                     |    10 +-
 ui/scripts/domains.js                           |     2 +-
 ui/scripts/installWizard.js                     |     4 +-
 ui/scripts/instanceWizard.js                    |    78 +-
 ui/scripts/instances.js                         |    71 +-
 ui/scripts/network.js                           |   145 +-
 ui/scripts/regions.js                           |    78 +-
 ui/scripts/sharedFunctions.js                   |    14 +-
 ui/scripts/system.js                            |   234 +-
 ui/scripts/templates.js                         |    91 +-
 ui/scripts/ui-custom/accountsWizard.js          |    33 +-
 ui/scripts/ui-custom/instanceWizard.js          |    34 +
 ui/scripts/ui/dialog.js                         |    14 +
 ui/scripts/ui/widgets/listView.js               |    29 +-
 ui/scripts/zoneWizard.js                        |    68 +-
 usage/pom.xml                                   |     5 -
 utils/conf/db.properties                        |     6 +-
 utils/conf/log4j-vmops.xml                      |    34 +-
 utils/pom.xml                                   |    70 +-
 utils/src/com/cloud/maint/Version.java          |     3 +
 utils/src/com/cloud/utils/ActionDelegate.java   |     7 +-
 .../com/cloud/utils/CloudResourceBundle.java    |     7 +-
 utils/src/com/cloud/utils/DateUtil.java         |     7 +-
 utils/src/com/cloud/utils/EnumUtils.java        |     7 +-
 utils/src/com/cloud/utils/ExecutionResult.java  |     2 +
 utils/src/com/cloud/utils/FileUtil.java         |     7 +-
 utils/src/com/cloud/utils/IteratorUtil.java     |     7 +-
 utils/src/com/cloud/utils/Journal.java          |     7 +-
 utils/src/com/cloud/utils/LogUtils.java         |     7 +-
 utils/src/com/cloud/utils/MethodCapturer.java   |     7 +-
 utils/src/com/cloud/utils/NumbersUtil.java      |     7 +-
 utils/src/com/cloud/utils/Pair.java             |     7 +-
 .../src/com/cloud/utils/PasswordGenerator.java  |     7 +-
 utils/src/com/cloud/utils/Predicate.java        |     7 +-
 utils/src/com/cloud/utils/ProcessUtil.java      |     7 +-
 utils/src/com/cloud/utils/Profiler.java         |     7 +-
 utils/src/com/cloud/utils/PropertiesUtil.java   |     7 +-
 utils/src/com/cloud/utils/ReflectUtil.java      |     7 +-
 utils/src/com/cloud/utils/S3Utils.java          |    37 +-
 utils/src/com/cloud/utils/SerialVersionUID.java |     7 +-
 utils/src/com/cloud/utils/StringUtils.java      |    15 +-
 utils/src/com/cloud/utils/SwiftUtil.java        |    41 +-
 utils/src/com/cloud/utils/Ternary.java          |     7 +-
 utils/src/com/cloud/utils/UriUtils.java         |    52 +-
 .../cloud/utils/UsernamePasswordValidator.java  |     7 +-
 utils/src/com/cloud/utils/UuidUtils.java        |    13 +-
 .../cloud/utils/backoff/BackoffAlgorithm.java   |     7 +-
 .../utils/backoff/impl/ConstantTimeBackoff.java |     7 +-
 .../backoff/impl/ConstantTimeBackoffMBean.java  |     7 +-
 .../utils/cisco/n1kv/vsm/NetconfHelper.java     |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/PolicyMap.java   |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/PortProfile.java |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmCommand.java  |     7 +-
 .../utils/cisco/n1kv/vsm/VsmOkResponse.java     |     7 +-
 .../cisco/n1kv/vsm/VsmPolicyMapResponse.java    |     7 +-
 .../cisco/n1kv/vsm/VsmPortProfileResponse.java  |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmResponse.java |     7 +-
 .../src/com/cloud/utils/component/Adapter.java  |     7 +-
 .../com/cloud/utils/component/AdapterBase.java  |     7 +-
 .../com/cloud/utils/component/AdapterList.java  |     7 +-
 .../cloud/utils/component/ComponentContext.java |     6 +-
 .../ComponentInstantiationPostProcessor.java    |     7 +-
 .../utils/component/ComponentLifecycle.java     |     7 +-
 .../utils/component/ComponentLifecycleBase.java |     7 +-
 .../component/ComponentMethodInterceptable.java |     7 +-
 .../component/ComponentMethodInterceptor.java   |     7 +-
 .../utils/component/ComponentNamingPolicy.java  |     7 +-
 .../src/com/cloud/utils/component/Manager.java  |     7 +-
 .../com/cloud/utils/component/ManagerBase.java  |     7 +-
 utils/src/com/cloud/utils/component/Named.java  |    37 +-
 .../cloud/utils/component/PluggableService.java |     7 +-
 .../src/com/cloud/utils/component/Registry.java |    37 +-
 .../utils/component/SystemIntegrityChecker.java |     7 +-
 .../utils/concurrency/NamedThreadFactory.java   |     7 +-
 .../com/cloud/utils/concurrency/Scheduler.java  |     7 +-
 .../utils/concurrency/SynchronizationEvent.java |     7 +-
 .../com/cloud/utils/concurrency/TestClock.java  |     7 +-
 .../com/cloud/utils/crypt/DBEncryptionUtil.java |     9 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java |     7 +-
 .../utils/crypt/EncryptionSecretKeySender.java  |     7 +-
 utils/src/com/cloud/utils/crypt/RSAHelper.java  |     7 +-
 utils/src/com/cloud/utils/db/DbProperties.java  |    37 +-
 utils/src/com/cloud/utils/db/EntityManager.java |     5 +
 utils/src/com/cloud/utils/db/UUIDManager.java   |     3 +
 .../com/cloud/utils/encoding/URLEncoder.java    |    33 +-
 utils/src/com/cloud/utils/events/EventArgs.java |     7 +-
 .../com/cloud/utils/events/SubscriptionMgr.java |     7 +-
 .../utils/exception/CSExceptionErrorCode.java   |     6 +-
 .../utils/exception/CloudRuntimeException.java  |     7 +-
 .../com/cloud/utils/exception/ErrorContext.java |     3 +
 .../utils/exception/ExceptionProxyObject.java   |     7 +-
 .../cloud/utils/exception/ExceptionUtil.java    |     7 +-
 .../utils/exception/ExecutionException.java     |     7 +-
 .../HypervisorVersionChangedException.java      |     7 +-
 utils/src/com/cloud/utils/fsm/ChangeEvent.java  |    37 +-
 utils/src/com/cloud/utils/fsm/FiniteState.java  |     7 +-
 utils/src/com/cloud/utils/fsm/FiniteState2.java |    37 +-
 .../com/cloud/utils/fsm/FiniteStateObject.java  |     7 +-
 .../cloud/utils/fsm/NoTransitionException.java  |     7 +-
 utils/src/com/cloud/utils/fsm/State.java        |    37 +-
 utils/src/com/cloud/utils/fsm/StateDao.java     |     7 +-
 .../src/com/cloud/utils/fsm/StateListener.java  |     7 +-
 utils/src/com/cloud/utils/fsm/StateMachine.java |     7 +-
 .../src/com/cloud/utils/fsm/StateMachine2.java  |     7 +-
 utils/src/com/cloud/utils/fsm/StateObject.java  |     7 +-
 .../cloud/utils/log/CglibThrowableRenderer.java |     7 +-
 utils/src/com/cloud/utils/mgmt/JmxUtil.java     |     7 +-
 .../com/cloud/utils/mgmt/ManagementBean.java    |     7 +-
 .../utils/mgmt/PropertyMapDynamicBean.java      |     7 +-
 utils/src/com/cloud/utils/net/Ip.java           |     7 +-
 utils/src/com/cloud/utils/net/Ip4Address.java   |     7 +-
 utils/src/com/cloud/utils/net/MacAddress.java   |     7 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |    22 +-
 utils/src/com/cloud/utils/net/NfsUtils.java     |     7 +-
 utils/src/com/cloud/utils/net/UrlUtil.java      |     7 +-
 .../src/com/cloud/utils/nio/HandlerFactory.java |     7 +-
 utils/src/com/cloud/utils/nio/Link.java         |     7 +-
 utils/src/com/cloud/utils/nio/NioClient.java    |     7 +-
 .../src/com/cloud/utils/nio/NioConnection.java  |     7 +-
 utils/src/com/cloud/utils/nio/NioServer.java    |     7 +-
 utils/src/com/cloud/utils/nio/Task.java         |     7 +-
 .../com/cloud/utils/nio/TrustAllManager.java    |     7 +-
 .../BasicEncodedRESTValidationStrategy.java     |    66 +
 .../utils/rest/CloudstackRESTException.java     |    39 +
 .../cloud/utils/rest/RESTServiceConnector.java  |   377 +
 .../utils/rest/RESTValidationStrategy.java      |   165 +
 .../cloud/utils/script/OutputInterpreter.java   |     7 +-
 utils/src/com/cloud/utils/script/Script.java    |     7 +-
 utils/src/com/cloud/utils/script/Script2.java   |     7 +-
 .../cloud/utils/security/CertificateHelper.java |     7 +-
 utils/src/com/cloud/utils/ssh/SSHCmdHelper.java |     7 +-
 .../src/com/cloud/utils/ssh/SSHKeysHelper.java  |     7 +-
 utils/src/com/cloud/utils/ssh/SshException.java |     7 +-
 utils/src/com/cloud/utils/ssh/SshHelper.java    |     2 +
 .../storage/encoding/DecodedDataObject.java     |    47 +-
 .../storage/encoding/DecodedDataStore.java      |    51 +-
 .../cloud/utils/storage/encoding/Decoder.java   |    37 +-
 .../utils/storage/encoding/EncodingType.java    |    37 +-
 .../com/cloud/utils/time/InaccurateClock.java   |     7 +-
 .../cloud/utils/time/InaccurateClockMBean.java  |     7 +-
 .../com/cloud/utils/xmlobject/XmlObject.java    |     3 +
 .../cloud/utils/xmlobject/XmlObjectParser.java  |     3 +
 .../utils/identity/ManagementServerNode.java    |     3 +
 .../ssl/EasySSLProtocolSocketFactory.java       |    53 +-
 .../contrib/ssl/EasyX509TrustManager.java       |    43 +-
 utils/test/com/cloud/utils/DummyImpl.java       |     7 +-
 utils/test/com/cloud/utils/DummyInterface.java  |     7 +-
 .../test/com/cloud/utils/DummyPremiumImpl.java  |     7 +-
 utils/test/com/cloud/utils/NumbersUtilTest.java |    10 +-
 .../com/cloud/utils/PasswordGeneratorTest.java  |     7 +-
 utils/test/com/cloud/utils/ProcessUtilTest.java |    33 +-
 .../com/cloud/utils/PropertiesUtilsTest.java    |     3 +
 utils/test/com/cloud/utils/ReflectUtilTest.java |     9 +-
 utils/test/com/cloud/utils/ScriptTest.java      |     7 +-
 utils/test/com/cloud/utils/StringUtilsTest.java |    18 +-
 utils/test/com/cloud/utils/TernaryTest.java     |     6 +-
 utils/test/com/cloud/utils/TestProfiler.java    |     7 +-
 utils/test/com/cloud/utils/UriUtilsTest.java    |    60 +
 utils/test/com/cloud/utils/UuidUtilsTest.java   |    42 +
 .../backoff/impl/ConstantTimeBackoffTest.java   |     7 +-
 .../com/cloud/utils/crypto/RSAHelperTest.java   |     3 +
 .../cloud/utils/encoding/UrlEncoderTest.java    |    37 +-
 .../utils/exception/ExceptionUtilTest.java      |    37 +-
 utils/test/com/cloud/utils/net/IpTest.java      |     7 +-
 .../test/com/cloud/utils/net/NetUtilsTest.java  |   234 +-
 .../utils/rest/RESTServiceConnectorTest.java    |   395 +
 .../com/cloud/utils/ssh/SSHKeysHelperTest.java  |     3 +
 .../utils/testcase/Log4jEnabledTestCase.java    |     7 +-
 .../test/com/cloud/utils/testcase/NioTest.java  |     7 +-
 .../cloud/utils/xmlobject/TestXmlObject.java    |     3 +
 .../cloud/utils/xmlobject/TestXmlObject2.java   |     3 +
 .../com/cloud/utils/QualifierTestContext.xml    |    30 +-
 .../utils/db/transactionContextBuilderTest.xml  |    30 +-
 utils/test/resources/log4j.xml                  |    30 +-
 utils/test/resources/testContext.xml            |    34 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |    12 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |    16 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |    88 +-
 .../vmware/util/VmwareGuestOsMapper.java        |     1 +
 1194 files changed, 33829 insertions(+), 19413 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/com/cloud/event/EventTypes.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/com/cloud/network/vpc/StaticRouteProfile.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/com/cloud/storage/VolumeApiService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/acl/SecurityChecker.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/APICommand.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/APICommand.java
index 690dd9a,6211afc..9b4dfaf
--- a/api/src/org/apache/cloudstack/api/APICommand.java
+++ b/api/src/org/apache/cloudstack/api/APICommand.java
@@@ -22,9 -22,8 +22,9 @@@ import java.lang.annotation.Retention
  import java.lang.annotation.RetentionPolicy;
  import java.lang.annotation.Target;
  
+ import org.apache.cloudstack.acl.IAMEntityType;
  import org.apache.cloudstack.acl.RoleType;
 +import org.apache.cloudstack.api.ResponseObject.ResponseView;
- import org.apache.cloudstack.acl.IAMEntityType;
  
  @Retention(RetentionPolicy.RUNTIME)
  @Target({TYPE})
@@@ -41,8 -40,10 +41,12 @@@ public @interface APICommand 
  
      String since() default "";
  
 +    ResponseView responseView() default ResponseView.Full;
 +
+     boolean requestHasSensitiveInfo() default true;
+ 
+     boolean responseHasSensitiveInfo() default true;
+ 
      RoleType[] authorized() default {};
  
      IAMEntityType[] entityType() default {};

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
index a2399cf,1a319d8..0c46d50
--- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@@ -36,7 -34,8 +36,9 @@@ import org.apache.cloudstack.context.Ca
  import com.cloud.user.Account;
  import com.cloud.user.UserAccount;
  
- @APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
 -@APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class,
++
++@APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
+         requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
  public class CreateAccountCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
index f1547a4,9a7417a..8cc87c2
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@@ -39,7 -36,8 +39,8 @@@ import com.cloud.event.EventTypes
  import com.cloud.user.Account;
  import com.cloud.user.User;
  
- @APICommand(name = "deleteAccount", description = "Deletes a account, and all users associated with this account", responseObject = SuccessResponse.class, entityType = { IAMEntityType.Account })
 -@APICommand(name = "deleteAccount", description = "Deletes a account, and all users associated with this account", responseObject = SuccessResponse.class,
++@APICommand(name = "deleteAccount", description = "Deletes a account, and all users associated with this account", responseObject = SuccessResponse.class, entityType = {IAMEntityType.Account},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class DeleteAccountCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DeleteAccountCmd.class.getName());
      private static final String s_name = "deleteaccountresponse";
@@@ -104,7 -102,7 +105,7 @@@
          boolean result = _regionService.deleteUserAccount(this);
          if (result) {
              SuccessResponse response = new SuccessResponse(getCommandName());
--            this.setResponseObject(response);
++            setResponseObject(response);
          } else {
              throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete user account and all corresponding users");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
index 028481c,642b748..1e81009
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
@@@ -41,7 -37,8 +41,8 @@@ import com.cloud.exception.ConcurrentOp
  import com.cloud.exception.ResourceUnavailableException;
  import com.cloud.user.Account;
  
- @APICommand(name = "disableAccount", description = "Disables an account", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
 -@APICommand(name = "disableAccount", description = "Disables an account", responseObject = AccountResponse.class,
++@APICommand(name = "disableAccount", description = "Disables an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
  public class DisableAccountCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName());
      private static final String s_name = "disableaccountresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
index 9e38d3a,97913f5..1bfd71c
--- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
@@@ -36,7 -32,8 +36,8 @@@ import org.apache.cloudstack.region.Reg
  
  import com.cloud.user.Account;
  
- @APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
 -@APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class,
++@APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
+     requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
  public class EnableAccountCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName());
      private static final String s_name = "enableaccountresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
index ddc1628,1fd3d7e..780dac1
--- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
@@@ -28,7 -27,8 +28,8 @@@ import org.apache.cloudstack.api.respon
  
  import com.cloud.user.Account;
  
- @APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
 -@APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class,
++@APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
  public class LockAccountCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName());
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
index d423848,61b1b31..8d9fe26
--- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@@ -39,7 -35,8 +39,8 @@@ import org.apache.cloudstack.region.Reg
  
  import com.cloud.user.Account;
  
- @APICommand(name = "updateAccount", description = "Updates account information for the authenticated user", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
 -@APICommand(name = "updateAccount", description = "Updates account information for the authenticated user", responseObject = AccountResponse.class,
++@APICommand(name = "updateAccount", description = "Updates account information for the authenticated user", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
  public class UpdateAccountCmd extends BaseCmd {
      public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName());
      private static final String s_name = "updateaccountresponse";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index 1cec188,43b18ee..e6ea519
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@@ -35,7 -34,8 +35,8 @@@ import org.apache.cloudstack.api.respon
  
  import com.cloud.network.router.VirtualRouter.Role;
  
- @APICommand(name = "listInternalLoadBalancerVMs", description = "List internal LB VMs.", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "listInternalLoadBalancerVMs", description = "List internal LB VMs.", responseObject = DomainRouterResponse.class,
++@APICommand(name = "listInternalLoadBalancerVMs", description = "List internal LB VMs.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd {
      public static final Logger s_logger = Logger.getLogger(ListInternalLBVMsCmd.class.getName());
  
@@@ -134,6 -134,6 +135,6 @@@
      public void execute() {
          ListResponse<DomainRouterResponse> response = _queryService.searchForInternalLbVms(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/internallb/StartInternalLBVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
index b747c30,a5b2bf7..54d7621
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
@@@ -39,7 -36,8 +39,8 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.network.router.VirtualRouter;
  import com.cloud.network.router.VirtualRouter.Role;
  
- @APICommand(name = "startInternalLoadBalancerVM", responseObject = DomainRouterResponse.class, description = "Starts an existing internal lb vm.", entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "startInternalLoadBalancerVM", responseObject = DomainRouterResponse.class, description = "Starts an existing internal lb vm.",
++@APICommand(name = "startInternalLoadBalancerVM", responseObject = DomainRouterResponse.class, description = "Starts an existing internal lb vm.", entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class StartInternalLBVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(StartInternalLBVMCmd.class.getName());
      private static final String s_name = "startinternallbvmresponse";
@@@ -116,7 -114,7 +117,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 internal lb vm");
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48e08fe6/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
index f8a8b7b,88d864b..aa946be
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
@@@ -38,7 -35,8 +38,8 @@@ import com.cloud.exception.ResourceUnav
  import com.cloud.network.router.VirtualRouter;
  import com.cloud.network.router.VirtualRouter.Role;
  
- @APICommand(name = "stopInternalLoadBalancerVM", description = "Stops an Internal LB vm.", responseObject = DomainRouterResponse.class, entityType = { IAMEntityType.VirtualMachine })
 -@APICommand(name = "stopInternalLoadBalancerVM", description = "Stops an Internal LB vm.", responseObject = DomainRouterResponse.class,
++@APICommand(name = "stopInternalLoadBalancerVM", description = "Stops an Internal LB vm.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
+         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
  public class StopInternalLBVMCmd extends BaseAsyncCmd {
      public static final Logger s_logger = Logger.getLogger(StopInternalLBVMCmd.class.getName());
      private static final String s_name = "stopinternallbvmresponse";
@@@ -118,7 -116,7 +119,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 internal lb vm");
          }


Mime
View raw message