cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/kvm-vnc-listen to 895c51d
Date Mon, 16 Sep 2013 09:11:48 GMT
Merge branch 'master' into kvm-vnc-listen

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java


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

Branch: refs/heads/kvm-vnc-listen
Commit: 895c51d0b11a8222bb74f56878b0a09a723731b9
Parents: 3890860 5410901
Author: Wido den Hollander <wido@widodh.nl>
Authored: Mon Sep 16 10:44:53 2013 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Mon Sep 16 10:44:53 2013 +0200

----------------------------------------------------------------------
 .gitignore                                      |      8 +-
 CHANGES                                         |    385 +-
 DISCLAIMER                                      |      7 -
 INSTALL.md                                      |     26 +-
 LICENSE                                         |     77 +-
 README.md                                       |      8 +-
 .../tomcatconf/commands-simulator.properties.in |      2 +-
 .../tomcatconf/components-simulator.xml.in      |     54 -
 agent/bindir/cloud-setup-agent.in               |      7 +-
 agent/conf/agent.properties                     |     27 +-
 agent/pom.xml                                   |     22 +-
 agent/src/com/cloud/agent/Agent.java            |     45 -
 agent/src/com/cloud/agent/AgentShell.java       |    198 +-
 agent/src/com/cloud/agent/IAgentShell.java      |      2 -
 agent/src/com/cloud/agent/VmmAgentShell.java    |    504 -
 .../consoleproxy/ConsoleProxyResource.java      |      4 +-
 agent/test/com/cloud/agent/TestAgentShell.java  |     43 -
 api/pom.xml                                     |     30 +-
 .../com/cloud/agent/api/AgentControlAnswer.java |     30 -
 .../cloud/agent/api/AgentControlCommand.java    |     27 -
 api/src/com/cloud/agent/api/Answer.java         |      1 +
 .../com/cloud/agent/api/AttachIsoCommand.java   |     59 -
 .../com/cloud/agent/api/AttachVolumeAnswer.java |     58 -
 .../cloud/agent/api/AttachVolumeCommand.java    |     99 -
 .../cloud/agent/api/BackupSnapshotAnswer.java   |     44 -
 .../cloud/agent/api/BackupSnapshotCommand.java  |    121 -
 .../cloud/agent/api/BumpUpPriorityCommand.java  |     30 -
 api/src/com/cloud/agent/api/CancelCommand.java  |     45 -
 .../com/cloud/agent/api/ChangeAgentAnswer.java  |     26 -
 .../com/cloud/agent/api/ChangeAgentCommand.java |     46 -
 .../com/cloud/agent/api/CheckHealthAnswer.java  |     26 -
 .../com/cloud/agent/api/CheckHealthCommand.java |     30 -
 .../com/cloud/agent/api/CheckNetworkAnswer.java |     38 -
 .../cloud/agent/api/CheckNetworkCommand.java    |     42 -
 .../com/cloud/agent/api/CheckOnHostAnswer.java  |     48 -
 .../com/cloud/agent/api/CheckOnHostCommand.java |     42 -
 .../com/cloud/agent/api/CheckRouterAnswer.java  |     81 -
 .../com/cloud/agent/api/CheckRouterCommand.java |     30 -
 .../agent/api/CheckS2SVpnConnectionsAnswer.java |     71 -
 .../api/CheckS2SVpnConnectionsCommand.java      |     39 -
 .../com/cloud/agent/api/CheckStateAnswer.java   |     45 -
 .../com/cloud/agent/api/CheckStateCommand.java  |     40 -
 .../agent/api/CheckVirtualMachineAnswer.java    |     52 -
 .../agent/api/CheckVirtualMachineCommand.java   |     41 -
 .../cloud/agent/api/CleanupNetworkRulesCmd.java |     47 -
 .../agent/api/CleanupSnapshotBackupCommand.java |     75 -
 .../com/cloud/agent/api/ClusterSyncAnswer.java  |     55 -
 .../com/cloud/agent/api/ClusterSyncCommand.java |     47 -
 api/src/com/cloud/agent/api/Command.java        |      4 +
 .../cloud/agent/api/ComputeChecksumCommand.java |     40 -
 .../api/ConsoleAccessAuthenticationAnswer.java  |     88 -
 .../api/ConsoleAccessAuthenticationCommand.java |     68 -
 .../api/ConsoleProxyLoadReportCommand.java      |     39 -
 ...reatePrivateTemplateFromSnapshotCommand.java |     82 -
 .../CreatePrivateTemplateFromVolumeCommand.java |     93 -
 .../agent/api/CreateStoragePoolCommand.java     |     30 -
 .../cloud/agent/api/CreateVMSnapshotAnswer.java |     62 -
 .../agent/api/CreateVMSnapshotCommand.java      |     42 -
 .../api/CreateVolumeFromSnapshotAnswer.java     |     38 -
 .../api/CreateVolumeFromSnapshotCommand.java    |     58 -
 .../api/CreateVolumeFromVMSnapshotAnswer.java   |     54 -
 .../api/CreateVolumeFromVMSnapshotCommand.java  |     88 -
 api/src/com/cloud/agent/api/CronCommand.java    |     24 -
 .../agent/api/DeleteObjectFromSwiftCommand.java |     61 -
 .../agent/api/DeleteSnapshotBackupAnswer.java   |     32 -
 .../agent/api/DeleteSnapshotBackupCommand.java  |     94 -
 .../agent/api/DeleteSnapshotsDirCommand.java    |     63 -
 .../agent/api/DeleteStoragePoolCommand.java     |     61 -
 .../agent/api/DeleteTemplateFromS3Command.java  |    106 -
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java |     49 -
 .../agent/api/DeleteVMSnapshotCommand.java      |     28 -
 .../api/DownloadSnapshotFromS3Command.java      |     61 -
 ...TemplateFromS3ToSecondaryStorageCommand.java |     66 -
 api/src/com/cloud/agent/api/FenceAnswer.java    |     36 -
 api/src/com/cloud/agent/api/FenceCommand.java   |     61 -
 .../cloud/agent/api/GetDomRVersionAnswer.java   |     45 -
 .../com/cloud/agent/api/GetDomRVersionCmd.java  |     30 -
 .../com/cloud/agent/api/GetFileStatsAnswer.java |     37 -
 .../cloud/agent/api/GetFileStatsCommand.java    |     41 -
 .../com/cloud/agent/api/GetHostStatsAnswer.java |     88 -
 .../cloud/agent/api/GetHostStatsCommand.java    |     53 -
 .../cloud/agent/api/GetStorageStatsAnswer.java  |     51 -
 .../cloud/agent/api/GetStorageStatsCommand.java |     76 -
 .../com/cloud/agent/api/GetVmStatsAnswer.java   |     40 -
 .../com/cloud/agent/api/GetVmStatsCommand.java  |     54 -
 .../com/cloud/agent/api/GetVncPortAnswer.java   |     48 -
 .../com/cloud/agent/api/GetVncPortCommand.java  |     43 -
 api/src/com/cloud/agent/api/HostStatsEntry.java |    113 -
 api/src/com/cloud/agent/api/MaintainAnswer.java |     46 -
 .../com/cloud/agent/api/MaintainCommand.java    |     28 -
 .../cloud/agent/api/ManageSnapshotAnswer.java   |     40 -
 .../cloud/agent/api/ManageSnapshotCommand.java  |     92 -
 api/src/com/cloud/agent/api/MigrateAnswer.java  |     33 -
 api/src/com/cloud/agent/api/MigrateCommand.java |     59 -
 .../cloud/agent/api/ModifySshKeysCommand.java   |     44 -
 .../agent/api/ModifyStoragePoolAnswer.java      |     57 -
 .../agent/api/ModifyStoragePoolCommand.java     |     75 -
 .../com/cloud/agent/api/NetworkUsageAnswer.java |     61 -
 .../cloud/agent/api/NetworkUsageCommand.java    |     98 -
 api/src/com/cloud/agent/api/PingAnswer.java     |     33 -
 api/src/com/cloud/agent/api/PingCommand.java    |     45 -
 .../com/cloud/agent/api/PingRoutingCommand.java |     54 -
 .../api/PingRoutingWithNwGroupsCommand.java     |     46 -
 .../agent/api/PingRoutingWithOvsCommand.java    |     42 -
 .../com/cloud/agent/api/PingStorageCommand.java |     37 -
 .../com/cloud/agent/api/PingTestCommand.java    |     54 -
 api/src/com/cloud/agent/api/PlugNicAnswer.java  |     25 -
 api/src/com/cloud/agent/api/PlugNicCommand.java |     46 -
 .../com/cloud/agent/api/PoolEjectCommand.java   |     42 -
 .../agent/api/PrepareForMigrationAnswer.java    |     34 -
 .../agent/api/PrepareForMigrationCommand.java   |     39 -
 .../agent/api/PrepareOCFS2NodesCommand.java     |     44 -
 .../api/PropagateResourceEventCommand.java      |     48 -
 .../com/cloud/agent/api/PvlanSetupCommand.java  |    121 +
 api/src/com/cloud/agent/api/ReadyAnswer.java    |     31 -
 api/src/com/cloud/agent/api/ReadyCommand.java   |     58 -
 api/src/com/cloud/agent/api/RebootAnswer.java   |     42 -
 api/src/com/cloud/agent/api/RebootCommand.java  |     45 -
 .../cloud/agent/api/RebootRouterCommand.java    |     38 -
 .../agent/api/RevertToVMSnapshotAnswer.java     |     63 -
 .../agent/api/RevertToVMSnapshotCommand.java    |     29 -
 api/src/com/cloud/agent/api/ScaleVmAnswer.java  |     28 -
 api/src/com/cloud/agent/api/ScaleVmCommand.java |    113 -
 .../agent/api/ScheduleHostScanTaskCommand.java  |     32 -
 .../agent/api/SecStorageFirewallCfgCommand.java |     82 -
 .../cloud/agent/api/SecStorageSetupAnswer.java  |     33 -
 .../cloud/agent/api/SecStorageSetupCommand.java |     83 -
 .../agent/api/SecStorageVMSetupCommand.java     |     57 -
 .../agent/api/SecurityGroupRuleAnswer.java      |     70 -
 .../cloud/agent/api/SecurityGroupRulesCmd.java  |    304 -
 api/src/com/cloud/agent/api/SetupAnswer.java    |     37 -
 api/src/com/cloud/agent/api/SetupCommand.java   |     60 -
 .../agent/api/SetupGuestNetworkAnswer.java      |     25 -
 .../agent/api/SetupGuestNetworkCommand.java     |     72 -
 .../com/cloud/agent/api/ShutdownCommand.java    |     56 -
 .../com/cloud/agent/api/SnapshotCommand.java    |    126 -
 api/src/com/cloud/agent/api/StartAnswer.java    |     57 -
 api/src/com/cloud/agent/api/StartCommand.java   |     52 -
 api/src/com/cloud/agent/api/StartupAnswer.java  |     44 -
 api/src/com/cloud/agent/api/StartupCommand.java |    286 -
 .../agent/api/StartupExternalDhcpCommand.java   |     25 -
 .../api/StartupExternalFirewallCommand.java     |     26 -
 .../api/StartupExternalLoadBalancerCommand.java |     26 -
 .../cloud/agent/api/StartupProxyCommand.java    |     49 -
 .../agent/api/StartupPxeServerCommand.java      |     25 -
 .../cloud/agent/api/StartupRoutingCommand.java  |    224 -
 .../api/StartupSecondaryStorageCommand.java     |     32 -
 .../cloud/agent/api/StartupStorageCommand.java  |    110 -
 .../agent/api/StartupTrafficMonitorCommand.java |     26 -
 api/src/com/cloud/agent/api/StopAnswer.java     |     45 -
 api/src/com/cloud/agent/api/StopCommand.java    |     71 -
 .../cloud/agent/api/TransferAgentCommand.java   |     57 -
 .../com/cloud/agent/api/UnPlugNicAnswer.java    |     25 -
 .../com/cloud/agent/api/UnPlugNicCommand.java   |     45 -
 .../agent/api/UpdateHostPasswordCommand.java    |     48 -
 api/src/com/cloud/agent/api/UpgradeAnswer.java  |     26 -
 api/src/com/cloud/agent/api/UpgradeCommand.java |     42 -
 .../cloud/agent/api/UpgradeSnapshotCommand.java |     64 -
 ...TemplateToS3FromSecondaryStorageCommand.java |    121 -
 .../cloud/agent/api/VMSnapshotBaseCommand.java  |     74 -
 api/src/com/cloud/agent/api/VMSnapshotTO.java   |     90 -
 .../cloud/agent/api/ValidateSnapshotAnswer.java |     53 -
 .../agent/api/ValidateSnapshotCommand.java      |     84 -
 api/src/com/cloud/agent/api/VmStatsEntry.java   |     82 -
 .../api/baremetal/IpmISetBootDevCommand.java    |     43 -
 .../api/baremetal/IpmiBootorResetCommand.java   |     28 -
 .../api/baremetal/PreparePxeServerAnswer.java   |     29 -
 .../api/baremetal/PreparePxeServerCommand.java  |     80 -
 .../baremetal/prepareCreateTemplateCommand.java |     66 -
 .../cloud/agent/api/check/CheckSshAnswer.java   |     37 -
 .../cloud/agent/api/check/CheckSshCommand.java  |     65 -
 .../api/downloadSnapshotFromSwiftCommand.java   |     60 -
 ...plateFromSwiftToSecondaryStorageCommand.java |     90 -
 .../api/proxy/CheckConsoleProxyLoadCommand.java |     60 -
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java |     44 -
 .../com/cloud/agent/api/proxy/ProxyCommand.java |     25 -
 ...tartConsoleProxyAgentHttpHandlerCommand.java |     68 -
 .../api/proxy/WatchConsoleProxyLoadCommand.java |     65 -
 .../CreateLoadBalancerApplianceCommand.java     |     48 -
 .../DestroyLoadBalancerApplianceCommand.java    |     32 -
 .../agent/api/routing/DhcpEntryCommand.java     |    142 -
 .../routing/GlobalLoadBalancerConfigAnswer.java |     27 -
 .../GlobalLoadBalancerConfigCommand.java        |    100 -
 .../api/routing/HealthCheckLBConfigAnswer.java  |     42 -
 .../api/routing/HealthCheckLBConfigCommand.java |     39 -
 .../cloud/agent/api/routing/IpAssocAnswer.java  |     48 -
 .../cloud/agent/api/routing/IpAssocCommand.java |     42 -
 .../agent/api/routing/IpAssocVpcCommand.java    |     29 -
 .../api/routing/LoadBalancerConfigCommand.java  |     66 -
 .../api/routing/NetworkElementCommand.java      |     53 -
 .../api/routing/RemoteAccessVpnCfgCommand.java  |     78 -
 .../agent/api/routing/SavePasswordCommand.java  |     54 -
 .../api/routing/SetFirewallRulesAnswer.java     |     36 -
 .../api/routing/SetFirewallRulesCommand.java    |     98 -
 .../agent/api/routing/SetNetworkACLAnswer.java  |     36 -
 .../agent/api/routing/SetNetworkACLCommand.java |     97 -
 .../routing/SetPortForwardingRulesAnswer.java   |     37 -
 .../routing/SetPortForwardingRulesCommand.java  |     40 -
 .../SetPortForwardingRulesVpcCommand.java       |     30 -
 .../agent/api/routing/SetSourceNatAnswer.java   |     27 -
 .../agent/api/routing/SetSourceNatCommand.java  |     42 -
 .../api/routing/SetStaticNatRulesAnswer.java    |     37 -
 .../api/routing/SetStaticNatRulesCommand.java   |     47 -
 .../agent/api/routing/SetStaticRouteAnswer.java |     36 -
 .../api/routing/SetStaticRouteCommand.java      |     62 -
 .../api/routing/Site2SiteVpnCfgCommand.java     |    154 -
 .../api/routing/SiteLoadBalancerConfig.java     |    121 -
 .../agent/api/routing/UserDataCommand.java      |     63 -
 .../cloud/agent/api/routing/VmDataCommand.java  |     67 -
 .../agent/api/routing/VpnUsersCfgCommand.java   |     94 -
 .../api/storage/AbstractDownloadCommand.java    |     78 -
 .../api/storage/AbstractUploadCommand.java      |     68 -
 .../CopyTemplateToPrimaryStorageAnswer.java     |     17 +
 .../agent/api/storage/CopyVolumeAnswer.java     |     42 -
 .../agent/api/storage/CopyVolumeCommand.java    |     72 -
 .../cloud/agent/api/storage/CreateAnswer.java   |     53 -
 .../cloud/agent/api/storage/CreateCommand.java  |     96 -
 .../storage/CreateEntityDownloadURLAnswer.java  |     37 -
 .../storage/CreateEntityDownloadURLCommand.java |     72 -
 .../storage/CreatePrivateTemplateAnswer.java    |     77 -
 .../storage/CreatePrivateTemplateCommand.java   |     90 -
 .../api/storage/CreateVolumeOVAAnswer.java      |     26 +
 .../api/storage/CreateVolumeOVACommand.java     |     60 +
 .../storage/DeleteEntityDownloadURLAnswer.java  |     37 -
 .../storage/DeleteEntityDownloadURLCommand.java |     72 -
 .../api/storage/DeleteTemplateCommand.java      |     40 -
 .../agent/api/storage/DeleteVolumeCommand.java  |     38 -
 .../cloud/agent/api/storage/DestroyAnswer.java  |     31 -
 .../cloud/agent/api/storage/DestroyCommand.java |     55 -
 .../cloud/agent/api/storage/DownloadAnswer.java |    141 -
 .../agent/api/storage/DownloadCommand.java      |    219 -
 .../api/storage/DownloadProgressCommand.java    |     48 -
 .../agent/api/storage/ListTemplateAnswer.java   |     53 -
 .../agent/api/storage/ListTemplateCommand.java  |     54 -
 .../agent/api/storage/ListVolumeAnswer.java     |     53 -
 .../agent/api/storage/ListVolumeCommand.java    |     40 -
 .../storage/ManageVolumeAvailabilityAnswer.java |     31 -
 .../ManageVolumeAvailabilityCommand.java        |     54 -
 .../cloud/agent/api/storage/PasswordAuth.java   |     39 +
 .../api/storage/PrepareOVAPackingAnswer.java    |     26 +
 .../api/storage/PrepareOVAPackingCommand.java   |     48 +
 .../storage/PrimaryStorageDownloadAnswer.java   |     54 -
 .../storage/PrimaryStorageDownloadCommand.java  |     87 -
 api/src/com/cloud/agent/api/storage/Proxy.java  |     72 +
 .../agent/api/storage/ResizeVolumeAnswer.java   |     40 -
 .../agent/api/storage/ResizeVolumeCommand.java  |     85 -
 .../cloud/agent/api/storage/StorageCommand.java |     26 -
 .../agent/api/storage/UpgradeDiskAnswer.java    |     29 -
 .../agent/api/storage/UpgradeDiskCommand.java   |     50 -
 .../cloud/agent/api/storage/UploadAnswer.java   |    123 -
 .../cloud/agent/api/storage/UploadCommand.java  |    145 -
 .../api/storage/UploadProgressCommand.java      |     48 -
 .../com/cloud/agent/api/storage/ssCommand.java  |     48 -
 .../com/cloud/agent/api/to/DataObjectType.java  |     25 +
 api/src/com/cloud/agent/api/to/DataStoreTO.java |     26 +
 api/src/com/cloud/agent/api/to/DataTO.java      |     33 +
 api/src/com/cloud/agent/api/to/DhcpTO.java      |     64 +
 api/src/com/cloud/agent/api/to/DiskTO.java      |     70 +
 .../com/cloud/agent/api/to/FirewallRuleTO.java  |     29 +
 .../com/cloud/agent/api/to/NetworkACLTO.java    |     49 +-
 api/src/com/cloud/agent/api/to/NfsTO.java       |     60 +
 api/src/com/cloud/agent/api/to/S3TO.java        |     37 +-
 api/src/com/cloud/agent/api/to/SwiftTO.java     |     16 +-
 .../cloud/agent/api/to/VirtualMachineTO.java    |     15 +-
 api/src/com/cloud/agent/api/to/VolumeTO.java    |     50 +
 ...plateToSwiftFromSecondaryStorageCommand.java |     80 -
 .../agent/manager/allocator/HostAllocator.java  |     85 +
 .../agent/manager/allocator/PodAllocator.java   |     33 +
 api/src/com/cloud/alert/AlertAdapter.java       |     22 +
 .../api/commands/CreatePrivateNetworkCmd.java   |    197 -
 .../api/commands/DestroyConsoleProxyCmd.java    |     93 -
 .../cloud/async/AsyncInstanceCreateStatus.java  |     24 -
 api/src/com/cloud/async/AsyncJob.java           |    100 -
 api/src/com/cloud/async/SyncQueueItem.java      |     26 -
 .../com/cloud/cluster/ManagementServerHost.java |     32 -
 .../com/cloud/configuration/Configuration.java  |     33 -
 .../configuration/ConfigurationService.java     |     41 +-
 .../consoleproxy/ConsoleProxyAllocator.java     |     34 +
 .../cloud/consoleproxy/ConsoleProxyService.java |     23 -
 api/src/com/cloud/dao/EntityManager.java        |    102 -
 api/src/com/cloud/dc/DedicatedResources.java    |     33 +
 .../cloud/deploy/DeploymentClusterPlanner.java  |     45 +
 api/src/com/cloud/deploy/DeploymentPlanner.java |     47 +-
 api/src/com/cloud/event/EventCategory.java      |      1 +
 api/src/com/cloud/event/EventTypes.java         |     86 +-
 api/src/com/cloud/event/UsageEvent.java         |     33 +
 .../exception/AffinityConflictException.java    |     34 +
 .../exception/AgentControlChannelException.java |     27 +
 .../InsufficientServerCapacityException.java    |     11 +
 .../MissingParameterValueException.java         |     25 +
 .../exception/OperationTimedoutException.java   |     62 +
 api/src/com/cloud/ha/FenceBuilder.java          |     31 +
 api/src/com/cloud/ha/Investigator.java          |     33 +
 api/src/com/cloud/host/Status.java              |      1 +
 api/src/com/cloud/hypervisor/Hypervisor.java    |     22 +
 .../hypervisor/HypervisorCapabilities.java      |      2 +
 .../com/cloud/hypervisor/HypervisorGuru.java    |     22 +-
 .../com/cloud/info/ConsoleProxyLoadInfo.java    |     48 +
 .../com/cloud/info/RunningHostCountInfo.java    |     48 +
 api/src/com/cloud/network/GuestVlan.java        |     31 +
 api/src/com/cloud/network/IpAddress.java        |     12 +-
 api/src/com/cloud/network/Network.java          |     46 +-
 .../network/NetworkMigrationResponder.java      |     70 +
 api/src/com/cloud/network/NetworkModel.java     |     26 +-
 api/src/com/cloud/network/NetworkProfile.java   |    130 +-
 .../com/cloud/network/NetworkRuleApplier.java   |     28 +
 api/src/com/cloud/network/NetworkService.java   |     34 +-
 api/src/com/cloud/network/Networks.java         |    204 +-
 api/src/com/cloud/network/PhysicalNetwork.java  |      9 +-
 api/src/com/cloud/network/PublicIpAddress.java  |      3 -
 api/src/com/cloud/network/UserIpv6Address.java  |     52 +
 .../network/VirtualNetworkApplianceService.java |      2 +
 .../cloud/network/VirtualRouterProvider.java    |      3 +-
 .../network/element/DhcpServiceProvider.java    |      4 +-
 .../com/cloud/network/element/IpDeployer.java   |      6 +-
 .../element/NetworkACLServiceProvider.java      |      3 +-
 .../cloud/network/element/NetworkElement.java   |      4 +-
 .../element/UserDataServiceProvider.java        |      8 +-
 .../com/cloud/network/element/VpcProvider.java  |      3 +
 .../network/firewall/NetworkACLService.java     |     51 -
 api/src/com/cloud/network/guru/NetworkGuru.java |     12 +-
 .../com/cloud/network/lb/LoadBalancingRule.java |     83 +-
 .../network/lb/LoadBalancingRulesService.java   |     21 +-
 .../com/cloud/network/router/VirtualRouter.java |      4 +-
 .../com/cloud/network/rules/LoadBalancer.java   |     10 +-
 .../network/rules/LoadBalancerContainer.java    |     33 +
 .../com/cloud/network/rules/RulesService.java   |      8 +-
 .../network/security/SecurityGroupRules.java    |      2 +
 .../cloud/network/security/SecurityRule.java    |      8 +-
 api/src/com/cloud/network/vpc/NetworkACL.java   |     36 +
 .../com/cloud/network/vpc/NetworkACLItem.java   |     80 +
 .../cloud/network/vpc/NetworkACLService.java    |    135 +
 api/src/com/cloud/network/vpc/PrivateIp.java    |      1 +
 api/src/com/cloud/network/vpc/VpcGateway.java   |     11 +-
 api/src/com/cloud/network/vpc/VpcOffering.java  |      1 +
 api/src/com/cloud/network/vpc/VpcService.java   |     74 +-
 .../network/vpn/RemoteAccessVpnService.java     |      3 +-
 api/src/com/cloud/offering/DiskOffering.java    |     41 +-
 api/src/com/cloud/offering/NetworkOffering.java |     16 +
 api/src/com/cloud/offering/ServiceOffering.java |     12 +-
 .../ha/GlobalLoadBalancingRulesService.java     |      6 +
 api/src/com/cloud/resource/ResourceService.java |     17 +-
 .../resource/UnableDeleteHostException.java     |     28 +
 api/src/com/cloud/server/ManagementService.java |     95 +-
 .../cloud/server/ResourceMetaDataService.java   |     47 +
 api/src/com/cloud/server/ResourceTag.java       |      1 +
 .../com/cloud/server/TaggedResourceService.java |      5 +-
 api/src/com/cloud/storage/DataStoreRole.java    |     54 +
 .../com/cloud/storage/GuestOSHypervisor.java    |     28 +
 api/src/com/cloud/storage/ImageStore.java       |     47 +
 api/src/com/cloud/storage/S3.java               |     50 -
 api/src/com/cloud/storage/ScopeType.java        |     27 +
 api/src/com/cloud/storage/Snapshot.java         |     12 +-
 api/src/com/cloud/storage/Storage.java          |     19 +-
 api/src/com/cloud/storage/StoragePool.java      |      4 +-
 .../cloud/storage/StoragePoolDiscoverer.java    |     33 +
 api/src/com/cloud/storage/StorageService.java   |     15 +
 api/src/com/cloud/storage/Swift.java            |     37 -
 api/src/com/cloud/storage/Upload.java           |      2 +-
 api/src/com/cloud/storage/Volume.java           |     20 +-
 api/src/com/cloud/storage/VolumeApiService.java |     38 +-
 .../storage/snapshot/SnapshotApiService.java    |    109 +
 .../storage/snapshot/SnapshotSchedule.java      |     11 +-
 .../cloud/storage/snapshot/SnapshotService.java |    109 -
 .../cloud/storage/template/TemplateInfo.java    |     81 -
 .../cloud/storage/template/TemplateProp.java    |     81 +
 .../com/cloud/template/TemplateApiService.java  |    103 +
 api/src/com/cloud/template/TemplateService.java |    100 -
 .../cloud/template/VirtualMachineTemplate.java  |      8 +
 api/src/com/cloud/user/Account.java             |      4 +
 api/src/com/cloud/user/AccountService.java      |     13 +-
 api/src/com/cloud/user/User.java                |      2 +
 api/src/com/cloud/user/UserContext.java         |    140 -
 .../com/cloud/user/UserContextInitializer.java  |     40 -
 api/src/com/cloud/vm/ConsoleProxy.java          |     27 +
 api/src/com/cloud/vm/DiskProfile.java           |     38 +-
 api/src/com/cloud/vm/NicIpAlias.java            |     45 +
 api/src/com/cloud/vm/SecondaryStorageVm.java    |     26 +
 api/src/com/cloud/vm/SystemVm.java              |     26 +
 api/src/com/cloud/vm/UserVmService.java         |    241 +-
 api/src/com/cloud/vm/VirtualMachine.java        |     70 +-
 api/src/com/cloud/vm/VirtualMachineName.java    |    186 +
 api/src/com/cloud/vm/VirtualMachineProfile.java |     14 +-
 api/src/com/cloud/vm/VmDetailConstants.java     |     24 +
 api/src/com/cloud/vm/VmDiskStats.java           |     30 +
 api/src/com/cloud/vm/VmStats.java               |      8 +
 .../cloudstack/affinity/AffinityGroup.java      |     33 +
 .../affinity/AffinityGroupProcessor.java        |     91 +
 .../affinity/AffinityGroupResponse.java         |    158 +
 .../affinity/AffinityGroupService.java          |     85 +
 .../affinity/AffinityGroupTypeResponse.java     |     48 +
 .../affinity/AffinityProcessorBase.java         |     71 +
 .../cloudstack/api/ApiCommandJobType.java       |     52 +
 .../org/apache/cloudstack/api/ApiConstants.java |     67 +-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java |     30 +-
 .../cloudstack/api/BaseAsyncCreateCmd.java      |     13 -
 api/src/org/apache/cloudstack/api/BaseCmd.java  |     60 +-
 .../org/apache/cloudstack/api/BaseListCmd.java  |     17 +-
 .../BaseListTemplateOrIsoPermissionsCmd.java    |      5 +-
 .../api/BaseUpdateTemplateOrIsoCmd.java         |     14 +
 .../apache/cloudstack/api/LdapValidator.java    |     21 +
 .../cloudstack/api/ResponseGenerator.java       |    128 +-
 .../cloudstack/api/ServerApiException.java      |      3 +-
 .../command/admin/account/CreateAccountCmd.java |     16 +-
 .../command/admin/account/DeleteAccountCmd.java |     13 +-
 .../admin/account/DisableAccountCmd.java        |     11 +-
 .../admin/autoscale/CreateCounterCmd.java       |      6 +-
 .../admin/autoscale/DeleteCounterCmd.java       |      6 +-
 .../command/admin/cluster/AddClusterCmd.java    |     31 +-
 .../command/admin/cluster/UpdateClusterCmd.java |     29 +-
 .../api/command/admin/config/ListCfgsByCmd.java |     61 +-
 .../admin/config/ListDeploymentPlannersCmd.java |     71 +
 .../api/command/admin/config/UpdateCfgCmd.java  |     46 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java |      8 +-
 .../command/admin/domain/CreateDomainCmd.java   |      5 +-
 .../command/admin/domain/DeleteDomainCmd.java   |      5 +-
 .../command/admin/domain/UpdateDomainCmd.java   |      5 +-
 .../admin/host/AddSecondaryStorageCmd.java      |     40 +-
 .../admin/host/CancelMaintenanceCmd.java        |     11 +-
 .../admin/host/FindHostsForMigrationCmd.java    |    106 +
 .../api/command/admin/host/ListHostsCmd.java    |     20 +-
 .../admin/host/PrepareForMaintenanceCmd.java    |     11 +-
 .../command/admin/host/ReconnectHostCmd.java    |     11 +-
 .../admin/host/ReleaseHostReservationCmd.java   |    106 +
 ...ConfigureInternalLoadBalancerElementCmd.java |    112 +
 .../CreateInternalLoadBalancerElementCmd.java   |    117 +
 .../admin/internallb/ListInternalLBVMsCmd.java  |    145 +
 .../ListInternalLoadBalancerElementsCmd.java    |     99 +
 .../admin/internallb/StartInternalLBVMCmd.java  |    121 +
 .../admin/internallb/StopInternalLBVMCmd.java   |    124 +
 .../api/command/admin/ldap/LDAPConfigCmd.java   |    196 -
 .../api/command/admin/ldap/LDAPRemoveCmd.java   |     71 -
 .../network/AddNetworkServiceProviderCmd.java   |     11 +-
 .../admin/network/CreateNetworkOfferingCmd.java |     32 +-
 .../admin/network/CreatePhysicalNetworkCmd.java |     11 +-
 .../network/DedicateGuestVlanRangeCmd.java      |    118 +
 .../DeleteNetworkServiceProviderCmd.java        |      6 +-
 .../admin/network/DeletePhysicalNetworkCmd.java |     11 +-
 .../ListDedicatedGuestVlanRangesCmd.java        |    129 +
 .../network/ListNetworkIsolationMethodsCmd.java |     58 +
 .../ReleaseDedicatedGuestVlanRangeCmd.java      |     95 +
 .../admin/network/UpdateNetworkOfferingCmd.java |      6 +
 .../UpdateNetworkServiceProviderCmd.java        |      6 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java |      6 +-
 .../admin/offering/CreateDiskOfferingCmd.java   |     60 +-
 .../offering/CreateServiceOfferingCmd.java      |     51 +
 .../admin/region/CreatePortableIpRangeCmd.java  |    156 +
 .../admin/region/DeletePortableIpRangeCmd.java  |     92 +
 .../admin/region/ListPortableIpRangesCmd.java   |    106 +
 .../admin/resource/ArchiveAlertsCmd.java        |     24 +-
 .../admin/resource/CleanVMReservationsCmd.java  |     80 +
 .../command/admin/resource/DeleteAlertsCmd.java |     23 +-
 .../ConfigureVirtualRouterElementCmd.java       |     11 +-
 .../router/CreateVirtualRouterElementCmd.java   |     26 +-
 .../command/admin/router/DestroyRouterCmd.java  |     13 +-
 .../command/admin/router/ListRoutersCmd.java    |     13 +-
 .../command/admin/router/RebootRouterCmd.java   |     11 +-
 .../command/admin/router/StartRouterCmd.java    |     21 +-
 .../api/command/admin/router/StopRouterCmd.java |     22 +-
 .../command/admin/storage/AddImageStoreCmd.java |    154 +
 .../api/command/admin/storage/AddS3Cmd.java     |     74 +-
 .../CancelPrimaryStorageMaintenanceCmd.java     |     11 +-
 .../storage/CreateSecondaryStagingStoreCmd.java |    135 +
 .../admin/storage/CreateStoragePoolCmd.java     |     46 +-
 .../admin/storage/DeleteImageStoreCmd.java      |     80 +
 .../storage/DeleteSecondaryStagingStoreCmd.java |     79 +
 .../FindStoragePoolsForMigrationCmd.java        |     97 +
 .../admin/storage/ListImageStoresCmd.java       |    104 +
 .../api/command/admin/storage/ListS3sCmd.java   |     34 +-
 .../storage/ListSecondaryStagingStoresCmd.java  |    104 +
 .../admin/storage/ListStoragePoolsCmd.java      |     16 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java |     11 +-
 .../admin/storage/UpdateStoragePoolCmd.java     |     15 +
 .../api/command/admin/swift/AddSwiftCmd.java    |     47 +-
 .../api/command/admin/swift/ListSwiftsCmd.java  |     26 +-
 .../admin/systemvm/DestroySystemVmCmd.java      |     13 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |      6 +-
 .../admin/systemvm/MigrateSystemVMCmd.java      |     30 +-
 .../admin/systemvm/RebootSystemVmCmd.java       |     13 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |    135 +
 .../admin/systemvm/StartSystemVMCmd.java        |     13 +-
 .../command/admin/systemvm/StopSystemVmCmd.java |     13 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |     13 +-
 .../admin/template/PrepareTemplateCmd.java      |      2 +-
 .../command/admin/usage/AddTrafficTypeCmd.java  |     11 +-
 .../admin/usage/DeleteTrafficTypeCmd.java       |      6 +-
 .../admin/usage/UpdateTrafficTypeCmd.java       |      6 +-
 .../api/command/admin/user/CreateUserCmd.java   |      7 +-
 .../api/command/admin/user/DeleteUserCmd.java   |      5 +-
 .../api/command/admin/user/DisableUserCmd.java  |     11 +-
 .../api/command/admin/user/EnableUserCmd.java   |      5 +-
 .../api/command/admin/user/UpdateUserCmd.java   |      5 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java    |    108 +
 .../admin/vlan/ReleasePublicIpRangeCmd.java     |     77 +
 .../api/command/admin/vm/AssignVMCmd.java       |      2 +-
 .../api/command/admin/vm/MigrateVMCmd.java      |      9 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java  |    161 +
 .../admin/vpc/CreatePrivateGatewayCmd.java      |     42 +-
 .../admin/vpc/DeletePrivateGatewayCmd.java      |     11 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java |      2 +-
 .../api/command/admin/zone/CreateZoneCmd.java   |      5 +-
 .../api/command/admin/zone/DeleteZoneCmd.java   |      5 +-
 .../zone/MarkDefaultZoneForAccountCmd.java      |      6 +-
 .../api/command/admin/zone/UpdateZoneCmd.java   |      5 +-
 .../user/account/AddAccountToProjectCmd.java    |      7 +-
 .../account/DeleteAccountFromProjectCmd.java    |      5 +-
 .../user/address/AssociateIPAddrCmd.java        |     96 +-
 .../user/address/DisassociateIPAddrCmd.java     |     29 +-
 .../user/address/ListPublicIpAddressesCmd.java  |      6 +-
 .../affinitygroup/CreateAffinityGroupCmd.java   |    168 +
 .../affinitygroup/DeleteAffinityGroupCmd.java   |    149 +
 .../ListAffinityGroupTypesCmd.java              |     67 +
 .../affinitygroup/ListAffinityGroupsCmd.java    |     91 +
 .../affinitygroup/UpdateVMAffinityGroupCmd.java |    165 +
 .../autoscale/CreateAutoScalePolicyCmd.java     |      6 +-
 .../autoscale/CreateAutoScaleVmGroupCmd.java    |      6 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |     15 +-
 .../user/autoscale/CreateConditionCmd.java      |     15 +-
 .../autoscale/DeleteAutoScalePolicyCmd.java     |     11 +-
 .../autoscale/DeleteAutoScaleVmGroupCmd.java    |     11 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java  |     11 +-
 .../user/autoscale/DeleteConditionCmd.java      |      6 +-
 .../autoscale/DisableAutoScaleVmGroupCmd.java   |      6 +-
 .../autoscale/EnableAutoScaleVmGroupCmd.java    |      6 +-
 .../user/autoscale/ListConditionsCmd.java       |      9 +-
 .../autoscale/UpdateAutoScalePolicyCmd.java     |     11 +-
 .../autoscale/UpdateAutoScaleVmGroupCmd.java    |     11 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java  |     11 +-
 .../user/config/ListCapabilitiesCmd.java        |      4 +-
 .../command/user/event/ArchiveEventsCmd.java    |     29 +-
 .../api/command/user/event/DeleteEventsCmd.java |     27 +-
 .../firewall/CreateEgressFirewallRuleCmd.java   |     17 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |     19 +-
 .../firewall/CreatePortForwardingRuleCmd.java   |     25 +-
 .../firewall/DeleteEgressFirewallRuleCmd.java   |     12 +-
 .../user/firewall/DeleteFirewallRuleCmd.java    |     11 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |     17 +-
 .../firewall/UpdatePortForwardingRuleCmd.java   |     19 +
 .../api/command/user/iso/AttachIsoCmd.java      |      5 +-
 .../api/command/user/iso/DeleteIsoCmd.java      |     11 +-
 .../api/command/user/iso/ExtractIsoCmd.java     |     18 +-
 .../api/command/user/iso/ListIsosCmd.java       |     22 +-
 .../api/command/user/iso/RegisterIsoCmd.java    |     18 +-
 .../api/command/user/iso/UpdateIsoCmd.java      |      4 +-
 .../AssignToLoadBalancerRuleCmd.java            |      5 +-
 .../CreateApplicationLoadBalancerCmd.java       |    219 +
 .../CreateLBHealthCheckPolicyCmd.java           |     10 +-
 .../CreateLBStickinessPolicyCmd.java            |     22 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |     37 +-
 .../DeleteApplicationLoadBalancerCmd.java       |    117 +
 .../DeleteLBHealthCheckPolicyCmd.java           |      8 +-
 .../DeleteLBStickinessPolicyCmd.java            |      7 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java |     11 +-
 .../ListApplicationLoadBalancersCmd.java        |    131 +
 .../ListLBHealthCheckPoliciesCmd.java           |      3 +-
 .../ListLBStickinessPoliciesCmd.java            |      5 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |     10 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java  |      9 +
 .../RemoveFromLoadBalancerRuleCmd.java          |      5 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java |     20 +-
 .../user/nat/CreateIpForwardingRuleCmd.java     |     17 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java     |     17 +-
 .../command/user/nat/EnableStaticNatCmd.java    |      8 +-
 .../user/network/CreateNetworkACLCmd.java       |    242 +-
 .../user/network/CreateNetworkACLListCmd.java   |    121 +
 .../command/user/network/CreateNetworkCmd.java  |     33 +-
 .../user/network/DeleteNetworkACLCmd.java       |     54 +-
 .../user/network/DeleteNetworkACLListCmd.java   |     93 +
 .../command/user/network/DeleteNetworkCmd.java  |      5 +-
 .../user/network/ListNetworkACLListsCmd.java    |    102 +
 .../user/network/ListNetworkACLsCmd.java        |     46 +-
 .../user/network/ReplaceNetworkACLListCmd.java  |    122 +
 .../user/network/UpdateNetworkACLItemCmd.java   |    175 +
 .../command/user/network/UpdateNetworkCmd.java  |     24 +-
 .../user/project/ActivateProjectCmd.java        |      5 +-
 .../command/user/project/CreateProjectCmd.java  |     11 +-
 .../command/user/project/DeleteProjectCmd.java  |      5 +-
 .../project/DeleteProjectInvitationCmd.java     |      5 +-
 .../command/user/project/SuspendProjectCmd.java |      5 +-
 .../command/user/project/UpdateProjectCmd.java  |      5 +-
 .../project/UpdateProjectInvitationCmd.java     |      5 +-
 .../gslb/AssignToGlobalLoadBalancerRuleCmd.java |     54 +-
 .../gslb/CreateGlobalLoadBalancerRuleCmd.java   |     26 +-
 .../gslb/DeleteGlobalLoadBalancerRuleCmd.java   |     25 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java  |      2 +-
 .../RemoveFromGlobalLoadBalancerRuleCmd.java    |      7 +-
 .../gslb/UpdateGlobalLoadBalancerRuleCmd.java   |     40 +-
 .../user/resource/ListResourceLimitsCmd.java    |     19 +-
 .../user/resource/UpdateResourceCountCmd.java   |      5 +-
 .../user/resource/UpdateResourceLimitCmd.java   |      5 +-
 .../AuthorizeSecurityGroupEgressCmd.java        |     15 +-
 .../AuthorizeSecurityGroupIngressCmd.java       |     22 +-
 .../securitygroup/CreateSecurityGroupCmd.java   |      9 +-
 .../securitygroup/DeleteSecurityGroupCmd.java   |      9 +-
 .../securitygroup/ListSecurityGroupsCmd.java    |      6 +-
 .../RevokeSecurityGroupEgressCmd.java           |     18 +-
 .../RevokeSecurityGroupIngressCmd.java          |     18 +-
 .../user/snapshot/CreateSnapshotCmd.java        |     31 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java  |      2 +-
 .../user/snapshot/DeleteSnapshotCmd.java        |     11 +-
 .../command/user/snapshot/ListSnapshotsCmd.java |     15 +-
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |      5 +-
 .../command/user/ssh/DeleteSSHKeyPairCmd.java   |      5 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java |      5 +-
 .../api/command/user/tag/CreateTagsCmd.java     |      2 +-
 .../api/command/user/tag/DeleteTagsCmd.java     |      2 +-
 .../api/command/user/tag/ListTagsCmd.java       |      2 +-
 .../command/user/template/CopyTemplateCmd.java  |     13 +-
 .../user/template/CreateTemplateCmd.java        |     47 +-
 .../user/template/DeleteTemplateCmd.java        |     10 +-
 .../user/template/ExtractTemplateCmd.java       |     17 +-
 .../command/user/template/ListTemplatesCmd.java |     27 +-
 .../user/template/RegisterTemplateCmd.java      |     38 +-
 .../user/template/UpdateTemplateCmd.java        |      5 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java    |     26 +-
 .../api/command/user/vm/AddNicToVMCmd.java      |      5 +-
 .../api/command/user/vm/DeployVMCmd.java        |     99 +-
 .../api/command/user/vm/DestroyVMCmd.java       |     11 +-
 .../api/command/user/vm/ListNicsCmd.java        |     14 +-
 .../api/command/user/vm/ListVMsCmd.java         |     26 +-
 .../api/command/user/vm/RebootVMCmd.java        |     11 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |     17 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java |      5 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java |     11 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java   |     11 +-
 .../api/command/user/vm/RestoreVMCmd.java       |     10 +-
 .../api/command/user/vm/ScaleVMCmd.java         |     28 +-
 .../api/command/user/vm/StartVMCmd.java         |     25 +-
 .../api/command/user/vm/StopVMCmd.java          |     11 +-
 .../user/vm/UpdateDefaultNicForVMCmd.java       |      5 +-
 .../api/command/user/vm/UpdateVMCmd.java        |     21 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |     11 +-
 .../command/user/vmgroup/CreateVMGroupCmd.java  |      8 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java    |      6 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java    |      7 +-
 .../user/vmsnapshot/ListVMSnapshotCmd.java      |      2 +-
 .../user/vmsnapshot/RevertToSnapshotCmd.java    |     92 -
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java  |     92 +
 .../user/volume/AddResourceDetailCmd.java       |    112 +
 .../command/user/volume/AttachVolumeCmd.java    |     11 +-
 .../command/user/volume/CreateVolumeCmd.java    |     48 +-
 .../command/user/volume/DeleteVolumeCmd.java    |      7 +-
 .../command/user/volume/DetachVolumeCmd.java    |     11 +-
 .../command/user/volume/ExtractVolumeCmd.java   |     56 +-
 .../user/volume/ListResourceDetailsCmd.java     |     75 +
 .../api/command/user/volume/ListVolumesCmd.java |      8 +-
 .../command/user/volume/MigrateVolumeCmd.java   |     30 +-
 .../user/volume/RemoveResourceDetailCmd.java    |    112 +
 .../command/user/volume/ResizeVolumeCmd.java    |     11 +-
 .../command/user/volume/UpdateVolumeCmd.java    |    113 +
 .../command/user/volume/UploadVolumeCmd.java    |     13 +-
 .../command/user/vpc/CreateStaticRouteCmd.java  |     20 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |     17 +-
 .../command/user/vpc/DeleteStaticRouteCmd.java  |     11 +-
 .../api/command/user/vpc/DeleteVPCCmd.java      |      9 +
 .../api/command/user/vpc/RestartVPCCmd.java     |     12 +-
 .../api/command/user/vpc/UpdateVPCCmd.java      |     14 +-
 .../api/command/user/vpn/AddVpnUserCmd.java     |      5 +-
 .../user/vpn/CreateVpnConnectionCmd.java        |     13 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |      5 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |      7 +-
 .../user/vpn/DeleteRemoteAccessVpnCmd.java      |      5 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java  |      7 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java |      5 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |      5 +-
 .../api/command/user/zone/ListZonesByCmd.java   |      8 +
 .../api/response/AccountResponse.java           |     88 +-
 ...ApplicationLoadBalancerInstanceResponse.java |     63 +
 .../ApplicationLoadBalancerResponse.java        |    142 +
 .../ApplicationLoadBalancerRuleResponse.java    |     51 +
 .../api/response/AsyncJobResponse.java          |      8 +-
 .../api/response/CapabilitiesResponse.java      |     10 +-
 .../api/response/ClusterResponse.java           |     27 +-
 .../api/response/ConfigurationResponse.java     |     15 +
 .../api/response/CreateCmdResponse.java         |      5 +
 .../response/DeploymentPlannersResponse.java    |     37 +
 .../api/response/DiskOfferingResponse.java      |     73 +
 .../api/response/DomainRouterResponse.java      |     13 +-
 .../api/response/ExceptionResponse.java         |     12 +-
 .../api/response/FirewallResponse.java          |      8 +-
 .../api/response/FirewallRuleResponse.java      |     12 +
 .../response/GlobalLoadBalancerResponse.java    |     18 +
 .../api/response/GuestVlanRangeResponse.java    |     94 +
 .../api/response/HostForMigrationResponse.java  |    365 +
 .../cloudstack/api/response/HostResponse.java   |      1 -
 .../HypervisorCapabilitiesResponse.java         |     32 +
 .../api/response/IPAddressResponse.java         |      7 +
 .../api/response/ImageStoreDetailResponse.java  |     86 +
 .../api/response/ImageStoreResponse.java        |    149 +
 .../InternalLoadBalancerElementResponse.java    |     51 +
 .../api/response/IsolationMethodResponse.java   |     33 +
 .../api/response/LDAPConfigResponse.java        |    105 -
 .../api/response/LDAPRemoveResponse.java        |     26 -
 .../api/response/LoadBalancerResponse.java      |     11 +-
 .../api/response/NetworkACLItemResponse.java    |    122 +
 .../api/response/NetworkACLResponse.java        |     78 +-
 .../api/response/NetworkOfferingResponse.java   |     22 +
 .../api/response/NetworkResponse.java           |     34 +-
 .../api/response/NicDetailResponse.java         |     81 +
 .../api/response/PortableIpRangeResponse.java   |     93 +
 .../api/response/PortableIpResponse.java        |    106 +
 .../api/response/PrivateGatewayResponse.java    |     19 +
 .../api/response/ProjectResponse.java           |    290 +-
 .../cloudstack/api/response/RegionResponse.java |     15 +-
 .../api/response/ResourceDetailResponse.java    |     81 +
 .../response/ResourceLimitAndCountResponse.java |     96 +
 .../cloudstack/api/response/S3Response.java     |    218 -
 .../api/response/SecurityGroupRuleResponse.java |      4 +-
 .../api/response/ServiceOfferingResponse.java   |     66 +-
 .../api/response/SnapshotResponse.java          |      8 +
 .../api/response/StoragePoolResponse.java       |     56 +-
 .../cloudstack/api/response/SwiftResponse.java  |     86 -
 .../api/response/TemplateResponse.java          |     38 +-
 .../api/response/TemplateZoneResponse.java      |    131 +
 .../api/response/UsageRecordResponse.java       |      7 +
 .../cloudstack/api/response/UserResponse.java   |      8 +
 .../cloudstack/api/response/UserVmResponse.java |    797 +-
 .../response/VirtualRouterProviderResponse.java |      1 +
 .../api/response/VolumeDetailResponse.java      |     82 +
 .../cloudstack/api/response/VolumeResponse.java |     72 +
 .../apache/cloudstack/context/CallContext.java  |    222 +
 api/src/org/apache/cloudstack/jobs/JobInfo.java |     81 +
 .../network/ExternalNetworkDeviceManager.java   |      2 +-
 .../InternalLoadBalancerElementService.java     |     56 +
 .../lb/ApplicationLoadBalancerContainer.java    |     28 +
 .../network/lb/ApplicationLoadBalancerRule.java |     24 +
 .../lb/ApplicationLoadBalancerService.java      |     42 +
 .../lb/InternalLoadBalancerVMService.java       |     34 +
 .../apache/cloudstack/query/QueryService.java   |     45 +-
 .../apache/cloudstack/region/PortableIp.java    |     58 +
 .../cloudstack/region/PortableIpRange.java      |     38 +
 .../org/apache/cloudstack/region/Region.java    |      4 +-
 api/src/org/apache/cloudstack/usage/Usage.java  |     15 +-
 .../org/apache/cloudstack/usage/UsageTypes.java |     10 +
 api/test/com/cloud/network/NetworksTest.java    |     87 +
 .../api/agent/test/AgentControlAnswerTest.java  |     35 -
 .../api/agent/test/AgentControlCommandTest.java |     33 -
 .../cloudstack/api/agent/test/AnswerTest.java   |     73 -
 .../api/agent/test/AttachIsoCommandTest.java    |     80 -
 .../api/agent/test/AttachVolumeAnswerTest.java  |     65 -
 .../api/agent/test/AttachVolumeCommandTest.java |    120 -
 .../agent/test/BackupSnapshotAnswerTest.java    |     75 -
 .../agent/test/BackupSnapshotCommandTest.java   |    301 -
 .../agent/test/BumpUpPriorityCommandTest.java   |     83 -
 .../api/agent/test/CancelCommandTest.java       |     46 -
 .../api/agent/test/ChangeAgentAnswerTest.java   |     44 -
 .../api/agent/test/ChangeAgentCommandTest.java  |     50 -
 .../api/agent/test/CheckHealthAnswerTest.java   |     49 -
 .../api/agent/test/CheckHealthCommandTest.java  |     40 -
 .../api/agent/test/CheckNetworkAnswerTest.java  |     62 -
 .../api/agent/test/CheckNetworkCommandTest.java |     53 -
 .../api/agent/test/CheckOnHostCommandTest.java  |    483 -
 .../api/agent/test/SnapshotCommandTest.java     |    209 -
 .../api/command/test/AddClusterCmdTest.java     |     15 +-
 .../api/command/test/AddHostCmdTest.java        |     29 +-
 .../api/command/test/AddIpToVmNicTest.java      |      6 +-
 .../test/AddSecondaryStorageCmdTest.java        |     67 +-
 .../api/command/test/AddSwiftCmdTest.java       |     97 -
 .../api/command/test/ListCfgCmdTest.java        |     92 +
 .../api/command/test/ScaleVMCmdTest.java        |     48 +-
 .../api/command/test/UpdateCfgCmdTest.java      |    119 +
 .../cloudstack/test/utils/SpringUtils.java      |    114 +
 .../agent/api/test/ResizeVolumeCommandTest.java |    229 -
 awsapi-setup/setup/cloudstack-aws-api-register  |      2 +-
 awsapi/conf/applicationContext.xml.in           |      2 +-
 awsapi/conf/ec2-service.properties.in           |      2 +-
 awsapi/pom.xml                                  |    202 +-
 awsapi/resource/AmazonEC2/services.xml          |    772 +-
 awsapi/src/com/amazon/ec2/ActivateLicense.java  |      8 +-
 .../com/amazon/ec2/ActivateLicenseResponse.java |      8 +-
 .../amazon/ec2/ActivateLicenseResponseType.java |     20 +-
 .../src/com/amazon/ec2/ActivateLicenseType.java |     20 +-
 awsapi/src/com/amazon/ec2/AllocateAddress.java  |      8 +-
 .../com/amazon/ec2/AllocateAddressResponse.java |      8 +-
 .../amazon/ec2/AllocateAddressResponseType.java |    219 +-
 .../src/com/amazon/ec2/AllocateAddressType.java |    124 +-
 .../com/amazon/ec2/AllocationIdSetItemType.java |    499 +
 .../src/com/amazon/ec2/AllocationIdSetType.java |    576 +
 .../ec2/AmazonEC2MessageReceiverInOut.java      |  10769 +-
 .../src/com/amazon/ec2/AmazonEC2Skeleton.java   |   1542 +-
 .../amazon/ec2/AmazonEC2SkeletonInterface.java  |   1258 +-
 .../amazon/ec2/AssignPrivateIpAddresses.java    |    378 +
 .../ec2/AssignPrivateIpAddressesResponse.java   |    378 +
 .../AssignPrivateIpAddressesResponseType.java   |    583 +
 ...ignPrivateIpAddressesSetItemRequestType.java |    499 +
 .../AssignPrivateIpAddressesSetRequestType.java |    564 +
 .../ec2/AssignPrivateIpAddressesType.java       |    771 +
 awsapi/src/com/amazon/ec2/AssociateAddress.java |      8 +-
 .../amazon/ec2/AssociateAddressResponse.java    |      8 +-
 .../ec2/AssociateAddressResponseType.java       |    131 +-
 .../com/amazon/ec2/AssociateAddressType.java    |    271 +-
 .../ec2/AssociateAddressTypeChoice_type0.java   |    561 +
 .../ec2/AssociateAddressTypeChoice_type1.java   |    561 +
 .../com/amazon/ec2/AssociateDhcpOptions.java    |      8 +-
 .../ec2/AssociateDhcpOptionsResponse.java       |      8 +-
 .../ec2/AssociateDhcpOptionsResponseType.java   |     20 +-
 .../amazon/ec2/AssociateDhcpOptionsType.java    |     20 +-
 .../src/com/amazon/ec2/AssociateRouteTable.java |    378 +
 .../amazon/ec2/AssociateRouteTableResponse.java |    378 +
 .../ec2/AssociateRouteTableResponseType.java    |    591 +
 .../com/amazon/ec2/AssociateRouteTableType.java |    591 +
 .../com/amazon/ec2/AttachInternetGateway.java   |    378 +
 .../ec2/AttachInternetGatewayResponse.java      |    378 +
 .../ec2/AttachInternetGatewayResponseType.java  |    583 +
 .../amazon/ec2/AttachInternetGatewayType.java   |    591 +
 .../com/amazon/ec2/AttachNetworkInterface.java  |    378 +
 .../ec2/AttachNetworkInterfaceResponse.java     |    378 +
 .../ec2/AttachNetworkInterfaceResponseType.java |    591 +
 .../amazon/ec2/AttachNetworkInterfaceType.java  |    675 +
 awsapi/src/com/amazon/ec2/AttachVolume.java     |      8 +-
 .../com/amazon/ec2/AttachVolumeResponse.java    |      8 +-
 .../amazon/ec2/AttachVolumeResponseType.java    |     44 +-
 awsapi/src/com/amazon/ec2/AttachVolumeType.java |     26 +-
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java |      8 +-
 .../amazon/ec2/AttachVpnGatewayResponse.java    |      8 +-
 .../ec2/AttachVpnGatewayResponseType.java       |     20 +-
 .../com/amazon/ec2/AttachVpnGatewayType.java    |     20 +-
 .../ec2/AttachmentSetItemResponseType.java      |     44 +-
 .../amazon/ec2/AttachmentSetResponseType.java   |     16 +-
 .../src/com/amazon/ec2/AttachmentSetType.java   |     16 +-
 awsapi/src/com/amazon/ec2/AttachmentType.java   |     20 +-
 .../amazon/ec2/AttributeBooleanValueType.java   |     14 +-
 .../src/com/amazon/ec2/AttributeValueType.java  |     14 +-
 .../ec2/AuthorizeSecurityGroupEgress.java       |    378 +
 .../AuthorizeSecurityGroupEgressResponse.java   |    378 +
 ...uthorizeSecurityGroupEgressResponseType.java |    583 +
 .../ec2/AuthorizeSecurityGroupEgressType.java   |    560 +
 .../ec2/AuthorizeSecurityGroupIngress.java      |      8 +-
 .../AuthorizeSecurityGroupIngressResponse.java  |      8 +-
 ...thorizeSecurityGroupIngressResponseType.java |     20 +-
 .../ec2/AuthorizeSecurityGroupIngressType.java  |    138 +-
 ...izeSecurityGroupIngressTypeChoice_type0.java |    561 +
 .../amazon/ec2/AvailabilityZoneItemType.java    |     32 +-
 .../ec2/AvailabilityZoneMessageSetType.java     |     16 +-
 .../amazon/ec2/AvailabilityZoneMessageType.java |     14 +-
 .../com/amazon/ec2/AvailabilityZoneSetType.java |     16 +-
 .../amazon/ec2/BlockDeviceMappingItemType.java  |     16 +-
 .../BlockDeviceMappingItemTypeChoice_type0.java |     26 +-
 .../com/amazon/ec2/BlockDeviceMappingType.java  |     16 +-
 awsapi/src/com/amazon/ec2/BundleInstance.java   |      8 +-
 .../com/amazon/ec2/BundleInstanceResponse.java  |      8 +-
 .../amazon/ec2/BundleInstanceResponseType.java  |     20 +-
 .../amazon/ec2/BundleInstanceS3StorageType.java |     38 +-
 .../amazon/ec2/BundleInstanceTaskErrorType.java |     20 +-
 .../ec2/BundleInstanceTaskStorageType.java      |     14 +-
 .../com/amazon/ec2/BundleInstanceTaskType.java  |     56 +-
 .../amazon/ec2/BundleInstanceTasksSetType.java  |     16 +-
 .../src/com/amazon/ec2/BundleInstanceType.java  |     20 +-
 awsapi/src/com/amazon/ec2/CancelBundleTask.java |      8 +-
 .../amazon/ec2/CancelBundleTaskResponse.java    |      8 +-
 .../ec2/CancelBundleTaskResponseType.java       |     20 +-
 .../com/amazon/ec2/CancelBundleTaskType.java    |     14 +-
 .../com/amazon/ec2/CancelConversionTask.java    |      8 +-
 .../ec2/CancelConversionTaskResponse.java       |      8 +-
 .../ec2/CancelConversionTaskResponseType.java   |     20 +-
 .../amazon/ec2/CancelConversionTaskType.java    |     14 +-
 awsapi/src/com/amazon/ec2/CancelExportTask.java |    378 +
 .../amazon/ec2/CancelExportTaskResponse.java    |    378 +
 .../ec2/CancelExportTaskResponseType.java       |    583 +
 .../com/amazon/ec2/CancelExportTaskType.java    |    499 +
 .../ec2/CancelReservedInstancesListing.java     |    378 +
 .../CancelReservedInstancesListingResponse.java |    378 +
 ...celReservedInstancesListingResponseType.java |    560 +
 .../ec2/CancelReservedInstancesListingType.java |    499 +
 .../amazon/ec2/CancelSpotInstanceRequests.java  |      8 +-
 .../ec2/CancelSpotInstanceRequestsResponse.java |      8 +-
 ...SpotInstanceRequestsResponseSetItemType.java |     20 +-
 ...ncelSpotInstanceRequestsResponseSetType.java |     16 +-
 .../CancelSpotInstanceRequestsResponseType.java |     20 +-
 .../ec2/CancelSpotInstanceRequestsType.java     |     14 +-
 .../com/amazon/ec2/ConfirmProductInstance.java  |      8 +-
 .../ec2/ConfirmProductInstanceResponse.java     |      8 +-
 .../ec2/ConfirmProductInstanceResponseType.java |     26 +-
 .../amazon/ec2/ConfirmProductInstanceType.java  |     20 +-
 .../amazon/ec2/ConversionTaskIdItemType.java    |     45 +-
 .../com/amazon/ec2/ConversionTaskIdSetType.java |     16 +-
 .../com/amazon/ec2/ConversionTaskSetType.java   |     16 +-
 .../src/com/amazon/ec2/ConversionTaskType.java  |    110 +-
 .../ec2/ConversionTaskTypeChoice_type0.java     |     20 +-
 .../com/amazon/ec2/CreateCustomerGateway.java   |      8 +-
 .../ec2/CreateCustomerGatewayResponse.java      |      8 +-
 .../ec2/CreateCustomerGatewayResponseType.java  |     20 +-
 .../amazon/ec2/CreateCustomerGatewayType.java   |     60 +-
 .../src/com/amazon/ec2/CreateDhcpOptions.java   |      8 +-
 .../amazon/ec2/CreateDhcpOptionsResponse.java   |      8 +-
 .../ec2/CreateDhcpOptionsResponseType.java      |     20 +-
 .../com/amazon/ec2/CreateDhcpOptionsType.java   |     14 +-
 awsapi/src/com/amazon/ec2/CreateImage.java      |      8 +-
 .../src/com/amazon/ec2/CreateImageResponse.java |      8 +-
 .../com/amazon/ec2/CreateImageResponseType.java |     20 +-
 awsapi/src/com/amazon/ec2/CreateImageType.java  |    110 +-
 .../amazon/ec2/CreateInstanceExportTask.java    |    378 +
 .../ec2/CreateInstanceExportTaskResponse.java   |    378 +
 .../CreateInstanceExportTaskResponseType.java   |    560 +
 .../ec2/CreateInstanceExportTaskType.java       |    749 +
 ...reateInstanceExportTaskTypeChoice_type0.java |    426 +
 .../com/amazon/ec2/CreateInternetGateway.java   |    378 +
 .../ec2/CreateInternetGatewayResponse.java      |    378 +
 .../ec2/CreateInternetGatewayResponseType.java  |    560 +
 .../amazon/ec2/CreateInternetGatewayType.java   |    400 +
 awsapi/src/com/amazon/ec2/CreateKeyPair.java    |      8 +-
 .../com/amazon/ec2/CreateKeyPairResponse.java   |      8 +-
 .../amazon/ec2/CreateKeyPairResponseType.java   |     32 +-
 .../src/com/amazon/ec2/CreateKeyPairType.java   |     14 +-
 awsapi/src/com/amazon/ec2/CreateNetworkAcl.java |    378 +
 .../com/amazon/ec2/CreateNetworkAclEntry.java   |    378 +
 .../ec2/CreateNetworkAclEntryResponse.java      |    378 +
 .../ec2/CreateNetworkAclEntryResponseType.java  |    583 +
 .../amazon/ec2/CreateNetworkAclEntryType.java   |   1091 +
 .../amazon/ec2/CreateNetworkAclResponse.java    |    378 +
 .../ec2/CreateNetworkAclResponseType.java       |    560 +
 .../com/amazon/ec2/CreateNetworkAclType.java    |    499 +
 .../com/amazon/ec2/CreateNetworkInterface.java  |    378 +
 .../ec2/CreateNetworkInterfaceResponse.java     |    378 +
 .../ec2/CreateNetworkInterfaceResponseType.java |    560 +
 .../amazon/ec2/CreateNetworkInterfaceType.java  |    957 +
 .../com/amazon/ec2/CreatePlacementGroup.java    |      8 +-
 .../ec2/CreatePlacementGroupResponse.java       |      8 +-
 .../ec2/CreatePlacementGroupResponseType.java   |     20 +-
 .../amazon/ec2/CreatePlacementGroupType.java    |     20 +-
 .../ec2/CreateReservedInstancesListing.java     |    378 +
 .../CreateReservedInstancesListingResponse.java |    378 +
 ...ateReservedInstancesListingResponseType.java |    560 +
 .../ec2/CreateReservedInstancesListingType.java |    752 +
 awsapi/src/com/amazon/ec2/CreateRoute.java      |    378 +
 .../src/com/amazon/ec2/CreateRouteResponse.java |    378 +
 .../com/amazon/ec2/CreateRouteResponseType.java |    583 +
 awsapi/src/com/amazon/ec2/CreateRouteTable.java |    378 +
 .../amazon/ec2/CreateRouteTableResponse.java    |    378 +
 .../ec2/CreateRouteTableResponseType.java       |    560 +
 .../com/amazon/ec2/CreateRouteTableType.java    |    499 +
 awsapi/src/com/amazon/ec2/CreateRouteType.java  |    644 +
 .../amazon/ec2/CreateRouteTypeChoice_type0.java |    665 +
 .../src/com/amazon/ec2/CreateSecurityGroup.java |      8 +-
 .../amazon/ec2/CreateSecurityGroupResponse.java |      8 +-
 .../ec2/CreateSecurityGroupResponseType.java    |    112 +-
 .../com/amazon/ec2/CreateSecurityGroupType.java |    131 +-
 awsapi/src/com/amazon/ec2/CreateSnapshot.java   |      8 +-
 .../com/amazon/ec2/CreateSnapshotResponse.java  |      8 +-
 .../amazon/ec2/CreateSnapshotResponseType.java  |     62 +-
 .../src/com/amazon/ec2/CreateSnapshotType.java  |     20 +-
 .../ec2/CreateSpotDatafeedSubscription.java     |      8 +-
 .../CreateSpotDatafeedSubscriptionResponse.java |      8 +-
 ...ateSpotDatafeedSubscriptionResponseType.java |     20 +-
 .../ec2/CreateSpotDatafeedSubscriptionType.java |     20 +-
 awsapi/src/com/amazon/ec2/CreateSubnet.java     |      8 +-
 .../com/amazon/ec2/CreateSubnetResponse.java    |      8 +-
 .../amazon/ec2/CreateSubnetResponseType.java    |     20 +-
 awsapi/src/com/amazon/ec2/CreateSubnetType.java |     26 +-
 awsapi/src/com/amazon/ec2/CreateTags.java       |      8 +-
 .../src/com/amazon/ec2/CreateTagsResponse.java  |      8 +-
 .../com/amazon/ec2/CreateTagsResponseType.java  |     20 +-
 awsapi/src/com/amazon/ec2/CreateTagsType.java   |     20 +-
 awsapi/src/com/amazon/ec2/CreateVolume.java     |      8 +-
 .../ec2/CreateVolumePermissionItemType.java     |     20 +-
 .../ec2/CreateVolumePermissionListType.java     |     16 +-
 .../CreateVolumePermissionOperationType.java    |     20 +-
 .../com/amazon/ec2/CreateVolumeResponse.java    |      8 +-
 .../amazon/ec2/CreateVolumeResponseType.java    |    244 +-
 awsapi/src/com/amazon/ec2/CreateVolumeType.java |    237 +-
 awsapi/src/com/amazon/ec2/CreateVpc.java        |      8 +-
 .../src/com/amazon/ec2/CreateVpcResponse.java   |      8 +-
 .../com/amazon/ec2/CreateVpcResponseType.java   |     20 +-
 awsapi/src/com/amazon/ec2/CreateVpcType.java    |    125 +-
 .../src/com/amazon/ec2/CreateVpnConnection.java |      8 +-
 .../amazon/ec2/CreateVpnConnectionResponse.java |      8 +-
 .../ec2/CreateVpnConnectionResponseType.java    |     20 +-
 .../amazon/ec2/CreateVpnConnectionRoute.java    |    378 +
 .../ec2/CreateVpnConnectionRouteResponse.java   |    378 +
 .../CreateVpnConnectionRouteResponseType.java   |    583 +
 .../ec2/CreateVpnConnectionRouteType.java       |    591 +
 .../com/amazon/ec2/CreateVpnConnectionType.java |    106 +-
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java |      8 +-
 .../amazon/ec2/CreateVpnGatewayResponse.java    |      8 +-
 .../ec2/CreateVpnGatewayResponseType.java       |     20 +-
 .../com/amazon/ec2/CreateVpnGatewayType.java    |     20 +-
 .../ec2/CustomerGatewayIdSetItemType.java       |     14 +-
 .../amazon/ec2/CustomerGatewayIdSetType.java    |     16 +-
 .../com/amazon/ec2/CustomerGatewaySetType.java  |     16 +-
 .../src/com/amazon/ec2/CustomerGatewayType.java |     78 +-
 .../src/com/amazon/ec2/DeactivateLicense.java   |      8 +-
 .../amazon/ec2/DeactivateLicenseResponse.java   |      8 +-
 .../ec2/DeactivateLicenseResponseType.java      |     20 +-
 .../com/amazon/ec2/DeactivateLicenseType.java   |     20 +-
 .../com/amazon/ec2/DeleteCustomerGateway.java   |      8 +-
 .../ec2/DeleteCustomerGatewayResponse.java      |      8 +-
 .../ec2/DeleteCustomerGatewayResponseType.java  |     20 +-
 .../amazon/ec2/DeleteCustomerGatewayType.java   |     14 +-
 .../src/com/amazon/ec2/DeleteDhcpOptions.java   |      8 +-
 .../amazon/ec2/DeleteDhcpOptionsResponse.java   |      8 +-
 .../ec2/DeleteDhcpOptionsResponseType.java      |     20 +-
 .../com/amazon/ec2/DeleteDhcpOptionsType.java   |     14 +-
 .../com/amazon/ec2/DeleteInternetGateway.java   |    378 +
 .../ec2/DeleteInternetGatewayResponse.java      |    378 +
 .../ec2/DeleteInternetGatewayResponseType.java  |    583 +
 .../amazon/ec2/DeleteInternetGatewayType.java   |    499 +
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java    |      8 +-
 .../com/amazon/ec2/DeleteKeyPairResponse.java   |      8 +-
 .../amazon/ec2/DeleteKeyPairResponseType.java   |     20 +-
 .../src/com/amazon/ec2/DeleteKeyPairType.java   |     14 +-
 awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java |    378 +
 .../com/amazon/ec2/DeleteNetworkAclEntry.java   |    378 +
 .../ec2/DeleteNetworkAclEntryResponse.java      |    378 +
 .../ec2/DeleteNetworkAclEntryResponseType.java  |    583 +
 .../amazon/ec2/DeleteNetworkAclEntryType.java   |    667 +
 .../amazon/ec2/DeleteNetworkAclResponse.java    |    378 +
 .../ec2/DeleteNetworkAclResponseType.java       |    583 +
 .../com/amazon/ec2/DeleteNetworkAclType.java    |    499 +
 .../com/amazon/ec2/DeleteNetworkInterface.java  |    378 +
 .../ec2/DeleteNetworkInterfaceResponse.java     |    378 +
 .../ec2/DeleteNetworkInterfaceResponseType.java |    583 +
 .../amazon/ec2/DeleteNetworkInterfaceType.java  |    499 +
 .../com/amazon/ec2/DeletePlacementGroup.java    |      8 +-
 .../ec2/DeletePlacementGroupResponse.java       |      8 +-
 .../ec2/DeletePlacementGroupResponseType.java   |     20 +-
 .../amazon/ec2/DeletePlacementGroupType.java    |     14 +-
 awsapi/src/com/amazon/ec2/DeleteRoute.java      |    378 +
 .../src/com/amazon/ec2/DeleteRouteResponse.java |    378 +
 .../com/amazon/ec2/DeleteRouteResponseType.java |    583 +
 awsapi/src/com/amazon/ec2/DeleteRouteTable.java |    378 +
 .../amazon/ec2/DeleteRouteTableResponse.java    |    378 +
 .../ec2/DeleteRouteTableResponseType.java       |    583 +
 .../com/amazon/ec2/DeleteRouteTableType.java    |    499 +
 awsapi/src/com/amazon/ec2/DeleteRouteType.java  |    591 +
 .../src/com/amazon/ec2/DeleteSecurityGroup.java |      8 +-
 .../amazon/ec2/DeleteSecurityGroupResponse.java |      8 +-
 .../ec2/DeleteSecurityGroupResponseType.java    |     20 +-
 .../com/amazon/ec2/DeleteSecurityGroupType.java |    168 +-
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java   |      8 +-
 .../com/amazon/ec2/DeleteSnapshotResponse.java  |      8 +-
 .../amazon/ec2/DeleteSnapshotResponseType.java  |     20 +-
 .../src/com/amazon/ec2/DeleteSnapshotType.java  |     14 +-
 .../ec2/DeleteSpotDatafeedSubscription.java     |      8 +-
 .../DeleteSpotDatafeedSubscriptionResponse.java |      8 +-
 ...eteSpotDatafeedSubscriptionResponseType.java |     20 +-
 .../ec2/DeleteSpotDatafeedSubscriptionType.java |      8 +-
 awsapi/src/com/amazon/ec2/DeleteSubnet.java     |      8 +-
 .../com/amazon/ec2/DeleteSubnetResponse.java    |      8 +-
 .../amazon/ec2/DeleteSubnetResponseType.java    |     20 +-
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java |     14 +-
 awsapi/src/com/amazon/ec2/DeleteTags.java       |      8 +-
 .../src/com/amazon/ec2/DeleteTagsResponse.java  |      8 +-
 .../com/amazon/ec2/DeleteTagsResponseType.java  |     20 +-
 .../com/amazon/ec2/DeleteTagsSetItemType.java   |     20 +-
 .../src/com/amazon/ec2/DeleteTagsSetType.java   |     16 +-
 awsapi/src/com/amazon/ec2/DeleteTagsType.java   |     20 +-
 awsapi/src/com/amazon/ec2/DeleteVolume.java     |      8 +-
 .../com/amazon/ec2/DeleteVolumeResponse.java    |      8 +-
 .../amazon/ec2/DeleteVolumeResponseType.java    |     20 +-
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java |     14 +-
 awsapi/src/com/amazon/ec2/DeleteVpc.java        |      8 +-
 .../src/com/amazon/ec2/DeleteVpcResponse.java   |      8 +-
 .../com/amazon/ec2/DeleteVpcResponseType.java   |     20 +-
 awsapi/src/com/amazon/ec2/DeleteVpcType.java    |     14 +-
 .../src/com/amazon/ec2/DeleteVpnConnection.java |      8 +-
 .../amazon/ec2/DeleteVpnConnectionResponse.java |      8 +-
 .../ec2/DeleteVpnConnectionResponseType.java    |     20 +-
 .../amazon/ec2/DeleteVpnConnectionRoute.java    |    378 +
 .../ec2/DeleteVpnConnectionRouteResponse.java   |    378 +
 .../DeleteVpnConnectionRouteResponseType.java   |    583 +
 .../ec2/DeleteVpnConnectionRouteType.java       |    591 +
 .../com/amazon/ec2/DeleteVpnConnectionType.java |     14 +-
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java |      8 +-
 .../amazon/ec2/DeleteVpnGatewayResponse.java    |      8 +-
 .../ec2/DeleteVpnGatewayResponseType.java       |     20 +-
 .../com/amazon/ec2/DeleteVpnGatewayType.java    |     14 +-
 awsapi/src/com/amazon/ec2/DeregisterImage.java  |      8 +-
 .../com/amazon/ec2/DeregisterImageResponse.java |      8 +-
 .../amazon/ec2/DeregisterImageResponseType.java |     20 +-
 .../src/com/amazon/ec2/DeregisterImageType.java |     14 +-
 .../src/com/amazon/ec2/DescribeAddresses.java   |      8 +-
 .../amazon/ec2/DescribeAddressesInfoType.java   |     16 +-
 .../amazon/ec2/DescribeAddressesItemType.java   |     14 +-
 .../amazon/ec2/DescribeAddressesResponse.java   |      8 +-
 .../ec2/DescribeAddressesResponseInfoType.java  |     16 +-
 .../ec2/DescribeAddressesResponseItemType.java  |    637 +-
 .../ec2/DescribeAddressesResponseType.java      |     20 +-
 .../com/amazon/ec2/DescribeAddressesType.java   |     81 +-
 .../amazon/ec2/DescribeAvailabilityZones.java   |      8 +-
 .../ec2/DescribeAvailabilityZonesResponse.java  |      8 +-
 .../DescribeAvailabilityZonesResponseType.java  |     20 +-
 .../DescribeAvailabilityZonesSetItemType.java   |     14 +-
 .../ec2/DescribeAvailabilityZonesSetType.java   |     16 +-
 .../ec2/DescribeAvailabilityZonesType.java      |     20 +-
 .../src/com/amazon/ec2/DescribeBundleTasks.java |      8 +-
 .../amazon/ec2/DescribeBundleTasksInfoType.java |     16 +-
 .../amazon/ec2/DescribeBundleTasksItemType.java |     14 +-
 .../amazon/ec2/DescribeBundleTasksResponse.java |      8 +-
 .../ec2/DescribeBundleTasksResponseType.java    |     20 +-
 .../com/amazon/ec2/DescribeBundleTasksType.java |     20 +-
 .../com/amazon/ec2/DescribeConversionTasks.java |      8 +-
 .../ec2/DescribeConversionTasksResponse.java    |      8 +-
 .../DescribeConversionTasksResponseType.java    |    106 +-
 .../amazon/ec2/DescribeConversionTasksType.java |     14 +-
 .../amazon/ec2/DescribeCustomerGateways.java    |      8 +-
 .../ec2/DescribeCustomerGatewaysResponse.java   |      8 +-
 .../DescribeCustomerGatewaysResponseType.java   |     20 +-
 .../ec2/DescribeCustomerGatewaysType.java       |     20 +-
 .../src/com/amazon/ec2/DescribeDhcpOptions.java |      8 +-
 .../amazon/ec2/DescribeDhcpOptionsResponse.java |      8 +-
 .../ec2/DescribeDhcpOptionsResponseType.java    |     20 +-
 .../com/amazon/ec2/DescribeDhcpOptionsType.java |     20 +-
 .../src/com/amazon/ec2/DescribeExportTasks.java |    378 +
 .../amazon/ec2/DescribeExportTasksResponse.java |    378 +
 .../ec2/DescribeExportTasksResponseType.java    |    560 +
 .../com/amazon/ec2/DescribeExportTasksType.java |    468 +
 .../com/amazon/ec2/DescribeImageAttribute.java  |      8 +-
 .../ec2/DescribeImageAttributeResponse.java     |      8 +-
 .../ec2/DescribeImageAttributeResponseType.java |     22 +-
 ...eImageAttributeResponseTypeChoice_type0.java |     54 +-
 .../amazon/ec2/DescribeImageAttributeType.java  |     16 +-
 .../ec2/DescribeImageAttributesGroup.java       |    117 +-
 awsapi/src/com/amazon/ec2/DescribeImages.java   |      8 +-
 .../ec2/DescribeImagesExecutableBySetType.java  |     16 +-
 .../ec2/DescribeImagesExecutableByType.java     |     14 +-
 .../com/amazon/ec2/DescribeImagesInfoType.java  |     16 +-
 .../com/amazon/ec2/DescribeImagesItemType.java  |     14 +-
 .../com/amazon/ec2/DescribeImagesOwnerType.java |     14 +-
 .../amazon/ec2/DescribeImagesOwnersType.java    |     16 +-
 .../com/amazon/ec2/DescribeImagesResponse.java  |      8 +-
 .../ec2/DescribeImagesResponseInfoType.java     |     16 +-
 .../ec2/DescribeImagesResponseItemType.java     |    134 +-
 .../amazon/ec2/DescribeImagesResponseType.java  |     20 +-
 .../src/com/amazon/ec2/DescribeImagesType.java  |     32 +-
 .../amazon/ec2/DescribeInstanceAttribute.java   |      8 +-
 .../ec2/DescribeInstanceAttributeResponse.java  |      8 +-
 .../DescribeInstanceAttributeResponseType.java  |     22 +-
 ...stanceAttributeResponseTypeChoice_type0.java |    348 +-
 .../ec2/DescribeInstanceAttributeType.java      |     16 +-
 .../ec2/DescribeInstanceAttributesGroup.java    |    348 +-
 .../com/amazon/ec2/DescribeInstanceStatus.java  |    378 +
 .../ec2/DescribeInstanceStatusResponse.java     |    378 +
 .../ec2/DescribeInstanceStatusResponseType.java |    665 +
 .../amazon/ec2/DescribeInstanceStatusType.java  |    845 +
 .../src/com/amazon/ec2/DescribeInstances.java   |      8 +-
 .../amazon/ec2/DescribeInstancesInfoType.java   |     16 +-
 .../amazon/ec2/DescribeInstancesItemType.java   |     14 +-
 .../amazon/ec2/DescribeInstancesResponse.java   |      8 +-
 .../ec2/DescribeInstancesResponseType.java      |     20 +-
 .../com/amazon/ec2/DescribeInstancesType.java   |     20 +-
 .../amazon/ec2/DescribeInternetGateways.java    |    378 +
 .../ec2/DescribeInternetGatewaysResponse.java   |    378 +
 .../DescribeInternetGatewaysResponseType.java   |    560 +
 .../ec2/DescribeInternetGatewaysType.java       |    542 +
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java |      8 +-
 .../amazon/ec2/DescribeKeyPairsInfoType.java    |     16 +-
 .../amazon/ec2/DescribeKeyPairsItemType.java    |     14 +-
 .../amazon/ec2/DescribeKeyPairsResponse.java    |      8 +-
 .../ec2/DescribeKeyPairsResponseInfoType.java   |     16 +-
 .../ec2/DescribeKeyPairsResponseItemType.java   |     20 +-
 .../ec2/DescribeKeyPairsResponseType.java       |     20 +-
 .../com/amazon/ec2/DescribeKeyPairsType.java    |     20 +-
 awsapi/src/com/amazon/ec2/DescribeLicenses.java |      8 +-
 .../amazon/ec2/DescribeLicensesResponse.java    |      8 +-
 .../ec2/DescribeLicensesResponseType.java       |     20 +-
 .../com/amazon/ec2/DescribeLicensesType.java    |     20 +-
 .../src/com/amazon/ec2/DescribeNetworkAcls.java |    378 +
 .../amazon/ec2/DescribeNetworkAclsResponse.java |    378 +
 .../ec2/DescribeNetworkAclsResponseType.java    |    560 +
 .../com/amazon/ec2/DescribeNetworkAclsType.java |    542 +
 .../ec2/DescribeNetworkInterfaceAttribute.java  |    378 +
 ...scribeNetworkInterfaceAttributeResponse.java |    378 +
 ...beNetworkInterfaceAttributeResponseType.java |    644 +
 ...erfaceAttributeResponseTypeChoice_type0.java |    645 +
 .../DescribeNetworkInterfaceAttributeType.java  |    552 +
 ...DescribeNetworkInterfaceAttributesGroup.java |    645 +
 .../amazon/ec2/DescribeNetworkInterfaces.java   |    378 +
 .../ec2/DescribeNetworkInterfacesResponse.java  |    378 +
 .../DescribeNetworkInterfacesResponseType.java  |    560 +
 .../ec2/DescribeNetworkInterfacesType.java      |    555 +
 .../ec2/DescribePlacementGroupItemType.java     |     14 +-
 .../com/amazon/ec2/DescribePlacementGroups.java |      8 +-
 .../ec2/DescribePlacementGroupsInfoType.java    |     16 +-
 .../ec2/DescribePlacementGroupsResponse.java    |      8 +-
 .../DescribePlacementGroupsResponseType.java    |     20 +-
 .../amazon/ec2/DescribePlacementGroupsType.java |     20 +-
 awsapi/src/com/amazon/ec2/DescribeRegions.java  |      8 +-
 .../com/amazon/ec2/DescribeRegionsResponse.java |      8 +-
 .../amazon/ec2/DescribeRegionsResponseType.java |     20 +-
 .../amazon/ec2/DescribeRegionsSetItemType.java  |     14 +-
 .../com/amazon/ec2/DescribeRegionsSetType.java  |     16 +-
 .../src/com/amazon/ec2/DescribeRegionsType.java |     20 +-
 .../amazon/ec2/DescribeReservedInstances.java   |      8 +-
 ...ribeReservedInstancesListingSetItemType.java |    499 +
 ...DescribeReservedInstancesListingSetType.java |    564 +
 .../ec2/DescribeReservedInstancesListings.java  |    378 +
 ...scribeReservedInstancesListingsResponse.java |    378 +
 ...vedInstancesListingsResponseSetItemType.java |   1260 +
 ...eservedInstancesListingsResponseSetType.java |    576 +
 ...beReservedInstancesListingsResponseType.java |    560 +
 .../DescribeReservedInstancesListingsType.java  |    629 +
 .../ec2/DescribeReservedInstancesOfferings.java |      8 +-
 ...cribeReservedInstancesOfferingsResponse.java |      8 +-
 ...edInstancesOfferingsResponseSetItemType.java |    561 +-
 ...servedInstancesOfferingsResponseSetType.java |     16 +-
 ...eReservedInstancesOfferingsResponseType.java |    129 +-
 ...beReservedInstancesOfferingsSetItemType.java |     14 +-
 ...scribeReservedInstancesOfferingsSetType.java |     16 +-
 .../DescribeReservedInstancesOfferingsType.java |    905 +-
 .../ec2/DescribeReservedInstancesResponse.java  |      8 +-
 ...ibeReservedInstancesResponseSetItemType.java |    424 +-
 ...escribeReservedInstancesResponseSetType.java |     16 +-
 .../DescribeReservedInstancesResponseType.java  |     20 +-
 .../DescribeReservedInstancesSetItemType.java   |     14 +-
 .../ec2/DescribeReservedInstancesSetType.java   |     16 +-
 .../ec2/DescribeReservedInstancesType.java      |    127 +-
 .../src/com/amazon/ec2/DescribeRouteTables.java |    378 +
 .../amazon/ec2/DescribeRouteTablesResponse.java |    378 +
 .../ec2/DescribeRouteTablesResponseType.java    |    560 +
 .../com/amazon/ec2/DescribeRouteTablesType.java |    542 +
 .../com/amazon/ec2/DescribeSecurityGroups.java  |      8 +-
 .../DescribeSecurityGroupsIdSetItemType.java    |    499 +
 .../ec2/DescribeSecurityGroupsIdSetType.java    |    576 +
 .../ec2/DescribeSecurityGroupsResponse.java     |      8 +-
 .../ec2/DescribeSecurityGroupsResponseType.java |     20 +-
 .../ec2/DescribeSecurityGroupsSetItemType.java  |     14 +-
 .../ec2/DescribeSecurityGroupsSetType.java      |     16 +-
 .../amazon/ec2/DescribeSecurityGroupsType.java  |     98 +-
 .../amazon/ec2/DescribeSnapshotAttribute.java   |      8 +-
 .../ec2/DescribeSnapshotAttributeResponse.java  |      8 +-
 .../DescribeSnapshotAttributeResponseType.java  |     68 +-
 ...apshotAttributeResponseTypeChoice_type0.java |    499 +
 .../ec2/DescribeSnapshotAttributeType.java      |     16 +-
 .../ec2/DescribeSnapshotAttributesGroup.java    |     87 +-
 .../src/com/amazon/ec2/DescribeSnapshots.java   |      8 +-
 .../amazon/ec2/DescribeSnapshotsOwnerType.java  |     14 +-
 .../amazon/ec2/DescribeSnapshotsOwnersType.java |     16 +-
 .../amazon/ec2/DescribeSnapshotsResponse.java   |      8 +-
 .../ec2/DescribeSnapshotsResponseType.java      |     20 +-
 .../DescribeSnapshotsRestorableBySetType.java   |     16 +-
 .../ec2/DescribeSnapshotsRestorableByType.java  |     14 +-
 .../DescribeSnapshotsSetItemResponseType.java   |     68 +-
 .../ec2/DescribeSnapshotsSetItemType.java       |     14 +-
 .../ec2/DescribeSnapshotsSetResponseType.java   |     16 +-
 .../amazon/ec2/DescribeSnapshotsSetType.java    |     16 +-
 .../com/amazon/ec2/DescribeSnapshotsType.java   |     32 +-
 .../ec2/DescribeSpotDatafeedSubscription.java   |      8 +-
 ...escribeSpotDatafeedSubscriptionResponse.java |      8 +-
 ...ibeSpotDatafeedSubscriptionResponseType.java |     20 +-
 .../DescribeSpotDatafeedSubscriptionType.java   |      8 +-
 .../ec2/DescribeSpotInstanceRequests.java       |      8 +-
 .../DescribeSpotInstanceRequestsResponse.java   |      8 +-
 ...escribeSpotInstanceRequestsResponseType.java |     20 +-
 .../ec2/DescribeSpotInstanceRequestsType.java   |     20 +-
 .../amazon/ec2/DescribeSpotPriceHistory.java    |      8 +-
 .../ec2/DescribeSpotPriceHistoryResponse.java   |      8 +-
 .../DescribeSpotPriceHistoryResponseType.java   |    129 +-
 .../ec2/DescribeSpotPriceHistoryType.java       |    355 +-
 awsapi/src/com/amazon/ec2/DescribeSubnets.java  |      8 +-
 .../com/amazon/ec2/DescribeSubnetsResponse.java |      8 +-
 .../amazon/ec2/DescribeSubnetsResponseType.java |     20 +-
 .../src/com/amazon/ec2/DescribeSubnetsType.java |     20 +-
 awsapi/src/com/amazon/ec2/DescribeTags.java     |      8 +-
 .../com/amazon/ec2/DescribeTagsResponse.java    |      8 +-
 .../amazon/ec2/DescribeTagsResponseType.java    |     20 +-
 awsapi/src/com/amazon/ec2/DescribeTagsType.java |     14 +-
 .../com/amazon/ec2/DescribeVolumeAttribute.java |    378 +
 .../ec2/DescribeVolumeAttributeResponse.java    |    378 +
 .../DescribeVolumeAttributeResponseType.java    |    644 +
 ...VolumeAttributeResponseTypeChoice_type0.java |    499 +
 .../amazon/ec2/DescribeVolumeAttributeType.java |    552 +
 .../ec2/DescribeVolumeAttributesGroup.java      |    499 +
 .../com/amazon/ec2/DescribeVolumeStatus.java    |    378 +
 .../ec2/DescribeVolumeStatusResponse.java       |    378 +
 .../ec2/DescribeVolumeStatusResponseType.java   |    665 +
 .../amazon/ec2/DescribeVolumeStatusType.java    |    752 +
 awsapi/src/com/amazon/ec2/DescribeVolumes.java  |      8 +-
 .../com/amazon/ec2/DescribeVolumesResponse.java |      8 +-
 .../amazon/ec2/DescribeVolumesResponseType.java |     20 +-
 .../ec2/DescribeVolumesSetItemResponseType.java |    248 +-
 .../amazon/ec2/DescribeVolumesSetItemType.java  |     14 +-
 .../ec2/DescribeVolumesSetResponseType.java     |     16 +-
 .../com/amazon/ec2/DescribeVolumesSetType.java  |     16 +-
 .../src/com/amazon/ec2/DescribeVolumesType.java |     20 +-
 awsapi/src/com/amazon/ec2/DescribeVpcs.java     |      8 +-
 .../com/amazon/ec2/DescribeVpcsResponse.java    |      8 +-
 .../amazon/ec2/DescribeVpcsResponseType.java    |     20 +-
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java |     20 +-
 .../com/amazon/ec2/DescribeVpnConnections.java  |      8 +-
 .../ec2/DescribeVpnConnectionsResponse.java     |      8 +-
 .../ec2/DescribeVpnConnectionsResponseType.java |     20 +-
 .../amazon/ec2/DescribeVpnConnectionsType.java  |     20 +-
 .../src/com/amazon/ec2/DescribeVpnGateways.java |      8 +-
 .../amazon/ec2/DescribeVpnGatewaysResponse.java |      8 +-
 .../ec2/DescribeVpnGatewaysResponseType.java    |     20 +-
 .../com/amazon/ec2/DescribeVpnGatewaysType.java |     20 +-
 .../com/amazon/ec2/DetachInternetGateway.java   |    378 +
 .../ec2/DetachInternetGatewayResponse.java      |    378 +
 .../ec2/DetachInternetGatewayResponseType.java  |    583 +
 .../amazon/ec2/DetachInternetGatewayType.java   |    591 +
 .../com/amazon/ec2/DetachNetworkInterface.java  |    378 +
 .../ec2/DetachNetworkInterfaceResponse.java     |    378 +
 .../ec2/DetachNetworkInterfaceResponseType.java |    583 +
 .../amazon/ec2/DetachNetworkInterfaceType.java  |    597 +
 awsapi/src/com/amazon/ec2/DetachVolume.java     |      8 +-
 .../com/amazon/ec2/DetachVolumeResponse.java    |      8 +-
 .../amazon/ec2/DetachVolumeResponseType.java    |     44 +-
 awsapi/src/com/amazon/ec2/DetachVolumeType.java |     32 +-
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java |      8 +-
 .../amazon/ec2/DetachVpnGatewayResponse.java    |      8 +-
 .../ec2/DetachVpnGatewayResponseType.java       |     20 +-
 .../com/amazon/ec2/DetachVpnGatewayType.java    |     20 +-
 .../ec2/DhcpConfigurationItemSetType.java       |     16 +-
 .../amazon/ec2/DhcpConfigurationItemType.java   |     20 +-
 .../amazon/ec2/DhcpOptionsIdSetItemType.java    |     14 +-
 .../com/amazon/ec2/DhcpOptionsIdSetType.java    |     16 +-
 .../src/com/amazon/ec2/DhcpOptionsSetType.java  |     16 +-
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java  |     26 +-
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java |     16 +-
 awsapi/src/com/amazon/ec2/DhcpValueType.java    |     14 +-
 .../amazon/ec2/DisableVgwRoutePropagation.java  |    378 +
 .../DisableVgwRoutePropagationRequestType.java  |    591 +
 .../ec2/DisableVgwRoutePropagationResponse.java |    378 +
 .../DisableVgwRoutePropagationResponseType.java |    583 +
 .../src/com/amazon/ec2/DisassociateAddress.java |      8 +-
 .../amazon/ec2/DisassociateAddressResponse.java |      8 +-
 .../ec2/DisassociateAddressResponseType.java    |     20 +-
 .../com/amazon/ec2/DisassociateAddressType.java |    170 +-
 .../com/amazon/ec2/DisassociateRouteTable.java  |    378 +
 .../ec2/DisassociateRouteTableResponse.java     |    378 +
 .../ec2/DisassociateRouteTableResponseType.java |    583 +
 .../amazon/ec2/DisassociateRouteTableType.java  |    499 +
 .../amazon/ec2/DiskImageDescriptionType.java    |     32 +-
 .../src/com/amazon/ec2/DiskImageDetailType.java |     26 +-
 awsapi/src/com/amazon/ec2/DiskImageSetType.java |     16 +-
 awsapi/src/com/amazon/ec2/DiskImageType.java    |     26 +-
 .../ec2/DiskImageVolumeDescriptionType.java     |     20 +-
 .../src/com/amazon/ec2/DiskImageVolumeType.java |     14 +-
 .../src/com/amazon/ec2/EbsBlockDeviceType.java  |    231 +-
 ...sInstanceBlockDeviceMappingResponseType.java |     32 +-
 awsapi/src/com/amazon/ec2/EmptyElementType.java |      8 +-
 .../amazon/ec2/EnableVgwRoutePropagation.java   |    378 +
 .../EnableVgwRoutePropagationRequestType.java   |    591 +
 .../ec2/EnableVgwRoutePropagationResponse.java  |    378 +
 .../EnableVgwRoutePropagationResponseType.java  |    583 +
 awsapi/src/com/amazon/ec2/EnableVolumeIO.java   |    378 +
 .../com/amazon/ec2/EnableVolumeIOResponse.java  |    378 +
 .../amazon/ec2/EnableVolumeIOResponseType.java  |    583 +
 .../src/com/amazon/ec2/EnableVolumeIOType.java  |    499 +
 .../src/com/amazon/ec2/ExportTaskIdSetType.java |    576 +
 awsapi/src/com/amazon/ec2/ExportTaskIdType.java |    499 +
 .../com/amazon/ec2/ExportTaskResponseType.java  |    907 +
 .../ec2/ExportTaskResponseTypeChoice_type0.java |    426 +
 .../ec2/ExportTaskResponseTypeChoice_type1.java |    426 +
 .../amazon/ec2/ExportTaskSetResponseType.java   |    576 +
 .../amazon/ec2/ExportToS3TaskResponseType.java  |    788 +
 .../src/com/amazon/ec2/ExportToS3TaskType.java  |    801 +
 awsapi/src/com/amazon/ec2/ExtensionMapper.java  |   4352 +-
 awsapi/src/com/amazon/ec2/FilterSetType.java    |     16 +-
 awsapi/src/com/amazon/ec2/FilterType.java       |     20 +-
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java |      8 +-
 .../amazon/ec2/GetConsoleOutputResponse.java    |      8 +-
 .../ec2/GetConsoleOutputResponseType.java       |     32 +-
 .../com/amazon/ec2/GetConsoleOutputType.java    |     14 +-
 awsapi/src/com/amazon/ec2/GetPasswordData.java  |      8 +-
 .../com/amazon/ec2/GetPasswordDataResponse.java |      8 +-
 .../amazon/ec2/GetPasswordDataResponseType.java |     32 +-
 .../src/com/amazon/ec2/GetPasswordDataType.java |     14 +-
 awsapi/src/com/amazon/ec2/GroupItemType.java    |    150 +-
 awsapi/src/com/amazon/ec2/GroupSetType.java     |     16 +-
 .../ec2/IamInstanceProfileRequestType.java      |    617 +
 .../ec2/IamInstanceProfileResponseType.java     |    591 +
 awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java |    575 +
 awsapi/src/com/amazon/ec2/ImportInstance.java   |      8 +-
 .../amazon/ec2/ImportInstanceGroupItemType.java |    617 +
 .../amazon/ec2/ImportInstanceGroupSetType.java  |    576 +
 .../ImportInstanceLaunchSpecificationType.java  |     72 +-
 .../com/amazon/ec2/ImportInstanceResponse.java  |      8 +-
 .../amazon/ec2/ImportInstanceResponseType.java  |    106 +-
 .../ec2/ImportInstanceTaskDetailsType.java      |     32 +-
 .../src/com/amazon/ec2/ImportInstanceType.java  |    134 +-
 .../ec2/ImportInstanceVolumeDetailItemType.java |     50 +-
 .../ec2/ImportInstanceVolumeDetailSetType.java  |     16 +-
 awsapi/src/com/amazon/ec2/ImportKeyPair.java    |      8 +-
 .../com/amazon/ec2/ImportKeyPairResponse.java   |      8 +-
 .../amazon/ec2/ImportKeyPairResponseType.java   |     26 +-
 .../src/com/amazon/ec2/ImportKeyPairType.java   |     20 +-
 awsapi/src/com/amazon/ec2/ImportVolume.java     |      8 +-
 .../com/amazon/ec2/ImportVolumeResponse.java    |      8 +-
 .../amazon/ec2/ImportVolumeResponseType.java    |    106 +-
 .../amazon/ec2/ImportVolumeTaskDetailsType.java |     38 +-
 awsapi/src/com/amazon/ec2/ImportVolumeType.java |     32 +-
 .../ec2/InstanceBlockDeviceMappingItemType.java |     16 +-
 ...eBlockDeviceMappingItemTypeChoice_type0.java |     26 +-
 ...tanceBlockDeviceMappingResponseItemType.java |     16 +-
 ...viceMappingResponseItemTypeChoice_type0.java |     14 +-
 .../InstanceBlockDeviceMappingResponseType.java |     16 +-
 .../ec2/InstanceBlockDeviceMappingType.java     |     16 +-
 .../amazon/ec2/InstanceCountsSetItemType.java   |    583 +
 .../com/amazon/ec2/InstanceCountsSetType.java   |    564 +
 .../amazon/ec2/InstanceEbsBlockDeviceType.java  |     20 +-
 .../ec2/InstanceExportTaskResponseType.java     |    604 +
 .../src/com/amazon/ec2/InstanceIdSetType.java   |     16 +-
 awsapi/src/com/amazon/ec2/InstanceIdType.java   |     14 +-
 .../amazon/ec2/InstanceLicenseRequestType.java  |     14 +-
 .../amazon/ec2/InstanceLicenseResponseType.java |     14 +-
 .../amazon/ec2/InstanceMonitoringStateType.java |     14 +-
 ...InstanceNetworkInterfaceAssociationType.java |    604 +
 .../InstanceNetworkInterfaceAttachmentType.java |    851 +
 ...tanceNetworkInterfaceSetItemRequestType.java |   1257 +
 .../InstanceNetworkInterfaceSetItemType.java    |   1589 +
 .../InstanceNetworkInterfaceSetRequestType.java |    576 +
 .../ec2/InstanceNetworkInterfaceSetType.java    |    576 +
 .../com/amazon/ec2/InstancePlacementType.java   |     20 +-
 .../InstancePrivateIpAddressesSetItemType.java  |    684 +
 .../ec2/InstancePrivateIpAddressesSetType.java  |    576 +
 .../amazon/ec2/InstanceStateChangeSetType.java  |     16 +-
 .../com/amazon/ec2/InstanceStateChangeType.java |     26 +-
 .../src/com/amazon/ec2/InstanceStateType.java   |     20 +-
 .../ec2/InstanceStatusDetailsSetItemType.java   |    696 +
 .../ec2/InstanceStatusDetailsSetType.java       |    576 +
 .../com/amazon/ec2/InstanceStatusEventType.java |    788 +
 .../amazon/ec2/InstanceStatusEventsSetType.java |    576 +
 .../com/amazon/ec2/InstanceStatusItemType.java  |    848 +
 .../com/amazon/ec2/InstanceStatusSetType.java   |    576 +
 .../src/com/amazon/ec2/InstanceStatusType.java  |    573 +
 .../com/amazon/ec2/InstanceTypeSetItemType.java |     14 +-
 .../src/com/amazon/ec2/InstanceTypeSetType.java |     16 +-
 .../ec2/InternetGatewayAttachmentSetType.java   |    576 +
 .../ec2/InternetGatewayAttachmentType.java      |    591 +
 .../ec2/InternetGatewayIdSetItemType.java       |    499 +
 .../amazon/ec2/InternetGatewayIdSetType.java    |    576 +
 .../com/amazon/ec2/InternetGatewaySetType.java  |    576 +
 .../src/com/amazon/ec2/InternetGatewayType.java |    634 +
 .../src/com/amazon/ec2/IpPermissionSetType.java |     16 +-
 awsapi/src/com/amazon/ec2/IpPermissionType.java |    102 +-
 awsapi/src/com/amazon/ec2/IpRangeItemType.java  |     14 +-
 awsapi/src/com/amazon/ec2/IpRangeSetType.java   |     16 +-
 .../amazon/ec2/LaunchPermissionItemType.java    |     20 +-
 .../amazon/ec2/LaunchPermissionListType.java    |     16 +-
 .../ec2/LaunchPermissionOperationType.java      |     20 +-
 .../ec2/LaunchSpecificationRequestType.java     |    336 +-
 .../ec2/LaunchSpecificationResponseType.java    |    330 +-
 .../amazon/ec2/LicenseCapacitySetItemType.java  |     32 +-
 .../com/amazon/ec2/LicenseCapacitySetType.java  |     16 +-
 .../com/amazon/ec2/LicenseIdSetItemType.java    |     14 +-
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java |     16 +-
 .../src/com/amazon/ec2/LicenseSetItemType.java  |     38 +-
 awsapi/src/com/amazon/ec2/LicenseSetType.java   |     16 +-
 .../com/amazon/ec2/ModifyImageAttribute.java    |      8 +-
 .../ec2/ModifyImageAttributeResponse.java       |      8 +-
 .../ec2/ModifyImageAttributeResponseType.java   |     20 +-
 .../amazon/ec2/ModifyImageAttributeType.java    |     16 +-
 .../ModifyImageAttributeTypeChoice_type0.java   |     26 +-
 .../com/amazon/ec2/ModifyInstanceAttribute.java |      8 +-
 .../ec2/ModifyInstanceAttributeResponse.java    |      8 +-
 .../ModifyInstanceAttributeResponseType.java    |     20 +-
 .../amazon/ec2/ModifyInstanceAttributeType.java |     16 +-
 ...ModifyInstanceAttributeTypeChoice_type0.java |    269 +-
 .../ModifyNetworkInterfaceAttachmentType.java   |    583 +
 .../ec2/ModifyNetworkInterfaceAttribute.java    |    378 +
 ...ModifyNetworkInterfaceAttributeResponse.java |    378 +
 ...fyNetworkInterfaceAttributeResponseType.java |    583 +
 .../ModifyNetworkInterfaceAttributeType.java    |    552 +
 ...tworkInterfaceAttributeTypeChoice_type0.java |    645 +
 .../com/amazon/ec2/ModifySnapshotAttribute.java |      8 +-
 .../ec2/ModifySnapshotAttributeResponse.java    |      8 +-
 .../ModifySnapshotAttributeResponseType.java    |     20 +-
 .../amazon/ec2/ModifySnapshotAttributeType.java |     20 +-
 .../com/amazon/ec2/ModifyVolumeAttribute.java   |    378 +
 .../ec2/ModifyVolumeAttributeResponse.java      |    378 +
 .../ec2/ModifyVolumeAttributeResponseType.java  |    583 +
 .../amazon/ec2/ModifyVolumeAttributeType.java   |    552 +
 .../ModifyVolumeAttributeTypeChoice_type0.java  |    426 +
 awsapi/src/com/amazon/ec2/MonitorInstances.java |      8 +-
 .../amazon/ec2/MonitorInstancesResponse.java    |      8 +-
 .../MonitorInstancesResponseSetItemType.java    |     20 +-
 .../ec2/MonitorInstancesResponseSetType.java    |     16 +-
 .../ec2/MonitorInstancesResponseType.java       |     20 +-
 .../amazon/ec2/MonitorInstancesSetItemType.java |     14 +-
 .../com/amazon/ec2/MonitorInstancesSetType.java |     16 +-
 .../com/amazon/ec2/MonitorInstancesType.java    |     14 +-
 .../com/amazon/ec2/MonitoringInstanceType.java  |     14 +-
 .../ec2/NetworkAclAssociationSetType.java       |    576 +
 .../amazon/ec2/NetworkAclAssociationType.java   |    683 +
 .../com/amazon/ec2/NetworkAclEntrySetType.java  |    576 +
 .../src/com/amazon/ec2/NetworkAclEntryType.java |    999 +
 .../com/amazon/ec2/NetworkAclIdSetItemType.java |    499 +
 .../src/com/amazon/ec2/NetworkAclIdSetType.java |    576 +
 .../src/com/amazon/ec2/NetworkAclSetType.java   |    576 +
 awsapi/src/com/amazon/ec2/NetworkAclType.java   |    871 +
 .../ec2/NetworkInterfaceAssociationType.java    |    814 +
 .../ec2/NetworkInterfaceAttachmentType.java     |   1061 +
 .../ec2/NetworkInterfaceIdSetItemType.java      |    499 +
 .../amazon/ec2/NetworkInterfaceIdSetType.java   |    576 +
 ...kInterfacePrivateIpAddressesSetItemType.java |    657 +
 ...tworkInterfacePrivateIpAddressesSetType.java |    576 +
 .../com/amazon/ec2/NetworkInterfaceSetType.java |    576 +
 .../com/amazon/ec2/NetworkInterfaceType.java    |   2036 +
 .../ec2/NullableAttributeBooleanValueType.java  |     14 +-
 .../amazon/ec2/NullableAttributeValueType.java  |     14 +-
 .../com/amazon/ec2/PlacementGroupInfoType.java  |     26 +-
 .../com/amazon/ec2/PlacementGroupSetType.java   |     16 +-
 .../com/amazon/ec2/PlacementRequestType.java    |    125 +-
 .../com/amazon/ec2/PlacementResponseType.java   |    125 +-
 awsapi/src/com/amazon/ec2/PortRangeType.java    |    575 +
 .../ec2/PriceScheduleRequestSetItemType.java    |    680 +
 .../amazon/ec2/PriceScheduleRequestSetType.java |    564 +
 .../amazon/ec2/PriceScheduleSetItemType.java    |    764 +
 .../com/amazon/ec2/PriceScheduleSetType.java    |    576 +
 .../amazon/ec2/PricingDetailsSetItemType.java   |    575 +
 .../com/amazon/ec2/PricingDetailsSetType.java   |    576 +
 .../PrivateIpAddressesSetItemRequestType.java   |    597 +
 .../ec2/PrivateIpAddressesSetRequestType.java   |    576 +
 .../src/com/amazon/ec2/ProductCodeItemType.java |     68 +-
 .../src/com/amazon/ec2/ProductCodeListType.java |     16 +-
 .../src/com/amazon/ec2/ProductCodeSetType.java  |    576 -
 awsapi/src/com/amazon/ec2/ProductCodeType.java  |    499 -
 .../com/amazon/ec2/ProductCodesSetItemType.java |    106 +-
 .../src/com/amazon/ec2/ProductCodesSetType.java |     16 +-
 .../ec2/ProductDescriptionSetItemType.java      |     14 +-
 .../amazon/ec2/ProductDescriptionSetType.java   |     16 +-
 .../com/amazon/ec2/PropagatingVgwSetType.java   |    576 +
 .../src/com/amazon/ec2/PropagatingVgwType.java  |    499 +
 .../ec2/PurchaseReservedInstancesOffering.java  |      8 +-
 ...rchaseReservedInstancesOfferingResponse.java |      8 +-
 ...seReservedInstancesOfferingResponseType.java |     20 +-
 .../PurchaseReservedInstancesOfferingType.java  |     98 +-
 awsapi/src/com/amazon/ec2/RebootInstances.java  |      8 +-
 .../com/amazon/ec2/RebootInstancesInfoType.java |     16 +-
 .../com/amazon/ec2/RebootInstancesItemType.java |     14 +-
 .../com/amazon/ec2/RebootInstancesResponse.java |      8 +-
 .../amazon/ec2/RebootInstancesResponseType.java |     20 +-
 .../src/com/amazon/ec2/RebootInstancesType.java |     14 +-
 .../amazon/ec2/RecurringChargesSetItemType.java |    583 +
 .../com/amazon/ec2/RecurringChargesSetType.java |    576 +
 awsapi/src/com/amazon/ec2/RegionItemType.java   |     20 +-
 awsapi/src/com/amazon/ec2/RegionSetType.java    |     16 +-
 awsapi/src/com/amazon/ec2/RegisterImage.java    |      8 +-
 .../com/amazon/ec2/RegisterImageResponse.java   |      8 +-
 .../amazon/ec2/RegisterImageResponseType.java   |     20 +-
 .../src/com/amazon/ec2/RegisterImageType.java   |     56 +-
 awsapi/src/com/amazon/ec2/ReleaseAddress.java   |      8 +-
 .../com/amazon/ec2/ReleaseAddressResponse.java  |      8 +-
 .../amazon/ec2/ReleaseAddressResponseType.java  |     20 +-
 .../src/com/amazon/ec2/ReleaseAddressType.java  |     97 +-
 .../ec2/ReleaseAddressTypeChoice_type0.java     |    561 +
 .../ec2/ReplaceNetworkAclAssociation.java       |    378 +
 .../ReplaceNetworkAclAssociationResponse.java   |    378 +
 ...eplaceNetworkAclAssociationResponseType.java |    591 +
 .../ec2/ReplaceNetworkAclAssociationType.java   |    591 +
 .../com/amazon/ec2/ReplaceNetworkAclEntry.java  |    378 +
 .../ec2/ReplaceNetworkAclEntryResponse.java     |    378 +
 .../ec2/ReplaceNetworkAclEntryResponseType.java |    583 +
 .../amazon/ec2/ReplaceNetworkAclEntryType.java  |   1091 +
 awsapi/src/com/amazon/ec2/ReplaceRoute.java     |    378 +
 .../com/amazon/ec2/ReplaceRouteResponse.java    |    378 +
 .../amazon/ec2/ReplaceRouteResponseType.java    |    583 +
 .../ec2/ReplaceRouteTableAssociation.java       |    378 +
 .../ReplaceRouteTableAssociationResponse.java   |    378 +
 ...eplaceRouteTableAssociationResponseType.java |    591 +
 .../ec2/ReplaceRouteTableAssociationType.java   |    591 +
 awsapi/src/com/amazon/ec2/ReplaceRouteType.java |    644 +
 .../ec2/ReplaceRouteTypeChoice_type0.java       |    665 +
 .../com/amazon/ec2/ReportInstanceStatus.java    |    378 +
 ...portInstanceStatusReasonCodeSetItemType.java |    499 +
 .../ReportInstanceStatusReasonCodesSetType.java |    564 +
 .../ec2/ReportInstanceStatusResponse.java       |    378 +
 .../ec2/ReportInstanceStatusResponseType.java   |    583 +
 .../amazon/ec2/ReportInstanceStatusType.java    |    936 +
 .../com/amazon/ec2/RequestSpotInstances.java    |      8 +-
 .../ec2/RequestSpotInstancesResponse.java       |      8 +-
 .../ec2/RequestSpotInstancesResponseType.java   |     20 +-
 .../amazon/ec2/RequestSpotInstancesType.java    |     56 +-
 .../src/com/amazon/ec2/ReservationInfoType.java |     38 +-
 .../src/com/amazon/ec2/ReservationSetType.java  |     16 +-
 .../ec2/ReservedInstanceLimitPriceType.java     |    596 +
 .../src/com/amazon/ec2/ResetImageAttribute.java |      8 +-
 .../amazon/ec2/ResetImageAttributeResponse.java |      8 +-
 .../ec2/ResetImageAttributeResponseType.java    |     20 +-
 .../com/amazon/ec2/ResetImageAttributeType.java |     16 +-
 .../amazon/ec2/ResetImageAttributesGroup.java   |     14 +-
 .../com/amazon/ec2/ResetInstanceAttribute.java  |      8 +-
 .../ec2/ResetInstanceAttributeResponse.java     |      8 +-
 .../ec2/ResetInstanceAttributeResponseType.java |     20 +-
 .../amazon/ec2/ResetInstanceAttributeType.java  |     16 +-
 .../ec2/ResetInstanceAttributesGroup.java       |     93 +-
 .../ec2/ResetNetworkInterfaceAttribute.java     |    378 +
 .../ResetNetworkInterfaceAttributeResponse.java |    378 +
 ...etNetworkInterfaceAttributeResponseType.java |    583 +
 .../ec2/ResetNetworkInterfaceAttributeType.java |    552 +
 .../ResetNetworkInterfaceAttributesGroup.java   |    426 +
 .../com/amazon/ec2/ResetSnapshotAttribute.java  |      8 +-
 .../ec2/ResetSnapshotAttributeResponse.java     |      8 +-
 .../ec2/ResetSnapshotAttributeResponseType.java |     20 +-
 .../amazon/ec2/ResetSnapshotAttributeType.java  |     16 +-
 .../ec2/ResetSnapshotAttributesGroup.java       |     14 +-
 .../com/amazon/ec2/ResourceIdSetItemType.java   |     14 +-
 .../src/com/amazon/ec2/ResourceIdSetType.java   |     16 +-
 .../com/amazon/ec2/ResourceTagSetItemType.java  |     20 +-
 .../src/com/amazon/ec2/ResourceTagSetType.java  |     16 +-
 .../amazon/ec2/RevokeSecurityGroupEgress.java   |    378 +
 .../ec2/RevokeSecurityGroupEgressResponse.java  |    378 +
 .../RevokeSecurityGroupEgressResponseType.java  |    583 +
 .../ec2/RevokeSecurityGroupEgressType.java      |    560 +
 .../amazon/ec2/RevokeSecurityGroupIngress.java  |      8 +-
 .../ec2/RevokeSecurityGroupIngressResponse.java |      8 +-
 .../RevokeSecurityGroupIngressResponseType.java |     20 +-
 .../ec2/RevokeSecurityGroupIngressType.java     |    138 +-
 ...okeSecurityGroupIngressTypeChoice_type0.java |    561 +
 awsapi/src/com/amazon/ec2/RouteSetType.java     |    576 +
 .../ec2/RouteTableAssociationSetType.java       |    576 +
 .../amazon/ec2/RouteTableAssociationType.java   |    644 +
 .../RouteTableAssociationTypeChoice_type0.java  |    554 +
 .../com/amazon/ec2/RouteTableIdSetItemType.java |    499 +
 .../src/com/amazon/ec2/RouteTableIdSetType.java |    576 +
 .../src/com/amazon/ec2/RouteTableSetType.java   |    576 +
 awsapi/src/com/amazon/ec2/RouteTableType.java   |    848 +
 awsapi/src/com/amazon/ec2/RouteType.java        |   1103 +
 awsapi/src/com/amazon/ec2/RunInstances.java     |      8 +-
 .../com/amazon/ec2/RunInstancesResponse.java    |      8 +-
 .../amazon/ec2/RunInstancesResponseType.java    |     44 +-
 awsapi/src/com/amazon/ec2/RunInstancesType.java |    580 +-
 .../amazon/ec2/RunningInstancesItemType.java    |    609 +-
 .../com/amazon/ec2/RunningInstancesSetType.java |     16 +-
 .../amazon/ec2/SecurityGroupIdSetItemType.java  |    499 +
 .../com/amazon/ec2/SecurityGroupIdSetType.java  |    576 +
 .../com/amazon/ec2/SecurityGroupItemType.java   |    387 +-
 .../com/amazon/ec2/SecurityGroupSetType.java    |     16 +-
 .../ec2/SpotDatafeedSubscriptionType.java       |     38 +-
 .../ec2/SpotInstanceRequestIdSetItemType.java   |     14 +-
 .../ec2/SpotInstanceRequestIdSetType.java       |     16 +-
 .../ec2/SpotInstanceRequestSetItemType.java     |    199 +-
 .../amazon/ec2/SpotInstanceRequestSetType.java  |     16 +-
 .../amazon/ec2/SpotInstanceStateFaultType.java  |     20 +-
 .../amazon/ec2/SpotPlacementRequestType.java    |    617 +
 .../amazon/ec2/SpotPriceHistorySetItemType.java |    143 +-
 .../com/amazon/ec2/SpotPriceHistorySetType.java |     16 +-
 awsapi/src/com/amazon/ec2/StartInstances.java   |      8 +-
 .../com/amazon/ec2/StartInstancesResponse.java  |      8 +-
 .../amazon/ec2/StartInstancesResponseType.java  |     20 +-
 .../src/com/amazon/ec2/StartInstancesType.java  |     14 +-
 awsapi/src/com/amazon/ec2/StateReasonType.java  |     20 +-
 awsapi/src/com/amazon/ec2/StopInstances.java    |      8 +-
 .../com/amazon/ec2/StopInstancesResponse.java   |      8 +-
 .../amazon/ec2/StopInstancesResponseType.java   |     20 +-
 .../src/com/amazon/ec2/StopInstancesType.java   |     20 +-
 .../src/com/amazon/ec2/SubnetIdSetItemType.java |     14 +-
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java  |     16 +-
 awsapi/src/com/amazon/ec2/SubnetSetType.java    |     16 +-
 awsapi/src/com/amazon/ec2/SubnetType.java       |     50 +-
 awsapi/src/com/amazon/ec2/TagSetItemType.java   |     32 +-
 awsapi/src/com/amazon/ec2/TagSetType.java       |     16 +-
 .../src/com/amazon/ec2/TerminateInstances.java  |      8 +-
 .../amazon/ec2/TerminateInstancesResponse.java  |      8 +-
 .../ec2/TerminateInstancesResponseType.java     |     20 +-
 .../com/amazon/ec2/TerminateInstancesType.java  |     14 +-
 .../amazon/ec2/UnassignPrivateIpAddresses.java  |    378 +
 .../ec2/UnassignPrivateIpAddressesResponse.java |    378 +
 .../UnassignPrivateIpAddressesResponseType.java |    583 +
 .../ec2/UnassignPrivateIpAddressesType.java     |    560 +
 .../src/com/amazon/ec2/UnmonitorInstances.java  |      8 +-
 .../amazon/ec2/UnmonitorInstancesResponse.java  |      8 +-
 awsapi/src/com/amazon/ec2/UserDataType.java     |     14 +-
 .../com/amazon/ec2/UserIdGroupPairSetType.java  |     16 +-
 .../src/com/amazon/ec2/UserIdGroupPairType.java |    183 +-
 awsapi/src/com/amazon/ec2/ValueSetType.java     |     16 +-
 awsapi/src/com/amazon/ec2/ValueType.java        |     14 +-
 awsapi/src/com/amazon/ec2/VgwTelemetryType.java |    576 +
 .../amazon/ec2/VolumeStatusActionItemType.java  |    775 +
 .../amazon/ec2/VolumeStatusActionsSetType.java  |    576 +
 .../amazon/ec2/VolumeStatusDetailsItemType.java |    591 +
 .../amazon/ec2/VolumeStatusDetailsSetType.java  |    576 +
 .../amazon/ec2/VolumeStatusEventItemType.java   |    867 +
 .../amazon/ec2/VolumeStatusEventsSetType.java   |    576 +
 .../com/amazon/ec2/VolumeStatusInfoType.java    |    560 +
 .../com/amazon/ec2/VolumeStatusItemType.java    |    774 +
 .../src/com/amazon/ec2/VolumeStatusSetType.java |    576 +
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java |     14 +-
 awsapi/src/com/amazon/ec2/VpcIdSetType.java     |     16 +-
 awsapi/src/com/amazon/ec2/VpcSetType.java       |     16 +-
 awsapi/src/com/amazon/ec2/VpcType.java          |    145 +-
 .../amazon/ec2/VpnConnectionIdSetItemType.java  |     14 +-
 .../com/amazon/ec2/VpnConnectionIdSetType.java  |     16 +-
 .../ec2/VpnConnectionOptionsRequestType.java    |    505 +
 .../ec2/VpnConnectionOptionsResponseType.java   |    505 +
 .../com/amazon/ec2/VpnConnectionSetType.java    |     16 +-
 .../src/com/amazon/ec2/VpnConnectionType.java   |    272 +-
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java |     14 +-
 .../src/com/amazon/ec2/VpnGatewayIdSetType.java |     16 +-
 .../src/com/amazon/ec2/VpnGatewaySetType.java   |     16 +-
 awsapi/src/com/amazon/ec2/VpnGatewayType.java   |     75 +-
 .../src/com/amazon/ec2/VpnStaticRouteType.java  |    683 +
 .../com/amazon/ec2/VpnStaticRoutesSetType.java  |    576 +
 .../com/amazon/ec2/VpnTunnelTelemetryType.java  |    872 +
 .../ec2/client/AmazonEC2CallbackHandler.java    |   1916 +-
 .../com/amazon/ec2/client/AmazonEC2Stub.java    | 387627 ++++++++++++----
 .../bridge/auth/ec2/AuthenticationHandler.java  |      6 +-
 .../model/CloudStackServiceOfferingVO.java      |      9 +-
 .../dao/CloudStackConfigurationDaoImpl.java     |      3 +-
 .../dao/CloudStackSvcOfferingDaoImpl.java       |      6 +-
 .../persist/dao/CloudStackUserDaoImpl.java      |     13 +-
 .../cloud/bridge/persist/dao/MHostDaoImpl.java  |      8 +-
 .../bridge/persist/dao/OfferingDaoImpl.java     |      8 +-
 .../cloud/bridge/persist/dao/SHostDaoImpl.java  |      8 +-
 .../persist/dao/UserCredentialsDaoImpl.java     |      1 +
 .../cloud/bridge/service/EC2MainServlet.java    |      2 +-
 .../cloud/bridge/service/EC2RestServlet.java    |    454 +-
 .../cloud/bridge/service/EC2SoapService.java    |    344 +-
 .../bridge/service/EC2SoapServiceImpl.java      |    623 +-
 .../service/controller/s3/ServiceProvider.java  |      6 +-
 .../service/core/ec2/EC2AddressFilterSet.java   |     16 +-
 .../core/ec2/EC2AvailabilityZonesFilterSet.java |      9 +-
 .../service/core/ec2/EC2DescribeImages.java     |     10 +
 .../bridge/service/core/ec2/EC2Engine.java      |   1021 +-
 .../service/core/ec2/EC2GroupFilterSet.java     |     53 +-
 .../cloud/bridge/service/core/ec2/EC2Image.java |     63 +-
 .../service/core/ec2/EC2ImageFilterSet.java     |    168 +
 .../service/core/ec2/EC2InstanceFilterSet.java  |      8 +-
 .../service/core/ec2/EC2KeyPairFilterSet.java   |     16 +-
 .../core/ec2/EC2ModifyInstanceAttribute.java    |     64 +
 .../service/core/ec2/EC2RegisterImage.java      |      5 +-
 .../service/core/ec2/EC2RunInstances.java       |     24 +-
 .../service/core/ec2/EC2SecurityGroup.java      |     11 +-
 .../service/core/ec2/EC2SnapshotFilterSet.java  |     10 +-
 .../service/core/ec2/EC2TagsFilterSet.java      |      9 +-
 .../service/core/ec2/EC2VolumeFilterSet.java    |      9 +-
 .../cloud/bridge/service/core/s3/S3Engine.java  |      2 +-
 .../service/exception/EC2ServiceException.java  |    120 +-
 .../src/com/cloud/stack/CloudStackClient.java   |      5 +-
 .../stack/models/CloudStackDiskOffering.java    |      9 +
 .../stack/models/CloudStackSecurityGroup.java   |      7 +
 .../com/cloud/gate/model/ModelTestCase.java     |    368 -
 .../com/cloud/gate/persist/PersitTestCase.java  |     73 -
 awsapi/web/web.xml                              |     11 +-
 build/replace.properties                        |      1 +
 .../classes/resources/messages.properties       |   1791 +-
 .../classes/resources/messages_ar.properties    |    285 +
 .../classes/resources/messages_ca.properties    |    306 +
 .../classes/resources/messages_de_DE.properties |    747 +
 .../classes/resources/messages_es.properties    |    861 +
 .../classes/resources/messages_fr_FR.properties |   1892 +-
 .../classes/resources/messages_it_IT.properties |    811 +
 .../classes/resources/messages_ja.properties    |   2995 +-
 .../classes/resources/messages_ko_KR.properties |   2885 +-
 .../classes/resources/messages_nb_NO.properties |    365 +
 .../classes/resources/messages_pt_BR.properties |   2092 +-
 .../classes/resources/messages_ru_RU.properties |   2890 +-
 .../classes/resources/messages_zh_CN.properties |   3040 +-
 client/WEB-INF/web.xml                          |      2 +
 client/pom.xml                                  |    309 +-
 client/tomcatconf/applicationContext.xml.in     |    499 +-
 client/tomcatconf/commands.properties.in        |    126 +-
 client/tomcatconf/componentContext.xml.in       |    287 +-
 client/tomcatconf/db-enc.properties.in          |     68 -
 client/tomcatconf/db.properties.in              |      1 +
 client/tomcatconf/log4j-cloud.xml.in            |     22 +-
 client/tomcatconf/nonossComponentContext.xml.in |    280 +-
 client/tomcatconf/server.xml.in                 |    231 -
 .../tomcatconf/simulatorComponentContext.xml.in |    312 +-
 core/pom.xml                                    |     21 +-
 core/src/com/cloud/agent/Listener.java          |    119 -
 core/src/com/cloud/agent/RecoveryHandler.java   |     31 -
 .../com/cloud/agent/api/AgentControlAnswer.java |     30 +
 .../cloud/agent/api/AgentControlCommand.java    |     27 +
 .../com/cloud/agent/api/AttachIsoCommand.java   |     59 +
 .../com/cloud/agent/api/AttachVolumeAnswer.java |     62 +
 .../cloud/agent/api/AttachVolumeCommand.java    |    199 +
 .../cloud/agent/api/BackupSnapshotAnswer.java   |     44 +
 .../cloud/agent/api/BackupSnapshotCommand.java  |    121 +
 .../cloud/agent/api/BumpUpPriorityCommand.java  |     30 +
 core/src/com/cloud/agent/api/CancelCommand.java |     45 +
 .../com/cloud/agent/api/ChangeAgentAnswer.java  |     26 +
 .../com/cloud/agent/api/ChangeAgentCommand.java |     46 +
 .../com/cloud/agent/api/CheckHealthAnswer.java  |     26 +
 .../com/cloud/agent/api/CheckHealthCommand.java |     30 +
 .../com/cloud/agent/api/CheckNetworkAnswer.java |     38 +
 .../cloud/agent/api/CheckNetworkCommand.java    |     42 +
 .../com/cloud/agent/api/CheckOnHostAnswer.java  |     48 +
 .../com/cloud/agent/api/CheckOnHostCommand.java |     42 +
 .../com/cloud/agent/api/CheckRouterAnswer.java  |     81 +
 .../com/cloud/agent/api/CheckRouterCommand.java |     30 +
 .../agent/api/CheckS2SVpnConnectionsAnswer.java |     71 +
 .../api/CheckS2SVpnConnectionsCommand.java      |     39 +
 .../com/cloud/agent/api/CheckStateAnswer.java   |     45 +
 .../com/cloud/agent/api/CheckStateCommand.java  |     40 +
 .../agent/api/CheckVirtualMachineAnswer.java    |     52 +
 .../agent/api/CheckVirtualMachineCommand.java   |     41 +
 .../cloud/agent/api/CleanupNetworkRulesCmd.java |     47 +
 .../com/cloud/agent/api/ClusterSyncAnswer.java  |     55 +
 .../com/cloud/agent/api/ClusterSyncCommand.java |     47 +
 .../cloud/agent/api/ComputeChecksumCommand.java |     48 +
 .../api/ConsoleAccessAuthenticationAnswer.java  |     88 +
 .../api/ConsoleAccessAuthenticationCommand.java |     68 +
 .../api/ConsoleProxyLoadReportCommand.java      |     39 +
 ...reatePrivateTemplateFromSnapshotCommand.java |     82 +
 .../CreatePrivateTemplateFromVolumeCommand.java |     93 +
 .../agent/api/CreateStoragePoolCommand.java     |     30 +
 .../cloud/agent/api/CreateVMSnapshotAnswer.java |     62 +
 .../agent/api/CreateVMSnapshotCommand.java      |     42 +
 .../api/CreateVolumeFromSnapshotAnswer.java     |     38 +
 .../api/CreateVolumeFromSnapshotCommand.java    |     58 +
 .../api/CreateVolumeFromVMSnapshotAnswer.java   |     54 +
 .../api/CreateVolumeFromVMSnapshotCommand.java  |     88 +
 core/src/com/cloud/agent/api/CronCommand.java   |     24 +
 .../agent/api/DeleteSnapshotsDirCommand.java    |     51 +
 .../agent/api/DeleteStoragePoolCommand.java     |     61 +
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java |     49 +
 .../agent/api/DeleteVMSnapshotCommand.java      |     28 +
 core/src/com/cloud/agent/api/FenceAnswer.java   |     36 +
 core/src/com/cloud/agent/api/FenceCommand.java  |     61 +
 .../cloud/agent/api/GetDomRVersionAnswer.java   |     45 +
 .../com/cloud/agent/api/GetDomRVersionCmd.java  |     30 +
 .../com/cloud/agent/api/GetFileStatsAnswer.java |     37 +
 .../cloud/agent/api/GetFileStatsCommand.java    |     41 +
 .../com/cloud/agent/api/GetHostStatsAnswer.java |     88 +
 .../cloud/agent/api/GetHostStatsCommand.java    |     53 +
 .../cloud/agent/api/GetStorageStatsAnswer.java  |     51 +
 .../cloud/agent/api/GetStorageStatsCommand.java |     86 +
 .../cloud/agent/api/GetVmDiskStatsAnswer.java   |     47 +
 .../cloud/agent/api/GetVmDiskStatsCommand.java  |     54 +
 .../com/cloud/agent/api/GetVmStatsAnswer.java   |     40 +
 .../com/cloud/agent/api/GetVmStatsCommand.java  |     54 +
 .../com/cloud/agent/api/GetVncPortAnswer.java   |     48 +
 .../com/cloud/agent/api/GetVncPortCommand.java  |     43 +
 .../src/com/cloud/agent/api/HostStatsEntry.java |    113 +
 .../src/com/cloud/agent/api/MaintainAnswer.java |     46 +
 .../com/cloud/agent/api/MaintainCommand.java    |     28 +
 .../cloud/agent/api/ManageSnapshotAnswer.java   |     40 +
 .../cloud/agent/api/ManageSnapshotCommand.java  |     92 +
 core/src/com/cloud/agent/api/MigrateAnswer.java |     33 +
 .../src/com/cloud/agent/api/MigrateCommand.java |     59 +
 .../agent/api/MigrateWithStorageAnswer.java     |     43 +
 .../agent/api/MigrateWithStorageCommand.java    |     57 +
 .../api/MigrateWithStorageCompleteAnswer.java   |     41 +
 .../api/MigrateWithStorageCompleteCommand.java  |     36 +
 .../api/MigrateWithStorageReceiveAnswer.java    |     55 +
 .../api/MigrateWithStorageReceiveCommand.java   |     45 +
 .../agent/api/MigrateWithStorageSendAnswer.java |     39 +
 .../api/MigrateWithStorageSendCommand.java      |     58 +
 .../cloud/agent/api/ModifySshKeysCommand.java   |     44 +
 .../agent/api/ModifyStoragePoolAnswer.java      |     57 +
 .../agent/api/ModifyStoragePoolCommand.java     |     75 +
 .../com/cloud/agent/api/NetworkUsageAnswer.java |     61 +
 .../cloud/agent/api/NetworkUsageCommand.java    |     98 +
 core/src/com/cloud/agent/api/PingAnswer.java    |     33 +
 core/src/com/cloud/agent/api/PingCommand.java   |     45 +
 .../com/cloud/agent/api/PingRoutingCommand.java |     54 +
 .../api/PingRoutingWithNwGroupsCommand.java     |     46 +
 .../agent/api/PingRoutingWithOvsCommand.java    |     42 +
 .../com/cloud/agent/api/PingStorageCommand.java |     37 +
 .../com/cloud/agent/api/PingTestCommand.java    |     54 +
 core/src/com/cloud/agent/api/PlugNicAnswer.java |     25 +
 .../src/com/cloud/agent/api/PlugNicCommand.java |     53 +
 .../com/cloud/agent/api/PoolEjectCommand.java   |     42 +
 .../agent/api/PrepareForMigrationAnswer.java    |     34 +
 .../agent/api/PrepareForMigrationCommand.java   |     39 +
 .../agent/api/PrepareOCFS2NodesCommand.java     |     44 +
 .../api/PropagateResourceEventCommand.java      |     48 +
 core/src/com/cloud/agent/api/ReadyAnswer.java   |     31 +
 core/src/com/cloud/agent/api/ReadyCommand.java  |     58 +
 core/src/com/cloud/agent/api/RebootAnswer.java  |     42 +
 core/src/com/cloud/agent/api/RebootCommand.java |     45 +
 .../cloud/agent/api/RebootRouterCommand.java    |     38 +
 .../agent/api/RevertToVMSnapshotAnswer.java     |     63 +
 .../agent/api/RevertToVMSnapshotCommand.java    |     29 +
 core/src/com/cloud/agent/api/ScaleVmAnswer.java |     28 +
 .../src/com/cloud/agent/api/ScaleVmCommand.java |    123 +
 .../agent/api/ScheduleHostScanTaskCommand.java  |     32 +
 .../agent/api/SecStorageFirewallCfgCommand.java |     82 +
 .../cloud/agent/api/SecStorageSetupAnswer.java  |     33 +
 .../cloud/agent/api/SecStorageSetupCommand.java |     96 +
 .../agent/api/SecStorageVMSetupCommand.java     |     57 +
 .../agent/api/SecurityGroupRuleAnswer.java      |     70 +
 .../cloud/agent/api/SecurityGroupRulesCmd.java  |    304 +
 core/src/com/cloud/agent/api/SetupAnswer.java   |     37 +
 core/src/com/cloud/agent/api/SetupCommand.java  |     60 +
 .../agent/api/SetupGuestNetworkAnswer.java      |     25 +
 .../agent/api/SetupGuestNetworkCommand.java     |     72 +
 .../com/cloud/agent/api/ShutdownCommand.java    |     56 +
 .../com/cloud/agent/api/SnapshotCommand.java    |    126 +
 core/src/com/cloud/agent/api/StartAnswer.java   |     57 +
 core/src/com/cloud/agent/api/StartCommand.java  |     50 +
 core/src/com/cloud/agent/api/StartupAnswer.java |     44 +
 .../src/com/cloud/agent/api/StartupCommand.java |    286 +
 .../agent/api/StartupExternalDhcpCommand.java   |     25 +
 .../api/StartupExternalFirewallCommand.java     |     26 +
 .../api/StartupExternalLoadBalancerCommand.java |     26 +
 .../cloud/agent/api/StartupProxyCommand.java    |     49 +
 .../agent/api/StartupPxeServerCommand.java      |     25 +
 .../cloud/agent/api/StartupRoutingCommand.java  |    224 +
 .../api/StartupSecondaryStorageCommand.java     |     32 +
 .../cloud/agent/api/StartupStorageCommand.java  |    110 +
 .../agent/api/StartupTrafficMonitorCommand.java |     26 +
 core/src/com/cloud/agent/api/StopAnswer.java    |     56 +
 core/src/com/cloud/agent/api/StopCommand.java   |     65 +
 .../cloud/agent/api/TransferAgentCommand.java   |     57 +
 .../com/cloud/agent/api/UnPlugNicAnswer.java    |     25 +
 .../com/cloud/agent/api/UnPlugNicCommand.java   |     45 +
 .../cloud/agent/api/UnregisterNicCommand.java   |     55 +
 .../cloud/agent/api/UnregisterVMCommand.java    |     34 +
 .../agent/api/UpdateHostPasswordCommand.java    |     48 +
 .../cloud/agent/api/UpgradeSnapshotCommand.java |     64 +
 .../cloud/agent/api/VMSnapshotBaseCommand.java  |     74 +
 core/src/com/cloud/agent/api/VMSnapshotTO.java  |     90 +
 .../cloud/agent/api/ValidateSnapshotAnswer.java |     53 +
 .../agent/api/ValidateSnapshotCommand.java      |     84 +
 .../com/cloud/agent/api/VmDiskStatsEntry.java   |     90 +
 core/src/com/cloud/agent/api/VmStatsEntry.java  |    130 +
 .../api/baremetal/IpmISetBootDevCommand.java    |     43 +
 .../api/baremetal/IpmiBootorResetCommand.java   |     28 +
 .../api/baremetal/PreparePxeServerAnswer.java   |     29 +
 .../api/baremetal/PreparePxeServerCommand.java  |     80 +
 .../baremetal/prepareCreateTemplateCommand.java |     66 +
 .../cloud/agent/api/check/CheckSshAnswer.java   |     37 +
 .../cloud/agent/api/check/CheckSshCommand.java  |     65 +
 .../api/proxy/CheckConsoleProxyLoadCommand.java |     60 +
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java |     44 +
 .../com/cloud/agent/api/proxy/ProxyCommand.java |     25 +
 ...tartConsoleProxyAgentHttpHandlerCommand.java |     68 +
 .../api/proxy/WatchConsoleProxyLoadCommand.java |     65 +
 .../agent/api/routing/CreateIpAliasCommand.java |     36 +
 .../CreateLoadBalancerApplianceCommand.java     |     48 +
 .../agent/api/routing/DeleteIpAliasCommand.java |     50 +
 .../DestroyLoadBalancerApplianceCommand.java    |     32 +
 .../agent/api/routing/DhcpEntryCommand.java     |    144 +
 .../agent/api/routing/DnsMasqConfigCommand.java |     35 +
 .../routing/GlobalLoadBalancerConfigAnswer.java |     27 +
 .../GlobalLoadBalancerConfigCommand.java        |    104 +
 .../api/routing/HealthCheckLBConfigAnswer.java  |     42 +
 .../api/routing/HealthCheckLBConfigCommand.java |     39 +
 .../com/cloud/agent/api/routing/IpAliasTO.java  |     42 +
 .../cloud/agent/api/routing/IpAssocAnswer.java  |     48 +
 .../cloud/agent/api/routing/IpAssocCommand.java |     42 +
 .../agent/api/routing/IpAssocVpcCommand.java    |     29 +
 .../api/routing/LoadBalancerConfigCommand.java  |     68 +
 .../api/routing/NetworkElementCommand.java      |     56 +
 .../api/routing/RemoteAccessVpnCfgCommand.java  |     78 +
 .../agent/api/routing/SavePasswordCommand.java  |     56 +
 .../api/routing/SetFirewallRulesAnswer.java     |     36 +
 .../api/routing/SetFirewallRulesCommand.java    |     98 +
 .../agent/api/routing/SetNetworkACLAnswer.java  |     36 +
 .../agent/api/routing/SetNetworkACLCommand.java |    103 +
 .../routing/SetPortForwardingRulesAnswer.java   |     37 +
 .../routing/SetPortForwardingRulesCommand.java  |     40 +
 .../SetPortForwardingRulesVpcCommand.java       |     30 +
 .../agent/api/routing/SetSourceNatAnswer.java   |     27 +
 .../agent/api/routing/SetSourceNatCommand.java  |     42 +
 .../api/routing/SetStaticNatRulesAnswer.java    |     37 +
 .../api/routing/SetStaticNatRulesCommand.java   |     47 +
 .../agent/api/routing/SetStaticRouteAnswer.java |     36 +
 .../api/routing/SetStaticRouteCommand.java      |     62 +
 .../api/routing/Site2SiteVpnCfgCommand.java     |    154 +
 .../api/routing/SiteLoadBalancerConfig.java     |    134 +
 .../agent/api/routing/UserDataCommand.java      |     65 +
 .../cloud/agent/api/routing/VmDataCommand.java  |     69 +
 .../agent/api/routing/VpnUsersCfgCommand.java   |     94 +
 .../api/storage/AbstractDownloadCommand.java    |     78 +
 .../api/storage/AbstractUploadCommand.java      |     68 +
 .../agent/api/storage/CopyVolumeAnswer.java     |     43 +
 .../agent/api/storage/CopyVolumeCommand.java    |     74 +
 .../cloud/agent/api/storage/CreateAnswer.java   |     54 +
 .../cloud/agent/api/storage/CreateCommand.java  |    100 +
 .../storage/CreateEntityDownloadURLAnswer.java  |     37 +
 .../storage/CreateEntityDownloadURLCommand.java |     84 +
 .../storage/CreatePrivateTemplateAnswer.java    |     79 +
 .../storage/CreatePrivateTemplateCommand.java   |     90 +
 .../storage/DeleteEntityDownloadURLAnswer.java  |     37 +
 .../storage/DeleteEntityDownloadURLCommand.java |     72 +
 .../cloud/agent/api/storage/DestroyAnswer.java  |     31 +
 .../cloud/agent/api/storage/DestroyCommand.java |     55 +
 .../cloud/agent/api/storage/DownloadAnswer.java |    141 +
 .../agent/api/storage/ListTemplateAnswer.java   |     53 +
 .../agent/api/storage/ListTemplateCommand.java  |     47 +
 .../agent/api/storage/ListVolumeAnswer.java     |     53 +
 .../agent/api/storage/ListVolumeCommand.java    |     47 +
 .../storage/ManageVolumeAvailabilityAnswer.java |     32 +
 .../ManageVolumeAvailabilityCommand.java        |     54 +
 .../agent/api/storage/MigrateVolumeAnswer.java  |     38 +
 .../agent/api/storage/MigrateVolumeCommand.java |     51 +
 .../storage/PrimaryStorageDownloadAnswer.java   |     55 +
 .../storage/PrimaryStorageDownloadCommand.java  |     96 +
 .../agent/api/storage/ResizeVolumeAnswer.java   |     40 +
 .../agent/api/storage/ResizeVolumeCommand.java  |     85 +
 .../cloud/agent/api/storage/StorageCommand.java |     26 +
 .../agent/api/storage/UpgradeDiskAnswer.java    |     31 +
 .../agent/api/storage/UpgradeDiskCommand.java   |     50 +
 .../cloud/agent/api/storage/UploadAnswer.java   |    123 +
 .../cloud/agent/api/storage/UploadCommand.java  |    144 +
 .../api/storage/UploadProgressCommand.java      |     48 +
 .../com/cloud/agent/api/storage/ssCommand.java  |     48 +
 .../virtualnetwork/VirtualRoutingResource.java  |    237 +-
 .../cloud/agent/transport/ArrayTypeAdaptor.java |      8 +-
 .../agent/transport/InterfaceTypeAdaptor.java   |     66 +
 core/src/com/cloud/alert/AlertAdapter.java      |     22 -
 core/src/com/cloud/alert/AlertManager.java      |     58 -
 core/src/com/cloud/alert/AlertVO.java           |    183 -
 core/src/com/cloud/async/AsyncJobVO.java        |    400 -
 core/src/com/cloud/async/SyncQueueItemVO.java   |    141 -
 core/src/com/cloud/async/SyncQueueVO.java       |    137 -
 core/src/com/cloud/capacity/CapacityVO.java     |    204 -
 .../com/cloud/certificate/CertificateVO.java    |     63 -
 .../cloud/configuration/ConfigurationVO.java    |    107 -
 .../cloud/configuration/ResourceCountVO.java    |    131 -
 .../cloud/configuration/ResourceLimitVO.java    |    128 -
 .../consoleproxy/ConsoleProxyAllocator.java     |     27 -
 core/src/com/cloud/event/EventVO.java           |    194 -
 core/src/com/cloud/event/UsageEvent.java        |     33 -
 core/src/com/cloud/event/UsageEventVO.java      |    216 -
 core/src/com/cloud/event/dao/EventDao.java      |     38 -
 core/src/com/cloud/event/dao/EventDaoImpl.java  |    109 -
 core/src/com/cloud/event/dao/UsageEventDao.java |     36 -
 .../com/cloud/event/dao/UsageEventDaoImpl.java  |    187 -
 .../exception/AgentControlChannelException.java |     27 -
 .../exception/OperationTimedoutException.java   |     62 -
 core/src/com/cloud/host/DetailVO.java           |     73 -
 core/src/com/cloud/host/HostTagVO.java          |     65 -
 core/src/com/cloud/host/HostVO.java             |    732 -
 .../hypervisor/HypervisorCapabilitiesVO.java    |    181 -
 .../hyperv/resource/HypervResource.java         |    978 -
 .../com/cloud/info/ConsoleProxyLoadInfo.java    |     48 -
 .../com/cloud/info/RunningHostCountInfo.java    |     48 -
 .../com/cloud/network/HAProxyConfigurator.java  |     27 +-
 core/src/com/cloud/network/VpnUserVO.java       |    131 -
 .../network/security/SecurityGroupRuleVO.java   |    167 -
 .../network/security/SecurityGroupRulesVO.java  |    156 -
 .../network/security/SecurityGroupVMMapVO.java  |     89 -
 .../cloud/network/security/SecurityGroupVO.java |     99 -
 .../network/security/SecurityGroupWork.java     |     40 -
 .../network/security/SecurityGroupWorkVO.java   |    135 -
 .../cloud/network/security/VmRulesetLogVO.java  |     81 -
 .../com/cloud/resource/ResourceListener.java    |     40 +-
 .../com/cloud/resource/ServerResourceBase.java  |      2 +-
 .../resource/UnableDeleteHostException.java     |     28 -
 core/src/com/cloud/serializer/GsonHelper.java   |      9 +
 core/src/com/cloud/storage/DiskOfferingVO.java  |    318 -
 .../com/cloud/storage/GuestOSCategoryVO.java    |     68 -
 core/src/com/cloud/storage/GuestOSVO.java       |     90 -
 .../src/com/cloud/storage/JavaStorageLayer.java |     16 +
 .../com/cloud/storage/LaunchPermissionVO.java   |     57 -
 core/src/com/cloud/storage/S3VO.java            |    209 -
 .../src/com/cloud/storage/SecondaryStorage.java |     30 -
 .../cloud/storage/SecondaryStorageLayer.java    |     39 -
 .../src/com/cloud/storage/SnapshotPolicyVO.java |    133 -
 .../com/cloud/storage/SnapshotScheduleVO.java   |    125 -
 core/src/com/cloud/storage/SnapshotVO.java      |    298 -
 core/src/com/cloud/storage/StorageLayer.java    |      2 +
 .../cloud/storage/StoragePoolDiscoverer.java    |     35 -
 .../com/cloud/storage/StoragePoolHostAssoc.java |     35 -
 .../com/cloud/storage/StoragePoolHostVO.java    |    109 -
 .../com/cloud/storage/StoragePoolWorkVO.java    |    118 -
 core/src/com/cloud/storage/SwiftVO.java         |    108 -
 core/src/com/cloud/storage/UploadVO.java        |    268 -
 .../com/cloud/storage/VMTemplateDetailVO.java   |     84 -
 .../src/com/cloud/storage/VMTemplateHostVO.java |    322 -
 core/src/com/cloud/storage/VMTemplateS3VO.java  |    204 -
 .../cloud/storage/VMTemplateStoragePoolVO.java  |    275 -
 .../com/cloud/storage/VMTemplateSwiftVO.java    |    107 -
 core/src/com/cloud/storage/VMTemplateVO.java    |    534 -
 .../src/com/cloud/storage/VMTemplateZoneVO.java |    116 -
 core/src/com/cloud/storage/VolumeHostVO.java    |    347 -
 core/src/com/cloud/storage/VolumeVO.java        |    454 -
 .../resource/CifsSecondaryStorageResource.java  |    755 -
 .../resource/LocalSecondaryStorageResource.java |    246 -
 .../resource/NfsSecondaryStorageResource.java   |   1842 -
 .../resource/SecondaryStorageResource.java      |     28 -
 .../SecondaryStorageResourceHandler.java        |     24 -
 .../storage/resource/StoragePoolResource.java   |      4 +-
 .../storage/resource/StorageProcessor.java      |     46 +
 .../StorageSubsystemCommandHandler.java         |     27 +
 .../StorageSubsystemCommandHandlerBase.java     |    141 +
 .../storage/snapshot/SnapshotSchedule.java      |     46 -
 .../cloud/storage/template/DownloadManager.java |    103 -
 .../storage/template/DownloadManagerImpl.java   |   1049 -
 .../template/HttpTemplateDownloader.java        |    101 +-
 .../cloud/storage/template/IsoProcessor.java    |      5 +
 .../com/cloud/storage/template/Processor.java   |      5 +
 .../cloud/storage/template/QCOW2Processor.java  |     23 +
 .../storage/template/RawImageProcessor.java     |      5 +
 .../storage/template/S3TemplateDownloader.java  |    418 +
 .../storage/template/TemplateConstants.java     |     11 +-
 .../storage/template/TemplateLocation.java      |     76 +-
 .../cloud/storage/template/UploadManager.java   |     85 -
 .../storage/template/UploadManagerImpl.java     |    645 -
 .../cloud/storage/template/VhdProcessor.java    |     28 +
 .../cloud/storage/template/VmdkProcessor.java   |     92 +-
 core/src/com/cloud/user/AccountVO.java          |    182 -
 core/src/com/cloud/user/SSHKeyPairVO.java       |    119 -
 core/src/com/cloud/user/UserAccountVO.java      |    284 -
 core/src/com/cloud/user/UserStatisticsVO.java   |    165 -
 core/src/com/cloud/user/UserStatsLogVO.java     |    132 -
 core/src/com/cloud/user/UserVO.java             |    265 -
 core/src/com/cloud/vm/ConsoleProxy.java         |     27 -
 core/src/com/cloud/vm/ConsoleProxyVO.java       |    151 -
 core/src/com/cloud/vm/DomainRouterVO.java       |    246 -
 core/src/com/cloud/vm/InstanceGroupVMMapVO.java |     71 -
 core/src/com/cloud/vm/InstanceGroupVO.java      |    120 -
 core/src/com/cloud/vm/SecondaryStorageVm.java   |     26 -
 core/src/com/cloud/vm/SecondaryStorageVmVO.java |    135 -
 core/src/com/cloud/vm/SystemVm.java             |     26 -
 core/src/com/cloud/vm/UserVmCloneSettingVO.java |     50 -
 core/src/com/cloud/vm/UserVmDetailVO.java       |     85 -
 core/src/com/cloud/vm/UserVmVO.java             |    137 -
 core/src/com/cloud/vm/VMInstanceVO.java         |    483 -
 core/src/com/cloud/vm/VirtualDisk.java          |     31 -
 core/src/com/cloud/vm/VirtualMachineName.java   |    190 -
 core/src/com/cloud/vm/VmDetailConstants.java    |     23 -
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |    224 -
 .../storage/command/AttachAnswer.java           |     47 +
 .../storage/command/AttachCommand.java          |    126 +
 .../command/AttachPrimaryDataStoreAnswer.java   |     56 +
 .../command/AttachPrimaryDataStoreCmd.java      |     39 +
 .../storage/command/CopyCmdAnswer.java          |     37 +
 .../cloudstack/storage/command/CopyCommand.java |     66 +
 .../storage/command/CreateObjectAnswer.java     |     43 +
 .../storage/command/CreateObjectCommand.java    |     45 +
 .../command/CreatePrimaryDataStoreCmd.java      |     38 +
 .../storage/command/DeleteCommand.java          |     45 +
 .../storage/command/DettachAnswer.java          |     47 +
 .../storage/command/DettachCommand.java         |     90 +
 .../storage/command/DownloadCommand.java        |    189 +
 .../command/DownloadProgressCommand.java        |     49 +
 .../command/StorageSubSystemCommand.java        |     23 +
 .../cloudstack/storage/to/ImageStoreTO.java     |     79 +
 .../storage/to/PrimaryDataStoreTO.java          |    103 +
 .../cloudstack/storage/to/SnapshotObjectTO.java |    137 +
 .../cloudstack/storage/to/TemplateObjectTO.java |    217 +
 .../cloudstack/storage/to/VolumeObjectTO.java   |    223 +
 .../com/cloud/agent/transport/RequestTest.java  |     72 +-
 .../api/agent/test/AgentControlAnswerTest.java  |     35 +
 .../api/agent/test/AgentControlCommandTest.java |     33 +
 .../cloudstack/api/agent/test/AnswerTest.java   |     73 +
 .../api/agent/test/AttachIsoCommandTest.java    |     80 +
 .../api/agent/test/AttachVolumeAnswerTest.java  |     65 +
 .../api/agent/test/AttachVolumeCommandTest.java |    114 +
 .../agent/test/BackupSnapshotAnswerTest.java    |     75 +
 .../agent/test/BackupSnapshotCommandTest.java   |    270 +
 .../agent/test/BumpUpPriorityCommandTest.java   |     83 +
 .../api/agent/test/CancelCommandTest.java       |     46 +
 .../api/agent/test/ChangeAgentAnswerTest.java   |     44 +
 .../api/agent/test/ChangeAgentCommandTest.java  |     50 +
 .../api/agent/test/CheckHealthAnswerTest.java   |     49 +
 .../api/agent/test/CheckHealthCommandTest.java  |     40 +
 .../api/agent/test/CheckNetworkAnswerTest.java  |    272 +
 .../api/agent/test/CheckNetworkCommandTest.java |     53 +
 .../api/agent/test/CheckOnHostCommandTest.java  |    483 +
 .../api/agent/test/SnapshotCommandTest.java     |    207 +
 debian/changelog                                |     12 +
 debian/cloudstack-agent.install                 |      6 +-
 debian/cloudstack-awsapi.install                |     10 +-
 debian/cloudstack-common.install                |      8 +-
 debian/cloudstack-management.install            |     35 +-
 debian/cloudstack-management.postinst           |     11 +-
 debian/cloudstack-usage.postinst                |     12 +-
 debian/control                                  |      6 +-
 debian/rules                                    |     60 +-
 deps/XenServerJava/pom.xml                      |      2 +-
 deps/install-non-oss.sh                         |     13 -
 developer/pom.xml                               |     19 +-
 docs/en-US/Admin_Guide.xml                      |      2 +-
 docs/en-US/Book_Info.xml                        |     39 +-
 docs/en-US/Book_Info_Release_Notes_4-0.xml      |     39 -
 docs/en-US/Book_Info_Release_Notes_4.xml        |     38 +
 docs/en-US/CloudStack_GSoC_Guide.ent            |     22 +
 docs/en-US/CloudStack_GSoC_Guide.xml            |     52 +
 docs/en-US/CloudStack_Nicira_NVP_Guide.xml      |      3 +-
 docs/en-US/Common_Content/Legal_Notice.xml      |      6 -
 docs/en-US/Common_Content/feedback.xml          |     24 +
 docs/en-US/Developers_Guide.xml                 |      4 +-
 docs/en-US/Installation_Guide.xml               |      6 +-
 docs/en-US/LDAP-for-user-authentication.xml     |     51 +
 .../LDAPserver-for-user-authentication.xml      |     39 -
 docs/en-US/MidoNet_Plugin_Guide.ent             |     22 +
 docs/en-US/MidoNet_Plugin_Guide.xml             |     52 +
 docs/en-US/Preface.xml                          |      2 +-
 docs/en-US/Release_Notes.xml                    |   4948 +-
 docs/en-US/about-password-encryption.xml        |      2 +-
 docs/en-US/about-primary-storage.xml            |      5 +-
 docs/en-US/about-regions.xml                    |      5 +-
 docs/en-US/about-secondary-storage.xml          |     22 +-
 docs/en-US/about-working-with-vms.xml           |     85 +-
 docs/en-US/about-zones.xml                      |     22 +-
 docs/en-US/accessing-system-vms.xml             |     66 +
 docs/en-US/accounts-users-domains.xml           |     88 +-
 docs/en-US/accounts.xml                         |      6 +-
 docs/en-US/acquire-new-ip-address.xml           |     38 +-
 docs/en-US/acquire-new-ip-for-vpc.xml           |     33 +-
 docs/en-US/add-clusters-vsphere.xml             |     11 +-
 docs/en-US/add-gateway-vpc.xml                  |    133 +-
 docs/en-US/add-ip-range.xml                     |    124 +
 docs/en-US/add-load-balancer-rule.xml           |     20 +-
 docs/en-US/add-loadbalancer-rule-vpc.xml        |    481 +-
 .../add-password-management-to-templates.xml    |     25 +-
 docs/en-US/add-portforward-rule-vpc.xml         |     36 +-
 docs/en-US/add-remove-nic-ui.xml                |    152 +
 docs/en-US/add-remove-nic.xml                   |     14 +-
 docs/en-US/add-tier.xml                         |     15 +-
 docs/en-US/add-vm-tier-sharednw.xml             |     62 +
 docs/en-US/add-vm-to-tier.xml                   |     14 +-
 docs/en-US/add-vpc.xml                          |      7 +-
 docs/en-US/added-API-commands-4-1.xml           |      1 -
 docs/en-US/added-API-commands-4.2.xml           |    554 +
 docs/en-US/added-API-commands.xml               |      2 +-
 docs/en-US/admin-alerts.xml                     |     95 +-
 docs/en-US/advanced-zone-configuration.xml      |     17 +-
 .../advanced-zone-network-traffic-types.xml     |      2 +-
 ...nced-zone-physical-network-configuration.xml |      1 +
 docs/en-US/append-displayname-vms.xml           |     84 +
 docs/en-US/attaching-volume.xml                 |     57 +-
 docs/en-US/aws-ec2-configuration.xml            |      6 +-
 docs/en-US/aws-ec2-introduction.xml             |      2 +-
 docs/en-US/basic-zone-configuration.xml         |    414 +-
 docs/en-US/basic-zone-network-traffic-types.xml |      4 +-
 docs/en-US/best-practices-for-vms.xml           |     30 +-
 docs/en-US/best-practices-primary-storage.xml   |      6 +-
 docs/en-US/build-nonoss.xml                     |     49 +
 docs/en-US/build-rpm.xml                        |     22 +-
 docs/en-US/building-devcloud.xml                |      2 +-
 docs/en-US/building-documentation.xml           |      2 +-
 docs/en-US/building-marvin.xml                  |      2 +-
 docs/en-US/building-translation.xml             |      2 +-
 ...nge-console-proxy-ssl-certificate-domain.xml |      2 +-
 docs/en-US/change-database-config.xml           |      2 +-
 docs/en-US/change-database-password.xml         |     16 +-
 ...change-network-offering-on-guest-network.xml |     75 +-
 docs/en-US/changed-API-commands-4.2.xml         |   1129 +
 docs/en-US/changing-service-offering-for-vm.xml |    194 +-
 docs/en-US/choosing-a-hypervisor.xml            |    136 +
 docs/en-US/citrix-xenserver-installation.xml    |     27 +-
 docs/en-US/configure-acl.xml                    |    378 +-
 docs/en-US/configure-package-repository.xml     |      6 +-
 docs/en-US/configure-usage-server.xml           |      4 +-
 docs/en-US/configure-vpc.xml                    |      1 +
 docs/en-US/configure-vpn.xml                    |      4 +-
 docs/en-US/console-proxy.xml                    |      2 +-
 docs/en-US/create-linux-template.xml            |     41 +
 docs/en-US/create-vpn-connection-vpc.xml        |     31 +-
 docs/en-US/create-vpn-gateway-for-vpc.xml       |     30 +-
 docs/en-US/creating-a-plugin.xml                |     29 +
 docs/en-US/creating-compute-offerings.xml       |      4 +
 docs/en-US/creating-disk-offerings.xml          |     10 +-
 docs/en-US/creating-my-first-plugin.xml         |    216 +
 docs/en-US/creating-network-offerings.xml       |     66 +-
 docs/en-US/creating-new-volumes.xml             |     99 +-
 docs/en-US/creating-shared-network.xml          |    132 +
 docs/en-US/creating-vms.xml                     |    124 +-
 docs/en-US/database-replication.xml             |     18 +-
 docs/en-US/delete-event-alerts.xml              |     89 +
 docs/en-US/delete-reset-vpn.xml                 |     28 +-
 docs/en-US/deployment-architecture-overview.xml |      2 +-
 docs/en-US/detach-move-volumes.xml              |     57 +-
 docs/en-US/egress-firewall-rule.xml             |    220 +-
 docs/en-US/elastic-ip.xml                       |    103 +
 docs/en-US/enable-disable-static-nat-vpc.xml    |     35 +-
 docs/en-US/event-framework.xml                  |      2 +-
 docs/en-US/events.xml                           |      5 +-
 .../example-LDAP-configuration-commands.xml     |     47 -
 .../example-activedirectory-configuration.xml   |     43 +
 docs/en-US/example-openldap-configuration.xml   |     44 +
 .../external-firewalls-and-load-balancers.xml   |      1 +
 docs/en-US/feedback.xml                         |     24 +
 docs/en-US/first_ms_node_install.xml            |      4 +-
 docs/en-US/getting-release.xml                  |      2 +-
 docs/en-US/global-config.xml                    |    380 +-
 docs/en-US/gslb.xml                             |    487 +
 docs/en-US/gsoc-dharmesh.xml                    |    149 +
 docs/en-US/gsoc-imduffy15.xml                   |    395 +
 docs/en-US/gsoc-meng.xml                        |    235 +
 docs/en-US/gsoc-midsummer-dharmesh.xml          |    193 +
 docs/en-US/gsoc-midsummer-ian.xml               |    344 +
 docs/en-US/gsoc-midsummer-meng.xml              |    216 +
 docs/en-US/gsoc-midsummer-nguyen.xml            |    480 +
 docs/en-US/gsoc-midsummer-shiva.xml             |    283 +
 docs/en-US/gsoc-midsummer.xml                   |     35 +
 docs/en-US/gsoc-proposals.xml                   |     35 +
 docs/en-US/gsoc-shiva.xml                       |     70 +
 docs/en-US/gsoc-tuna.xml                        |    231 +
 docs/en-US/guest-ip-ranges.xml                  |     10 +-
 docs/en-US/guest-traffic.xml                    |     24 +-
 docs/en-US/hardware-firewall.xml                |      7 +-
 docs/en-US/health-checks-for-lb-rules.xml       |     51 +
 docs/en-US/host-add-xenserver-kvm-ovm.xml       |      6 +-
 docs/en-US/host-allocation.xml                  |    105 +-
 docs/en-US/hypervisor-host-install-agent.xml    |     51 +-
 docs/en-US/hypervisor-host-install-firewall.xml |      4 +-
 docs/en-US/hypervisor-host-install-libvirt.xml  |      9 +-
 ...ervisor-host-install-network-openvswitch.xml |      2 +-
 docs/en-US/hypervisor-host-install-network.xml  |     12 +-
 docs/en-US/hypervisor-installation.xml          |      1 +
 docs/en-US/hypervisor-kvm-install-flow.xml      |      1 +
 .../hypervisor-support-for-primarystorage.xml   |    148 +-
 docs/en-US/images/VMSnapshotButton.png          |    Bin 0 -> 967 bytes
 docs/en-US/images/Workloads.png                 |    Bin 0 -> 39846 bytes
 docs/en-US/images/add-account-screen.png        |    Bin 0 -> 71491 bytes
 docs/en-US/images/add-cluster.png               |    Bin 35697 -> 37800 bytes
 docs/en-US/images/add-gslb.png                  |    Bin 0 -> 17665 bytes
 docs/en-US/images/add-guest-network.png         |    Bin 20547 -> 24669 bytes
 docs/en-US/images/add-ip-range.png              |    Bin 0 -> 16572 bytes
 docs/en-US/images/add-ldap-configuration-ad.png |    Bin 0 -> 70112 bytes
 .../images/add-ldap-configuration-failure.png   |    Bin 0 -> 84858 bytes
 .../images/add-ldap-configuration-openldap.png  |    Bin 0 -> 65270 bytes
 docs/en-US/images/add-ldap-configuration.png    |    Bin 0 -> 78542 bytes
 docs/en-US/images/add-new-gateway-vpc.png       |    Bin 23184 -> 21912 bytes
 docs/en-US/images/add-tier.png                  |    Bin 14891 -> 19054 bytes
 docs/en-US/images/add-vlan-icon.png             |    Bin 0 -> 860 bytes
 docs/en-US/images/add-vm-vpc.png                |    Bin 0 -> 8596 bytes
 docs/en-US/images/add-vpc.png                   |    Bin 16597 -> 20392 bytes
 docs/en-US/images/addAccount-icon.png           |    Bin 0 -> 605 bytes
 docs/en-US/images/addvm-tier-sharednw.png       |    Bin 0 -> 111465 bytes
 docs/en-US/images/async-calls.png               |    Bin 0 -> 126157 bytes
 docs/en-US/images/change-affinity-button.png    |    Bin 0 -> 7300 bytes
 docs/en-US/images/clusterDefinition.png         |    Bin 0 -> 52607 bytes
 .../en-US/images/configuration-edit-success.png |    Bin 0 -> 86909 bytes
 docs/en-US/images/configurations-screen.png     |    Bin 0 -> 85285 bytes
 docs/en-US/images/create-account-post.png       |    Bin 0 -> 116063 bytes
 docs/en-US/images/create-account-request.png    |    Bin 0 -> 169834 bytes
 docs/en-US/images/dedicate-resource-button.png  |    Bin 0 -> 7144 bytes
 docs/en-US/images/del-tier.png                  |    Bin 0 -> 815 bytes
 .../delete-ldap-configuration-failure.png       |    Bin 0 -> 39952 bytes
 docs/en-US/images/delete-ldap-configuration.png |    Bin 0 -> 69084 bytes
 docs/en-US/images/delete-ldap.png               |    Bin 0 -> 27832 bytes
 docs/en-US/images/edit-configuration.png        |    Bin 0 -> 86589 bytes
 docs/en-US/images/edit-traffic-type.png         |    Bin 0 -> 93662 bytes
 docs/en-US/images/eip-ns-basiczone.png          |    Bin 0 -> 63227 bytes
 docs/en-US/images/gslb.png                      |    Bin 0 -> 68556 bytes
 docs/en-US/images/instances-screen.png          |    Bin 0 -> 66865 bytes
 docs/en-US/images/jenkins-pipeline.png          |    Bin 0 -> 29136 bytes
 docs/en-US/images/l3_services.png               |    Bin 0 -> 30362 bytes
 docs/en-US/images/launchHadoopClusterApi.png    |    Bin 0 -> 13427 bytes
 docs/en-US/images/launchHadoopClusterCmd.png    |    Bin 0 -> 83972 bytes
 docs/en-US/images/ldap-account-addition.png     |    Bin 0 -> 69225 bytes
 docs/en-US/images/ldap-configuration.png        |    Bin 0 -> 33360 bytes
 docs/en-US/images/ldap-global-settings.png      |    Bin 0 -> 31145 bytes
 docs/en-US/images/ldap-list-users.png           |    Bin 0 -> 85922 bytes
 docs/en-US/images/list-domain-vms.png           |    Bin 0 -> 130442 bytes
 docs/en-US/images/list-ldap-configuration.png   |    Bin 0 -> 38909 bytes
 docs/en-US/images/list-specific-vm.png          |    Bin 0 -> 86323 bytes
 docs/en-US/images/list-virtualmachines.png      |    Bin 0 -> 124665 bytes
 docs/en-US/images/mesos-integration-arch.jpg    |      0
 docs/en-US/images/network_service.png           |    Bin 0 -> 28162 bytes
 docs/en-US/images/nvp-add-controller.png        |    Bin 0 -> 35928 bytes
 docs/en-US/images/nvp-enable-provider.png       |    Bin 0 -> 32158 bytes
 docs/en-US/images/nvp-network-offering.png      |    Bin 0 -> 104060 bytes
 docs/en-US/images/nvp-physical-network-stt.png  |    Bin 0 -> 27317 bytes
 docs/en-US/images/nvp-vpc-offering-edit.png     |    Bin 0 -> 29279 bytes
 docs/en-US/images/odl_structure.jpg             |    Bin 0 -> 116542 bytes
 docs/en-US/images/plugin1.jpg                   |    Bin 0 -> 32999 bytes
 docs/en-US/images/plugin2.jpg                   |    Bin 0 -> 35149 bytes
 docs/en-US/images/plugin3.jpg                   |    Bin 0 -> 41983 bytes
 docs/en-US/images/plugin4.jpg                   |    Bin 0 -> 32125 bytes
 docs/en-US/images/plugin_intro.jpg              |    Bin 0 -> 22247 bytes
 docs/en-US/images/remove-nic.png                |    Bin 0 -> 735 bytes
 docs/en-US/images/replace-acl-icon.png          |    Bin 0 -> 982 bytes
 docs/en-US/images/replace-acl-list.png          |    Bin 0 -> 7706 bytes
 docs/en-US/images/revert-vm.png                 |    Bin 0 -> 860 bytes
 docs/en-US/images/set-default-nic.png           |    Bin 0 -> 1012 bytes
 docs/en-US/images/start-vm-screen.png           |    Bin 0 -> 65228 bytes
 docs/en-US/images/traffic-label.png             |    Bin 0 -> 15520 bytes
 docs/en-US/images/traffic-type.png              |    Bin 0 -> 19159 bytes
 docs/en-US/images/vds-name.png                  |    Bin 0 -> 64739 bytes
 docs/en-US/images/view-systemvm-details.png     |    Bin 0 -> 25483 bytes
 docs/en-US/images/vm-running.png                |    Bin 0 -> 67708 bytes
 docs/en-US/images/vpc-lb.png                    |    Bin 0 -> 181811 bytes
 docs/en-US/images/whirrDependency.png           |    Bin 0 -> 10794 bytes
 docs/en-US/images/whirrOutput.png               |    Bin 0 -> 61831 bytes
 .../increase-management-server-max-memory.xml   |      4 +-
 docs/en-US/install-usage-server.xml             |      2 +-
 docs/en-US/inter-vlan-routing.xml               |     30 +-
 docs/en-US/ip-forwarding-firewalling.xml        |      9 +-
 docs/en-US/ip-vlan-tenant.xml                   |    212 +
 docs/en-US/ipv6-support.xml                     |      6 +-
 docs/en-US/isolated-networks.xml                |     25 +-
 docs/en-US/libcloud-examples.xml                |     75 +
 docs/en-US/limit-accounts-domains.xml           |    371 +
 docs/en-US/linux-installation.xml               |     89 +-
 docs/en-US/load-balancer-rules.xml              |      1 +
 docs/en-US/lxc-install.xml                      |    110 +
 docs/en-US/lxc-topology-req.xml                 |     24 +
 docs/en-US/manage-cloud.xml                     |      2 +-
 docs/en-US/management-server-install-client.xml |      8 +-
 .../management-server-install-db-external.xml   |      2 +-
 .../management-server-install-db-local.xml      |     12 +-
 docs/en-US/management-server-install-flow.xml   |     28 +-
 .../management-server-install-multi-node.xml    |     10 +-
 .../management-server-install-prepare-os.xml    |      2 +-
 .../management-server-install-systemvm.xml      |      6 +-
 docs/en-US/management-server-lb.xml             |      2 +-
 docs/en-US/manual-live-migration.xml            |     13 +-
 ...migrate-datadisk-volume-new-storage-pool.xml |     61 +-
 ...te-vm-rootvolume-volume-new-storage-pool.xml |     34 +-
 docs/en-US/minimum-system-requirements.xml      |      3 +-
 docs/en-US/multiple-ip-nic.xml                  |     95 +
 docs/en-US/multiple-ip-range.xml                |     42 +
 docs/en-US/network-offerings.xml                |     83 +-
 docs/en-US/network-service-providers.xml        |    233 +-
 docs/en-US/networks.xml                         |     10 +-
 docs/en-US/non-contiguous-vlan.xml              |     67 +
 ...ver-provisioning-service-offering-limits.xml |    140 +-
 docs/en-US/password-storage-engine.xml          |     74 +
 docs/en-US/plugin-development.xml               |     28 +
 docs/en-US/plugin-midonet-about.xml             |     27 +
 docs/en-US/plugin-midonet-features.xml          |     57 +
 docs/en-US/plugin-midonet-introduction.xml      |     26 +
 docs/en-US/plugin-midonet-preparations.xml      |     90 +
 docs/en-US/plugin-midonet-provider.xml          |     39 +
 docs/en-US/plugin-midonet-revisions.xml         |     45 +
 docs/en-US/plugin-midonet-ui.xml                |     65 +
 docs/en-US/plugin-midonet-usage.xml             |     29 +
 docs/en-US/plugin-niciranvp-about.xml           |      2 +-
 .../en-US/plugin-niciranvp-devicemanagement.xml |     32 +-
 docs/en-US/plugin-niciranvp-features.xml        |     67 +-
 docs/en-US/plugin-niciranvp-guide.xml           |     31 -
 docs/en-US/plugin-niciranvp-introduction.xml    |      5 +-
 .../en-US/plugin-niciranvp-networkofferings.xml |    131 +
 docs/en-US/plugin-niciranvp-physicalnet.xml     |     37 +
 docs/en-US/plugin-niciranvp-preparations.xml    |     11 +-
 docs/en-US/plugin-niciranvp-provider.xml        |     28 +-
 docs/en-US/plugin-niciranvp-revisions.xml       |     14 +
 docs/en-US/plugin-niciranvp-tables.xml          |    105 +-
 docs/en-US/plugin-niciranvp-usage.xml           |     11 +-
 docs/en-US/plugin-niciranvp-vpc.xml             |     30 +
 docs/en-US/plugin-niciranvp-vpcfeatures.xml     |     28 +
 .../plugin-niciranvp-vpcnetworkoffering.xml     |     81 +
 docs/en-US/plugin-niciranvp-vpcoffering.xml     |     38 +
 docs/en-US/portable-ip.xml                      |    145 +
 docs/en-US/prepare-linux-template.xml           |    190 +
 docs/en-US/prepare-system-vm-template.xml       |      4 +
 docs/en-US/primary-storage-add.xml              |     99 +-
 docs/en-US/pvlan.xml                            |    247 +
 docs/en-US/query-filter.xml                     |     60 -
 docs/en-US/region-add.xml                       |     73 +-
 docs/en-US/release-ip-for-vpc.xml               |     31 +-
 docs/en-US/remove-tier.xml                      |     22 +-
 docs/en-US/remove-vpc.xml                       |      5 +-
 docs/en-US/removed-api-4.2.xml                  |    144 +
 docs/en-US/reserved-ip-addresses-non-csvms.xml  |      7 +-
 docs/en-US/reset-volume-on-reboot.xml           |     32 +
 .../runtime-behavior-of-primary-storage.xml     |      5 +-
 docs/en-US/search-user-bind-dn.xml              |     47 -
 docs/en-US/secondary-storage-add.xml            |     45 +-
 docs/en-US/set-database-buffer-pool-size.xml    |      2 +-
 .../set-global-project-resource-limits.xml      |      2 +-
 docs/en-US/set-projects-creator-permissions.xml |      2 +-
 docs/en-US/set-up-invitations.xml               |      2 +-
 docs/en-US/set-up-network-for-users.xml         |     13 +-
 docs/en-US/shared-networks.xml                  |     40 +-
 docs/en-US/signing-api-calls-python.xml         |    101 +
 docs/en-US/signing-api-requests.xml             |      7 +-
 docs/en-US/site-to-site-vpn.xml                 |     11 +-
 docs/en-US/snapshot-performance-vmware.xml      |     39 +
 docs/en-US/source-build.xml                     |      6 +-
 docs/en-US/source.xml                           |      1 +
 docs/en-US/stop-restart-management-server.xml   |      6 +-
 docs/en-US/stopping-and-starting-vms.xml        |      2 +-
 docs/en-US/storage-plugins.xml                  |    144 +
 docs/en-US/storage-setup.xml                    |    192 +
 docs/en-US/storage.xml                          |     15 +-
 docs/en-US/sys-offering-sysvm.xml               |      2 +-
 docs/en-US/third-party-ui-plugin.xml            |    364 +
 docs/en-US/tools.xml                            |      1 +
 docs/en-US/topology-req.xml                     |      3 +-
 docs/en-US/translating-documentation.xml        |      2 +-
 ...troubleshooting-working-with-server-logs.xml |      6 +-
 docs/en-US/update-iso-vm.xml                    |     47 +
 docs/en-US/upload-existing-volume-to-vm.xml     |    129 +-
 docs/en-US/user-data-and-meta-data.xml          |      2 +-
 docs/en-US/user-services-overview.xml           |      6 +-
 docs/en-US/using-multiple-guest-networks.xml    |      1 +
 docs/en-US/using-netscaler-load-balancers.xml   |    132 +-
 docs/en-US/using-sshkeys.xml                    |      2 +-
 docs/en-US/using-vpn-with-mac.xml               |      2 +-
 docs/en-US/using-vpn-with-windows.xml           |      2 +-
 docs/en-US/verifying-source.xml                 |      2 +-
 docs/en-US/virtual-machines.xml                 |      8 +
 docs/en-US/vlan-assign-isolated-nw.xml          |     66 +
 docs/en-US/vlan-provisioning.xml                |      3 +
 docs/en-US/vm-snapshots.xml                     |    148 +
 docs/en-US/vm-storage-migration.xml             |     35 +-
 docs/en-US/vmware-cluster-config-dvswitch.xml   |    227 +-
 docs/en-US/vmware-install.xml                   |      6 +-
 docs/en-US/vmware-requirements.xml              |      2 +-
 docs/en-US/vnmc-cisco.xml                       |    400 +
 .../volume-deletion-garbage-collection.xml      |     29 +-
 docs/en-US/vpc.xml                              |     10 +-
 docs/en-US/vpn.xml                              |     57 +-
 docs/en-US/whats-new.xml                        |      8 +-
 docs/en-US/windows-installation.xml             |      9 +-
 docs/en-US/work-with-usage.xml                  |     26 +-
 docs/en-US/working-with-hosts.xml               |      2 +-
 docs/en-US/working-with-iso.xml                 |      1 +
 docs/en-US/working-with-snapshots.xml           |      3 +-
 docs/en-US/working-with-system-vm.xml           |      1 +
 docs/en-US/working-with-templates.xml           |      1 +
 docs/en-US/working-with-volumes.xml             |     52 +-
 docs/en-US/writing-new-documentation.xml        |      4 +-
 docs/en-US/zone-add.xml                         |     33 +-
 docs/pot/configure-package-repository.pot       |      4 +-
 docs/publican-cloudstack/defaults.cfg           |      4 +-
 docs/publican-cloudstack/en-US/Feedback.xml     |     56 +-
 docs/publican-gsoc-2013.cfg                     |     27 +
 docs/publican-plugin-midonet.cfg                |     28 +
 docs/qig/en-US/Author_Group.xml                 |     32 +
 docs/qig/en-US/Book_Info.xml                    |     52 +
 docs/qig/en-US/Chapter.xml                      |     53 +
 docs/qig/en-US/Environment.xml                  |    258 +
 docs/qig/en-US/Management.xml                   |     99 +
 docs/qig/en-US/Overview.xml                     |     93 +
 docs/qig/en-US/Preface.xml                      |     33 +
 docs/qig/en-US/Revision_History.xml             |     42 +
 docs/qig/en-US/config.xml                       |    177 +
 docs/qig/en-US/kvm.xml                          |    142 +
 docs/qig/en-US/qig.ent                          |     22 +
 docs/qig/en-US/qig.xml                          |     36 +
 docs/qig/publican.cfg                           |     22 +
 engine/api/pom.xml                              |     21 +-
 .../src/com/cloud/vm/VirtualMachineGuru.java    |     62 +
 .../src/com/cloud/vm/VirtualMachineManager.java |    198 +
 .../datacenter/entity/api/HostEntity.java       |     89 +-
 .../service/NetworkOrchestrationService.java    |    216 +
 .../service/VolumeOrchestrationService.java     |    100 +
 .../rest/service/api/ClusterRestService.java    |    168 +-
 .../rest/service/api/NetworkRestService.java    |    120 +-
 .../engine/rest/service/api/PodRestService.java |    154 +-
 .../service/api/VirtualMachineRestService.java  |    108 +-
 .../rest/service/api/VolumeRestService.java     |    148 +-
 .../rest/service/api/ZoneRestService.java       |    170 +-
 .../engine/service/api/OperationsServices.java  |     19 +-
 .../subsystem/api/storage/AbstractScope.java    |      6 +-
 .../engine/subsystem/api/storage/ChapInfo.java  |     26 +
 .../subsystem/api/storage/ClusterScope.java     |     10 +-
 .../subsystem/api/storage/CommandResult.java    |     52 -
 .../api/storage/CopyCommandResult.java          |      9 +-
 .../subsystem/api/storage/CreateCmdResult.java  |     24 +-
 .../api/storage/DataMigrationSubSystem.java     |     29 -
 .../api/storage/DataMotionService.java          |     34 +
 .../api/storage/DataMotionStrategy.java         |     38 +
 .../subsystem/api/storage/DataObject.java       |     37 +-
 .../api/storage/DataObjectInStore.java          |     12 +-
 .../subsystem/api/storage/DataObjectType.java   |     25 -
 .../engine/subsystem/api/storage/DataStore.java |     14 +
 .../subsystem/api/storage/DataStoreDriver.java  |     20 +-
 .../api/storage/DataStoreLifeCycle.java         |     20 +-
 .../subsystem/api/storage/DataStoreManager.java |     23 +-
 .../api/storage/DataStoreProvider.java          |     33 +-
 .../api/storage/DataStoreProviderManager.java   |      9 +-
 .../subsystem/api/storage/DataStoreRole.java    |     54 -
 .../subsystem/api/storage/DataStoreStatus.java  |     23 -
 .../engine/subsystem/api/storage/EndPoint.java  |     12 +-
 .../subsystem/api/storage/EndPointSelector.java |     31 +
 .../engine/subsystem/api/storage/HostScope.java |     21 +-
 .../api/storage/HypervisorHostListener.java     |      1 +
 .../subsystem/api/storage/ImageDataFactory.java |     26 -
 .../api/storage/ImageDataStoreProvider.java     |     24 -
 .../subsystem/api/storage/ImageService.java     |     29 -
 .../api/storage/ImageStoreProvider.java         |     28 +
 .../storage/ObjectInDataStoreStateMachine.java  |      7 +-
 .../api/storage/PrimaryDataStoreDriver.java     |      2 +
 .../api/storage/PrimaryDataStoreInfo.java       |     16 +-
 .../api/storage/PrimaryDataStoreLifeCycle.java  |      1 -
 .../api/storage/PrimaryDataStoreParameters.java |     90 +-
 .../engine/subsystem/api/storage/Scope.java     |     10 +-
 .../engine/subsystem/api/storage/ScopeType.java |     27 -
 .../api/storage/SnapshotDataFactory.java        |      9 +-
 .../subsystem/api/storage/SnapshotInfo.java     |     17 +-
 .../subsystem/api/storage/SnapshotProfile.java  |      9 +-
 .../subsystem/api/storage/SnapshotResult.java   |     48 +
 .../subsystem/api/storage/SnapshotService.java  |     28 +
 .../subsystem/api/storage/SnapshotStrategy.java |     16 +-
 .../api/storage/StorageCacheManager.java        |     40 +
 .../subsystem/api/storage/StorageEvent.java     |      4 +-
 .../api/storage/StorageOrchestrator.java        |     68 -
 .../api/storage/StoragePoolAllocator.java       |     33 +-
 .../subsystem/api/storage/StorageSubSystem.java |     29 -
 .../api/storage/TemplateDataFactory.java        |     31 +
 .../subsystem/api/storage/TemplateEvent.java    |      5 +-
 .../subsystem/api/storage/TemplateInfo.java     |      7 +-
 .../subsystem/api/storage/TemplateProfile.java  |    287 -
 .../subsystem/api/storage/TemplateService.java  |     66 +
 .../subsystem/api/storage/TemplateState.java    |      6 +-
 .../api/storage/VolumeDataFactory.java          |      5 +
 .../subsystem/api/storage/VolumeInfo.java       |     28 +-
 .../subsystem/api/storage/VolumeProfile.java    |     34 -
 .../subsystem/api/storage/VolumeService.java    |     37 +-
 .../engine/subsystem/api/storage/ZoneScope.java |      6 +-
 .../api/storage/disktype/DiskFormat.java        |      7 +-
 .../subsystem/api/storage/disktype/VHDX.java    |     16 +
 .../subsystem/api/storage/type/BaseImage.java   |      6 +-
 .../subsystem/api/storage/type/DataDisk.java    |      8 +-
 .../engine/subsystem/api/storage/type/Iso.java  |      8 +-
 .../subsystem/api/storage/type/RootDisk.java    |      8 +-
 .../subsystem/api/storage/type/Unknown.java     |      6 +-
 .../api/storage/type/VolumeTypeBase.java        |     54 +-
 .../api/storage/type/VolumeTypeHelper.java      |     37 +-
 .../storage/command/CommandResult.java          |     52 +
 .../datastore/db/DataStoreProviderDao.java      |     25 -
 .../datastore/db/DataStoreProviderDaoImpl.java  |     38 -
 .../datastore/db/DataStoreProviderVO.java       |     60 -
 .../datastore/db/PrimaryDataStoreDao.java       |    112 -
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |    430 -
 .../datastore/db/PrimaryDataStoreDetailVO.java  |     79 -
 .../db/PrimaryDataStoreDetailsDao.java          |     27 -
 .../db/PrimaryDataStoreDetailsDaoImpl.java      |     71 -
 .../datastore/db/StoragePoolDetailVO.java       |     81 -
 .../datastore/db/StoragePoolDetailsDao.java     |     28 -
 .../storage/datastore/db/StoragePoolVO.java     |    311 -
 .../image/datastore/ImageStoreEntity.java       |     46 +
 .../storage/image/datastore/ImageStoreInfo.java |     27 +
 .../engine/subsystem/api/storage/ScopeTest.java |     18 +-
 engine/components-api/pom.xml                   |     27 +-
 .../src/com/cloud/agent/AgentManager.java       |    148 +
 .../src/com/cloud/agent/Listener.java           |    119 +
 .../src/com/cloud/alert/AlertManager.java       |     69 +
 .../src/com/cloud/capacity/CapacityManager.java |     78 +
 .../configuration/ConfigurationManager.java     |    242 +
 .../cloud/deploy/DeploymentPlanningManager.java |     50 +
 .../src/com/cloud/event/UsageEventUtils.java    |    168 +
 .../com/cloud/ha/HighAvailabilityManager.java   |    114 +
 .../cloud/hypervisor/HypervisorGuruManager.java |     27 +
 .../src/com/cloud/network/IpAddressManager.java |    187 +
 .../com/cloud/network/NetworkStateListener.java |    107 +
 .../src/com/cloud/network/addr/PublicIp.java    |    235 +
 .../network/lb/LoadBalancingRulesManager.java   |     62 +
 .../cloud/network/rules/FirewallManager.java    |     89 +
 .../com/cloud/network/rules/RulesManager.java   |     66 +
 .../cloud/network/rules/StaticNatRuleImpl.java  |    147 +
 .../cloud/network/vpc/NetworkACLManager.java    |    155 +
 .../src/com/cloud/network/vpc/VpcManager.java   |    177 +
 .../src/com/cloud/resource/Discoverer.java      |     51 +
 .../src/com/cloud/resource/ResourceManager.java |    138 +
 .../cloud/resource/ResourceStateAdapter.java    |     63 +
 .../src/com/cloud/template/TemplateManager.java |    119 +
 .../com/cloud/vm/ReservationContextImpl.java    |     96 +
 .../com/cloud/vm/VirtualMachineProfileImpl.java |    258 +
 .../cloud/vm/snapshot/VMSnapshotManager.java    |     47 +
 .../apache/cloudstack/compute/ComputeGuru.java  |     68 +-
 .../cloudstack/context/ServerContexts.java      |     67 +
 engine/compute/pom.xml                          |     52 -
 .../cloudstack/compute/ComputeOrchestrator.java |     34 -
 .../compute/ComputeOrchestratorImpl.java        |     42 -
 engine/network/pom.xml                          |      2 +-
 engine/orchestration/pom.xml                    |     27 +-
 .../com/cloud/agent/manager/AgentAttache.java   |    519 +
 .../cloud/agent/manager/AgentManagerImpl.java   |   1584 +
 .../agent/manager/ClusteredAgentAttache.java    |    260 +
 .../manager/ClusteredAgentManagerImpl.java      |   1421 +
 .../manager/ClusteredDirectAgentAttache.java    |     69 +
 .../agent/manager/ConnectedAgentAttache.java    |     95 +
 .../cloud/agent/manager/DirectAgentAttache.java |    219 +
 .../com/cloud/agent/manager/DummyAttache.java   |     48 +
 .../src/com/cloud/agent/manager/Routable.java   |     29 +
 .../agent/manager/SynchronousListener.java      |    135 +
 .../cluster/ClusteredAgentRebalanceService.java |     30 +
 .../agentlb/AgentLoadBalancerPlanner.java       |     29 +
 .../ClusterBasedAgentLoadBalancerPlanner.java   |    150 +
 .../vm/ClusteredVirtualMachineManagerImpl.java  |     64 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java |   3276 +
 .../cloud/entity/api/VMEntityManager.java       |     52 +-
 .../cloud/entity/api/VMEntityManagerImpl.java   |    179 +-
 .../entity/api/VirtualMachineEntityFactory.java |     41 -
 .../entity/api/VirtualMachineEntityImpl.java    |    446 +-
 .../cloud/entity/api/db/VMComputeTagVO.java     |     67 -
 .../engine/cloud/entity/api/db/VMEntityVO.java  |    577 -
 .../cloud/entity/api/db/VMNetworkMapVO.java     |     71 -
 .../cloud/entity/api/db/VMReservationVO.java    |    127 -
 .../cloud/entity/api/db/VMRootDiskTagVO.java    |     67 -
 .../entity/api/db/VolumeReservationVO.java      |    100 -
 .../entity/api/db/dao/VMComputeTagDao.java      |     31 -
 .../entity/api/db/dao/VMComputeTagDaoImpl.java  |     89 -
 .../cloud/entity/api/db/dao/VMEntityDao.java    |     41 -
 .../entity/api/db/dao/VMEntityDaoImpl.java      |    169 -
 .../entity/api/db/dao/VMNetworkMapDao.java      |     31 -
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java  |     85 -
 .../entity/api/db/dao/VMReservationDao.java     |     34 -
 .../entity/api/db/dao/VMReservationDaoImpl.java |    111 -
 .../entity/api/db/dao/VMRootDiskTagDao.java     |     31 -
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java |     88 -
 .../entity/api/db/dao/VolumeReservationDao.java |     31 -
 .../api/db/dao/VolumeReservationDaoImpl.java    |     68 -
 .../entity/api/ClusterEntityImpl.java           |    386 +-
 .../entity/api/DataCenterResourceManager.java   |     68 +-
 .../api/DataCenterResourceManagerImpl.java      |    226 +-
 .../datacenter/entity/api/HostEntityImpl.java   |    398 +-
 .../datacenter/entity/api/PodEntityImpl.java    |    422 +-
 .../datacenter/entity/api/ZoneEntityImpl.java   |    402 +-
 .../entity/api/db/ClusterDetailsVO.java         |     38 +-
 .../datacenter/entity/api/db/DcDetailVO.java    |     38 +-
 .../datacenter/entity/api/db/EngineCluster.java |     46 +-
 .../entity/api/db/EngineClusterVO.java          |     38 +-
 .../entity/api/db/EngineDataCenter.java         |     46 +-
 .../entity/api/db/EngineDataCenterVO.java       |    254 +-
 .../datacenter/entity/api/db/EngineHost.java    |     48 +-
 .../entity/api/db/EngineHostPodVO.java          |    202 +-
 .../datacenter/entity/api/db/EngineHostVO.java  |     12 +-
 .../datacenter/entity/api/db/EnginePod.java     |     46 +-
 .../entity/api/db/dao/DcDetailsDao.java         |     34 +-
 .../entity/api/db/dao/DcDetailsDaoImpl.java     |     42 +-
 .../entity/api/db/dao/EngineClusterDao.java     |     28 +-
 .../entity/api/db/dao/EngineClusterDaoImpl.java |     36 +-
 .../entity/api/db/dao/EngineDataCenterDao.java  |     36 +-
 .../api/db/dao/EngineDataCenterDaoImpl.java     |     40 +-
 .../entity/api/db/dao/EngineHostDao.java        |      2 +-
 .../entity/api/db/dao/EngineHostDaoImpl.java    |      9 +-
 .../entity/api/db/dao/EngineHostPodDao.java     |     46 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java |    182 +-
 .../entity/api/db/dao/HostDetailsDaoImpl.java   |     43 +-
 .../engine/orchestration/CloudOrchestrator.java |    293 +
 .../orchestration/NetworkOrchestrator.java      |   3087 +
 .../orchestration/VolumeOrchestrator.java       |   1183 +
 .../service/api/ProvisioningServiceImpl.java    |    340 +-
 .../orchestration/CloudOrchestrator.java        |    284 -
 .../cloud/vm/VirtualMachineManagerImplTest.java |    465 +
 .../provisioning/test/ProvisioningTest.java     |    242 +-
 .../cloudstack/platform/planning/Concierge.java |     36 -
 engine/pom.xml                                  |     18 +-
 engine/schema/pom.xml                           |     14 +-
 engine/schema/src/com/cloud/alert/AlertVO.java  |    183 +
 .../src/com/cloud/alert/dao/AlertDao.java       |     33 +
 .../src/com/cloud/alert/dao/AlertDaoImpl.java   |    171 +
 .../src/com/cloud/capacity/CapacityVO.java      |    204 +
 .../src/com/cloud/capacity/dao/CapacityDao.java |     45 +
 .../com/cloud/capacity/dao/CapacityDaoImpl.java |    871 +
 .../com/cloud/certificate/CertificateVO.java    |     63 +
 .../cloud/certificate/dao/CertificateDao.java   |     24 +
 .../certificate/dao/CertificateDaoImpl.java     |     63 +
 .../cluster/agentlb/HostTransferMapVO.java      |     98 +
 .../cluster/agentlb/dao/HostTransferMapDao.java |     45 +
 .../agentlb/dao/HostTransferMapDaoImpl.java     |    146 +
 .../cloud/configuration/ResourceCountVO.java    |    131 +
 .../cloud/configuration/ResourceLimitVO.java    |    128 +
 .../configuration/dao/ResourceCountDao.java     |     60 +
 .../configuration/dao/ResourceCountDaoImpl.java |    238 +
 .../configuration/dao/ResourceLimitDao.java     |     37 +
 .../configuration/dao/ResourceLimitDaoImpl.java |    114 +
 .../src/com/cloud/dc/AccountVlanMapVO.java      |     65 +
 .../src/com/cloud/dc/ClusterDetailsDao.java     |     32 +
 .../src/com/cloud/dc/ClusterDetailsDaoImpl.java |    144 +
 .../src/com/cloud/dc/ClusterDetailsVO.java      |     74 +
 engine/schema/src/com/cloud/dc/ClusterVO.java   |    189 +
 .../src/com/cloud/dc/ClusterVSMMapVO.java       |     62 +
 .../src/com/cloud/dc/DataCenterIpAddressVO.java |    115 +
 .../dc/DataCenterLinkLocalIpAddressVO.java      |    108 +
 .../schema/src/com/cloud/dc/DataCenterVO.java   |    460 +
 .../src/com/cloud/dc/DataCenterVnetVO.java      |    120 +
 engine/schema/src/com/cloud/dc/DcDetailVO.java  |     73 +
 engine/schema/src/com/cloud/dc/HostPodVO.java   |    197 +
 engine/schema/src/com/cloud/dc/PodCluster.java  |     67 +
 .../schema/src/com/cloud/dc/PodVlanMapVO.java   |     62 +
 engine/schema/src/com/cloud/dc/PodVlanVO.java   |     98 +
 .../com/cloud/dc/StorageNetworkIpAddressVO.java |    120 +
 .../com/cloud/dc/StorageNetworkIpRangeVO.java   |    184 +
 engine/schema/src/com/cloud/dc/VlanVO.java      |    204 +
 .../src/com/cloud/dc/dao/AccountVlanMapDao.java |     30 +
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java |     75 +
 .../schema/src/com/cloud/dc/dao/ClusterDao.java |     39 +
 .../src/com/cloud/dc/dao/ClusterDaoImpl.java    |    265 +
 .../src/com/cloud/dc/dao/ClusterVSMMapDao.java  |     29 +
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java  |     95 +
 .../src/com/cloud/dc/dao/DataCenterDao.java     |     82 +
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |    430 +
 .../cloud/dc/dao/DataCenterIpAddressDao.java    |     38 +
 .../dc/dao/DataCenterIpAddressDaoImpl.java      |    225 +
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java |     32 +
 .../DataCenterLinkLocalIpAddressDaoImpl.java    |    188 +
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java |     53 +
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java |    340 +
 .../src/com/cloud/dc/dao/DcDetailsDao.java      |     32 +
 .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java  |    110 +
 .../schema/src/com/cloud/dc/dao/HostPodDao.java |     36 +
 .../src/com/cloud/dc/dao/HostPodDaoImpl.java    |    140 +
 .../schema/src/com/cloud/dc/dao/PodVlanDao.java |     30 +
 .../src/com/cloud/dc/dao/PodVlanDaoImpl.java    |    139 +
 .../src/com/cloud/dc/dao/PodVlanMapDao.java     |     30 +
 .../src/com/cloud/dc/dao/PodVlanMapDaoImpl.java |     75 +
 .../dc/dao/StorageNetworkIpAddressDao.java      |     32 +
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java  |    114 +
 .../cloud/dc/dao/StorageNetworkIpRangeDao.java  |     32 +
 .../dc/dao/StorageNetworkIpRangeDaoImpl.java    |     78 +
 engine/schema/src/com/cloud/dc/dao/VlanDao.java |     59 +
 .../src/com/cloud/dc/dao/VlanDaoImpl.java       |    361 +
 .../schema/src/com/cloud/domain/DomainVO.java   |    215 +
 .../src/com/cloud/domain/dao/DomainDao.java     |     35 +
 .../src/com/cloud/domain/dao/DomainDaoImpl.java |    292 +
 engine/schema/src/com/cloud/event/EventVO.java  |    194 +
 .../src/com/cloud/event/UsageEventVO.java       |    240 +
 .../src/com/cloud/event/dao/EventDao.java       |     38 +
 .../src/com/cloud/event/dao/EventDaoImpl.java   |    118 +
 .../src/com/cloud/event/dao/UsageEventDao.java  |     35 +
 .../com/cloud/event/dao/UsageEventDaoImpl.java  |    187 +
 engine/schema/src/com/cloud/host/DetailVO.java  |     73 +
 engine/schema/src/com/cloud/host/HostTagVO.java |     65 +
 engine/schema/src/com/cloud/host/HostVO.java    |    732 +
 .../schema/src/com/cloud/host/dao/HostDao.java  |     90 +
 .../src/com/cloud/host/dao/HostDaoImpl.java     |   1040 +
 .../src/com/cloud/host/dao/HostDetailsDao.java  |     32 +
 .../com/cloud/host/dao/HostDetailsDaoImpl.java  |    121 +
 .../src/com/cloud/host/dao/HostTagsDao.java     |     30 +
 .../src/com/cloud/host/dao/HostTagsDaoImpl.java |     75 +
 .../hypervisor/HypervisorCapabilitiesVO.java    |    212 +
 .../dao/HypervisorCapabilitiesDao.java          |     38 +
 .../dao/HypervisorCapabilitiesDaoImpl.java      |    105 +
 .../src/com/cloud/keystore/KeystoreDao.java     |     29 +
 .../src/com/cloud/keystore/KeystoreDaoImpl.java |    118 +
 .../src/com/cloud/keystore/KeystoreVO.java      |    101 +
 .../cloud/network/LBHealthCheckPolicyVO.java    |    157 +
 .../com/cloud/network/UserIpv6AddressVO.java    |    188 +
 .../schema/src/com/cloud/network/VpnUserVO.java |    131 +
 .../as/AutoScalePolicyConditionMapVO.java       |     61 +
 .../com/cloud/network/as/AutoScalePolicyVO.java |    134 +
 .../network/as/AutoScaleVmGroupPolicyMapVO.java |     64 +
 .../cloud/network/as/AutoScaleVmGroupVO.java    |    191 +
 .../cloud/network/as/AutoScaleVmProfileVO.java  |    218 +
 .../src/com/cloud/network/as/ConditionVO.java   |    129 +
 .../src/com/cloud/network/as/CounterVO.java     |    111 +
 .../as/dao/AutoScalePolicyConditionMapDao.java  |     28 +
 .../dao/AutoScalePolicyConditionMapDaoImpl.java |     61 +
 .../network/as/dao/AutoScalePolicyDao.java      |     24 +
 .../network/as/dao/AutoScalePolicyDaoImpl.java  |     38 +
 .../network/as/dao/AutoScaleVmGroupDao.java     |     28 +
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java |     65 +
 .../as/dao/AutoScaleVmGroupPolicyMapDao.java    |     30 +
 .../dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |     77 +
 .../network/as/dao/AutoScaleVmProfileDao.java   |     25 +
 .../as/dao/AutoScaleVmProfileDaoImpl.java       |     38 +
 .../com/cloud/network/as/dao/ConditionDao.java  |     28 +
 .../cloud/network/as/dao/ConditionDaoImpl.java  |     56 +
 .../com/cloud/network/as/dao/CounterDao.java    |     29 +
 .../cloud/network/as/dao/CounterDaoImpl.java    |     70 +
 .../network/dao/AccountGuestVlanMapDao.java     |     34 +
 .../network/dao/AccountGuestVlanMapDaoImpl.java |     83 +
 .../network/dao/AccountGuestVlanMapVO.java      |     94 +
 .../network/dao/ExternalFirewallDeviceDao.java  |     58 +
 .../dao/ExternalFirewallDeviceDaoImpl.java      |     96 +
 .../network/dao/ExternalFirewallDeviceVO.java   |    161 +
 .../dao/ExternalLoadBalancerDeviceDao.java      |     74 +
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java  |    127 +
 .../dao/ExternalLoadBalancerDeviceVO.java       |    227 +
 .../network/dao/FirewallRulesCidrsDao.java      |     29 +
 .../network/dao/FirewallRulesCidrsDaoImpl.java  |     70 +
 .../cloud/network/dao/FirewallRulesCidrsVO.java |     65 +
 .../com/cloud/network/dao/FirewallRulesDao.java |     66 +
 .../cloud/network/dao/FirewallRulesDaoImpl.java |    363 +
 .../src/com/cloud/network/dao/IPAddressDao.java |     83 +
 .../com/cloud/network/dao/IPAddressDaoImpl.java |    418 +
 .../src/com/cloud/network/dao/IPAddressVO.java  |    336 +
 .../dao/InlineLoadBalancerNicMapDao.java        |     24 +
 .../dao/InlineLoadBalancerNicMapDaoImpl.java    |     46 +
 .../network/dao/InlineLoadBalancerNicMapVO.java |     60 +
 .../network/dao/LBHealthCheckPolicyDao.java     |     35 +
 .../network/dao/LBHealthCheckPolicyDaoImpl.java |     71 +
 .../network/dao/LBStickinessPolicyDao.java      |     34 +
 .../network/dao/LBStickinessPolicyDaoImpl.java  |     69 +
 .../cloud/network/dao/LBStickinessPolicyVO.java |    145 +
 .../com/cloud/network/dao/LoadBalancerDao.java  |     32 +
 .../cloud/network/dao/LoadBalancerDaoImpl.java  |     79 +
 .../cloud/network/dao/LoadBalancerVMMapDao.java |     31 +
 .../network/dao/LoadBalancerVMMapDaoImpl.java   |     97 +
 .../cloud/network/dao/LoadBalancerVMMapVO.java  |     89 +
 .../com/cloud/network/dao/LoadBalancerVO.java   |    116 +
 .../cloud/network/dao/NetworkAccountDao.java    |     23 +
 .../network/dao/NetworkAccountDaoImpl.java      |     44 +
 .../com/cloud/network/dao/NetworkAccountVO.java |     72 +
 .../src/com/cloud/network/dao/NetworkDao.java   |    118 +
 .../com/cloud/network/dao/NetworkDaoImpl.java   |    648 +
 .../com/cloud/network/dao/NetworkDomainDao.java |     27 +
 .../cloud/network/dao/NetworkDomainDaoImpl.java |     75 +
 .../com/cloud/network/dao/NetworkDomainVO.java  |     72 +
 .../network/dao/NetworkExternalFirewallDao.java |     38 +
 .../dao/NetworkExternalFirewallDaoImpl.java     |     61 +
 .../network/dao/NetworkExternalFirewallVO.java  |     88 +
 .../dao/NetworkExternalLoadBalancerDao.java     |     38 +
 .../dao/NetworkExternalLoadBalancerDaoImpl.java |     62 +
 .../dao/NetworkExternalLoadBalancerVO.java      |     89 +
 .../src/com/cloud/network/dao/NetworkOpDao.java |     26 +
 .../com/cloud/network/dao/NetworkOpDaoImpl.java |     84 +
 .../src/com/cloud/network/dao/NetworkOpVO.java  |     76 +
 .../cloud/network/dao/NetworkRuleConfigDao.java |     26 +
 .../network/dao/NetworkRuleConfigDaoImpl.java   |     51 +
 .../cloud/network/dao/NetworkRuleConfigVO.java  |     77 +
 .../cloud/network/dao/NetworkServiceMapDao.java |     39 +
 .../network/dao/NetworkServiceMapDaoImpl.java   |    176 +
 .../cloud/network/dao/NetworkServiceMapVO.java  |     92 +
 .../src/com/cloud/network/dao/NetworkVO.java    |    565 +
 .../cloud/network/dao/PhysicalNetworkDao.java   |     28 +
 .../network/dao/PhysicalNetworkDaoImpl.java     |     79 +
 .../PhysicalNetworkIsolationMethodDaoImpl.java  |     70 +
 .../dao/PhysicalNetworkIsolationMethodVO.java   |     68 +
 .../dao/PhysicalNetworkServiceProviderDao.java  |     28 +
 .../PhysicalNetworkServiceProviderDaoImpl.java  |    131 +
 .../dao/PhysicalNetworkServiceProviderVO.java   |    322 +
 .../network/dao/PhysicalNetworkTagDaoImpl.java  |     63 +
 .../cloud/network/dao/PhysicalNetworkTagVO.java |     68 +
 .../dao/PhysicalNetworkTrafficTypeDao.java      |     33 +
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java  |    143 +
 .../dao/PhysicalNetworkTrafficTypeVO.java       |    149 +
 .../cloud/network/dao/PhysicalNetworkVO.java    |    246 +
 .../com/cloud/network/dao/PortProfileDao.java   |     50 +
 .../cloud/network/dao/PortProfileDaoImpl.java   |     89 +
 .../com/cloud/network/dao/PortProfileVO.java    |    204 +
 .../cloud/network/dao/RemoteAccessVpnDao.java   |     30 +
 .../network/dao/RemoteAccessVpnDaoImpl.java     |     84 +
 .../cloud/network/dao/RemoteAccessVpnVO.java    |    142 +
 .../com/cloud/network/dao/RouterNetworkDao.java |     26 +
 .../cloud/network/dao/RouterNetworkDaoImpl.java |     62 +
 .../com/cloud/network/dao/RouterNetworkVO.java  |     75 +
 .../dao/Site2SiteCustomerGatewayDao.java        |     27 +
 .../dao/Site2SiteCustomerGatewayDaoImpl.java    |     67 +
 .../network/dao/Site2SiteCustomerGatewayVO.java |    208 +
 .../network/dao/Site2SiteVpnConnectionDao.java  |     29 +
 .../dao/Site2SiteVpnConnectionDaoImpl.java      |     97 +
 .../network/dao/Site2SiteVpnConnectionVO.java   |    143 +
 .../network/dao/Site2SiteVpnGatewayDao.java     |     23 +
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java |     50 +
 .../network/dao/Site2SiteVpnGatewayVO.java      |    114 +
 .../cloud/network/dao/UserIpv6AddressDao.java   |     41 +
 .../network/dao/UserIpv6AddressDaoImpl.java     |    122 +
 .../network/dao/VirtualRouterProviderDao.java   |     31 +
 .../dao/VirtualRouterProviderDaoImpl.java       |     79 +
 .../src/com/cloud/network/dao/VpnUserDao.java   |     28 +
 .../com/cloud/network/dao/VpnUserDaoImpl.java   |     87 +
 .../element/VirtualRouterProviderVO.java        |    120 +
 .../com/cloud/network/rules/FirewallRuleVO.java |    275 +
 .../network/rules/PortForwardingRuleVO.java     |     96 +
 .../rules/dao/PortForwardingRulesDao.java       |     47 +
 .../rules/dao/PortForwardingRulesDaoImpl.java   |    169 +
 .../network/security/SecurityGroupRuleVO.java   |    148 +
 .../network/security/SecurityGroupRulesVO.java  |    169 +
 .../network/security/SecurityGroupVMMapVO.java  |     89 +
 .../cloud/network/security/SecurityGroupVO.java |     99 +
 .../network/security/SecurityGroupWork.java     |     40 +
 .../network/security/SecurityGroupWorkVO.java   |    135 +
 .../cloud/network/security/VmRulesetLogVO.java  |     81 +
 .../network/security/dao/SecurityGroupDao.java  |     30 +
 .../security/dao/SecurityGroupDaoImpl.java      |    136 +
 .../security/dao/SecurityGroupRuleDao.java      |     35 +
 .../security/dao/SecurityGroupRuleDaoImpl.java  |    176 +
 .../security/dao/SecurityGroupRulesDao.java     |     48 +
 .../security/dao/SecurityGroupRulesDaoImpl.java |     88 +
 .../security/dao/SecurityGroupVMMapDao.java     |     38 +
 .../security/dao/SecurityGroupVMMapDaoImpl.java |    166 +
 .../security/dao/SecurityGroupWorkDao.java      |     49 +
 .../security/dao/SecurityGroupWorkDaoImpl.java  |    241 +
 .../network/security/dao/VmRulesetLogDao.java   |     29 +
 .../security/dao/VmRulesetLogDaoImpl.java       |    200 +
 .../cloud/network/vpc/NetworkACLItemDao.java    |     37 +
 .../com/cloud/network/vpc/NetworkACLItemVO.java |    237 +
 .../src/com/cloud/network/vpc/NetworkACLVO.java |     79 +
 .../src/com/cloud/network/vpc/PrivateIpVO.java  |    103 +
 .../com/cloud/network/vpc/StaticRouteVO.java    |    141 +
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |    221 +
 .../network/vpc/VpcOfferingServiceMapVO.java    |     89 +
 .../com/cloud/network/vpc/VpcOfferingVO.java    |    151 +
 .../com/cloud/network/vpc/VpcServiceMapVO.java  |     90 +
 .../schema/src/com/cloud/network/vpc/VpcVO.java |    181 +
 .../cloud/network/vpc/dao/NetworkACLDao.java    |     23 +
 .../network/vpc/dao/NetworkACLDaoImpl.java      |     35 +
 .../network/vpc/dao/NetworkACLItemDaoImpl.java  |    113 +
 .../com/cloud/network/vpc/dao/PrivateIpDao.java |     76 +
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java |    165 +
 .../cloud/network/vpc/dao/StaticRouteDao.java   |     35 +
 .../network/vpc/dao/StaticRouteDaoImpl.java     |    119 +
 .../src/com/cloud/network/vpc/dao/VpcDao.java   |     47 +
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |    152 +
 .../cloud/network/vpc/dao/VpcGatewayDao.java    |     34 +
 .../network/vpc/dao/VpcGatewayDaoImpl.java      |     89 +
 .../cloud/network/vpc/dao/VpcOfferingDao.java   |     32 +
 .../network/vpc/dao/VpcOfferingDaoImpl.java     |     71 +
 .../vpc/dao/VpcOfferingServiceMapDao.java       |     41 +
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java   |    119 +
 .../cloud/network/vpc/dao/VpcServiceMapDao.java |     40 +
 .../network/vpc/dao/VpcServiceMapDaoImpl.java   |    115 +
 .../offerings/NetworkOfferingDetailsVO.java     |     90 +
 .../offerings/NetworkOfferingServiceMapVO.java  |     94 +
 .../com/cloud/offerings/NetworkOfferingVO.java  |    444 +
 .../cloud/offerings/dao/NetworkOfferingDao.java |     64 +
 .../offerings/dao/NetworkOfferingDaoImpl.java   |    193 +
 .../dao/NetworkOfferingDetailsDao.java          |     31 +
 .../dao/NetworkOfferingDetailsDaoImpl.java      |     79 +
 .../dao/NetworkOfferingServiceMapDao.java       |     50 +
 .../dao/NetworkOfferingServiceMapDaoImpl.java   |    171 +
 .../com/cloud/projects/ProjectAccountVO.java    |     96 +
 .../com/cloud/projects/ProjectInvitationVO.java |    150 +
 .../src/com/cloud/projects/ProjectVO.java       |    163 +
 .../cloud/projects/dao/ProjectAccountDao.java   |     43 +
 .../projects/dao/ProjectAccountDaoImpl.java     |    157 +
 .../src/com/cloud/projects/dao/ProjectDao.java  |     37 +
 .../com/cloud/projects/dao/ProjectDaoImpl.java  |    124 +
 .../projects/dao/ProjectInvitationDao.java      |     44 +
 .../projects/dao/ProjectInvitationDaoImpl.java  |    171 +
 .../com/cloud/secstorage/CommandExecLogDao.java |     25 +
 .../cloud/secstorage/CommandExecLogDaoImpl.java |     49 +
 .../com/cloud/secstorage/CommandExecLogVO.java  |    112 +
 .../cloud/service/ServiceOfferingDetailsVO.java |     73 +
 .../com/cloud/service/ServiceOfferingVO.java    |    255 +
 .../cloud/service/dao/ServiceOfferingDao.java   |     36 +
 .../service/dao/ServiceOfferingDaoImpl.java     |    174 +
 .../service/dao/ServiceOfferingDetailsDao.java  |     29 +
 .../dao/ServiceOfferingDetailsDaoImpl.java      |     98 +
 .../src/com/cloud/storage/DiskOfferingVO.java   |    443 +
 .../com/cloud/storage/GuestOSCategoryVO.java    |     65 +
 .../com/cloud/storage/GuestOSHypervisorVO.java  |     73 +
 .../schema/src/com/cloud/storage/GuestOSVO.java |     87 +
 .../com/cloud/storage/LaunchPermissionVO.java   |     58 +
 .../src/com/cloud/storage/SnapshotPolicyVO.java |    131 +
 .../com/cloud/storage/SnapshotScheduleVO.java   |    125 +
 .../src/com/cloud/storage/SnapshotVO.java       |    229 +
 .../com/cloud/storage/StoragePoolHostAssoc.java |     35 +
 .../com/cloud/storage/StoragePoolHostVO.java    |    103 +
 .../com/cloud/storage/StoragePoolWorkVO.java    |    114 +
 .../schema/src/com/cloud/storage/UploadVO.java  |    266 +
 .../com/cloud/storage/VMTemplateDetailVO.java   |     85 +
 .../src/com/cloud/storage/VMTemplateHostVO.java |    335 +
 .../cloud/storage/VMTemplateStoragePoolVO.java  |    305 +
 .../src/com/cloud/storage/VMTemplateVO.java     |    576 +
 .../src/com/cloud/storage/VMTemplateZoneVO.java |    116 +
 .../src/com/cloud/storage/VolumeDetailVO.java   |     85 +
 .../src/com/cloud/storage/VolumeHostVO.java     |    342 +
 .../schema/src/com/cloud/storage/VolumeVO.java  |    576 +
 .../com/cloud/storage/dao/DiskOfferingDao.java  |     35 +
 .../cloud/storage/dao/DiskOfferingDaoImpl.java  |    153 +
 .../cloud/storage/dao/GuestOSCategoryDao.java   |     24 +
 .../storage/dao/GuestOSCategoryDaoImpl.java     |     34 +
 .../src/com/cloud/storage/dao/GuestOSDao.java   |     26 +
 .../com/cloud/storage/dao/GuestOSDaoImpl.java   |     47 +
 .../cloud/storage/dao/GuestOSHypervisorDao.java |     27 +
 .../storage/dao/GuestOSHypervisorDaoImpl.java   |     49 +
 .../cloud/storage/dao/LaunchPermissionDao.java  |     73 +
 .../storage/dao/LaunchPermissionDaoImpl.java    |    163 +
 .../src/com/cloud/storage/dao/SnapshotDao.java  |     69 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java  |    347 +
 .../cloud/storage/dao/SnapshotPolicyDao.java    |     44 +
 .../storage/dao/SnapshotPolicyDaoImpl.java      |    103 +
 .../cloud/storage/dao/SnapshotScheduleDao.java  |     40 +
 .../storage/dao/SnapshotScheduleDaoImpl.java    |    139 +
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |     97 +
 .../cloud/storage/dao/StoragePoolHostDao.java   |     42 +
 .../storage/dao/StoragePoolHostDaoImpl.java     |    188 +
 .../cloud/storage/dao/StoragePoolWorkDao.java   |     39 +
 .../storage/dao/StoragePoolWorkDaoImpl.java     |    146 +
 .../src/com/cloud/storage/dao/UploadDao.java    |     35 +
 .../com/cloud/storage/dao/UploadDaoImpl.java    |     93 +
 .../com/cloud/storage/dao/VMTemplateDao.java    |     79 +
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |    974 +
 .../cloud/storage/dao/VMTemplateDetailsDao.java |     32 +
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |     99 +
 .../cloud/storage/dao/VMTemplateHostDao.java    |     70 +
 .../storage/dao/VMTemplateHostDaoImpl.java      |    437 +
 .../cloud/storage/dao/VMTemplatePoolDao.java    |     53 +
 .../storage/dao/VMTemplatePoolDaoImpl.java      |    311 +
 .../cloud/storage/dao/VMTemplateZoneDao.java    |     35 +
 .../storage/dao/VMTemplateZoneDaoImpl.java      |     99 +
 .../src/com/cloud/storage/dao/VolumeDao.java    |    104 +
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |    561 +
 .../com/cloud/storage/dao/VolumeDetailsDao.java |     36 +
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |    114 +
 .../com/cloud/storage/dao/VolumeHostDao.java    |     41 +
 .../cloud/storage/dao/VolumeHostDaoImpl.java    |    164 +
 .../src/com/cloud/tags/ResourceTagVO.java       |    160 +
 .../src/com/cloud/tags/dao/ResourceTagDao.java  |     37 +
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java |     62 +
 .../src/com/cloud/upgrade/DatabaseCreator.java  |    240 +
 .../cloud/upgrade/DatabaseIntegrityChecker.java |    264 +
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |    400 +
 .../upgrade/PremiumDatabaseUpgradeChecker.java  |    144 +
 .../src/com/cloud/upgrade/dao/DbUpgrade.java    |     45 +
 .../com/cloud/upgrade/dao/DbUpgradeUtils.java   |    106 +
 .../com/cloud/upgrade/dao/Upgrade217to218.java  |     66 +
 .../com/cloud/upgrade/dao/Upgrade218to22.java   |   2382 +
 .../upgrade/dao/Upgrade218to224DomainVlans.java |    140 +
 .../upgrade/dao/Upgrade218to22Premium.java      |    100 +
 .../cloud/upgrade/dao/Upgrade2210to2211.java    |     64 +
 .../cloud/upgrade/dao/Upgrade2211to2212.java    |    139 +
 .../upgrade/dao/Upgrade2211to2212Premium.java   |     55 +
 .../cloud/upgrade/dao/Upgrade2212to2213.java    |    104 +
 .../cloud/upgrade/dao/Upgrade2213to2214.java    |    308 +
 .../com/cloud/upgrade/dao/Upgrade2214to30.java  |   1193 +
 .../com/cloud/upgrade/dao/Upgrade221to222.java  |     66 +
 .../upgrade/dao/Upgrade221to222Premium.java     |     61 +
 .../com/cloud/upgrade/dao/Upgrade222to224.java  |    610 +
 .../upgrade/dao/Upgrade222to224Premium.java     |     87 +
 .../com/cloud/upgrade/dao/Upgrade224to225.java  |    351 +
 .../com/cloud/upgrade/dao/Upgrade225to226.java  |    108 +
 .../com/cloud/upgrade/dao/Upgrade227to228.java  |    157 +
 .../upgrade/dao/Upgrade227to228Premium.java     |    132 +
 .../com/cloud/upgrade/dao/Upgrade228to229.java  |    138 +
 .../com/cloud/upgrade/dao/Upgrade229to2210.java |    194 +
 .../com/cloud/upgrade/dao/Upgrade301to302.java  |    229 +
 .../com/cloud/upgrade/dao/Upgrade302to303.java  |    312 +
 .../com/cloud/upgrade/dao/Upgrade302to40.java   |   1114 +
 .../com/cloud/upgrade/dao/Upgrade303to304.java  |    492 +
 .../com/cloud/upgrade/dao/Upgrade304to305.java  |    499 +
 .../com/cloud/upgrade/dao/Upgrade305to306.java  |    312 +
 .../com/cloud/upgrade/dao/Upgrade306to307.java  |    119 +
 .../com/cloud/upgrade/dao/Upgrade307to410.java  |     96 +
 .../com/cloud/upgrade/dao/Upgrade30to301.java   |    124 +
 .../com/cloud/upgrade/dao/Upgrade30xBase.java   |    311 +
 .../com/cloud/upgrade/dao/Upgrade40to41.java    |    164 +
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |   2956 +
 .../com/cloud/upgrade/dao/Upgrade420to430.java  |     70 +
 .../upgrade/dao/UpgradeSnapshot217to224.java    |     60 +
 .../upgrade/dao/UpgradeSnapshot223to224.java    |     60 +
 .../src/com/cloud/upgrade/dao/VersionDao.java   |     25 +
 .../com/cloud/upgrade/dao/VersionDaoImpl.java   |    173 +
 .../src/com/cloud/upgrade/dao/VersionVO.java    |     91 +
 .../usage/ExternalPublicIpStatisticsVO.java     |     98 +
 .../src/com/cloud/usage/UsageIPAddressVO.java   |    121 +
 .../schema/src/com/cloud/usage/UsageJobVO.java  |    180 +
 .../cloud/usage/UsageLoadBalancerPolicyVO.java  |     91 +
 .../com/cloud/usage/UsageNetworkOfferingVO.java |    117 +
 .../src/com/cloud/usage/UsageNetworkVO.java     |    144 +
 .../cloud/usage/UsagePortForwardingRuleVO.java  |     91 +
 .../com/cloud/usage/UsageSecurityGroupVO.java   |     97 +
 .../src/com/cloud/usage/UsageStorageVO.java     |    135 +
 .../src/com/cloud/usage/UsageVMInstanceVO.java  |    129 +
 .../src/com/cloud/usage/UsageVMSnapshotVO.java  |    122 +
 engine/schema/src/com/cloud/usage/UsageVO.java  |    288 +
 .../src/com/cloud/usage/UsageVPNUserVO.java     |    105 +
 .../src/com/cloud/usage/UsageVmDiskVO.java      |    180 +
 .../src/com/cloud/usage/UsageVolumeVO.java      |    115 +
 .../dao/ExternalPublicIpStatisticsDao.java      |     33 +
 .../dao/ExternalPublicIpStatisticsDaoImpl.java  |     77 +
 .../src/com/cloud/usage/dao/UsageDao.java       |     44 +
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |    447 +
 .../com/cloud/usage/dao/UsageIPAddressDao.java  |     28 +
 .../cloud/usage/dao/UsageIPAddressDaoImpl.java  |    145 +
 .../src/com/cloud/usage/dao/UsageJobDao.java    |     34 +
 .../com/cloud/usage/dao/UsageJobDaoImpl.java    |    200 +
 .../usage/dao/UsageLoadBalancerPolicyDao.java   |     29 +
 .../dao/UsageLoadBalancerPolicyDaoImpl.java     |    169 +
 .../com/cloud/usage/dao/UsageNetworkDao.java    |     29 +
 .../cloud/usage/dao/UsageNetworkDaoImpl.java    |    132 +
 .../usage/dao/UsageNetworkOfferingDao.java      |     28 +
 .../usage/dao/UsageNetworkOfferingDaoImpl.java  |    153 +
 .../usage/dao/UsagePortForwardingRuleDao.java   |     29 +
 .../dao/UsagePortForwardingRuleDaoImpl.java     |    169 +
 .../cloud/usage/dao/UsageSecurityGroupDao.java  |     28 +
 .../usage/dao/UsageSecurityGroupDaoImpl.java    |    151 +
 .../com/cloud/usage/dao/UsageStorageDao.java    |     31 +
 .../cloud/usage/dao/UsageStorageDaoImpl.java    |    212 +
 .../com/cloud/usage/dao/UsageVMInstanceDao.java |     29 +
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java |    137 +
 .../com/cloud/usage/dao/UsageVMSnapshotDao.java |     29 +
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java |    182 +
 .../com/cloud/usage/dao/UsageVPNUserDao.java    |     28 +
 .../cloud/usage/dao/UsageVPNUserDaoImpl.java    |    150 +
 .../src/com/cloud/usage/dao/UsageVmDiskDao.java |     29 +
 .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java |    139 +
 .../src/com/cloud/usage/dao/UsageVolumeDao.java |     29 +
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java |    178 +
 .../src/com/cloud/user/AccountDetailVO.java     |     75 +
 .../src/com/cloud/user/AccountDetailsDao.java   |     38 +
 .../com/cloud/user/AccountDetailsDaoImpl.java   |    108 +
 engine/schema/src/com/cloud/user/AccountVO.java |    189 +
 .../schema/src/com/cloud/user/SSHKeyPairVO.java |    119 +
 .../src/com/cloud/user/UserAccountVO.java       |    284 +
 .../src/com/cloud/user/UserStatisticsVO.java    |    165 +
 .../src/com/cloud/user/UserStatsLogVO.java      |    132 +
 engine/schema/src/com/cloud/user/UserVO.java    |    274 +
 .../src/com/cloud/user/VmDiskStatisticsVO.java  |    216 +
 .../src/com/cloud/user/dao/AccountDao.java      |     53 +
 .../src/com/cloud/user/dao/AccountDaoImpl.java  |    282 +
 .../src/com/cloud/user/dao/SSHKeyPairDao.java   |     38 +
 .../com/cloud/user/dao/SSHKeyPairDaoImpl.java   |     85 +
 .../src/com/cloud/user/dao/UserAccountDao.java  |     27 +
 .../com/cloud/user/dao/UserAccountDaoImpl.java  |     69 +
 .../schema/src/com/cloud/user/dao/UserDao.java  |     52 +
 .../src/com/cloud/user/dao/UserDaoImpl.java     |    131 +
 .../com/cloud/user/dao/UserStatisticsDao.java   |     35 +
 .../cloud/user/dao/UserStatisticsDaoImpl.java   |    137 +
 .../src/com/cloud/user/dao/UserStatsLogDao.java |     23 +
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java |     31 +
 .../com/cloud/user/dao/VmDiskStatisticsDao.java |     35 +
 .../cloud/user/dao/VmDiskStatisticsDaoImpl.java |    134 +
 .../schema/src/com/cloud/vm/ConsoleProxyVO.java |    287 +
 .../schema/src/com/cloud/vm/DomainRouterVO.java |    246 +
 .../src/com/cloud/vm/InstanceGroupVMMapVO.java  |     71 +
 .../src/com/cloud/vm/InstanceGroupVO.java       |    120 +
 engine/schema/src/com/cloud/vm/ItWorkDao.java   |     45 +
 .../schema/src/com/cloud/vm/ItWorkDaoImpl.java  |    108 +
 engine/schema/src/com/cloud/vm/ItWorkVO.java    |    179 +
 engine/schema/src/com/cloud/vm/NicDetailVO.java |     85 +
 engine/schema/src/com/cloud/vm/NicVO.java       |    365 +
 .../src/com/cloud/vm/SecondaryStorageVmVO.java  |    135 +
 .../src/com/cloud/vm/UserVmCloneSettingVO.java  |     50 +
 .../schema/src/com/cloud/vm/UserVmDetailVO.java |     85 +
 engine/schema/src/com/cloud/vm/UserVmVO.java    |    141 +
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |    504 +
 .../src/com/cloud/vm/dao/ConsoleProxyDao.java   |     47 +
 .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java   |    353 +
 .../src/com/cloud/vm/dao/DomainRouterDao.java   |    149 +
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java   |    372 +
 .../src/com/cloud/vm/dao/InstanceGroupDao.java  |     36 +
 .../com/cloud/vm/dao/InstanceGroupDaoImpl.java  |     80 +
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java |     28 +
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java |     75 +
 engine/schema/src/com/cloud/vm/dao/NicDao.java  |     76 +
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java |    290 +
 .../src/com/cloud/vm/dao/NicDetailDao.java      |     35 +
 .../src/com/cloud/vm/dao/NicDetailDaoImpl.java  |    110 +
 .../src/com/cloud/vm/dao/NicIpAliasDao.java     |     60 +
 .../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java |    177 +
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |    226 +
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java |     53 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java |    138 +
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java  |    160 +
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java |     42 +
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java |    269 +
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java |     37 +
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java |     74 +
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |     76 +
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |    586 +
 .../schema/src/com/cloud/vm/dao/UserVmData.java |    759 +
 .../src/com/cloud/vm/dao/UserVmDetailsDao.java  |     32 +
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |     99 +
 .../src/com/cloud/vm/dao/VMInstanceDao.java     |    125 +
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |    683 +
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |    224 +
 .../cloud/vm/snapshot/dao/VMSnapshotDao.java    |     39 +
 .../vm/snapshot/dao/VMSnapshotDaoImpl.java      |    161 +
 .../affinity/AffinityGroupDomainMapVO.java      |     73 +
 .../affinity/AffinityGroupVMMapVO.java          |     66 +
 .../cloudstack/affinity/AffinityGroupVO.java    |    127 +
 .../affinity/dao/AffinityGroupDao.java          |     38 +
 .../affinity/dao/AffinityGroupDaoImpl.java      |    164 +
 .../affinity/dao/AffinityGroupDomainMapDao.java |     31 +
 .../dao/AffinityGroupDomainMapDaoImpl.java      |     67 +
 .../affinity/dao/AffinityGroupVMMapDao.java     |     48 +
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java |    178 +
 .../cloud/entity/api/db/VMComputeTagVO.java     |     67 +
 .../engine/cloud/entity/api/db/VMEntityVO.java  |    577 +
 .../cloud/entity/api/db/VMNetworkMapVO.java     |     71 +
 .../cloud/entity/api/db/VMReservationVO.java    |    127 +
 .../cloud/entity/api/db/VMRootDiskTagVO.java    |     67 +
 .../entity/api/db/VolumeReservationVO.java      |     84 +
 .../entity/api/db/dao/VMComputeTagDao.java      |     31 +
 .../entity/api/db/dao/VMComputeTagDaoImpl.java  |     89 +
 .../cloud/entity/api/db/dao/VMEntityDao.java    |     41 +
 .../entity/api/db/dao/VMEntityDaoImpl.java      |    169 +
 .../entity/api/db/dao/VMNetworkMapDao.java      |     31 +
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java  |     85 +
 .../entity/api/db/dao/VMReservationDao.java     |     34 +
 .../entity/api/db/dao/VMReservationDaoImpl.java |    111 +
 .../entity/api/db/dao/VMRootDiskTagDao.java     |     31 +
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java |     88 +
 .../entity/api/db/dao/VolumeReservationDao.java |     31 +
 .../api/db/dao/VolumeReservationDaoImpl.java    |     68 +
 .../lb/ApplicationLoadBalancerRuleVO.java       |    133 +
 .../lb/dao/ApplicationLoadBalancerRuleDao.java  |     37 +
 .../dao/ApplicationLoadBalancerRuleDaoImpl.java |    151 +
 .../apache/cloudstack/region/PortableIpDao.java |     39 +
 .../cloudstack/region/PortableIpDaoImpl.java    |    131 +
 .../cloudstack/region/PortableIpRangeDao.java   |     30 +
 .../region/PortableIpRangeDaoImpl.java          |     65 +
 .../cloudstack/region/PortableIpRangeVO.java    |    119 +
 .../apache/cloudstack/region/PortableIpVO.java  |    222 +
 .../apache/cloudstack/region/RegionSyncVO.java  |     93 +
 .../org/apache/cloudstack/region/RegionVO.java  |    114 +
 .../apache/cloudstack/region/dao/RegionDao.java |     27 +
 .../cloudstack/region/dao/RegionDaoImpl.java    |     48 +
 .../region/gslb/GlobalLoadBalancerDaoImpl.java  |     70 +
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java    |     30 +
 .../GlobalLoadBalancerLbRuleMapDaoImpl.java     |     63 +
 .../gslb/GlobalLoadBalancerLbRuleMapVO.java     |     95 +
 .../region/gslb/GlobalLoadBalancerRuleDao.java  |     31 +
 .../region/gslb/GlobalLoadBalancerRuleVO.java   |    183 +
 .../storage/datastore/db/ImageStoreDao.java     |     39 +
 .../datastore/db/ImageStoreDetailVO.java        |     82 +
 .../datastore/db/ImageStoreDetailsDao.java      |     30 +
 .../storage/datastore/db/ImageStoreVO.java      |    193 +
 .../datastore/db/PrimaryDataStoreDao.java       |    117 +
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |    431 +
 .../datastore/db/PrimaryDataStoreDetailVO.java  |     79 +
 .../db/PrimaryDataStoreDetailsDao.java          |     28 +
 .../datastore/db/SnapshotDataStoreDao.java      |     43 +
 .../datastore/db/SnapshotDataStoreVO.java       |    271 +
 .../datastore/db/StoragePoolDetailVO.java       |     81 +
 .../datastore/db/StoragePoolDetailsDao.java     |     30 +
 .../storage/datastore/db/StoragePoolVO.java     |    345 +
 .../datastore/db/TemplateDataStoreDao.java      |     65 +
 .../datastore/db/TemplateDataStoreVO.java       |    372 +
 .../datastore/db/VolumeDataStoreDao.java        |     43 +
 .../storage/datastore/db/VolumeDataStoreVO.java |    358 +
 engine/service/pom.xml                          |     15 +-
 engine/storage/backup/pom.xml                   |     50 -
 .../storage/backup/BackupMotionService.java     |     23 -
 .../storage/backup/BackupService.java           |     26 -
 engine/storage/cache/pom.xml                    |     33 +
 .../cache/allocator/StorageCacheAllocator.java  |     26 +
 .../allocator/StorageCacheRandomAllocator.java  |     56 +
 .../cache/manager/StorageCacheManagerImpl.java  |    263 +
 .../StorageCacheReplacementAlgorithm.java       |     26 +
 .../StorageCacheReplacementAlgorithmLRU.java    |    109 +
 engine/storage/datamotion/pom.xml               |     41 +
 .../motion/AncientDataMotionStrategy.java       |    494 +
 .../storage/motion/DataMotionServiceImpl.java   |     77 +
 engine/storage/image/pom.xml                    |     23 +-
 .../storage/image/ImageDataFactoryImpl.java     |     93 -
 .../storage/image/ImageOrchestrator.java        |     29 -
 .../storage/image/ImageServiceImpl.java         |    156 -
 .../storage/image/TemplateDataFactoryImpl.java  |    112 +
 .../storage/image/TemplateServiceImpl.java      |    753 +
 .../image/downloader/ImageDownloader.java       |     25 -
 .../driver/AncientImageDataStoreDriverImpl.java |    250 -
 .../driver/DefaultImageDataStoreDriverImpl.java |    126 -
 .../storage/image/manager/ImageDataManager.java |     30 -
 .../image/manager/ImageDataManagerImpl.java     |     50 -
 .../manager/ImageDataStoreManagerImpl.java      |     94 -
 .../manager/ImageStoreProviderManagerImpl.java  |    130 +
 .../store/AncientImageDataStoreProvider.java    |    101 -
 .../image/store/DefaultImageDataStoreImpl.java  |    145 -
 .../store/DefaultImageDataStoreProvider.java    |     82 -
 .../storage/image/store/ImageStoreImpl.java     |    198 +
 .../storage/image/store/TemplateObject.java     |    404 +-
 .../DefaultImageDataStoreLifeCycle.java         |    107 -
 .../lifecycle/ImageDataStoreLifeCycle.java      |     24 -
 .../store/lifecycle/ImageStoreLifeCycle.java    |     24 +
 engine/storage/imagemotion/pom.xml              |     62 -
 .../motion/DefaultImageMotionStrategy.java      |    140 -
 .../image/motion/ImageMotionServiceImpl.java    |     70 -
 .../image/motion/ImageMotionStrategy.java       |     24 -
 engine/storage/integration-test/pom.xml         |     81 +-
 .../MockLocalNfsSecondaryStorageResource.java   |     82 +
 .../storage/allocator/StorageAllocatorTest.java |    816 +-
 .../StorageAllocatorTestConfiguration.java      |     49 +-
 ...StorageCacheReplacementAlgorithmLRUTest.java |    226 +
 .../apache/cloudstack/storage/test/AopTest.java |      2 +-
 .../cloudstack/storage/test/AopTestAdvice.java  |     20 +-
 .../storage/test/ChildTestConfiguration.java    |    173 +-
 .../storage/test/CloudStackTestNGBase.java      |    132 +-
 .../test/DirectAgentManagerSimpleImpl.java      |    162 +-
 .../storage/test/DirectAgentTest.java           |     66 +-
 .../storage/test/EndpointSelectorTest.java      |    327 +
 .../test/FakeDriverTestConfiguration.java       |     67 +
 .../test/FakePrimaryDataStoreDriver.java        |    107 +
 ...HostEndpointRpcServerDirectCallResource.java |     70 -
 .../MockHypervsiorHostEndPointRpcServer.java    |     72 -
 .../storage/test/MockLocalHostEndPoint.java     |     39 +
 .../storage/test/MockRpcCallBack.java           |     12 +-
 .../storage/test/MockStorageMotionStrategy.java |     24 +-
 .../cloudstack/storage/test/S3TemplateTest.java |    180 +
 .../cloudstack/storage/test/SnapshotTest.java   |    500 +
 .../storage/test/SnapshotTestWithFakeData.java  |    194 +
 .../storage/test/StorageFactoryBean.java        |     11 +-
 .../cloudstack/storage/test/StorageTest.java    |     11 +-
 .../cloudstack/storage/test/TemplateTest.java   |    167 +
 .../cloudstack/storage/test/TestHttp.java       |     17 +-
 .../apache/cloudstack/storage/test/TestNG.java  |      5 +-
 .../cloudstack/storage/test/TestNGAop.java      |      6 +-
 .../cloudstack/storage/test/VolumeTest.java     |    433 +
 .../storage/test/VolumeTestVmware.java          |    444 +
 .../storage/test/volumeServiceTest.java         |    618 +-
 .../resource/StorageAllocatorTestContext.xml    |     45 -
 .../test/resource/component.xml                 |    201 -
 .../test/resource/fakeDriverTestContext.xml     |     87 +
 .../test/resource/storageContext.xml            |     43 -
 .../integration-test/test/resource/testng.xml   |     40 -
 .../resources/StorageAllocatorTestContext.xml   |     45 +
 .../test/resources/component.xml                |    192 +
 .../test/resources/s3_testng.xml                |     47 +
 .../test/resources/storageContext.xml           |     88 +
 .../integration-test/test/resources/testng.xml  |     53 +
 engine/storage/pom.xml                          |     25 +-
 engine/storage/snapshot/pom.xml                 |     28 +-
 .../snapshot/SnapshotDataFactoryImpl.java       |     51 +-
 .../storage/snapshot/SnapshotObject.java        |    376 +-
 .../storage/snapshot/SnapshotServiceImpl.java   |    398 +-
 .../snapshot/SnapshotStateMachineManager.java   |      2 +-
 .../SnapshotStateMachineManagerImpl.java        |     48 +-
 .../storage/snapshot/SnapshotStrategyBase.java  |     38 +
 .../snapshot/XenserverSnapshotStrategy.java     |    278 +
 .../storage/snapshot/db/SnapshotDao2.java       |     25 -
 .../storage/snapshot/db/SnapshotDao2Impl.java   |     28 -
 .../storage/snapshot/db/SnapshotVO.java         |    296 -
 .../strategy/AncientSnapshotStrategy.java       |    608 -
 .../resource/SnapshotManagerTestContext.xml     |     42 -
 .../resources/SnapshotManagerTestContext.xml    |     42 +
 .../test/src/SnapshotDataFactoryTest.java       |     23 +-
 .../org/apache/cloudstack/storage/BaseType.java |      1 +
 .../storage/HostEndpointRpcServer.java          |     29 -
 .../storage/HypervisorHostEndPoint.java         |     75 -
 .../HypervsiorHostEndPointRpcServer.java        |    119 -
 .../cloudstack/storage/LocalHostEndpoint.java   |    129 +
 .../cloudstack/storage/RemoteHostEndPoint.java  |    182 +
 .../allocator/AbstractStoragePoolAllocator.java |    177 +-
 .../ClusterScopeStoragePoolAllocator.java       |     81 +-
 .../GarbageCollectingStoragePoolAllocator.java  |     22 +-
 .../allocator/LocalStoragePoolAllocator.java    |     65 +-
 .../allocator/UseLocalForRootAllocator.java     |     10 +-
 .../allocator/ZoneWideStoragePoolAllocator.java |    124 +-
 .../backup/SnapshotOnBackupStoreInfo.java       |      5 +-
 .../backup/datastore/BackupStoreInfo.java       |      5 +-
 .../command/AttachPrimaryDataStoreAnswer.java   |     55 -
 .../command/AttachPrimaryDataStoreCmd.java      |     38 -
 .../cloudstack/storage/command/CopyCmd.java     |     45 -
 .../storage/command/CopyCmdAnswer.java          |     33 -
 .../CopyTemplateToPrimaryStorageAnswer.java     |     16 -
 .../storage/command/CreateObjectAnswer.java     |     48 -
 .../storage/command/CreateObjectCommand.java    |     45 -
 .../command/CreatePrimaryDataStoreCmd.java      |     37 -
 .../CreateVolumeFromBaseImageCommand.java       |     49 -
 .../storage/command/DeleteCommand.java          |     44 -
 .../command/StorageSubSystemCommand.java        |     23 -
 .../storage/datastore/DataObjectManager.java    |     11 +-
 .../datastore/DataObjectManagerImpl.java        |    254 +-
 .../storage/datastore/DataStoreManagerImpl.java |     83 +-
 .../datastore/ObjectInDataStoreManager.java     |     23 +-
 .../datastore/ObjectInDataStoreManagerImpl.java |    405 +-
 .../storage/datastore/PrimaryDataStore.java     |      3 +-
 .../datastore/PrimaryDataStoreEntityImpl.java   |    257 -
 .../PrimaryDataStoreProviderManager.java        |      3 +-
 .../datastore/protocol/DataStoreProtocol.java   |      8 +-
 .../provider/DataStoreProviderManagerImpl.java  |    111 +-
 .../storage/db/ObjectInDataStoreDao.java        |      3 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java    |     29 +-
 .../storage/db/ObjectInDataStoreVO.java         |    100 +-
 .../endpoint/DefaultEndPointSelector.java       |    159 +-
 .../storage/endpoint/EndPointSelector.java      |     40 -
 .../storage/image/BaseImageStoreDriverImpl.java |    265 +
 .../storage/image/ImageDataStoreDriver.java     |     24 -
 .../storage/image/ImageStoreDriver.java         |     29 +
 .../storage/image/TemplateEntityImpl.java       |     23 +-
 .../storage/image/datastore/ImageDataStore.java |     35 -
 .../image/datastore/ImageDataStoreHelper.java   |     60 -
 .../image/datastore/ImageDataStoreInfo.java     |     26 -
 .../image/datastore/ImageDataStoreManager.java  |     31 -
 .../image/datastore/ImageStoreHelper.java       |    118 +
 .../datastore/ImageStoreProviderManager.java    |     42 +
 .../storage/image/db/ImageDaoStoreDaoImpl.java  |     38 -
 .../storage/image/db/ImageDataStoreDao.java     |     25 -
 .../image/db/ImageDataStoreProviderDao.java     |     25 -
 .../image/db/ImageDataStoreProviderDaoImpl.java |     40 -
 .../image/db/ImageDataStoreProviderVO.java      |     49 -
 .../storage/image/db/ImageDataStoreVO.java      |    110 -
 .../storage/image/db/ImageStoreDaoImpl.java     |    121 +
 .../image/db/ImageStoreDetailsDaoImpl.java      |     88 +
 .../image/db/SnapshotDataStoreDaoImpl.java      |    226 +
 .../image/db/TemplateDataStoreDaoImpl.java      |    344 +
 .../image/db/VolumeDataStoreDaoImpl.java        |    189 +
 .../cloudstack/storage/image/format/ISO.java    |      2 -
 .../cloudstack/storage/image/format/RAW.java    |     32 +
 .../cloudstack/storage/image/format/VHDX.java   |     32 +
 .../image/motion/ImageMotionService.java        |      8 +-
 .../motion/AncientDataMotionStrategy.java       |    725 -
 .../storage/motion/DataMotionDriver.java        |     25 -
 .../storage/motion/DataMotionService.java       |     28 -
 .../storage/motion/DataMotionServiceImpl.java   |     61 -
 .../storage/motion/DataMotionStrategy.java      |     30 -
 .../storage/snapshot/SnapshotEntityImpl.java    |    316 +-
 .../storage/snapshot/SnapshotService.java       |     27 -
 .../cloudstack/storage/to/ImageDataStoreTO.java |     36 -
 .../storage/to/ImageOnPrimayDataStoreTO.java    |     44 -
 .../storage/to/NfsPrimaryDataStoreTO.java       |     44 -
 .../storage/to/PrimaryDataStoreTO.java          |     48 -
 .../cloudstack/storage/to/TemplateTO.java       |     51 -
 .../apache/cloudstack/storage/to/VolumeTO.java  |     77 -
 .../datastore/PrimaryDataStoreHelper.java       |     79 +-
 .../db/PrimaryDataStoreDetailsDaoImpl.java      |     74 +
 .../volume/db/TemplatePrimaryDataStoreDao.java  |      4 +-
 .../db/TemplatePrimaryDataStoreDaoImpl.java     |     43 +-
 .../volume/db/TemplatePrimaryDataStoreVO.java   |     18 +-
 .../storage/volume/db/VolumeDao2.java           |     82 -
 .../storage/volume/db/VolumeDao2Impl.java       |    440 -
 .../cloudstack/storage/volume/db/VolumeVO.java  |    416 -
 engine/storage/volume/pom.xml                   |     21 +-
 .../datastore/DefaultPrimaryDataStore.java      |    343 -
 .../storage/datastore/PrimaryDataStoreImpl.java |    384 +
 .../DefaultPrimaryDataStoreDriverImpl.java      |    249 -
 .../driver/PrimaryDataStoreDriver.java          |     16 -
 .../DefaultPrimaryDataStoreLifeCycleImpl.java   |    147 -
 ...aultPrimaryDataStoreProviderManagerImpl.java |     85 -
 .../PrimaryDataStoreProviderManagerImpl.java    |     88 +
 .../datastore/provider/DefaultHostListener.java |     38 +-
 .../DefaultPrimaryDatastoreProviderImpl.java    |     83 -
 .../PrimaryDataStoreProviderManager.java        |     16 -
 .../storage/volume/TemplateInstallStrategy.java |     28 -
 .../volume/TemplateInstallStrategyImpl.java     |    289 -
 .../storage/volume/VolumeDataFactoryImpl.java   |     48 +-
 .../storage/volume/VolumeEntityImpl.java        |    204 -
 .../storage/volume/VolumeMotionService.java     |     23 -
 .../cloudstack/storage/volume/VolumeObject.java |    405 +-
 .../storage/volume/VolumeServiceImpl.java       |   1275 +-
 .../storage/volume/test/ConfiguratorTest.java   |     64 +-
 .../cloudstack/storage/volume/test/Server.java  |     17 +-
 .../storage/volume/test/TestConfiguration.java  |      2 +-
 .../storage/volume/test/TestInProcessAsync.java |      7 +-
 .../volume/test/resource/testContext.xml        |      2 +-
 framework/api/pom.xml                           |     42 -
 .../framework/async/AsyncCallFuture.java        |     84 -
 .../async/AsyncCompletionCallback.java          |     23 -
 framework/cluster/pom.xml                       |     45 +
 .../cloud/cluster/ActiveFencingException.java   |     30 +
 .../com/cloud/cluster/ClusterFenceManager.java  |     23 +
 .../cloud/cluster/ClusterFenceManagerImpl.java  |     58 +
 .../cluster/ClusterInvalidSessionException.java |     32 +
 .../src/com/cloud/cluster/ClusterManager.java   |     63 +
 .../com/cloud/cluster/ClusterManagerImpl.java   |   1193 +
 .../cloud/cluster/ClusterManagerListener.java   |     26 +
 .../com/cloud/cluster/ClusterManagerMBean.java  |     26 +
 .../cloud/cluster/ClusterManagerMBeanImpl.java  |     67 +
 .../cloud/cluster/ClusterManagerMessage.java    |     44 +
 .../cloud/cluster/ClusterNodeJoinEventArgs.java |     43 +
 .../cloud/cluster/ClusterNodeLeftEventArgs.java |     44 +
 .../src/com/cloud/cluster/ClusterService.java   |     25 +
 .../cloud/cluster/ClusterServiceAdapter.java    |     32 +
 .../com/cloud/cluster/ClusterServicePdu.java    |    112 +
 .../cloud/cluster/ClusterServiceRequestPdu.java |     54 +
 .../cluster/ClusterServiceServletAdapter.java   |    140 +
 .../cluster/ClusterServiceServletContainer.java |    179 +
 .../ClusterServiceServletHttpHandler.java       |    192 +
 .../cluster/ClusterServiceServletImpl.java      |    142 +
 .../com/cloud/cluster/ManagementServerHost.java |     34 +
 .../cluster/ManagementServerHostPeerVO.java     |    119 +
 .../cloud/cluster/ManagementServerHostVO.java   |    182 +
 .../cloud/cluster/RemoteMethodConstants.java    |     23 +
 .../cluster/dao/ManagementServerHostDao.java    |     48 +
 .../dao/ManagementServerHostDaoImpl.java        |    274 +
 .../dao/ManagementServerHostPeerDao.java        |     27 +
 .../dao/ManagementServerHostPeerDaoImpl.java    |    106 +
 framework/config/pom.xml                        |     33 +
 .../apache/cloudstack/config/Configuration.java |     84 +
 .../framework/config/ConfigDepot.java           |     26 +
 .../framework/config/ConfigDepotAdmin.java      |     36 +
 .../cloudstack/framework/config/ConfigKey.java  |    187 +
 .../framework/config/Configurable.java          |     40 +
 .../framework/config/ScopedConfigStorage.java   |     30 +
 .../framework/config/dao/ConfigurationDao.java  |     70 +
 .../config/dao/ConfigurationDaoImpl.java        |    203 +
 .../framework/config/impl/ConfigDepotImpl.java  |    149 +
 .../framework/config/impl/ConfigurationVO.java  |    176 +
 .../config/impl/ConfigDepotAdminTest.java       |    102 +
 framework/db/pom.xml                            |     62 +
 .../db/src/com/cloud/dao/EntityManagerImpl.java |    125 +
 .../utils/crypt/EncryptionSecretKeyChanger.java |    427 +
 .../db/src/com/cloud/utils/db/Attribute.java    |    253 +
 .../com/cloud/utils/db/ConnectionConcierge.java |    223 +
 .../utils/db/ConnectionConciergeMBean.java      |     30 +
 framework/db/src/com/cloud/utils/db/DB.java     |     59 +
 framework/db/src/com/cloud/utils/db/DbUtil.java |    342 +
 framework/db/src/com/cloud/utils/db/EcInfo.java |    106 +
 .../db/src/com/cloud/utils/db/Encrypt.java      |     32 +
 framework/db/src/com/cloud/utils/db/Filter.java |    115 +
 .../db/src/com/cloud/utils/db/GenericDao.java   |    282 +
 .../src/com/cloud/utils/db/GenericDaoBase.java  |   1891 +
 .../cloud/utils/db/GenericSearchBuilder.java    |    548 +
 .../db/src/com/cloud/utils/db/GlobalLock.java   |    244 +
 .../db/src/com/cloud/utils/db/GroupBy.java      |    108 +
 .../db/src/com/cloud/utils/db/JoinBuilder.java  |     79 +
 .../db/src/com/cloud/utils/db/JoinType.java     |     32 +
 .../db/src/com/cloud/utils/db/Merovingian2.java |    461 +
 .../com/cloud/utils/db/MerovingianMBean.java    |     32 +
 .../db/src/com/cloud/utils/db/ScriptRunner.java |    233 +
 .../src/com/cloud/utils/db/SearchBuilder.java   |     64 +
 .../src/com/cloud/utils/db/SearchCriteria.java  |    364 +
 .../src/com/cloud/utils/db/SearchCriteria2.java |    213 +
 .../cloud/utils/db/SearchCriteriaService.java   |     29 +
 .../src/com/cloud/utils/db/SequenceFetcher.java |    171 +
 .../db/src/com/cloud/utils/db/SqlGenerator.java |    668 +
 .../db/src/com/cloud/utils/db/StateMachine.java |     30 +
 .../db/src/com/cloud/utils/db/Transaction.java  |   1180 +
 .../cloud/utils/db/TransactionAttachment.java   |     34 +
 .../utils/db/TransactionContextBuilder.java     |     65 +
 .../com/cloud/utils/db/TransactionMBean.java    |     33 +
 .../cloud/utils/db/TransactionMBeanImpl.java    |    113 +
 .../src/com/cloud/utils/db/UpdateBuilder.java   |    147 +
 .../db/src/com/cloud/utils/db/UpdateFilter.java |     29 +
 .../com/cloud/utils/db/DbAnnotatedBase.java     |     44 +
 .../cloud/utils/db/DbAnnotatedBaseDerived.java  |     27 +
 .../db/test/com/cloud/utils/db/DbTestDao.java   |     66 +
 .../db/test/com/cloud/utils/db/DbTestUtils.java |     90 +
 .../db/test/com/cloud/utils/db/DbTestVO.java    |     56 +
 .../test/com/cloud/utils/db/DummyComponent.java |     27 +
 .../cloud/utils/db/ElementCollectionTest.java   |     72 +
 .../test/com/cloud/utils/db/GlobalLockTest.java |     81 +
 .../com/cloud/utils/db/Merovingian2Test.java    |     77 +
 .../utils/db/TransactionContextBuilderTest.java |     63 +
 .../com/cloud/utils/db/TransactionTest.java     |    214 +
 framework/events/pom.xml                        |     51 +-
 framework/ipc/pom.xml                           |     33 +-
 .../src/com/cloud/agent/manager/Commands.java   |    153 +
 .../framework/async/AsyncCallFuture.java        |     84 +
 .../async/AsyncCallbackDispatcher.java          |     57 +-
 .../async/AsyncCompletionCallback.java          |     23 +
 .../framework/async/AsyncRpcConext.java         |     30 -
 .../framework/async/AsyncRpcContext.java        |     30 +
 .../framework/client/ClientEventBus.java        |     31 -
 .../framework/client/ClientMessageBus.java      |     31 +
 .../client/ClientTransportProvider.java         |      2 +-
 .../cloudstack/framework/eventbus/EventBus.java |     32 -
 .../framework/eventbus/EventBusBase.java        |    308 -
 .../framework/eventbus/EventBusEndpoint.java    |     61 -
 .../framework/eventbus/EventDispatcher.java     |    104 -
 .../framework/eventbus/EventHandler.java        |     30 -
 .../framework/eventbus/PublishScope.java        |     24 -
 .../framework/eventbus/Subscriber.java          |     24 -
 .../framework/messagebus/MessageBus.java        |     34 +
 .../framework/messagebus/MessageBusBase.java    |    406 +
 .../messagebus/MessageBusEndpoint.java          |     61 +
 .../framework/messagebus/MessageDetector.java   |     75 +
 .../framework/messagebus/MessageDispatcher.java |    104 +
 .../framework/messagebus/MessageHandler.java    |     30 +
 .../framework/messagebus/MessageSubscriber.java |     24 +
 .../framework/messagebus/PublishScope.java      |     24 +
 .../framework/server/ServerEventBus.java        |     31 -
 .../framework/server/ServerMessageBus.java      |     31 +
 .../AsyncSampleEventDrivenStyleCaller.java      |      4 +-
 .../sampleserver/SampleManagementServer.java    |      3 -
 .../sampleserver/SampleManagerComponent.java    |     12 +-
 .../sampleserver/SampleManagerComponent2.java   |     12 +-
 .../cloudstack/messagebus/TestMessageBus.java   |    155 +
 .../test/resources/MessageBusTestContext.xml    |     51 +
 .../SampleManagementServerAppContext.xml        |      3 +-
 framework/jobs/pom.xml                          |     46 +-
 .../apache/cloudstack/framework/job/Job.java    |     32 -
 .../framework/job/JobInterceptor.java           |     23 -
 .../cloudstack/framework/jobs/AsyncJob.java     |    117 +
 .../framework/jobs/AsyncJobDispatcher.java      |     28 +
 .../jobs/AsyncJobExecutionContext.java          |    167 +
 .../framework/jobs/AsyncJobMBean.java           |     37 +
 .../framework/jobs/AsyncJobManager.java         |    125 +
 .../jobs/JobCancellationException.java          |     49 +
 .../cloudstack/framework/jobs/Outcome.java      |     62 +
 .../framework/jobs/dao/AsyncJobDao.java         |     37 +
 .../framework/jobs/dao/AsyncJobDaoImpl.java     |    198 +
 .../framework/jobs/dao/AsyncJobJoinMapDao.java  |     46 +
 .../jobs/dao/AsyncJobJoinMapDaoImpl.java        |    303 +
 .../framework/jobs/dao/AsyncJobJournalDao.java  |     27 +
 .../jobs/dao/AsyncJobJournalDaoImpl.java        |     45 +
 .../framework/jobs/dao/SyncQueueDao.java        |     26 +
 .../framework/jobs/dao/SyncQueueDaoImpl.java    |     78 +
 .../framework/jobs/dao/SyncQueueItemDao.java    |     31 +
 .../jobs/dao/SyncQueueItemDaoImpl.java          |    155 +
 .../framework/jobs/impl/AsyncJobJoinMapVO.java  |    215 +
 .../framework/jobs/impl/AsyncJobJournalVO.java  |    111 +
 .../framework/jobs/impl/AsyncJobMBeanImpl.java  |    165 +
 .../jobs/impl/AsyncJobManagerImpl.java          |    992 +
 .../framework/jobs/impl/AsyncJobMonitor.java    |    185 +
 .../framework/jobs/impl/AsyncJobVO.java         |    398 +
 .../jobs/impl/JobSerializerHelper.java          |    203 +
 .../framework/jobs/impl/OutcomeImpl.java        |    124 +
 .../framework/jobs/impl/SyncQueueItem.java      |     41 +
 .../framework/jobs/impl/SyncQueueItemVO.java    |    143 +
 .../framework/jobs/impl/SyncQueueManager.java   |     34 +
 .../jobs/impl/SyncQueueManagerImpl.java         |    258 +
 .../framework/jobs/impl/SyncQueueVO.java        |    137 +
 framework/pom.xml                               |      7 +-
 framework/rest/pom.xml                          |      5 +-
 .../CSJacksonAnnotationIntrospector.java        |    120 +-
 .../ws/jackson/CSJacksonAnnotationModule.java   |     94 +-
 .../framework/ws/jackson/UriSerializer.java     |    116 +-
 .../framework/ws/jackson/UrisSerializer.java    |    142 +-
 .../cloudstack/framework/ws/jackson/Url.java    |    106 +-
 .../ws/jackson/CSJacksonAnnotationTest.java     |    166 +-
 packaging/centos63/cloud-agent.rc               |      3 +-
 packaging/centos63/cloud-management.rc          |     10 +-
 packaging/centos63/cloud-usage.rc               |      2 +-
 packaging/centos63/cloud.spec                   |    193 +-
 packaging/centos63/package.sh                   |    224 +-
 packaging/centos63/replace.properties           |      2 +-
 packaging/debian/init/cloud-agent               |      2 +-
 packaging/debian/init/cloud-management          |      3 +-
 packaging/debian/replace.properties             |      2 +-
 patches/pom.xml                                 |      9 +-
 patches/systemvm/debian/README                  |      5 +
 patches/systemvm/debian/buildsystemvm.sh        |     45 +-
 patches/systemvm/debian/config/etc/dnsmasq.conf |    634 -
 .../debian/config/etc/dnsmasq.conf.tmpl         |    636 +
 .../debian/config/etc/init.d/cloud-early-config |    369 +-
 .../debian/config/etc/init.d/cloud-passwd-srvr  |      2 +-
 .../debian/config/etc/iptables/iptables-ilbvm   |     33 +
 patches/systemvm/debian/config/etc/rc.local     |      3 +
 .../systemvm/debian/config/etc/ssh/sshd_config  |      4 +-
 .../systemvm/debian/config/etc/vpcdnsmasq.conf  |      3 -
 .../opt/cloud/bin/get_template_version.sh       |     26 +
 .../systemvm/debian/config/opt/cloud/bin/ilb.sh |    211 +
 .../debian/config/opt/cloud/bin/ipassoc.sh      |     59 +-
 .../config/opt/cloud/bin/passwd_server_ip       |      2 +-
 .../config/opt/cloud/bin/patchsystemvm.sh       |     23 +
 .../config/opt/cloud/bin/serve_password.sh      |      2 +-
 .../debian/config/opt/cloud/bin/vmdata.py       |    204 +
 .../debian/config/opt/cloud/bin/vpc_acl.sh      |     11 +-
 .../debian/config/opt/cloud/bin/vpc_func.sh     |      2 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh  |     44 +
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh  |     48 +-
 .../config/opt/cloud/bin/vpc_loadbalancer.sh    |     23 +
 .../config/opt/cloud/bin/vpc_privateGateway.sh  |      2 +-
 .../config/opt/cloud/bin/vpc_privategw_acl.sh   |    224 +
 .../debian/config/root/createIpAlias.sh         |    100 +
 .../debian/config/root/deleteIpAlias.sh         |     60 +
 patches/systemvm/debian/config/root/dnsmasq.sh  |    130 +
 .../systemvm/debian/config/root/edithosts.sh    |     44 +-
 .../debian/config/root/firewallRule_egress.sh   |     26 +-
 patches/systemvm/debian/config/root/func.sh     |     64 +-
 .../root/redundant_router/backup.sh.templ       |      2 +
 .../redundant_router/check_heartbeat.sh.templ   |      2 +-
 .../root/redundant_router/enable_pubip.sh.templ |      8 +-
 .../systemvm/debian/config/root/savepassword.sh |      4 +-
 patches/systemvm/debian/config/root/userdata.sh |     59 +-
 plugins/acl/static-role-based/pom.xml           |      2 +-
 .../explicit-dedication/pom.xml                 |     33 +
 .../affinity/ExplicitDedicationProcessor.java   |    450 +
 .../host-anti-affinity/pom.xml                  |     33 +
 .../affinity/HostAntiAffinityProcessor.java     |    156 +
 plugins/alert-handlers/snmp-alerts/pom.xml      |      4 +-
 plugins/alert-handlers/syslog-alerts/pom.xml    |      3 +-
 .../cloudstack/syslog/AlertsSyslogAppender.java |      4 +-
 plugins/api/discovery/pom.xml                   |     10 +-
 .../api/command/user/discovery/ListApisCmd.java |      5 +-
 .../discovery/ApiDiscoveryServiceImpl.java      |      4 +
 plugins/api/rate-limit/pom.xml                  |     10 +-
 .../admin/ratelimit/ResetApiLimitCmd.java       |      7 +-
 .../command/user/ratelimit/GetApiLimitCmd.java  |      9 +-
 .../ratelimit/ApiRateLimitServiceImpl.java      |      5 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java  |      3 +-
 plugins/dedicated-resources/pom.xml             |     29 +
 .../api/commands/DedicateClusterCmd.java        |    115 +
 .../api/commands/DedicateHostCmd.java           |    118 +
 .../cloudstack/api/commands/DedicatePodCmd.java |    120 +
 .../api/commands/DedicateZoneCmd.java           |    120 +
 .../api/commands/ListDedicatedClustersCmd.java  |    114 +
 .../api/commands/ListDedicatedHostsCmd.java     |    114 +
 .../api/commands/ListDedicatedPodsCmd.java      |    114 +
 .../api/commands/ListDedicatedZonesCmd.java     |    114 +
 .../commands/ReleaseDedicatedClusterCmd.java    |     91 +
 .../api/commands/ReleaseDedicatedHostCmd.java   |     91 +
 .../api/commands/ReleaseDedicatedPodCmd.java    |     91 +
 .../api/commands/ReleaseDedicatedZoneCmd.java   |     91 +
 .../api/response/DedicateClusterResponse.java   |     93 +
 .../api/response/DedicateHostResponse.java      |     91 +
 .../api/response/DedicatePodResponse.java       |     94 +
 .../api/response/DedicateZoneResponse.java      |     94 +
 .../dedicated/DedicatedResourceManagerImpl.java |    943 +
 .../cloudstack/dedicated/DedicatedService.java  |     63 +
 .../dedicated/manager/DedicatedApiUnitTest.java |    335 +
 .../test/resource/dedicatedContext.xml          |     45 +
 .../implicit-dedication/pom.xml                 |     29 +
 .../cloud/deploy/ImplicitDedicationPlanner.java |    334 +
 .../implicitplanner/ImplicitPlannerTest.java    |    589 +
 .../user-concentrated-pod/pom.xml               |      2 +-
 .../deploy/UserConcentratedPodPlanner.java      |     38 +-
 .../deployment-planners/user-dispersing/pom.xml |      2 +-
 .../com/cloud/deploy/UserDispersingPlanner.java |     18 +-
 plugins/event-bus/rabbitmq/pom.xml              |      3 +-
 plugins/file-systems/netapp/pom.xml             |      2 +-
 plugins/host-allocators/random/pom.xml          |      2 +-
 .../manager/allocator/impl/RandomAllocator.java |     63 +-
 plugins/hypervisors/baremetal/pom.xml           |      2 +-
 .../baremetal/manager/AddBaremetalHostCmd.java  |     48 -
 .../baremetal/manager/BareMetalDiscoverer.java  |      8 +-
 .../cloud/baremetal/manager/BareMetalGuru.java  |     11 +-
 .../baremetal/manager/BareMetalPlanner.java     |     21 +-
 .../manager/BareMetalTemplateAdapter.java       |    128 +-
 .../baremetal/manager/BaremetalManager.java     |      2 +-
 .../baremetal/manager/BaremetalManagerImpl.java |      1 +
 .../manager/BaremetalPlannerSelector.java       |     39 -
 .../networkservice/AddBaremetalDhcpCmd.java     |    153 -
 .../AddBaremetalKickStartPxeCmd.java            |     37 -
 .../networkservice/AddBaremetalPxeCmd.java      |    147 -
 .../AddBaremetalPxePingServerCmd.java           |     82 -
 .../BareMetalPingServiceImpl.java               |     49 +-
 .../networkservice/BareMetalResourceBase.java   |     75 +-
 .../networkservice/BaremetaNetworkGuru.java     |    224 +-
 .../networkservice/BaremetalDhcpElement.java    |     52 +-
 .../networkservice/BaremetalDhcpManager.java    |      5 +-
 .../BaremetalDhcpManagerImpl.java               |     52 +-
 .../BaremetalDhcpResourceBase.java              |     13 -
 .../networkservice/BaremetalDhcpResponse.java   |     11 +
 .../BaremetalDnsmasqResource.java               |      4 +-
 .../BaremetalKickStartPxeResource.java          |    322 +-
 .../BaremetalKickStartServiceImpl.java          |    412 +-
 .../networkservice/BaremetalPxeElement.java     |      4 +-
 .../BaremetalPxeKickStartResponse.java          |     32 +-
 .../networkservice/BaremetalPxeManager.java     |     18 +-
 .../networkservice/BaremetalPxeManagerImpl.java |     34 +-
 .../networkservice/BaremetalPxeResponse.java    |     18 +-
 .../networkservice/BaremetalPxeService.java     |     19 +-
 .../BaremetalUserdataElement.java               |    260 +-
 .../networkservice/ListBaremetalDhcpCmd.java    |    104 -
 .../ListBaremetalPxePingServersCmd.java         |     94 -
 .../PrepareKickstartPxeServerCommand.java       |     92 +-
 .../networkservice/SecurityGroupHttpClient.java |     76 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |    144 +
 .../cloudstack/api/AddBaremetalHostCmd.java     |     50 +
 .../api/AddBaremetalKickStartPxeCmd.java        |     39 +
 .../cloudstack/api/AddBaremetalPxeCmd.java      |    153 +
 .../api/AddBaremetalPxePingServerCmd.java       |     84 +
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |     96 +
 .../api/ListBaremetalPxeServersCmd.java         |     79 +
 plugins/hypervisors/kvm/agent-descriptor.xml    |      2 +-
 plugins/hypervisors/kvm/pom.xml                 |    143 +-
 .../kvm/src/com/cloud/ha/KVMInvestigator.java   |     74 +
 .../kvm/resource/BridgeVifDriver.java           |    107 +-
 .../kvm/resource/DirectVifDriver.java           |      8 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java   |     54 +-
 .../kvm/resource/LibvirtComputingResource.java  |   1113 +-
 .../kvm/resource/LibvirtConnection.java         |     31 +-
 .../kvm/resource/LibvirtDomainXMLParser.java    |     98 +-
 .../kvm/resource/LibvirtStorageVolumeDef.java   |      2 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    124 +-
 .../hypervisor/kvm/resource/OvsVifDriver.java   |     33 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java |      6 +-
 .../kvm/storage/KVMStoragePoolManager.java      |     17 +-
 .../kvm/storage/KVMStorageProcessor.java        |   1216 +
 .../kvm/storage/KVMStorageResource.java         |     87 +
 .../kvm/storage/LibvirtStorageAdaptor.java      |    529 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java  |      2 -
 .../resource/LibvirtComputingResourceTest.java  |     36 +-
 .../kvm/resource/LibvirtVMDefTest.java          |     20 +
 .../kvm/storage/KVMStorageProcessorTest.java    |     42 +
 plugins/hypervisors/ovm/pom.xml                 |      2 +-
 .../src/com/cloud/ovm/hypervisor/OvmFencer.java |      7 +-
 .../src/com/cloud/ovm/hypervisor/OvmGuru.java   |      6 +-
 .../cloud/ovm/hypervisor/OvmResourceBase.java   |     34 +-
 plugins/hypervisors/simulator/pom.xml           |     70 +-
 .../resources/components-simulator.xml          |     66 -
 .../src/com/cloud/agent/MetricsCollector.java   |    107 -
 .../src/com/cloud/agent/MockVmMetrics.java      |    204 -
 .../src/com/cloud/agent/MultiCaster.java        |    152 -
 .../com/cloud/agent/MultiCasterListener.java    |     22 -
 .../src/com/cloud/agent/SimulatorCmd.java       |     37 -
 .../com/cloud/agent/SimulatorMigrateVmCmd.java  |     83 -
 .../cloud/agent/manager/MockAgentManager.java   |     15 +-
 .../agent/manager/MockAgentManagerImpl.java     |     87 +-
 .../cloud/agent/manager/MockNetworkManager.java |     91 +
 .../agent/manager/MockNetworkManagerImpl.java   |    236 +
 .../cloud/agent/manager/MockStorageManager.java |     13 +-
 .../agent/manager/MockStorageManagerImpl.java   |    215 +-
 .../com/cloud/agent/manager/MockVmManager.java  |     72 +-
 .../cloud/agent/manager/MockVmManagerImpl.java  |    142 +-
 .../cloud/agent/manager/SimulatorManager.java   |      0
 .../agent/manager/SimulatorManagerImpl.java     |    176 +-
 .../cloud/api/commands/ConfigureSimulator.java  |     84 -
 .../api/commands/ConfigureSimulatorCmd.java     |     84 +
 .../commands/SimulatorAddSecondaryAgent.java    |     28 +
 .../SimulatorComponentLibrary.java              |     40 -
 .../com/cloud/resource/AgentResourceBase.java   |     29 +-
 .../cloud/resource/AgentRoutingResource.java    |      4 +-
 .../cloud/resource/AgentStorageResource.java    |      6 +-
 .../com/cloud/resource/SimulatorDiscoverer.java |      6 +-
 .../resource/SimulatorSecondaryDiscoverer.java  |     57 +-
 .../resource/SimulatorStorageProcessor.java     |    217 +
 .../server/ManagementServerSimulatorImpl.java   |     31 -
 .../com/cloud/simulator/MockSecStorageVO.java   |      3 +-
 .../com/cloud/simulator/MockStoragePoolVO.java  |      3 +-
 .../src/com/cloud/simulator/MockVolumeVO.java   |      3 +-
 .../src/com/cloud/simulator/SimulatorGuru.java  |      9 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |    123 +
 .../SimulatorImageStoreLifeCycleImpl.java       |    132 +
 .../SimulatorImageStoreProviderImpl.java        |     98 +
 .../motion/SimulatorDataMotionStrategy.java     |     52 +
 .../SimulatorSecondaryStorageResource.java      |     23 +
 plugins/hypervisors/ucs/pom.xml                 |     43 +-
 .../src/com/cloud/ucs/database/UcsBladeDao.java |     16 +-
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java |     22 +-
 .../src/com/cloud/ucs/database/UcsBladeVO.java  |    140 +-
 .../com/cloud/ucs/database/UcsManagerDao.java   |     32 +-
 .../cloud/ucs/database/UcsManagerDaoImpl.java   |     21 +-
 .../com/cloud/ucs/database/UcsManagerVO.java    |    149 +-
 .../com/cloud/ucs/manager/AddUcsManagerCmd.java |    126 -
 .../manager/AssociateUcsProfileToBladeCmd.java  |     96 -
 .../com/cloud/ucs/manager/ListUcsBladeCmd.java  |     87 -
 .../cloud/ucs/manager/ListUcsManagerCmd.java    |     88 -
 .../cloud/ucs/manager/ListUcsProfileCmd.java    |     81 -
 .../com/cloud/ucs/manager/StringTemplate.java   |     46 +-
 .../com/cloud/ucs/manager/UcsBladeResponse.java |     84 -
 .../src/com/cloud/ucs/manager/UcsCommands.java  |    180 +-
 .../com/cloud/ucs/manager/UcsHttpClient.java    |     96 +-
 .../src/com/cloud/ucs/manager/UcsManager.java   |     40 +-
 .../com/cloud/ucs/manager/UcsManagerImpl.java   |    708 +-
 .../cloud/ucs/manager/UcsManagerResponse.java   |     73 -
 .../cloud/ucs/manager/UcsProfileResponse.java   |     37 -
 .../com/cloud/ucs/structure/ComputeBlade.java   |    332 +-
 .../src/com/cloud/ucs/structure/UcsCookie.java  |     38 +
 .../src/com/cloud/ucs/structure/UcsProfile.java |     76 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java |    128 +
 .../api/AssociateUcsProfileToBladeCmd.java      |    110 +
 .../cloudstack/api/DeleteUcsManagerCmd.java     |     74 +
 .../apache/cloudstack/api/ListUcsBladeCmd.java  |     90 +
 .../cloudstack/api/ListUcsManagerCmd.java       |    105 +
 .../cloudstack/api/ListUcsProfileCmd.java       |     84 +
 .../api/response/UcsBladeResponse.java          |     84 +
 .../api/response/UcsManagerResponse.java        |     73 +
 .../api/response/UcsProfileResponse.java        |     37 +
 plugins/hypervisors/vmware/pom.xml              |     21 +-
 .../vmware/src/com/cloud/ha/VmwareFencer.java   |     11 +-
 .../src/com/cloud/ha/VmwareInvestigator.java    |     10 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |    233 +-
 .../com/cloud/hypervisor/vmware/LegacyZone.java |     28 +
 .../cloud/hypervisor/vmware/LegacyZoneVO.java   |     81 +
 .../hypervisor/vmware/VmwareDatacenter.java     |     36 +
 .../vmware/VmwareDatacenterService.java         |     38 +
 .../hypervisor/vmware/VmwareDatacenterVO.java   |    160 +
 .../vmware/VmwareDatacenterZoneMap.java         |     30 +
 .../vmware/VmwareDatacenterZoneMapVO.java       |     78 +
 .../vmware/VmwareServerDiscoverer.java          |    186 +-
 .../hypervisor/vmware/dao/LegacyZoneDao.java    |     37 +
 .../vmware/dao/LegacyZoneDaoImpl.java           |     66 +
 .../vmware/dao/VmwareDatacenterDao.java         |     65 +
 .../vmware/dao/VmwareDatacenterDaoImpl.java     |    104 +
 .../vmware/dao/VmwareDatacenterZoneMapDao.java  |     35 +
 .../dao/VmwareDatacenterZoneMapDaoImpl.java     |     61 +
 .../vmware/manager/VmwareHostService.java       |     13 +-
 .../vmware/manager/VmwareManager.java           |      3 +
 .../vmware/manager/VmwareManagerImpl.java       |    451 +-
 .../vmware/manager/VmwareStorageManager.java    |      5 +-
 .../manager/VmwareStorageManagerImpl.java       |   1162 +-
 .../vmware/resource/VmwareContextFactory.java   |     25 +-
 .../vmware/resource/VmwareResource.java         |   3135 +-
 .../com/cloud/network/VmwareTrafficLabel.java   |     21 +-
 .../network/element/CiscoNexusVSMElement.java   |     40 +-
 .../element/CiscoNexusVSMElementService.java    |      7 +-
 .../PremiumSecondaryStorageResource.java        |      2 +
 .../VmwareSecondaryStorageContextFactory.java   |     58 +-
 .../VmwareSecondaryStorageResourceHandler.java  |    208 +-
 .../resource/VmwareStorageLayoutHelper.java     |    299 +
 .../resource/VmwareStorageLayoutType.java       |     22 +
 .../resource/VmwareStorageProcessor.java        |   1689 +
 .../VmwareStorageSubsystemCommandHandler.java   |    158 +
 .../api/command/admin/zone/AddVmwareDcCmd.java  |    123 +
 .../command/admin/zone/ListVmwareDcsCmd.java    |    118 +
 .../command/admin/zone/RemoveVmwareDcCmd.java   |     92 +
 .../api/response/VmwareDatacenterResponse.java  |     76 +
 .../motion/VmwareStorageMotionStrategy.java     |    205 +
 .../vmware/VmwareDatacenterApiUnitTest.java     |    437 +
 .../vmware/resource/VmwareResourceTest.java     |     83 +
 .../motion/VmwareStorageMotionStrategyTest.java |    271 +
 plugins/hypervisors/xen/pom.xml                 |      8 +-
 .../xen/src/com/cloud/ha/XenServerFencer.java   |      7 +-
 .../src/com/cloud/hypervisor/XenServerGuru.java |      5 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |    261 +-
 .../hypervisor/xen/resource/CitrixHelper.java   |   1412 +-
 .../xen/resource/CitrixResourceBase.java        |   1324 +-
 .../hypervisor/xen/resource/XcpOssResource.java |     38 +-
 .../xen/resource/XcpServer16Resource.java       |     32 +
 .../xen/resource/XcpServerResource.java         |    113 +-
 .../xen/resource/XenServer56FP1Resource.java    |    155 +-
 .../xen/resource/XenServer56Resource.java       |     44 -
 .../xen/resource/XenServer56SP2Resource.java    |     29 +
 .../xen/resource/XenServer600Resource.java      |     29 +
 .../xen/resource/XenServer602Resource.java      |     28 +
 .../xen/resource/XenServer610Resource.java      |    400 +-
 .../xen/resource/XenServer620Resource.java      |     86 +
 .../xen/resource/XenServerConnectionPool.java   |      4 +-
 .../xen/resource/XenServerStorageProcessor.java |   1506 +
 .../xen/resource/XenServerStorageResource.java  |    662 -
 .../motion/XenServerStorageMotionStrategy.java  |    248 +
 .../xen/resource/CitrixResourceBaseTest.java    |     25 +-
 plugins/network-elements/bigswitch-vns/pom.xml  |      2 +-
 .../api/commands/AddBigSwitchVnsDeviceCmd.java  |      4 +-
 .../commands/DeleteBigSwitchVnsDeviceCmd.java   |      4 +-
 .../network/element/BigSwitchVnsElement.java    |     38 +-
 .../guru/BigSwitchVnsGuestNetworkGuru.java      |     35 +-
 plugins/network-elements/cisco-vnmc/pom.xml     |     42 +
 .../scripts/network/cisco/assoc-asa1000v.xml    |     34 +
 .../network/cisco/associate-acl-policy-set.xml  |     37 +
 .../network/cisco/associate-dhcp-policy.xml     |     34 +
 .../network/cisco/associate-dhcp-server.xml     |     32 +
 .../network/cisco/associate-nat-policy-set.xml  |     35 +
 .../network/cisco/associate-route-policy.xml    |     33 +
 .../network/cisco/create-acl-policy-ref.xml     |     38 +
 .../network/cisco/create-acl-policy-set.xml     |     36 +
 .../scripts/network/cisco/create-acl-policy.xml |     35 +
 .../network/cisco/create-acl-rule-for-dnat.xml  |     82 +
 .../network/cisco/create-acl-rule-for-pf.xml    |    156 +
 .../network/cisco/create-dhcp-policy.xml        |     72 +
 .../scripts/network/cisco/create-dnat-rule.xml  |     91 +
 .../cisco/create-edge-device-profile.xml        |     32 +
 .../cisco/create-edge-device-route-policy.xml   |     30 +
 .../network/cisco/create-edge-device-route.xml  |     35 +
 .../network/cisco/create-edge-firewall.xml      |     89 +
 .../cisco/create-edge-security-profile.xml      |     41 +
 .../network/cisco/create-egress-acl-rule.xml    |    168 +
 ...eate-generic-egress-acl-no-protocol-rule.xml |     94 +
 .../cisco/create-generic-egress-acl-rule.xml    |    121 +
 .../cisco/create-generic-ingress-acl-rule.xml   |    121 +
 .../network/cisco/create-ingress-acl-rule.xml   |    168 +
 .../scripts/network/cisco/create-ip-pool.xml    |     58 +
 .../network/cisco/create-nat-policy-ref.xml     |     38 +
 .../network/cisco/create-nat-policy-set.xml     |     37 +
 .../scripts/network/cisco/create-nat-policy.xml |     33 +
 .../scripts/network/cisco/create-pf-rule.xml    |    166 +
 .../scripts/network/cisco/create-port-pool.xml  |     72 +
 .../network/cisco/create-source-nat-pool.xml    |     58 +
 .../network/cisco/create-source-nat-rule.xml    |    103 +
 .../scripts/network/cisco/create-tenant.xml     |     29 +
 .../scripts/network/cisco/create-vdc.xml        |     30 +
 .../network/cisco/delete-acl-policy-set.xml     |     30 +
 .../scripts/network/cisco/delete-acl-policy.xml |     33 +
 .../network/cisco/delete-edge-firewall.xml      |     30 +
 .../cisco/delete-edge-security-profile.xml      |     38 +
 .../network/cisco/delete-nat-policy-set.xml     |     30 +
 .../scripts/network/cisco/delete-nat-policy.xml |     33 +
 .../scripts/network/cisco/delete-rule.xml       |     31 +
 .../scripts/network/cisco/delete-tenant.xml     |     30 +
 .../scripts/network/cisco/delete-vdc.xml        |     30 +
 .../scripts/network/cisco/disassoc-asa1000v.xml |     30 +
 .../scripts/network/cisco/list-acl-policies.xml |     31 +
 .../scripts/network/cisco/list-children.xml     |     27 +
 .../scripts/network/cisco/list-nat-policies.xml |     31 +
 .../cisco/list-policyrefs-in-policyset.xml      |     31 +
 .../scripts/network/cisco/list-tenants.xml      |     26 +
 .../network/cisco/list-unassigned-asa1000v.xml  |     39 +
 .../cisco-vnmc/scripts/network/cisco/login.xml  |     20 +
 ...ociateAsaWithLogicalEdgeFirewallCommand.java |     53 +
 .../api/CleanupLogicalEdgeFirewallCommand.java  |     43 +
 .../api/ConfigureNexusVsmForAsaCommand.java     |     95 +
 .../api/CreateLogicalEdgeFirewallCommand.java   |     94 +
 .../commands/AddCiscoAsa1000vResourceCmd.java   |    117 +
 .../api/commands/AddCiscoVnmcResourceCmd.java   |    116 +
 .../DeleteCiscoAsa1000vResourceCmd.java         |     94 +
 .../commands/DeleteCiscoVnmcResourceCmd.java    |     94 +
 .../commands/ListCiscoAsa1000vResourcesCmd.java |    111 +
 .../api/commands/ListCiscoVnmcResourcesCmd.java |    107 +
 .../response/CiscoAsa1000vResourceResponse.java |     97 +
 .../api/response/CiscoVnmcResourceResponse.java |     85 +
 .../network/cisco/CiscoAsa1000vDevice.java      |     39 +
 .../network/cisco/CiscoAsa1000vDeviceVO.java    |    101 +
 .../network/cisco/CiscoVnmcConnection.java      |    196 +
 .../network/cisco/CiscoVnmcConnectionImpl.java  |   1402 +
 .../network/cisco/CiscoVnmcController.java      |     40 +
 .../network/cisco/CiscoVnmcControllerVO.java    |    102 +
 .../cloud/network/cisco/NetworkAsa1000vMap.java |     31 +
 .../network/cisco/NetworkAsa1000vMapVO.java     |     73 +
 .../com/cloud/network/dao/CiscoAsa1000vDao.java |     33 +
 .../cloud/network/dao/CiscoAsa1000vDaoImpl.java |     63 +
 .../src/com/cloud/network/dao/CiscoVnmcDao.java |     32 +
 .../com/cloud/network/dao/CiscoVnmcDaoImpl.java |     51 +
 .../network/dao/NetworkAsa1000vMapDao.java      |     28 +
 .../network/dao/NetworkAsa1000vMapDaoImpl.java  |     61 +
 .../network/element/CiscoAsa1000vService.java   |     43 +
 .../cloud/network/element/CiscoVnmcElement.java |    972 +
 .../element/CiscoVnmcElementService.java        |     42 +
 .../network/resource/CiscoVnmcResource.java     |    763 +
 .../network/cisco/CiscoVnmcConnectionTest.java  |    248 +
 .../network/element/CiscoVnmcElementTest.java   |    409 +
 .../network/resource/CiscoVnmcResourceTest.java |    278 +
 plugins/network-elements/dns-notifier/pom.xml   |      2 +-
 .../resources/components-example.xml            |     12 +-
 .../cloudstack/network/element/DnsNotifier.java |    244 +-
 .../elastic-loadbalancer/pom.xml                |      2 +-
 .../element/ElasticLoadBalancerElement.java     |     29 +-
 .../network/lb/ElasticLoadBalancerManager.java  |      4 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |    216 +-
 plugins/network-elements/f5/pom.xml             |      3 +-
 .../api/commands/AddF5LoadBalancerCmd.java      |      6 +-
 .../commands/ConfigureF5LoadBalancerCmd.java    |      6 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java   |      6 +-
 .../element/F5ExternalLoadBalancerElement.java  |     84 +-
 .../cloud/network/resource/F5BigIpResource.java |      1 +
 .../internal-loadbalancer/pom.xml               |     50 +
 .../element/InternalLoadBalancerElement.java    |    536 +
 .../lb/InternalLoadBalancerVMManager.java       |     89 +
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    928 +
 .../ElementChildTestConfiguration.java          |    135 +
 .../InternalLbElementServiceTest.java           |    189 +
 .../InternalLbElementTest.java                  |    231 +
 .../InternalLBVMManagerTest.java                |    386 +
 .../InternalLBVMServiceTest.java                |    256 +
 .../LbChildTestConfiguration.java               |    186 +
 .../test/resources/lb_element.xml               |     46 +
 .../test/resources/lb_mgr.xml                   |     46 +
 .../test/resources/lb_svc.xml                   |     46 +
 plugins/network-elements/juniper-srx/pom.xml    |      3 +-
 .../cloud/api/commands/AddSrxFirewallCmd.java   |      6 +-
 .../api/commands/ConfigureSrxFirewallCmd.java   |      5 +-
 .../api/commands/DeleteSrxFirewallCmd.java      |      5 +-
 .../JuniperSRXExternalFirewallElement.java      |     34 +-
 .../network/resource/JuniperSrxResource.java    |    412 +-
 .../network-elements/midokura-midonet/pom.xml   |     30 -
 .../network/element/MidokuraMidonetElement.java |    131 -
 .../guru/MidokuraMidonetGuestNetworkGuru.java   |     48 -
 plugins/network-elements/midonet/pom.xml        |     60 +
 .../cloud/network/element/MidoNetElement.java   |   1747 +
 .../network/element/SimpleFirewallRule.java     |    218 +
 .../network/guru/MidoNetGuestNetworkGuru.java   |    167 +
 .../network/guru/MidoNetPublicNetworkGuru.java  |    257 +
 .../network/resource/MidoNetVifDriver.java      |    171 +
 .../network/element/MidoNetElementTest.java     |    188 +
 plugins/network-elements/netscaler/pom.xml      |      8 +-
 .../commands/AddNetscalerLoadBalancerCmd.java   |      6 +-
 .../ConfigureNetscalerLoadBalancerCmd.java      |      6 +-
 .../DeleteNetscalerLoadBalancerCmd.java         |      5 +-
 .../response/NetscalerLoadBalancerResponse.java |     21 +
 .../cloud/network/element/NetscalerElement.java |    225 +-
 .../network/resource/NetscalerResource.java     |    335 +-
 plugins/network-elements/nicira-nvp/pom.xml     |      2 +-
 .../api/commands/AddNiciraNvpDeviceCmd.java     |      6 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |      8 +-
 .../cloud/network/element/NiciraNvpElement.java |     57 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java |     11 +-
 .../network/nicira/DestinationNatRule.java      |    105 +
 .../src/com/cloud/network/nicira/Match.java     |    146 +-
 .../src/com/cloud/network/nicira/NatRule.java   |    363 +-
 .../com/cloud/network/nicira/NiciraNvpApi.java  |     67 +-
 .../com/cloud/network/nicira/NiciraNvpTag.java  |     17 +-
 .../com/cloud/network/nicira/SourceNatRule.java |    123 +
 .../network/resource/NiciraNvpResource.java     |     57 +-
 .../network/element/NiciraNvpElementTest.java   |    241 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |      8 +-
 .../com/cloud/network/nicira/NatRuleTest.java   |     43 +-
 .../com/cloud/network/nicira/NiciraTagTest.java |     54 +
 .../network/resource/NiciraNvpResourceTest.java |    113 +-
 plugins/network-elements/ovs/pom.xml            |      2 +-
 .../com/cloud/network/element/OvsElement.java   |      4 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java |     17 +-
 .../com/cloud/network/ovs/OvsTunnelManager.java |      2 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |     15 +-
 .../network-elements/stratosphere-ssp/pom.xml   |     31 +
 .../cloudstack/api/commands/AddSspCmd.java      |    139 +
 .../cloudstack/api/commands/DeleteSspCmd.java   |     75 +
 .../cloudstack/api/response/SspResponse.java    |     77 +
 .../network/dao/SspCredentialDao.java           |     33 +
 .../network/dao/SspCredentialDaoImpl.java       |     42 +
 .../cloudstack/network/dao/SspCredentialVO.java |     67 +
 .../cloudstack/network/dao/SspTenantDao.java    |     34 +
 .../network/dao/SspTenantDaoImpl.java           |     48 +
 .../cloudstack/network/dao/SspTenantVO.java     |     55 +
 .../cloudstack/network/dao/SspUuidDao.java      |     36 +
 .../cloudstack/network/dao/SspUuidDaoImpl.java  |    116 +
 .../cloudstack/network/dao/SspUuidVO.java       |     73 +
 .../cloudstack/network/element/SspClient.java   |    272 +
 .../cloudstack/network/element/SspElement.java  |    620 +
 .../cloudstack/network/element/SspManager.java  |     71 +
 .../cloudstack/network/element/SspService.java  |     47 +
 .../network/guru/SspGuestNetworkGuru.java       |    173 +
 .../stratosphere-ssp/sspmock/sspmock.py         |     85 +
 .../network/element/SspClientTest.java          |     93 +
 .../network/element/SspElementTest.java         |    154 +
 plugins/pom.xml                                 |     73 +-
 plugins/storage-allocators/random/pom.xml       |      2 +-
 .../allocator/RandomStoragePoolAllocator.java   |     56 +-
 plugins/storage/image/default/pom.xml           |     62 +
 .../driver/CloudStackImageStoreDriverImpl.java  |     98 +
 .../CloudStackImageStoreLifeCycleImpl.java      |    164 +
 .../CloudStackImageStoreProviderImpl.java       |    103 +
 plugins/storage/image/s3/pom.xml                |     22 +-
 .../driver/S3ImageStoreDriverImpl.java          |    100 +
 .../lifecycle/S3ImageStoreLifeCycleImpl.java    |    134 +
 .../provider/S3ImageStoreProviderImpl.java      |    100 +
 plugins/storage/image/sample/pom.xml            |     62 +
 .../driver/SampleImageStoreDriverImpl.java      |     52 +
 .../SampleImageStoreLifeCycleImpl.java          |     82 +
 .../provider/SampleImageStoreProviderImpl.java  |     96 +
 plugins/storage/image/swift/pom.xml             |     62 +
 .../driver/SwiftImageStoreDriverImpl.java       |    102 +
 .../lifecycle/SwiftImageStoreLifeCycleImpl.java |    116 +
 .../provider/SwiftImageStoreProviderImpl.java   |    102 +
 plugins/storage/volume/default/pom.xml          |     11 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |    519 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    266 +-
 .../CloudStackPrimaryDataStoreProviderImpl.java |     20 +-
 plugins/storage/volume/sample/pom.xml           |     47 +
 .../SamplePrimaryDataStoreDriverImpl.java       |    186 +
 .../SamplePrimaryDataStoreLifeCycleImpl.java    |    122 +
 .../SamplePrimaryDatastoreProviderImpl.java     |     79 +
 plugins/storage/volume/solidfire/pom.xml        |     18 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java |    546 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java     |    333 +
 .../SolidfirePrimaryDataStoreProvider.java      |    117 +-
 .../storage/datastore/util/SolidFireUtil.java   |    957 +
 .../cloudstack/storage/test/AopTestAdvice.java  |     20 +-
 .../storage/test/ChildTestConfiguration.java    |     47 +-
 .../storage/test/TestConfiguration.java         |     17 +-
 .../cloudstack/storage/test/VolumeTest.java     |    169 +-
 plugins/user-authenticators/ldap/pom.xml        |    121 +-
 .../server/auth/LDAPUserAuthenticator.java      |    173 -
 .../api/command/LdapAddConfigurationCmd.java    |     99 +
 .../api/command/LdapCreateAccountCmd.java       |    167 +
 .../api/command/LdapDeleteConfigurationCmd.java |     78 +
 .../api/command/LdapListConfigurationCmd.java   |    110 +
 .../api/command/LdapListUsersCmd.java           |    123 +
 .../api/command/LdapUserSearchCmd.java          |     98 +
 .../api/response/LdapConfigurationResponse.java |     62 +
 .../api/response/LdapUserResponse.java          |     99 +
 .../cloudstack/ldap/LdapAuthenticator.java      |     81 +
 .../cloudstack/ldap/LdapConfiguration.java      |    145 +
 .../cloudstack/ldap/LdapConfigurationVO.java    |     66 +
 .../cloudstack/ldap/LdapContextFactory.java     |    136 +
 .../org/apache/cloudstack/ldap/LdapManager.java |     57 +
 .../apache/cloudstack/ldap/LdapManagerImpl.java |    232 +
 .../org/apache/cloudstack/ldap/LdapUser.java    |     77 +
 .../apache/cloudstack/ldap/LdapUserManager.java |    140 +
 .../org/apache/cloudstack/ldap/LdapUtils.java   |     62 +
 .../ldap/NoLdapUserMatchingQueryException.java  |     32 +
 .../ldap/NoSuchLdapUserException.java           |     31 +
 .../ldap/dao/LdapConfigurationDao.java          |     32 +
 .../ldap/dao/LdapConfigurationDaoImpl.java      |     72 +
 .../ldap/BasicNamingEnumerationImpl.groovy      |     56 +
 .../ldap/LdapAddConfigurationCmdSpec.groovy     |     89 +
 .../ldap/LdapAuthenticatorSpec.groovy           |     99 +
 .../ldap/LdapConfigurationDaoImplSpec.groovy    |     29 +
 .../ldap/LdapConfigurationResponseSpec.groovy   |     49 +
 .../ldap/LdapConfigurationSpec.groovy           |    223 +
 .../ldap/LdapConfigurationVOSpec.groovy         |     36 +
 .../ldap/LdapContextFactorySpec.groovy          |    127 +
 .../ldap/LdapCreateAccountCmdSpec.groovy        |    155 +
 .../ldap/LdapDeleteConfigurationCmdSpec.groovy  |     68 +
 .../ldap/LdapListConfigurationCmdSpec.groovy    |     98 +
 .../cloudstack/ldap/LdapListUsersCmdSpec.groovy |    123 +
 .../cloudstack/ldap/LdapManagerImplSpec.groovy  |    336 +
 .../ldap/LdapSearchUserCmdSpec.groovy           |     72 +
 .../cloudstack/ldap/LdapUserManagerSpec.groovy  |    206 +
 .../cloudstack/ldap/LdapUserResponseSpec.groovy |     67 +
 .../apache/cloudstack/ldap/LdapUserSpec.groovy  |    101 +
 .../apache/cloudstack/ldap/LdapUtilsSpec.groovy |     68 +
 .../NoLdapUserMatchingQueryExceptionSpec.groovy |     30 +
 .../ldap/NoSuchLdapUserExceptionSpec.groovy     |     30 +
 .../ldap/test/resources/cloudstack.org.ldif     |    311 +
 plugins/user-authenticators/md5/pom.xml         |      2 +-
 plugins/user-authenticators/plain-text/pom.xml  |      2 +-
 .../user-authenticators/sha256salted/pom.xml    |      2 +-
 .../auth/SHA256SaltedUserAuthenticator.java     |     39 +-
 .../server/auth/test/AuthenticatorTest.java     |     78 +-
 pom.xml                                         |    399 +-
 python/lib/cloudutils/globalEnv.py              |      2 +
 python/lib/cloudutils/networkConfig.py          |     16 +-
 python/lib/cloudutils/serviceConfig.py          |     66 +-
 scripts/network/domr/call_dnsmasq.sh            |     27 +
 scripts/network/domr/createipAlias.sh           |     26 +
 scripts/network/domr/deleteipAlias.sh           |     25 +
 scripts/network/domr/save_password_to_domr.sh   |      2 +-
 scripts/network/domr/vm_data.sh                 |    147 -
 scripts/network/exdhcp/dnsmasq_edithosts.sh     |     19 +-
 scripts/network/juniper/application-add.xml     |      2 +-
 scripts/network/juniper/security-policy-add.xml |      7 +-
 scripts/storage/qcow2/cleanupmyvms.sh           |     83 -
 scripts/storage/qcow2/createtmplt.sh            |      4 +-
 scripts/storage/qcow2/managesnapshot.sh         |     15 +-
 scripts/storage/qcow2/modifyvlan.sh             |    269 -
 .../storage/secondary/cloud-install-sys-tmplt   |      2 +-
 .../create_privatetemplate_from_snapshot_xen.sh |     98 +
 scripts/storage/secondary/createtmplt.sh        |      2 +-
 scripts/vm/hypervisor/kvm/patchviasocket.pl     |      2 +-
 .../xenserver/Add-To-VCPUs-Params-Live.sh       |     33 -
 .../xenserver/add_to_vcpus_params_live.sh       |     33 +
 .../vm/hypervisor/xenserver/createipAlias.sh    |     25 +
 .../vm/hypervisor/xenserver/deleteipAlias.sh    |     24 +
 .../vm/hypervisor/xenserver/ovs-get-bridge.sh   |     27 +
 .../hypervisor/xenserver/ovs-get-dhcp-iface.sh  |     25 +
 scripts/vm/hypervisor/xenserver/ovs-pvlan       |    145 +
 .../vm/hypervisor/xenserver/ovs-vif-flows.py    |     23 +-
 scripts/vm/hypervisor/xenserver/s3xen           |    161 +-
 .../vm/hypervisor/xenserver/setupxenserver.sh   |      2 +-
 scripts/vm/hypervisor/xenserver/vmops           |    155 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot   |     30 +-
 scripts/vm/hypervisor/xenserver/xcposs/patch    |      3 +-
 scripts/vm/hypervisor/xenserver/xcposs/vmops    |     82 +-
 .../hypervisor/xenserver/xcposs/vmopsSnapshot   |     77 +-
 scripts/vm/hypervisor/xenserver/xcpserver/patch |      4 +-
 .../vm/hypervisor/xenserver/xenserver56/patch   |      4 +-
 .../hypervisor/xenserver/xenserver56fp1/patch   |      4 +-
 .../vm/hypervisor/xenserver/xenserver60/patch   |     11 +-
 scripts/vm/network/ovs-pvlan-cleanup.sh         |     23 +
 scripts/vm/network/ovs-pvlan-dhcp-host.sh       |    123 +
 scripts/vm/network/ovs-pvlan-vm.sh              |    100 +
 scripts/vm/network/security_group.py            |    483 +-
 scripts/vm/systemvm/injectkeys.sh               |     26 +-
 server/conf/cloudstack-limits.conf.in           |      4 +-
 server/conf/cloudstack-sudoers.in               |      2 +-
 server/conf/log4j-cloud.xml.in                  |     12 +-
 server/pom.xml                                  |    168 +-
 .../cloud/acl/AffinityGroupAccessChecker.java   |     82 +
 server/src/com/cloud/acl/DomainChecker.java     |     32 +-
 server/src/com/cloud/agent/AgentManager.java    |    161 -
 .../com/cloud/agent/manager/AgentAttache.java   |    524 -
 .../cloud/agent/manager/AgentManagerImpl.java   |   1531 -
 .../com/cloud/agent/manager/AgentMonitor.java   |    304 -
 .../agent/manager/AgentMonitorService.java      |     28 -
 .../agent/manager/ClusteredAgentAttache.java    |    260 -
 .../manager/ClusteredAgentManagerImpl.java      |   1139 -
 .../manager/ClusteredDirectAgentAttache.java    |     69 -
 .../src/com/cloud/agent/manager/Commands.java   |    153 -
 .../agent/manager/ConnectedAgentAttache.java    |    101 -
 .../cloud/agent/manager/DirectAgentAttache.java |    220 -
 .../com/cloud/agent/manager/DummyAttache.java   |     56 -
 .../src/com/cloud/agent/manager/Routable.java   |     29 -
 .../agent/manager/SynchronousListener.java      |    135 -
 .../agent/manager/allocator/HostAllocator.java  |     70 -
 .../agent/manager/allocator/PodAllocator.java   |     35 -
 .../allocator/impl/FirstFitAllocator.java       |    496 +-
 .../impl/FirstFitRoutingAllocator.java          |      2 +-
 .../allocator/impl/RecreateHostAllocator.java   |      2 +-
 .../allocator/impl/TestingAllocator.java        |     15 +-
 .../impl/UserConcentratedAllocator.java         |     79 +-
 .../authn/impl/BasicAgentAuthManager.java       |      3 +-
 .../src/com/cloud/alert/AlertManagerImpl.java   |    149 +-
 server/src/com/cloud/alert/dao/AlertDao.java    |     33 -
 .../src/com/cloud/alert/dao/AlertDaoImpl.java   |    156 -
 .../com/cloud/api/ApiAsyncJobDispatcher.java    |    126 +
 server/src/com/cloud/api/ApiDBUtils.java        |    395 +-
 server/src/com/cloud/api/ApiDispatcher.java     |    164 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   1502 +-
 .../src/com/cloud/api/ApiSerializerHelper.java  |      5 +-
 server/src/com/cloud/api/ApiServer.java         |    341 +-
 server/src/com/cloud/api/ApiServerService.java  |      1 +
 server/src/com/cloud/api/ApiServlet.java        |     54 +-
 .../src/com/cloud/api/doc/ApiXmlDocWriter.java  |     44 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |   1579 +-
 .../com/cloud/api/query/ViewResponseHelper.java |    195 +-
 .../com/cloud/api/query/dao/AccountJoinDao.java |      6 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java |    140 +-
 .../api/query/dao/AffinityGroupJoinDao.java     |     37 +
 .../api/query/dao/AffinityGroupJoinDaoImpl.java |    144 +
 .../cloud/api/query/dao/AsyncJobJoinDao.java    |      4 +-
 .../api/query/dao/AsyncJobJoinDaoImpl.java      |     14 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java    |      7 +-
 .../api/query/dao/DiskOfferingJoinDaoImpl.java  |     13 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |     18 +-
 .../com/cloud/api/query/dao/HostJoinDao.java    |      5 +
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |    144 +-
 .../cloud/api/query/dao/ImageStoreJoinDao.java  |     36 +
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |    163 +
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java |     17 +-
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |      3 +-
 .../api/query/dao/SecurityGroupJoinDaoImpl.java |      9 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |     10 +
 .../cloud/api/query/dao/StoragePoolJoinDao.java |     12 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |    105 +-
 .../cloud/api/query/dao/TemplateJoinDao.java    |     45 +
 .../api/query/dao/TemplateJoinDaoImpl.java      |    450 +
 .../api/query/dao/UserAccountJoinDaoImpl.java   |      7 +-
 .../com/cloud/api/query/dao/UserVmJoinDao.java  |      2 +
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |     86 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |     43 +-
 .../com/cloud/api/query/vo/AccountJoinVO.java   |     16 +-
 .../cloud/api/query/vo/AffinityGroupJoinVO.java |    275 +
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java  |      9 +-
 .../cloud/api/query/vo/DataCenterJoinVO.java    |     20 +
 .../cloud/api/query/vo/DiskOfferingJoinVO.java  |     86 +
 .../cloud/api/query/vo/DomainRouterJoinVO.java  |     23 +-
 .../src/com/cloud/api/query/vo/HostJoinVO.java  |      6 +-
 .../cloud/api/query/vo/ImageStoreJoinVO.java    |    207 +
 .../com/cloud/api/query/vo/ProjectJoinVO.java   |      8 +-
 .../cloud/api/query/vo/SecurityGroupJoinVO.java |      6 +-
 .../api/query/vo/ServiceOfferingJoinVO.java     |     63 +
 .../cloud/api/query/vo/StoragePoolJoinVO.java   |     54 +-
 .../com/cloud/api/query/vo/TemplateJoinVO.java  |   1075 +
 .../cloud/api/query/vo/UserAccountJoinVO.java   |     22 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |     66 +-
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |    114 +-
 .../api/response/ApiResponseSerializer.java     |     23 +-
 .../src/com/cloud/async/AsyncCommandQueued.java |     35 -
 .../src/com/cloud/async/AsyncJobExecutor.java   |     39 -
 .../cloud/async/AsyncJobExecutorContext.java    |     54 -
 .../async/AsyncJobExecutorContextImpl.java      |    146 -
 server/src/com/cloud/async/AsyncJobMBean.java   |     37 -
 .../src/com/cloud/async/AsyncJobMBeanImpl.java  |    144 -
 server/src/com/cloud/async/AsyncJobManager.java |     51 -
 .../com/cloud/async/AsyncJobManagerImpl.java    |    783 -
 server/src/com/cloud/async/AsyncJobResult.java  |     28 +-
 .../com/cloud/async/BaseAsyncJobExecutor.java   |     69 -
 .../src/com/cloud/async/SyncQueueManager.java   |     35 -
 .../com/cloud/async/SyncQueueManagerImpl.java   |    253 -
 server/src/com/cloud/async/dao/AsyncJobDao.java |     31 -
 .../com/cloud/async/dao/AsyncJobDaoImpl.java    |    127 -
 .../src/com/cloud/async/dao/SyncQueueDao.java   |     25 -
 .../com/cloud/async/dao/SyncQueueDaoImpl.java   |     81 -
 .../com/cloud/async/dao/SyncQueueItemDao.java   |     30 -
 .../cloud/async/dao/SyncQueueItemDaoImpl.java   |    163 -
 .../async/executor/ExtractJobResultObject.java  |    183 -
 .../src/com/cloud/capacity/CapacityManager.java |     59 -
 .../com/cloud/capacity/CapacityManagerImpl.java |    268 +-
 .../cloud/capacity/ComputeCapacityListener.java |      4 +-
 .../cloud/capacity/StorageCapacityListener.java |     20 +-
 .../src/com/cloud/capacity/dao/CapacityDao.java |     45 -
 .../com/cloud/capacity/dao/CapacityDaoImpl.java |    806 -
 .../cloud/certificate/dao/CertificateDao.java   |     24 -
 .../certificate/dao/CertificateDaoImpl.java     |     63 -
 .../cloud/cluster/ActiveFencingException.java   |     31 -
 server/src/com/cloud/cluster/CheckPointVO.java  |    121 -
 .../com/cloud/cluster/ClusterFenceManager.java  |     23 -
 .../cloud/cluster/ClusterFenceManagerImpl.java  |     58 -
 .../cluster/ClusterInvalidSessionException.java |     33 -
 .../src/com/cloud/cluster/ClusterManager.java   |     67 -
 .../com/cloud/cluster/ClusterManagerImpl.java   |   1514 -
 .../cloud/cluster/ClusterManagerListener.java   |     25 -
 .../com/cloud/cluster/ClusterManagerMBean.java  |     27 -
 .../cloud/cluster/ClusterManagerMBeanImpl.java  |     67 -
 .../cloud/cluster/ClusterManagerMessage.java    |     44 -
 .../cloud/cluster/ClusterNodeJoinEventArgs.java |     43 -
 .../cloud/cluster/ClusterNodeLeftEventArgs.java |     44 -
 .../src/com/cloud/cluster/ClusterService.java   |     25 -
 .../cloud/cluster/ClusterServiceAdapter.java    |     28 -
 .../com/cloud/cluster/ClusterServicePdu.java    |    112 -
 .../cloud/cluster/ClusterServiceRequestPdu.java |     54 -
 .../cluster/ClusterServiceServletAdapter.java   |    148 -
 .../cluster/ClusterServiceServletContainer.java |    179 -
 .../ClusterServiceServletHttpHandler.java       |    192 -
 .../cluster/ClusterServiceServletImpl.java      |    146 -
 .../cluster/ClusteredAgentRebalanceService.java |     30 -
 .../cloud/cluster/DummyClusterManagerImpl.java  |    179 -
 .../com/cloud/cluster/LockMasterListener.java   |     49 -
 .../cluster/ManagementServerHostPeerVO.java     |    120 -
 .../cloud/cluster/ManagementServerHostVO.java   |    182 -
 .../com/cloud/cluster/ManagementServerNode.java |     64 -
 .../cloud/cluster/RemoteMethodConstants.java    |     23 -
 .../agentlb/AgentLoadBalancerPlanner.java       |     29 -
 .../ClusterBasedAgentLoadBalancerPlanner.java   |    150 -
 .../cluster/agentlb/HostTransferMapVO.java      |     98 -
 .../cluster/agentlb/dao/HostTransferMapDao.java |     45 -
 .../agentlb/dao/HostTransferMapDaoImpl.java     |    146 -
 .../cluster/dao/ManagementServerHostDao.java    |     48 -
 .../dao/ManagementServerHostDaoImpl.java        |    276 -
 .../dao/ManagementServerHostPeerDao.java        |     27 -
 .../dao/ManagementServerHostPeerDaoImpl.java    |    108 -
 .../src/com/cloud/cluster/dao/StackMaidDao.java |     44 -
 .../com/cloud/cluster/dao/StackMaidDaoImpl.java |    208 -
 server/src/com/cloud/configuration/Config.java  |    197 +-
 .../configuration/ConfigurationManager.java     |    243 -
 .../configuration/ConfigurationManagerImpl.java |   2794 +-
 .../configuration/dao/ConfigurationDao.java     |     68 -
 .../configuration/dao/ConfigurationDaoImpl.java |    225 -
 .../configuration/dao/ResourceCountDao.java     |     58 -
 .../configuration/dao/ResourceCountDaoImpl.java |    222 -
 .../configuration/dao/ResourceLimitDao.java     |     35 -
 .../configuration/dao/ResourceLimitDaoImpl.java |    100 -
 .../AgentBasedConsoleProxyManager.java          |    191 +-
 ...AgentBasedStandaloneConsoleProxyManager.java |      2 +-
 .../src/com/cloud/consoleproxy/AgentHook.java   |      9 +-
 .../com/cloud/consoleproxy/AgentHookBase.java   |    284 +
 .../ConsoleProxyBalanceAllocator.java           |     55 +-
 .../consoleproxy/ConsoleProxyListener.java      |      4 +-
 .../cloud/consoleproxy/ConsoleProxyManager.java |     18 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    833 +-
 .../cloud/consoleproxy/ConsoleProxyService.java |     25 +
 .../consoleproxy/StaticConsoleProxyManager.java |     87 +-
 server/src/com/cloud/dao/EntityManagerImpl.java |    149 -
 server/src/com/cloud/dc/AccountVlanMapVO.java   |     65 -
 server/src/com/cloud/dc/ClusterDetailsDao.java  |     32 -
 .../src/com/cloud/dc/ClusterDetailsDaoImpl.java |    125 -
 server/src/com/cloud/dc/ClusterDetailsVO.java   |     74 -
 server/src/com/cloud/dc/ClusterVO.java          |    189 -
 server/src/com/cloud/dc/ClusterVSMMapVO.java    |     62 -
 .../src/com/cloud/dc/DataCenterIpAddressVO.java |    115 -
 .../dc/DataCenterLinkLocalIpAddressVO.java      |    108 -
 server/src/com/cloud/dc/DataCenterVO.java       |    460 -
 server/src/com/cloud/dc/DataCenterVnetVO.java   |    109 -
 server/src/com/cloud/dc/DcDetailVO.java         |     73 -
 .../src/com/cloud/dc/DedicatedResourceVO.java   |    155 +
 server/src/com/cloud/dc/HostPodVO.java          |    197 -
 server/src/com/cloud/dc/PodCluster.java         |     67 -
 server/src/com/cloud/dc/PodVlanMapVO.java       |     62 -
 server/src/com/cloud/dc/PodVlanVO.java          |     98 -
 .../com/cloud/dc/StorageNetworkIpAddressVO.java |    120 -
 .../com/cloud/dc/StorageNetworkIpRangeVO.java   |    184 -
 server/src/com/cloud/dc/VlanVO.java             |    196 -
 .../src/com/cloud/dc/dao/AccountVlanMapDao.java |     30 -
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java |     75 -
 server/src/com/cloud/dc/dao/ClusterDao.java     |     37 -
 server/src/com/cloud/dc/dao/ClusterDaoImpl.java |    241 -
 .../src/com/cloud/dc/dao/ClusterVSMMapDao.java  |     29 -
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java  |     95 -
 server/src/com/cloud/dc/dao/DataCenterDao.java  |     80 -
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |    404 -
 .../cloud/dc/dao/DataCenterIpAddressDao.java    |     38 -
 .../dc/dao/DataCenterIpAddressDaoImpl.java      |    225 -
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java |     32 -
 .../DataCenterLinkLocalIpAddressDaoImpl.java    |    188 -
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java |     38 -
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java |    186 -
 server/src/com/cloud/dc/dao/DcDetailsDao.java   |     32 -
 .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java  |     97 -
 .../com/cloud/dc/dao/DedicatedResourceDao.java  |     58 +
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |    376 +
 server/src/com/cloud/dc/dao/HostPodDao.java     |     35 -
 server/src/com/cloud/dc/dao/HostPodDaoImpl.java |    134 -
 server/src/com/cloud/dc/dao/PodVlanDao.java     |     30 -
 server/src/com/cloud/dc/dao/PodVlanDaoImpl.java |    139 -
 server/src/com/cloud/dc/dao/PodVlanMapDao.java  |     30 -
 .../src/com/cloud/dc/dao/PodVlanMapDaoImpl.java |     75 -
 .../dc/dao/StorageNetworkIpAddressDao.java      |     32 -
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java  |    114 -
 .../cloud/dc/dao/StorageNetworkIpRangeDao.java  |     32 -
 .../dc/dao/StorageNetworkIpRangeDaoImpl.java    |     78 -
 server/src/com/cloud/dc/dao/VlanDao.java        |     53 -
 server/src/com/cloud/dc/dao/VlanDaoImpl.java    |    315 -
 .../deploy/AbstractDeployPlannerSelector.java   |     84 -
 .../com/cloud/deploy/DeployPlannerSelector.java |     24 -
 .../deploy/DeploymentPlanningManagerImpl.java   |   1281 +
 .../src/com/cloud/deploy/FirstFitPlanner.java   |    643 +-
 .../deploy/HypervisorVmPlannerSelector.java     |     54 -
 .../cloud/deploy/PlannerHostReservationVO.java  |    117 +
 .../deploy/dao/PlannerHostReservationDao.java   |     32 +
 .../dao/PlannerHostReservationDaoImpl.java      |     76 +
 server/src/com/cloud/domain/DomainVO.java       |    215 -
 server/src/com/cloud/domain/dao/DomainDao.java  |     34 -
 .../src/com/cloud/domain/dao/DomainDaoImpl.java |    275 -
 .../com/cloud/event/ActionEventInterceptor.java |     31 +-
 .../src/com/cloud/event/ActionEventUtils.java   |     69 +-
 server/src/com/cloud/event/AlertGenerator.java  |      8 +
 server/src/com/cloud/event/EventUtils.java      |    118 -
 server/src/com/cloud/event/UsageEventUtils.java |    144 -
 .../com/cloud/ha/CheckOnAgentInvestigator.java  |      8 +-
 server/src/com/cloud/ha/FenceBuilder.java       |     31 -
 .../com/cloud/ha/HighAvailabilityManager.java   |    114 -
 .../ha/HighAvailabilityManagerExtImpl.java      |      3 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    207 +-
 server/src/com/cloud/ha/Investigator.java       |     33 -
 server/src/com/cloud/ha/KVMFencer.java          |      6 +-
 .../ha/ManagementIPSystemVMInvestigator.java    |     12 +-
 server/src/com/cloud/ha/RecreatableFencer.java  |      8 +-
 .../com/cloud/ha/UserVmDomRInvestigator.java    |     18 +-
 .../src/com/cloud/ha/XenServerInvestigator.java |      9 +-
 server/src/com/cloud/host/dao/HostDao.java      |     83 -
 server/src/com/cloud/host/dao/HostDaoImpl.java  |    920 -
 .../src/com/cloud/host/dao/HostDetailsDao.java  |     32 -
 .../com/cloud/host/dao/HostDetailsDaoImpl.java  |    110 -
 server/src/com/cloud/host/dao/HostTagsDao.java  |     30 -
 .../src/com/cloud/host/dao/HostTagsDaoImpl.java |     75 -
 .../hypervisor/CloudZonesStartupProcessor.java  |      3 +-
 .../cloud/hypervisor/HypervisorGuruBase.java    |     49 +-
 .../cloud/hypervisor/HypervisorGuruManager.java |     27 -
 .../hypervisor/HypervisorGuruManagerImpl.java   |     14 +-
 server/src/com/cloud/hypervisor/KVMGuru.java    |      4 +-
 server/src/com/cloud/hypervisor/LXCGuru.java    |      4 +-
 .../dao/HypervisorCapabilitiesDao.java          |     36 -
 .../dao/HypervisorCapabilitiesDaoImpl.java      |     98 -
 .../com/cloud/hypervisor/guru/HypervGuru.java   |     73 -
 .../hyperv/HypervServerDiscoverer.java          |    243 -
 .../kvm/discoverer/LibvirtServerDiscoverer.java |    102 +-
 server/src/com/cloud/keystore/KeystoreDao.java  |     29 -
 .../src/com/cloud/keystore/KeystoreDaoImpl.java |    118 -
 server/src/com/cloud/keystore/KeystoreVO.java   |    101 -
 server/src/com/cloud/maint/AgentUpgradeVO.java  |     63 -
 server/src/com/cloud/maint/UpgradeManager.java  |     47 -
 .../src/com/cloud/maint/UpgradeManagerImpl.java |    189 -
 .../com/cloud/maint/UpgradeManagerMBean.java    |     23 -
 server/src/com/cloud/maint/UpgradeMonitor.java  |     34 -
 server/src/com/cloud/maint/Version.java         |     66 -
 .../com/cloud/maint/dao/AgentUpgradeDao.java    |     23 -
 .../cloud/maint/dao/AgentUpgradeDaoImpl.java    |     29 -
 .../cloud/metadata/ResourceMetaDataManager.java |     22 +
 .../metadata/ResourceMetaDataManagerImpl.java   |    250 +
 .../cloud/migration/Db21to22MigrationUtil.java  |    228 -
 .../migration/Db22beta4to22GAMigrationUtil.java |    128 -
 .../com/cloud/migration/DiskOffering20Dao.java  |     22 -
 .../cloud/migration/DiskOffering20DaoImpl.java  |     27 -
 .../com/cloud/migration/DiskOffering20VO.java   |    113 -
 .../com/cloud/migration/DiskOffering21Dao.java  |     23 -
 .../cloud/migration/DiskOffering21DaoImpl.java  |     27 -
 .../com/cloud/migration/DiskOffering21VO.java   |    257 -
 .../cloud/migration/ServiceOffering20Dao.java   |     22 -
 .../migration/ServiceOffering20DaoImpl.java     |     27 -
 .../cloud/migration/ServiceOffering20VO.java    |    199 -
 .../cloud/migration/ServiceOffering21Dao.java   |     22 -
 .../migration/ServiceOffering21DaoImpl.java     |     27 -
 .../cloud/migration/ServiceOffering21VO.java    |    178 -
 .../network/ExteralIpAddressAllocator.java      |    165 -
 .../network/ExternalDeviceUsageManager.java     |     33 +
 .../network/ExternalDeviceUsageManagerImpl.java |    675 +
 .../ExternalFirewallDeviceManagerImpl.java      |     85 +-
 .../network/ExternalIpAddressAllocator.java     |    166 +
 .../ExternalLoadBalancerDeviceManager.java      |      6 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |    139 +-
 .../ExternalLoadBalancerUsageManager.java       |     33 -
 .../ExternalLoadBalancerUsageManagerImpl.java   |    669 -
 .../ExternalNetworkDeviceManagerImpl.java       |      3 +-
 .../src/com/cloud/network/IpAddrAllocator.java  |      2 +-
 .../com/cloud/network/IpAddressManagerImpl.java |   1925 +
 .../cloud/network/Ipv6AddressManagerImpl.java   |      3 +-
 .../cloud/network/LBHealthCheckPolicyVO.java    |    157 -
 .../src/com/cloud/network/NetworkManager.java   |    350 -
 .../com/cloud/network/NetworkManagerImpl.java   |   3747 -
 .../src/com/cloud/network/NetworkModelImpl.java |    317 +-
 .../com/cloud/network/NetworkRuleApplier.java   |     28 -
 .../com/cloud/network/NetworkServiceImpl.java   |   1436 +-
 .../com/cloud/network/NetworkStateListener.java |     99 -
 .../cloud/network/NetworkUsageManagerImpl.java  |     36 +-
 .../com/cloud/network/SshKeysDistriMonitor.java |      7 +-
 .../network/StorageNetworkManagerImpl.java      |      5 +-
 .../src/com/cloud/network/UserIpv6Address.java  |     52 -
 .../com/cloud/network/UserIpv6AddressVO.java    |    188 -
 server/src/com/cloud/network/addr/PublicIp.java |    238 -
 .../com/cloud/network/as/AutoScaleManager.java  |     32 +-
 .../cloud/network/as/AutoScaleManagerImpl.java  |     69 +-
 .../as/AutoScalePolicyConditionMapVO.java       |     61 -
 .../com/cloud/network/as/AutoScalePolicyVO.java |    134 -
 .../network/as/AutoScaleVmGroupPolicyMapVO.java |     64 -
 .../cloud/network/as/AutoScaleVmGroupVO.java    |    191 -
 .../cloud/network/as/AutoScaleVmProfileVO.java  |    218 -
 .../src/com/cloud/network/as/ConditionVO.java   |    129 -
 server/src/com/cloud/network/as/CounterVO.java  |    111 -
 .../as/dao/AutoScalePolicyConditionMapDao.java  |     28 -
 .../dao/AutoScalePolicyConditionMapDaoImpl.java |     61 -
 .../network/as/dao/AutoScalePolicyDao.java      |     24 -
 .../network/as/dao/AutoScalePolicyDaoImpl.java  |     38 -
 .../network/as/dao/AutoScaleVmGroupDao.java     |     28 -
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java |     65 -
 .../as/dao/AutoScaleVmGroupPolicyMapDao.java    |     30 -
 .../dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |     77 -
 .../network/as/dao/AutoScaleVmProfileDao.java   |     25 -
 .../as/dao/AutoScaleVmProfileDaoImpl.java       |     38 -
 .../com/cloud/network/as/dao/ConditionDao.java  |     28 -
 .../cloud/network/as/dao/ConditionDaoImpl.java  |     56 -
 .../com/cloud/network/as/dao/CounterDao.java    |     29 -
 .../cloud/network/as/dao/CounterDaoImpl.java    |     70 -
 .../network/dao/ExternalFirewallDeviceDao.java  |     58 -
 .../dao/ExternalFirewallDeviceDaoImpl.java      |     96 -
 .../network/dao/ExternalFirewallDeviceVO.java   |    161 -
 .../dao/ExternalLoadBalancerDeviceDao.java      |     74 -
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java  |    127 -
 .../dao/ExternalLoadBalancerDeviceVO.java       |    227 -
 .../network/dao/FirewallRulesCidrsDao.java      |     29 -
 .../network/dao/FirewallRulesCidrsDaoImpl.java  |     70 -
 .../cloud/network/dao/FirewallRulesCidrsVO.java |     65 -
 .../com/cloud/network/dao/FirewallRulesDao.java |     65 -
 .../cloud/network/dao/FirewallRulesDaoImpl.java |    352 -
 .../src/com/cloud/network/dao/IPAddressDao.java |     71 -
 .../com/cloud/network/dao/IPAddressDaoImpl.java |    376 -
 .../src/com/cloud/network/dao/IPAddressVO.java  |    309 -
 .../dao/InlineLoadBalancerNicMapDao.java        |     24 -
 .../dao/InlineLoadBalancerNicMapDaoImpl.java    |     46 -
 .../network/dao/InlineLoadBalancerNicMapVO.java |     60 -
 .../network/dao/LBHealthCheckPolicyDao.java     |     35 -
 .../network/dao/LBHealthCheckPolicyDaoImpl.java |     71 -
 .../network/dao/LBStickinessPolicyDao.java      |     34 -
 .../network/dao/LBStickinessPolicyDaoImpl.java  |     69 -
 .../cloud/network/dao/LBStickinessPolicyVO.java |    145 -
 .../com/cloud/network/dao/LoadBalancerDao.java  |     36 -
 .../cloud/network/dao/LoadBalancerDaoImpl.java  |    137 -
 .../cloud/network/dao/LoadBalancerVMMapDao.java |     31 -
 .../network/dao/LoadBalancerVMMapDaoImpl.java   |     97 -
 .../cloud/network/dao/LoadBalancerVMMapVO.java  |     89 -
 .../com/cloud/network/dao/LoadBalancerVO.java   |     98 -
 .../cloud/network/dao/NetworkAccountDao.java    |     22 -
 .../network/dao/NetworkAccountDaoImpl.java      |     29 -
 .../com/cloud/network/dao/NetworkAccountVO.java |     72 -
 .../src/com/cloud/network/dao/NetworkDao.java   |    114 -
 .../com/cloud/network/dao/NetworkDaoImpl.java   |    621 -
 .../com/cloud/network/dao/NetworkDomainDao.java |     27 -
 .../cloud/network/dao/NetworkDomainDaoImpl.java |     75 -
 .../com/cloud/network/dao/NetworkDomainVO.java  |     72 -
 .../network/dao/NetworkExternalFirewallDao.java |     38 -
 .../dao/NetworkExternalFirewallDaoImpl.java     |     61 -
 .../network/dao/NetworkExternalFirewallVO.java  |     88 -
 .../dao/NetworkExternalLoadBalancerDao.java     |     38 -
 .../dao/NetworkExternalLoadBalancerDaoImpl.java |     62 -
 .../dao/NetworkExternalLoadBalancerVO.java      |     89 -
 .../src/com/cloud/network/dao/NetworkOpDao.java |     26 -
 .../com/cloud/network/dao/NetworkOpDaoImpl.java |     84 -
 .../src/com/cloud/network/dao/NetworkOpVO.java  |     76 -
 .../cloud/network/dao/NetworkRuleConfigDao.java |     26 -
 .../network/dao/NetworkRuleConfigDaoImpl.java   |     51 -
 .../cloud/network/dao/NetworkRuleConfigVO.java  |     93 -
 .../cloud/network/dao/NetworkServiceMapDao.java |     38 -
 .../network/dao/NetworkServiceMapDaoImpl.java   |    167 -
 .../cloud/network/dao/NetworkServiceMapVO.java  |     92 -
 server/src/com/cloud/network/dao/NetworkVO.java |    543 -
 .../cloud/network/dao/PhysicalNetworkDao.java   |     28 -
 .../network/dao/PhysicalNetworkDaoImpl.java     |     79 -
 .../PhysicalNetworkIsolationMethodDaoImpl.java  |     70 -
 .../dao/PhysicalNetworkIsolationMethodVO.java   |     68 -
 .../dao/PhysicalNetworkServiceProviderDao.java  |     28 -
 .../PhysicalNetworkServiceProviderDaoImpl.java  |    131 -
 .../dao/PhysicalNetworkServiceProviderVO.java   |    322 -
 .../network/dao/PhysicalNetworkTagDaoImpl.java  |     63 -
 .../cloud/network/dao/PhysicalNetworkTagVO.java |     68 -
 .../dao/PhysicalNetworkTrafficTypeDao.java      |     33 -
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java  |    143 -
 .../dao/PhysicalNetworkTrafficTypeVO.java       |    149 -
 .../cloud/network/dao/PhysicalNetworkVO.java    |    234 -
 .../com/cloud/network/dao/PortProfileDao.java   |     50 -
 .../cloud/network/dao/PortProfileDaoImpl.java   |     89 -
 .../com/cloud/network/dao/PortProfileVO.java    |    204 -
 .../cloud/network/dao/RemoteAccessVpnDao.java   |     30 -
 .../network/dao/RemoteAccessVpnDaoImpl.java     |     84 -
 .../cloud/network/dao/RemoteAccessVpnVO.java    |    142 -
 .../com/cloud/network/dao/RouterNetworkDao.java |     26 -
 .../cloud/network/dao/RouterNetworkDaoImpl.java |     62 -
 .../com/cloud/network/dao/RouterNetworkVO.java  |     75 -
 .../dao/Site2SiteCustomerGatewayDao.java        |     27 -
 .../dao/Site2SiteCustomerGatewayDaoImpl.java    |     66 -
 .../network/dao/Site2SiteCustomerGatewayVO.java |    206 -
 .../network/dao/Site2SiteVpnConnectionDao.java  |     29 -
 .../dao/Site2SiteVpnConnectionDaoImpl.java      |     97 -
 .../network/dao/Site2SiteVpnConnectionVO.java   |    143 -
 .../network/dao/Site2SiteVpnGatewayDao.java     |     23 -
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java |     50 -
 .../network/dao/Site2SiteVpnGatewayVO.java      |    114 -
 .../cloud/network/dao/UserIpv6AddressDao.java   |     41 -
 .../network/dao/UserIpv6AddressDaoImpl.java     |    122 -
 .../network/dao/VirtualRouterProviderDao.java   |     31 -
 .../dao/VirtualRouterProviderDaoImpl.java       |     79 -
 .../src/com/cloud/network/dao/VpnUserDao.java   |     28 -
 .../com/cloud/network/dao/VpnUserDaoImpl.java   |     87 -
 .../element/CloudZonesNetworkElement.java       |     38 +-
 .../network/element/SecurityGroupElement.java   |      4 +-
 .../network/element/VirtualRouterElement.java   |    204 +-
 .../element/VirtualRouterProviderVO.java        |    120 -
 .../element/VpcVirtualRouterElement.java        |     91 +-
 .../network/firewall/FirewallManagerImpl.java   |    182 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |     25 +-
 .../cloud/network/guru/DirectNetworkGuru.java   |     46 +-
 .../network/guru/DirectPodBasedNetworkGuru.java |     35 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |     93 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |    143 +-
 .../cloud/network/guru/PodBasedNetworkGuru.java |     10 +-
 .../cloud/network/guru/PrivateNetworkGuru.java  |     36 +-
 .../cloud/network/guru/PublicNetworkGuru.java   |     30 +-
 .../cloud/network/guru/StorageNetworkGuru.java  |     10 +-
 .../cloud/network/lb/LBHealthCheckManager.java  |      4 +-
 .../network/lb/LBHealthCheckManagerImpl.java    |     12 +-
 .../network/lb/LoadBalancingRulesManager.java   |     55 -
 .../lb/LoadBalancingRulesManagerImpl.java       |    578 +-
 .../router/VirtualNetworkApplianceManager.java  |     58 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   1100 +-
 .../VpcVirtualNetworkApplianceManager.java      |      9 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    387 +-
 .../cloud/network/rules/FirewallManager.java    |     88 -
 .../com/cloud/network/rules/FirewallRuleVO.java |    270 -
 .../network/rules/PortForwardingRuleVO.java     |     96 -
 .../com/cloud/network/rules/RulesManager.java   |     90 -
 .../cloud/network/rules/RulesManagerImpl.java   |    363 +-
 .../cloud/network/rules/StaticNatRuleImpl.java  |    147 -
 .../rules/dao/PortForwardingRulesDao.java       |     47 -
 .../rules/dao/PortForwardingRulesDaoImpl.java   |    162 -
 .../network/security/SecurityGroupListener.java |      4 +-
 .../security/SecurityGroupManagerImpl.java      |     74 +-
 .../network/security/dao/SecurityGroupDao.java  |     30 -
 .../security/dao/SecurityGroupDaoImpl.java      |    136 -
 .../security/dao/SecurityGroupRuleDao.java      |     35 -
 .../security/dao/SecurityGroupRuleDaoImpl.java  |    176 -
 .../security/dao/SecurityGroupRulesDao.java     |     48 -
 .../security/dao/SecurityGroupRulesDaoImpl.java |     87 -
 .../security/dao/SecurityGroupVMMapDao.java     |     38 -
 .../security/dao/SecurityGroupVMMapDaoImpl.java |    166 -
 .../security/dao/SecurityGroupWorkDao.java      |     49 -
 .../security/dao/SecurityGroupWorkDaoImpl.java  |    242 -
 .../network/security/dao/VmRulesetLogDao.java   |     29 -
 .../security/dao/VmRulesetLogDaoImpl.java       |    200 -
 .../cloud/network/vpc/NetworkACLManager.java    |     40 -
 .../network/vpc/NetworkACLManagerImpl.java      |    647 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    546 +
 .../network/vpc/PrivateGatewayProfile.java      |     13 +-
 .../com/cloud/network/vpc/PrivateIpAddress.java |      7 +
 .../src/com/cloud/network/vpc/PrivateIpVO.java  |     95 -
 .../com/cloud/network/vpc/StaticRouteVO.java    |    141 -
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |    196 -
 .../src/com/cloud/network/vpc/VpcManager.java   |    165 -
 .../com/cloud/network/vpc/VpcManagerImpl.java   |    410 +-
 .../network/vpc/VpcOfferingServiceMapVO.java    |     89 -
 .../com/cloud/network/vpc/VpcOfferingVO.java    |    151 -
 .../com/cloud/network/vpc/VpcServiceMapVO.java  |     90 -
 server/src/com/cloud/network/vpc/VpcVO.java     |    181 -
 .../com/cloud/network/vpc/dao/PrivateIpDao.java |     75 -
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java |    156 -
 .../cloud/network/vpc/dao/StaticRouteDao.java   |     35 -
 .../network/vpc/dao/StaticRouteDaoImpl.java     |    119 -
 .../src/com/cloud/network/vpc/dao/VpcDao.java   |     47 -
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |    152 -
 .../cloud/network/vpc/dao/VpcGatewayDao.java    |     26 -
 .../network/vpc/dao/VpcGatewayDaoImpl.java      |     62 -
 .../cloud/network/vpc/dao/VpcOfferingDao.java   |     32 -
 .../network/vpc/dao/VpcOfferingDaoImpl.java     |     71 -
 .../vpc/dao/VpcOfferingServiceMapDao.java       |     41 -
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java   |    119 -
 .../cloud/network/vpc/dao/VpcServiceMapDao.java |     40 -
 .../network/vpc/dao/VpcServiceMapDaoImpl.java   |    115 -
 .../network/vpn/RemoteAccessVpnManagerImpl.java |     85 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |     41 +-
 .../offerings/NetworkOfferingServiceMapVO.java  |     94 -
 .../com/cloud/offerings/NetworkOfferingVO.java  |    381 -
 .../cloud/offerings/dao/NetworkOfferingDao.java |     60 -
 .../offerings/dao/NetworkOfferingDaoImpl.java   |    169 -
 .../dao/NetworkOfferingServiceMapDao.java       |     50 -
 .../dao/NetworkOfferingServiceMapDaoImpl.java   |    171 -
 .../com/cloud/projects/ProjectAccountVO.java    |     96 -
 .../com/cloud/projects/ProjectInvitationVO.java |    150 -
 .../com/cloud/projects/ProjectManagerImpl.java  |     66 +-
 server/src/com/cloud/projects/ProjectVO.java    |    163 -
 .../cloud/projects/dao/ProjectAccountDao.java   |     43 -
 .../projects/dao/ProjectAccountDaoImpl.java     |    157 -
 .../src/com/cloud/projects/dao/ProjectDao.java  |     37 -
 .../com/cloud/projects/dao/ProjectDaoImpl.java  |    124 -
 .../projects/dao/ProjectInvitationDao.java      |     44 -
 .../projects/dao/ProjectInvitationDaoImpl.java  |    171 -
 server/src/com/cloud/resource/Discoverer.java   |     51 -
 .../src/com/cloud/resource/DiscovererBase.java  |      4 +-
 .../src/com/cloud/resource/ResourceManager.java |    153 -
 .../com/cloud/resource/ResourceManagerImpl.java |   1691 +-
 .../cloud/resource/ResourceStateAdapter.java    |     63 -
 .../resourcelimit/ResourceLimitManagerImpl.java |     62 +-
 .../com/cloud/secstorage/CommandExecLogDao.java |     25 -
 .../cloud/secstorage/CommandExecLogDaoImpl.java |     49 -
 .../com/cloud/secstorage/CommandExecLogVO.java  |    112 -
 .../PremiumSecondaryStorageManagerImpl.java     |      6 +-
 .../com/cloud/server/ConfigurationServer.java   |      5 +
 .../cloud/server/ConfigurationServerImpl.java   |    160 +-
 server/src/com/cloud/server/Criteria.java       |     12 +-
 .../com/cloud/server/LockMasterListener.java    |     51 +
 .../src/com/cloud/server/ManagementServer.java  |     33 +-
 .../com/cloud/server/ManagementServerImpl.java  |   1949 +-
 server/src/com/cloud/server/StatsCollector.java |    421 +-
 .../com/cloud/service/ServiceOfferingVO.java    |    211 -
 .../cloud/service/dao/ServiceOfferingDao.java   |     34 -
 .../service/dao/ServiceOfferingDaoImpl.java     |    157 -
 .../com/cloud/servlet/CloudStartupServlet.java  |      9 +-
 .../ConsoleProxyPasswordBasedEncryptor.java     |     99 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |     65 +-
 .../cloud/servlet/RegisterCompleteServlet.java  |      5 +-
 .../cloud/storage/CreateSnapshotPayload.java    |     50 +
 .../cloud/storage/LocalStoragePoolListener.java |      4 +-
 .../src/com/cloud/storage/OCFS2ManagerImpl.java |     48 +-
 .../src/com/cloud/storage/StorageManager.java   |     22 +-
 .../com/cloud/storage/StorageManagerImpl.java   |   1643 +-
 .../storage/StoragePoolAutomationImpl.java      |    258 +-
 .../src/com/cloud/storage/TemplateProfile.java  |     89 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |   1682 +
 server/src/com/cloud/storage/VolumeManager.java |    100 -
 .../com/cloud/storage/VolumeManagerImpl.java    |   2496 -
 .../com/cloud/storage/dao/DiskOfferingDao.java  |     31 -
 .../cloud/storage/dao/DiskOfferingDaoImpl.java  |    152 -
 .../cloud/storage/dao/GuestOSCategoryDao.java   |     24 -
 .../storage/dao/GuestOSCategoryDaoImpl.java     |     34 -
 .../src/com/cloud/storage/dao/GuestOSDao.java   |     26 -
 .../com/cloud/storage/dao/GuestOSDaoImpl.java   |     51 -
 .../cloud/storage/dao/LaunchPermissionDao.java  |     61 -
 .../storage/dao/LaunchPermissionDaoImpl.java    |    158 -
 server/src/com/cloud/storage/dao/S3Dao.java     |     29 -
 server/src/com/cloud/storage/dao/S3DaoImpl.java |     50 -
 .../src/com/cloud/storage/dao/SnapshotDao.java  |     54 -
 .../com/cloud/storage/dao/SnapshotDaoImpl.java  |    357 -
 .../cloud/storage/dao/SnapshotPolicyDao.java    |     38 -
 .../storage/dao/SnapshotPolicyDaoImpl.java      |    105 -
 .../cloud/storage/dao/SnapshotScheduleDao.java  |     41 -
 .../storage/dao/SnapshotScheduleDaoImpl.java    |    134 -
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |     75 -
 .../cloud/storage/dao/StoragePoolHostDao.java   |     42 -
 .../storage/dao/StoragePoolHostDaoImpl.java     |    184 -
 .../cloud/storage/dao/StoragePoolWorkDao.java   |     38 -
 .../storage/dao/StoragePoolWorkDaoImpl.java     |    136 -
 server/src/com/cloud/storage/dao/SwiftDao.java  |     31 -
 .../src/com/cloud/storage/dao/SwiftDaoImpl.java |     58 -
 server/src/com/cloud/storage/dao/UploadDao.java |     36 -
 .../com/cloud/storage/dao/UploadDaoImpl.java    |     92 -
 .../com/cloud/storage/dao/VMTemplateDao.java    |     84 -
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |   1122 -
 .../cloud/storage/dao/VMTemplateDetailsDao.java |     32 -
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |     99 -
 .../cloud/storage/dao/VMTemplateHostDao.java    |     67 -
 .../storage/dao/VMTemplateHostDaoImpl.java      |    427 -
 .../cloud/storage/dao/VMTemplatePoolDao.java    |     49 -
 .../storage/dao/VMTemplatePoolDaoImpl.java      |    304 -
 .../com/cloud/storage/dao/VMTemplateS3Dao.java  |     36 -
 .../cloud/storage/dao/VMTemplateS3DaoImpl.java  |    105 -
 .../cloud/storage/dao/VMTemplateSwiftDao.java   |     37 -
 .../storage/dao/VMTemplateSwiftDaoImpl.java     |     87 -
 .../cloud/storage/dao/VMTemplateZoneDao.java    |     33 -
 .../storage/dao/VMTemplateZoneDaoImpl.java      |     89 -
 server/src/com/cloud/storage/dao/VolumeDao.java |     92 -
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |    459 -
 .../com/cloud/storage/dao/VolumeHostDao.java    |     40 -
 .../cloud/storage/dao/VolumeHostDaoImpl.java    |    165 -
 .../download/DownloadAbandonedState.java        |      7 +-
 .../storage/download/DownloadActiveState.java   |      4 +-
 .../storage/download/DownloadCompleteState.java |      3 +-
 .../storage/download/DownloadErrorState.java    |      8 +-
 .../storage/download/DownloadListener.java      |    432 +-
 .../cloud/storage/download/DownloadMonitor.java |     29 +-
 .../storage/download/DownloadMonitorImpl.java   |   1132 +-
 .../cloud/storage/download/DownloadState.java   |      2 +-
 .../storage/download/NotDownloadedState.java    |      3 +-
 .../storage/listener/SnapshotStateListener.java |      6 +
 .../storage/listener/StoragePoolMonitor.java    |     11 +-
 .../storage/listener/StorageSyncListener.java   |      4 +-
 .../storage/listener/VolumeStateListener.java   |      6 +
 .../resource/DummySecondaryStorageResource.java |     14 +-
 server/src/com/cloud/storage/s3/S3Manager.java  |     64 -
 .../src/com/cloud/storage/s3/S3ManagerImpl.java |    657 -
 .../secondary/SecondaryStorageDiscoverer.java   |    322 -
 .../secondary/SecondaryStorageListener.java     |      4 +-
 .../secondary/SecondaryStorageManagerImpl.java  |    576 +-
 .../secondary/SecondaryStorageVmManager.java    |     14 +-
 .../cloud/storage/snapshot/SnapshotManager.java |     18 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |    600 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |     48 +-
 .../com/cloud/storage/swift/SwiftManager.java   |     57 -
 .../cloud/storage/swift/SwiftManagerImpl.java   |    291 -
 .../cloud/storage/upload/UploadListener.java    |    824 +-
 .../com/cloud/storage/upload/UploadMonitor.java |     20 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |    305 +-
 server/src/com/cloud/tags/ResourceTagVO.java    |    160 -
 .../cloud/tags/TaggedResourceManagerImpl.java   |     35 +-
 .../src/com/cloud/tags/dao/ResourceTagDao.java  |     37 -
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java |     62 -
 .../template/HypervisorTemplateAdapter.java     |    600 +-
 server/src/com/cloud/template/S3SyncTask.java   |     94 -
 .../src/com/cloud/template/TemplateAdapter.java |     20 +-
 .../com/cloud/template/TemplateAdapterBase.java |    562 +-
 .../src/com/cloud/template/TemplateManager.java |    120 -
 .../com/cloud/template/TemplateManagerImpl.java |   2233 +-
 server/src/com/cloud/test/DatabaseConfig.java   |     36 +-
 .../src/com/cloud/upgrade/DatabaseCreator.java  |    233 -
 .../cloud/upgrade/DatabaseIntegrityChecker.java |    264 -
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |    369 -
 .../upgrade/PremiumDatabaseUpgradeChecker.java  |    139 -
 server/src/com/cloud/upgrade/dao/DbUpgrade.java |     45 -
 .../com/cloud/upgrade/dao/DbUpgradeUtils.java   |    106 -
 .../com/cloud/upgrade/dao/Upgrade217to218.java  |     66 -
 .../com/cloud/upgrade/dao/Upgrade218to22.java   |   2385 -
 .../upgrade/dao/Upgrade218to224DomainVlans.java |    140 -
 .../upgrade/dao/Upgrade218to22Premium.java      |    100 -
 .../cloud/upgrade/dao/Upgrade2210to2211.java    |     64 -
 .../cloud/upgrade/dao/Upgrade2211to2212.java    |    139 -
 .../upgrade/dao/Upgrade2211to2212Premium.java   |     55 -
 .../cloud/upgrade/dao/Upgrade2212to2213.java    |    104 -
 .../cloud/upgrade/dao/Upgrade2213to2214.java    |    308 -
 .../com/cloud/upgrade/dao/Upgrade2214to30.java  |   1326 -
 .../com/cloud/upgrade/dao/Upgrade221to222.java  |     66 -
 .../upgrade/dao/Upgrade221to222Premium.java     |     61 -
 .../com/cloud/upgrade/dao/Upgrade222to224.java  |    610 -
 .../upgrade/dao/Upgrade222to224Premium.java     |     87 -
 .../com/cloud/upgrade/dao/Upgrade224to225.java  |    351 -
 .../com/cloud/upgrade/dao/Upgrade225to226.java  |    108 -
 .../com/cloud/upgrade/dao/Upgrade227to228.java  |    157 -
 .../upgrade/dao/Upgrade227to228Premium.java     |    132 -
 .../com/cloud/upgrade/dao/Upgrade228to229.java  |    138 -
 .../com/cloud/upgrade/dao/Upgrade229to2210.java |    194 -
 .../com/cloud/upgrade/dao/Upgrade301to302.java  |    229 -
 .../com/cloud/upgrade/dao/Upgrade302to40.java   |   1033 -
 .../com/cloud/upgrade/dao/Upgrade30to301.java   |    124 -
 .../com/cloud/upgrade/dao/Upgrade30xBase.java   |    311 -
 .../com/cloud/upgrade/dao/Upgrade40to41.java    |    164 -
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |    271 -
 .../upgrade/dao/UpgradeSnapshot217to224.java    |     60 -
 .../upgrade/dao/UpgradeSnapshot223to224.java    |     60 -
 .../src/com/cloud/upgrade/dao/VersionDao.java   |     25 -
 .../com/cloud/upgrade/dao/VersionDaoImpl.java   |    172 -
 server/src/com/cloud/upgrade/dao/VersionVO.java |     91 -
 .../usage/ExternalPublicIpStatisticsVO.java     |     98 -
 .../src/com/cloud/usage/UsageIPAddressVO.java   |    121 -
 server/src/com/cloud/usage/UsageJobVO.java      |    180 -
 .../cloud/usage/UsageLoadBalancerPolicyVO.java  |     91 -
 .../com/cloud/usage/UsageNetworkOfferingVO.java |    105 -
 server/src/com/cloud/usage/UsageNetworkVO.java  |    144 -
 .../cloud/usage/UsagePortForwardingRuleVO.java  |     91 -
 .../com/cloud/usage/UsageSecurityGroupVO.java   |     97 -
 .../src/com/cloud/usage/UsageServiceImpl.java   |      7 +-
 server/src/com/cloud/usage/UsageStorageVO.java  |    115 -
 .../src/com/cloud/usage/UsageVMInstanceVO.java  |    121 -
 server/src/com/cloud/usage/UsageVO.java         |    260 -
 server/src/com/cloud/usage/UsageVPNUserVO.java  |    105 -
 server/src/com/cloud/usage/UsageVolumeVO.java   |    115 -
 .../dao/ExternalPublicIpStatisticsDao.java      |     33 -
 .../dao/ExternalPublicIpStatisticsDaoImpl.java  |     77 -
 server/src/com/cloud/usage/dao/UsageDao.java    |     41 -
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |    272 -
 .../com/cloud/usage/dao/UsageIPAddressDao.java  |     28 -
 .../cloud/usage/dao/UsageIPAddressDaoImpl.java  |    145 -
 server/src/com/cloud/usage/dao/UsageJobDao.java |     34 -
 .../com/cloud/usage/dao/UsageJobDaoImpl.java    |    200 -
 .../usage/dao/UsageLoadBalancerPolicyDao.java   |     29 -
 .../dao/UsageLoadBalancerPolicyDaoImpl.java     |    169 -
 .../com/cloud/usage/dao/UsageNetworkDao.java    |     27 -
 .../cloud/usage/dao/UsageNetworkDaoImpl.java    |     98 -
 .../usage/dao/UsageNetworkOfferingDao.java      |     28 -
 .../usage/dao/UsageNetworkOfferingDaoImpl.java  |    152 -
 .../usage/dao/UsagePortForwardingRuleDao.java   |     29 -
 .../dao/UsagePortForwardingRuleDaoImpl.java     |    169 -
 .../cloud/usage/dao/UsageSecurityGroupDao.java  |     28 -
 .../usage/dao/UsageSecurityGroupDaoImpl.java    |    151 -
 .../com/cloud/usage/dao/UsageStorageDao.java    |     31 -
 .../cloud/usage/dao/UsageStorageDaoImpl.java    |    211 -
 .../com/cloud/usage/dao/UsageVMInstanceDao.java |     29 -
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java |    137 -
 .../com/cloud/usage/dao/UsageVPNUserDao.java    |     28 -
 .../cloud/usage/dao/UsageVPNUserDaoImpl.java    |    150 -
 .../src/com/cloud/usage/dao/UsageVolumeDao.java |     29 -
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java |    178 -
 server/src/com/cloud/user/AccountDetailVO.java  |     75 -
 .../src/com/cloud/user/AccountDetailsDao.java   |     37 -
 .../com/cloud/user/AccountDetailsDaoImpl.java   |     96 -
 server/src/com/cloud/user/AccountManager.java   |     16 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    331 +-
 .../src/com/cloud/user/DomainManagerImpl.java   |    125 +-
 server/src/com/cloud/user/dao/AccountDao.java   |     52 -
 .../src/com/cloud/user/dao/AccountDaoImpl.java  |    267 -
 .../src/com/cloud/user/dao/SSHKeyPairDao.java   |     38 -
 .../com/cloud/user/dao/SSHKeyPairDaoImpl.java   |     85 -
 .../src/com/cloud/user/dao/UserAccountDao.java  |     27 -
 .../com/cloud/user/dao/UserAccountDaoImpl.java  |     69 -
 server/src/com/cloud/user/dao/UserDao.java      |     52 -
 server/src/com/cloud/user/dao/UserDaoImpl.java  |    131 -
 .../com/cloud/user/dao/UserStatisticsDao.java   |     35 -
 .../cloud/user/dao/UserStatisticsDaoImpl.java   |    137 -
 .../src/com/cloud/user/dao/UserStatsLogDao.java |     23 -
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java |     31 -
 .../cloud/uuididentity/dao/IdentityDaoImpl.java |      4 +-
 .../vm/ClusteredVirtualMachineManagerImpl.java  |     62 -
 server/src/com/cloud/vm/ItWorkDao.java          |     45 -
 server/src/com/cloud/vm/ItWorkDaoImpl.java      |    108 -
 server/src/com/cloud/vm/ItWorkVO.java           |    179 -
 server/src/com/cloud/vm/NicVO.java              |    363 -
 .../com/cloud/vm/ReservationContextImpl.java    |    102 -
 .../src/com/cloud/vm/SystemVmLoadScanner.java   |      7 +-
 server/src/com/cloud/vm/UserVmManager.java      |     18 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   1883 +-
 .../src/com/cloud/vm/UserVmStateListener.java   |     29 +-
 server/src/com/cloud/vm/VirtualMachineGuru.java |    118 -
 .../src/com/cloud/vm/VirtualMachineManager.java |    201 -
 .../com/cloud/vm/VirtualMachineManagerImpl.java |   2950 -
 .../com/cloud/vm/VirtualMachineProfileImpl.java |    266 -
 .../src/com/cloud/vm/dao/ConsoleProxyDao.java   |     47 -
 .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java   |    353 -
 .../src/com/cloud/vm/dao/DomainRouterDao.java   |    149 -
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java   |    358 -
 .../src/com/cloud/vm/dao/InstanceGroupDao.java  |     36 -
 .../com/cloud/vm/dao/InstanceGroupDaoImpl.java  |     80 -
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java |     28 -
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java |     75 -
 server/src/com/cloud/vm/dao/NicDao.java         |     68 -
 server/src/com/cloud/vm/dao/NicDaoImpl.java     |    232 -
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java |     53 -
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java |    138 -
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java  |    160 -
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java |     42 -
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java |    269 -
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java |     37 -
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java |     74 -
 server/src/com/cloud/vm/dao/UserVmDao.java      |     76 -
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java  |    585 -
 server/src/com/cloud/vm/dao/UserVmData.java     |    723 -
 .../src/com/cloud/vm/dao/UserVmDetailsDao.java  |     32 -
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |     99 -
 server/src/com/cloud/vm/dao/VMInstanceDao.java  |    119 -
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |    628 -
 .../cloud/vm/snapshot/VMSnapshotManager.java    |     47 -
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    104 +-
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |    224 -
 .../cloud/vm/snapshot/dao/VMSnapshotDao.java    |     39 -
 .../vm/snapshot/dao/VMSnapshotDaoImpl.java      |    161 -
 .../affinity/AffinityGroupServiceImpl.java      |    548 +
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    531 +
 .../apache/cloudstack/region/RegionSyncVO.java  |     93 -
 .../org/apache/cloudstack/region/RegionVO.java  |     87 -
 .../apache/cloudstack/region/dao/RegionDao.java |     27 -
 .../cloudstack/region/dao/RegionDaoImpl.java    |     48 -
 .../region/gslb/GlobalLoadBalancerDaoImpl.java  |     58 -
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java    |     30 -
 .../GlobalLoadBalancerLbRuleMapDaoImpl.java     |     63 -
 .../gslb/GlobalLoadBalancerLbRuleMapVO.java     |     83 -
 .../region/gslb/GlobalLoadBalancerRuleDao.java  |     28 -
 .../region/gslb/GlobalLoadBalancerRuleVO.java   |    183 -
 .../GlobalLoadBalancingRulesServiceImpl.java    |    236 +-
 .../region/gslb/GslbServiceProvider.java        |      8 +-
 server/test/async-job-component.xml             |      1 +
 .../com/cloud/agent/MockAgentManagerImpl.java   |    197 -
 .../com/cloud/alert/AlertControlsUnitTest.java  |     10 +-
 .../test/com/cloud/async/CleanupDelegate.java   |     29 -
 server/test/com/cloud/async/TestAsync.java      |    281 -
 .../com/cloud/async/TestAsyncJobManager.java    |    252 -
 .../com/cloud/async/TestSyncQueueManager.java   |    208 -
 .../configuration/ConfigurationManagerTest.java |    432 +
 .../configuration/ValidateIpRangeTest.java      |     72 +
 .../com/cloud/event/EventControlsUnitTest.java  |      3 +-
 .../test/com/cloud/keystore/KeystoreTest.java   |      4 +-
 .../metadata/ResourceMetaDataManagerTest.java   |    117 +
 .../cloud/network/CreatePrivateNetworkTest.java |    193 +
 .../network/DedicateGuestVlanRangesTest.java    |    393 +
 .../cloud/network/MockFirewallManagerImpl.java  |      5 +
 .../cloud/network/MockNetworkManagerImpl.java   |    891 -
 .../com/cloud/network/MockNetworkModelImpl.java |     62 +-
 .../com/cloud/network/MockRulesManagerImpl.java |    314 -
 .../com/cloud/network/NetworkManagerTest.java   |     67 -
 .../network/UpdatePhysicalNetworkTest.java      |     74 +
 .../network/firewall/FirewallManagerTest.java   |     27 +-
 .../security/SecurityGroupManagerImplTest.java  |     76 +
 .../SecurityGroupManagerTestConfiguration.java  |    317 +-
 .../security/SecurityGroupQueueTest.java        |      2 +-
 .../cloud/resource/MockResourceManagerImpl.java |     84 +-
 .../server/ConfigurationServerImplTest.java     |     61 +
 .../snapshot/SnapshotDaoTestConfiguration.java  |    144 +-
 .../dao/StoragePoolDaoTestConfiguration.java    |    106 +-
 .../upgrade/AdvanceZone217To224UpgradeTest.java |    117 -
 .../upgrade/AdvanceZone223To224UpgradeTest.java |     57 -
 .../upgrade/BasicZone218To224UpgradeTest.java   |    211 -
 .../test/com/cloud/upgrade/DbUpgrade22Test.java |     29 -
 .../cloud/upgrade/HostCapacity218to22Test.java  |     66 -
 .../InstanceGroup218To224UpgradeTest.java       |    216 -
 .../PortForwarding218To224UpgradeTest.java      |    132 -
 .../upgrade/Sanity220To224UpgradeTest.java      |     95 -
 .../upgrade/Sanity222To224UpgradeTest.java      |     96 -
 .../upgrade/Sanity223To225UpgradeTest.java      |     94 -
 .../upgrade/Sanity224To225UpgradeTest.java      |     95 -
 .../upgrade/Template2214To30UpgradeTest.java    |    123 -
 .../cloud/upgrade/Test2214To30DBUpgrade.java    |    199 -
 .../cloud/upgrade/Usage217To224UpgradeTest.java |     94 -
 .../upgrade/UsageEvents218To224UpgradeTest.java |     91 -
 .../com/cloud/user/MockAccountManagerImpl.java  |     54 +-
 .../vm/DeploymentPlanningManagerImplTest.java   |    384 +
 .../com/cloud/vm/MockUserVmManagerImpl.java     |    425 -
 .../cloud/vm/MockVirtualMachineManagerImpl.java |    312 -
 server/test/com/cloud/vm/UserVmManagerTest.java |    336 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java |    208 -
 .../UserVmCloneSettingDaoTestConfiguration.java |      4 +-
 .../com/cloud/vm/dao/UserVmDaoImplTest.java     |     43 +-
 .../vm/dao/UserVmDaoTestConfiguration.java      |     50 +
 .../vm/snapshot/VMSnapshotManagerTest.java      |    390 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java |    163 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    500 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java     |     62 +-
 .../test/com/cloud/vpc/MockVpcManagerImpl.java  |    386 -
 .../MockVpcVirtualNetworkApplianceManager.java  |     50 +-
 .../com/cloud/vpc/NetworkACLManagerTest.java    |    232 +
 .../com/cloud/vpc/NetworkACLServiceTest.java    |    259 +
 server/test/com/cloud/vpc/Site2SiteVpnTest.java |      2 +-
 server/test/com/cloud/vpc/VpcApiUnitTest.java   |    181 +-
 .../com/cloud/vpc/VpcTestConfiguration.java     |    474 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java |      5 +-
 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java   |     10 +
 .../vpc/dao/MockNetworkOfferingDaoImpl.java     |     12 +-
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java   |      6 +
 .../affinity/AffinityApiUnitTest.java           |    294 +
 .../lb/ApplicationLoadBalancerTest.java         |    380 +
 .../networkoffering/ChildTestConfiguration.java |    185 +-
 .../CreateNetworkOfferingTest.java              |     78 +-
 .../privategw/AclOnPrivateGwTest.java           |    290 +
 .../cloudstack/region/RegionManagerTest.java    |      3 +-
 ...GlobalLoadBalancingRulesServiceImplTest.java |    136 +-
 server/test/resources/UserVMDaoTestContext.xml  |     44 +
 server/test/resources/appLoadBalancer.xml       |     43 +
 server/test/resources/createNetworkOffering.xml |     21 +-
 server/test/resources/network-mgr-component.xml |      2 +-
 services/console-proxy/plugin/pom.xml           |     12 +-
 services/console-proxy/pom.xml                  |     10 +-
 .../console-proxy/server/conf/agent.properties  |     17 -
 .../server/conf/environment.properties          |      2 +
 .../console-proxy/server/conf/log4j-cloud.xml   |      2 +-
 .../console-proxy/server/css/ajaxviewer.css     |      6 +-
 services/console-proxy/server/js/ajaxkeys.js    |    338 +-
 services/console-proxy/server/js/ajaxviewer.js  |    139 +-
 services/console-proxy/server/pom.xml           |     68 +-
 services/console-proxy/server/scripts/_run.sh   |      3 +-
 .../console-proxy/server/scripts/config_ssl.sh  |      9 +
 .../server/scripts/consoleproxy.sh              |     33 +
 .../console-proxy/server/scripts/secstorage.sh  |     33 +
 .../console-proxy/server/scripts/ssvm-check.sh  |    136 -
 .../com/cloud/consoleproxy/ConsoleProxy.java    |     16 +-
 .../consoleproxy/ConsoleProxyClientBase.java    |      5 +-
 .../consoleproxy/ConsoleProxyGCThread.java      |      5 +-
 .../ConsoleProxyPasswordBasedEncryptor.java     |    253 +-
 .../consoleproxy/ConsoleProxyVncClient.java     |      5 +-
 .../consoleproxy/vnc/VncClientPacketSender.java |      4 +-
 .../vnc/VncServerPacketReceiver.java            |      4 +-
 .../server/systemvm-descriptor.xml              |      9 +
 services/pom.xml                                |      5 +-
 .../secondary-storage/conf/agent.properties     |      4 +
 .../conf/environment.properties                 |      2 +
 services/secondary-storage/conf/log4j-cloud.xml |    102 +
 services/secondary-storage/conf/log4j.xml       |    102 +
 services/secondary-storage/pom.xml              |    112 +
 services/secondary-storage/scripts/_run.sh      |     64 +
 .../secondary-storage/scripts/config_auth.sh    |     69 +
 .../secondary-storage/scripts/config_ssl.sh     |    183 +
 .../secondary-storage/scripts/ipfirewall.sh     |     50 +
 services/secondary-storage/scripts/run-proxy.sh |     48 +
 services/secondary-storage/scripts/run.bat      |     18 +
 services/secondary-storage/scripts/run.sh       |     45 +
 .../secondary-storage/scripts/ssvm-check.sh     |    136 +
 .../LocalNfsSecondaryStorageResource.java       |    121 +
 .../resource/LocalSecondaryStorageResource.java |    246 +
 .../resource/NfsSecondaryStorageResource.java   |   2556 +
 .../resource/SecondaryStorageDiscoverer.java    |    321 +
 .../resource/SecondaryStorageResource.java      |     27 +
 .../SecondaryStorageResourceHandler.java        |     24 +
 .../storage/template/DownloadManager.java       |    112 +
 .../storage/template/DownloadManagerImpl.java   |   1157 +
 .../storage/template/UploadManager.java         |     87 +
 .../storage/template/UploadManagerImpl.java     |    648 +
 .../LocalNfsSecondaryStorageResourceTest.java   |    145 +
 .../NfsSecondaryStorageResourceTest.java        |    120 +
 setup/bindir/cloud-set-guest-sshkey.in          |     63 +-
 setup/bindir/cloud-setup-databases.in           |      2 +-
 setup/bindir/cloud-setup-encryption.in          |      2 +-
 setup/bindir/cloud-sysvmadm.in                  |     50 +-
 setup/db/create-schema.sql                      |     83 +-
 setup/db/db/schema-2214to30.sql                 |      2 +
 setup/db/db/schema-302to303.sql                 |    196 +
 setup/db/db/schema-302to40.sql                  |     19 +-
 setup/db/db/schema-304to305-cleanup.sql         |     22 +
 setup/db/db/schema-304to305.sql                 |    389 +
 setup/db/db/schema-305to306-cleanup.sql         |     26 +
 setup/db/db/schema-305to306.sql                 |     96 +
 setup/db/db/schema-306to307.sql                 |     22 +
 setup/db/db/schema-307to410-cleanup.sql         |     43 +
 setup/db/db/schema-307to410.sql                 |   1587 +
 setup/db/db/schema-40to410.sql                  |     71 +-
 setup/db/db/schema-410to420.sql                 |   2224 +-
 setup/db/db/schema-420to430-cleanup.sql         |     22 +
 setup/db/db/schema-420to430.sql                 |    283 +
 setup/db/templates.simulator.sql                |      8 +-
 setup/db/templates.sql                          |     96 +-
 setup/dev/advanced.cfg                          |     37 +-
 setup/dev/advancedsg.cfg                        |    186 +
 setup/dev/basic.cfg                             |     12 +-
 setup/dev/local.cfg                             |     44 +
 setup/dev/s3.cfg                                |    140 +
 .../component/cpu_limits/__init__.py            |     16 +
 .../component/cpu_limits/test_cpu_limits.py     |    745 +
 .../component/cpu_limits/test_domain_limits.py  |    764 +
 .../component/cpu_limits/test_maximum_limits.py |    377 +
 .../component/cpu_limits/test_project_limits.py |    347 +
 test/integration/component/maint/__init__.py    |     21 +
 .../component/maint/test_high_availability.py   |   1079 +
 .../maint/test_host_high_availability.py        |    810 +
 .../component/maint/test_redundant_router.py    |   1589 +
 ...test_redundant_router_deployment_planning.py |   1012 +
 .../test_redundant_router_network_rules.py      |   1427 +
 .../maint/test_vpc_host_maintenance.py          |    557 +
 .../maint/test_vpc_on_host_maintenance.py       |    323 +
 .../memory_limits/test_domain_limits.py         |    761 +
 .../memory_limits/test_maximum_limits.py        |    352 +
 .../memory_limits/test_memory_limits.py         |    764 +
 .../memory_limits/test_project_limits.py        |    350 +
 test/integration/component/test_accounts.py     |    393 +-
 .../component/test_advancedsg_networks.py       |    756 +
 .../component/test_affinity_groups.py           |   1729 +
 .../component/test_allocation_states.py         |      4 +-
 test/integration/component/test_asa1000v_fw.py  |    136 +
 test/integration/component/test_assign_vm.py    |    479 +
 test/integration/component/test_baremetal.py    |    123 +
 test/integration/component/test_blocker_bugs.py |    557 +-
 .../component/test_custom_hostname.py           |    855 +
 .../component/test_egress_fw_rules.py           |    952 +
 test/integration/component/test_egress_rules.py |    310 +-
 test/integration/component/test_eip_elb.py      |    137 +-
 .../component/test_explicit_dedication.py       |    232 +
 .../component/test_implicit_planner.py          |    267 +
 test/integration/component/test_ldap.py         |    261 +
 .../component/test_multiple_ip_ranges.py        |    559 +
 .../component/test_netscaler_configs.py         |   3016 +
 test/integration/component/test_netscaler_lb.py |   2973 +
 .../component/test_netscaler_lb_algo.py         |   1998 +
 .../component/test_netscaler_lb_sticky.py       |   1023 +
 .../component/test_netscaler_nw_off.py          |   3007 +
 .../component/test_network_offering.py          |   1186 +-
 test/integration/component/test_portable_ip.py  |   1309 +
 .../component/test_project_configs.py           |    150 +-
 .../component/test_project_limits.py            |    129 +-
 .../component/test_project_resources.py         |     79 +-
 .../integration/component/test_project_usage.py |     80 +-
 test/integration/component/test_projects.py     |    176 +-
 .../component/test_recurring_snapshots.py       |    405 +
 .../component/test_redundant_router_cleanups.py |    674 +
 .../component/test_redundant_router_services.py |    384 +
 .../component/test_redundant_router_upgrades.py |    494 +
 test/integration/component/test_regions.py      |    139 +
 .../component/test_regions_accounts.py          |    206 +
 .../component/test_resource_limits.py           |    258 +-
 test/integration/component/test_routers.py      |    302 +-
 .../component/test_security_groups.py           |    242 +-
 .../component/test_shared_network_offering.py   |    213 +
 .../component/test_shared_networks.py           |   2871 +
 test/integration/component/test_snapshot_gc.py  |    311 +
 .../component/test_snapshot_limits.py           |    293 +
 test/integration/component/test_snapshots.py    |   1981 +-
 test/integration/component/test_stopped_vm.py   |   1984 +
 .../component/test_storage_motion.py            |    305 +
 test/integration/component/test_tags.py         |   2326 +
 test/integration/component/test_templates.py    |    215 +-
 test/integration/component/test_update_vm.py    |    159 +
 test/integration/component/test_usage.py        |    154 +-
 .../component/test_vm_passwdenabled.py          |     68 +-
 test/integration/component/test_volumes.py      |    385 +-
 test/integration/component/test_vpc.py          |   2418 +
 test/integration/component/test_vpc_network.py  |   2550 +
 .../component/test_vpc_network_lbrules.py       |    984 +
 .../component/test_vpc_network_pfrules.py       |    852 +
 .../component/test_vpc_network_staticnatrule.py |    714 +
 .../integration/component/test_vpc_offerings.py |   1116 +
 test/integration/component/test_vpc_routers.py  |   1324 +
 .../component/test_vpc_vm_life_cycle.py         |   2707 +
 .../component/test_vpc_vms_deployment.py        |   2373 +
 test/integration/component/test_vpn_users.py    |    452 +
 test/integration/smoke/test_ScaleVm.py          |    221 -
 test/integration/smoke/test_affinity_groups.py  |    194 +
 test/integration/smoke/test_deploy_vm.py        |    156 +
 .../smoke/test_deploy_vm_with_userdata.py       |    147 +
 ...deploy_vms_with_varied_deploymentplanners.py |    257 +
 test/integration/smoke/test_global_settings.py  |     77 +
 test/integration/smoke/test_guest_vlan_range.py |    168 +
 test/integration/smoke/test_internal_lb.py      |    187 +
 test/integration/smoke/test_iso.py              |     31 +-
 test/integration/smoke/test_loadbalance.py      |    598 +
 .../smoke/test_multipleips_per_nic.py           |    181 +
 test/integration/smoke/test_network.py          |    957 +-
 test/integration/smoke/test_network_acl.py      |    177 +
 test/integration/smoke/test_nic.py              |     75 +-
 .../smoke/test_non_contigiousvlan.py            |     87 +
 .../integration/smoke/test_portable_publicip.py |    237 +
 test/integration/smoke/test_primary_storage.py  |    134 +-
 test/integration/smoke/test_privategw_acl.py    |    151 +
 test/integration/smoke/test_public_ip_range.py  |    173 +
 test/integration/smoke/test_pvlan.py            |     87 +
 test/integration/smoke/test_regions.py          |     93 +
 test/integration/smoke/test_resource_detail.py  |    185 +
 test/integration/smoke/test_routers.py          |    294 +-
 test/integration/smoke/test_scale_vm.py         |    226 +
 .../integration/smoke/test_service_offerings.py |    379 +-
 test/integration/smoke/test_snapshots.py        |    345 +
 test/integration/smoke/test_ssvm.py             |     95 +-
 test/integration/smoke/test_templates.py        |     59 +-
 test/integration/smoke/test_vm_life_cycle.py    |    436 +-
 test/integration/smoke/test_vm_snapshots.py     |    311 +
 test/integration/smoke/test_volumes.py          |    183 +-
 test/pom.xml                                    |      4 +-
 test/selenium/ReadMe.txt                        |     36 +-
 test/selenium/lib/initialize.py                 |     17 +-
 test/selenium/smoke/Login_and_Accounts.py       |      5 +-
 test/selenium/smoke/main.py                     |      2 +-
 test/setup-test-data.sh                         |    102 -
 tools/apidoc/build-apidoc.sh                    |     13 +-
 tools/apidoc/gen_toc.py                         |     23 +-
 tools/apidoc/generateadmincommands.xsl          |      6 +-
 tools/apidoc/generatecommand.xsl                |      4 +-
 tools/apidoc/generatedomainadmincommands.xsl    |      4 +-
 tools/apidoc/generatetoc_footer.xsl             |      4 +-
 tools/apidoc/generatetoc_header.xsl             |      2 +-
 tools/apidoc/generateusercommands.xsl           |      4 +-
 tools/apidoc/images/cloudstack.png              |    Bin 3893 -> 8575 bytes
 tools/apidoc/images/ins_buttonshadow.gif        |    Bin 1683 -> 0 bytes
 tools/apidoc/images/insdownload_button.gif      |    Bin 2531 -> 0 bytes
 .../apidoc/images/insdownload_button_hover.gif  |    Bin 2569 -> 0 bytes
 tools/apidoc/images/insjoincomm_button.gif      |    Bin 2627 -> 0 bytes
 .../apidoc/images/insjoincomm_button_hover.gif  |    Bin 2620 -> 0 bytes
 tools/apidoc/includes/main.css                  |      2 +-
 tools/apidoc/pom.xml                            |      7 +-
 tools/appliance/README.md                       |     18 +
 tools/appliance/build.sh                        |     41 +-
 tools/appliance/definitions/builtin/base.sh     |     14 +
 tools/appliance/definitions/builtin/cleanup.sh  |     21 +
 .../appliance/definitions/builtin/definition.rb |     33 +
 .../definitions/builtin/install-xs-tools.sh     |     10 +
 tools/appliance/definitions/builtin/ks.cfg      |     35 +
 .../definitions/builtin/postinstall.sh          |     54 +
 tools/appliance/definitions/builtin/zerodisk.sh |      3 +
 .../definitions/devcloud/definition.rb          |      6 +-
 .../definitions/systemvmtemplate/cleanup.sh     |      1 -
 .../definitions/systemvmtemplate/definition.rb  |      6 +-
 .../definitions/systemvmtemplate/postinstall.sh |     46 +-
 .../definitions/systemvmtemplate/preseed.cfg    |     14 +-
 .../definitions/systemvmtemplate64/cleanup.sh   |      1 -
 .../systemvmtemplate64/definition.rb            |      6 +-
 .../systemvmtemplate64/postinstall.sh           |     46 +-
 .../definitions/systemvmtemplate64/preseed.cfg  |     14 +-
 tools/build/build_asf.sh                        |    101 +-
 tools/build/build_docs.sh                       |     19 +-
 tools/build/setnextversion.sh                   |     75 +
 tools/cli/README                                |      1 +
 tools/cli/cloudmonkey/__init__.py               |     23 -
 tools/cli/cloudmonkey/cachemaker.py             |    181 -
 tools/cli/cloudmonkey/cloudmonkey.py            |    499 -
 tools/cli/cloudmonkey/config.py                 |    122 -
 tools/cli/cloudmonkey/printer.py                |    120 -
 tools/cli/cloudmonkey/requester.py              |    153 -
 tools/cli/pom.xml                               |     73 -
 tools/cli/setup.py                              |     68 -
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg    |      7 +-
 tools/devcloud-kvm/devcloud-kvm.cfg             |      5 +-
 tools/devcloud-kvm/pom.xml                      |      2 +-
 tools/devcloud/devcloud-advancedsg.cfg          |    119 +
 tools/devcloud/devcloud.cfg                     |     11 +-
 tools/devcloud/devcloud_internal-mgt.cfg        |      2 +-
 tools/devcloud/devcloud_s3.cfg                  |    141 +
 tools/devcloud/pom.xml                          |     35 +-
 tools/devcloud/quickcloud.cfg                   |    121 +
 tools/eclipse/eclipse.epf                       |    616 +
 tools/marvin/marvin/TestCaseExecuteEngine.py    |     45 +-
 tools/marvin/marvin/__init__.py                 |      4 +-
 tools/marvin/marvin/asyncJobMgr.py              |    106 +-
 tools/marvin/marvin/cloudstackConnection.py     |    288 +-
 tools/marvin/marvin/cloudstackException.py      |     22 +-
 tools/marvin/marvin/cloudstackTestCase.py       |     25 +-
 tools/marvin/marvin/cloudstackTestClient.py     |    123 +-
 tools/marvin/marvin/codegenerator.py            |    193 +-
 tools/marvin/marvin/configGenerator.py          |    503 +-
 tools/marvin/marvin/dbConnection.py             |     37 +-
 tools/marvin/marvin/deployAndRun.py             |     53 +-
 tools/marvin/marvin/deployDataCenter.py         |    311 +-
 tools/marvin/marvin/integration/lib/base.py     |   1451 +-
 tools/marvin/marvin/integration/lib/common.py   |    160 +-
 tools/marvin/marvin/integration/lib/utils.py    |    244 +-
 tools/marvin/marvin/jsonHelper.py               |    290 +-
 tools/marvin/marvin/marvinPlugin.py             |    100 +-
 tools/marvin/marvin/remoteSSHClient.py          |     61 +-
 .../marvin/sandbox/advanced/advanced_env.py     |      9 +
 .../marvin/sandbox/advancedsg/__init__.py       |     18 +
 .../marvin/sandbox/advancedsg/advancedsg_env.py |    151 +
 .../marvin/sandbox/advancedsg/setup.properties  |     61 +
 tools/marvin/marvin/sandbox/basic/basic_env.py  |      2 +
 .../sandbox/demo/simulator/simulator_setup.py   |      2 +
 tools/marvin/marvin/settings.py                 |     10 +-
 tools/marvin/marvin/testSetupSuccess.py         |     40 +-
 tools/marvin/pom.xml                            |     93 +-
 tools/marvin/setup.py                           |     17 +-
 tools/ngui/README.md                            |     17 +
 tools/ngui/api.py                               |     37 +
 tools/ngui/app.py                               |     38 +
 tools/ngui/config.py                            |     21 +
 tools/ngui/precache.py                          |     19 +
 tools/ngui/requester.py                         |    153 +
 .../bootstrap/css/bootstrap-responsive.css      |   1109 +
 .../bootstrap/css/bootstrap-responsive.min.css  |      9 +
 tools/ngui/static/bootstrap/css/bootstrap.css   |   6315 +
 .../ngui/static/bootstrap/css/bootstrap.min.css |    874 +
 .../img/glyphicons-halflings-white.png          |    Bin 0 -> 8777 bytes
 .../bootstrap/img/glyphicons-halflings.png      |    Bin 0 -> 12799 bytes
 tools/ngui/static/bootstrap/js/bootstrap.js     |   2291 +
 tools/ngui/static/bootstrap/js/bootstrap.min.js |      7 +
 tools/ngui/static/css/app.css                   |     45 +
 tools/ngui/static/images/ajax-inverse.gif       |    Bin 0 -> 6488 bytes
 tools/ngui/static/images/ajax-loader.gif        |    Bin 0 -> 3208 bytes
 tools/ngui/static/js/app/accounts/accounts.js   |    102 +
 .../static/js/app/accounts/accounts.tpl.html    |     36 +
 tools/ngui/static/js/app/app.js                 |     77 +
 tools/ngui/static/js/app/dashboard/dashboard.js |     17 +
 tools/ngui/static/js/app/domains/domains.js     |     37 +
 tools/ngui/static/js/app/events/events.js       |     37 +
 .../js/app/globalsettings/globalsettings.js     |     38 +
 .../app/globalsettings/globalsettings.tpl.html  |     37 +
 .../js/app/infrastructure/infrastructure.js     |     17 +
 .../js/app/instances/instance-details.tpl.html  |     24 +
 tools/ngui/static/js/app/instances/instances.js |     54 +
 .../static/js/app/instances/instances.tpl.html  |     54 +
 tools/ngui/static/js/app/networks/networks.js   |     37 +
 tools/ngui/static/js/app/projects/projects.js   |     37 +
 .../js/app/serviceofferings/serviceofferings.js |     37 +
 tools/ngui/static/js/app/storage/storage.js     |    153 +
 .../ngui/static/js/app/storage/storage.tpl.html |     51 +
 .../js/app/storage/upload-volume.tpl.html       |     18 +
 tools/ngui/static/js/app/templates/templates.js |     37 +
 tools/ngui/static/js/common/dictionary.js       |     68 +
 .../ngui/static/js/common/directives/confirm.js |     43 +
 .../js/common/directives/edit-in-place.js       |     49 +
 .../js/common/directives/edit-in-place.tpl.html |     26 +
 tools/ngui/static/js/common/directives/label.js |     42 +
 .../static/js/common/directives/modal-form.js   |     70 +
 .../js/common/directives/modal-form.tpl.html    |     42 +
 .../ngui/static/js/common/resources/accounts.js |     41 +
 .../js/common/resources/configurations.js       |     44 +
 .../static/js/common/resources/diskofferings.js |     33 +
 .../ngui/static/js/common/resources/domains.js  |     33 +
 tools/ngui/static/js/common/resources/events.js |     33 +
 .../ngui/static/js/common/resources/networks.js |     33 +
 .../ngui/static/js/common/resources/projects.js |     33 +
 .../js/common/resources/serviceofferings.js     |     33 +
 .../static/js/common/resources/snapshots.js     |     33 +
 .../static/js/common/resources/templates.js     |     33 +
 tools/ngui/static/js/common/resources/users.js  |     40 +
 .../js/common/resources/virtualmachines.js      |     75 +
 .../ngui/static/js/common/resources/volumes.js  |     33 +
 tools/ngui/static/js/common/resources/zones.js  |     33 +
 .../static/js/common/services/breadcrumbs.js    |     32 +
 .../js/common/services/helperfunctions.js       |     39 +
 .../static/js/common/services/notifications.js  |     34 +
 .../ngui/static/js/common/services/requester.js |     46 +
 tools/ngui/static/js/lib/angular-ui.min.js      |      2 +
 tools/ngui/static/js/lib/angular.js             |  14847 +
 tools/ngui/static/js/lib/jquery-1.7.2.js        |   9404 +
 tools/ngui/templates/index.html                 |    142 +
 tools/pom.xml                                   |      3 +-
 tools/transifex/.tx/config                      |     32 +
 tools/transifex/README-transifex.txt            |     71 +
 tools/transifex/sync-transifex-ui.sh            |    160 +
 tools/waf/javadir.py                            |     38 -
 tools/waf/mkisofs.py                            |     84 -
 tools/waf/tar.py                                |     79 -
 tools/waf/tomcat.py                             |     57 -
 tools/waf/usermgmt.py                           |    140 -
 tools/whisker/LICENSE                           |     71 +-
 tools/whisker/descriptor-for-packaging.xml      |     35 +-
 tools/whisker/descriptor.xml                    |     37 +-
 ui/css/cloudstack3.css                          |    544 +-
 ui/dictionary.jsp                               |   1748 +-
 ui/images/bg-system-chart-compute.png           |    Bin 85957 -> 94812 bytes
 ui/images/icons.png                             |    Bin 50745 -> 50052 bytes
 ui/images/sprites.png                           |    Bin 188552 -> 193277 bytes
 ui/index.jsp                                    |    182 +-
 ui/modules/infrastructure/infrastructure.css    |     19 +
 ui/modules/infrastructure/infrastructure.js     |     75 +
 ui/modules/modules.js                           |     24 +
 ui/modules/vnmcAsa1000v/vnmcAsa1000v.css        |     19 +
 ui/modules/vnmcAsa1000v/vnmcAsa1000v.js         |    183 +
 .../vnmcNetworkProvider/vnmcNetworkProvider.css |     19 +
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  |    615 +
 ui/modules/vpc/vpc.css                          |    384 +
 ui/modules/vpc/vpc.js                           |    427 +
 ui/scripts/accounts.js                          |   2732 +-
 ui/scripts/accountsWizard.js                    |    288 +
 ui/scripts/affinity.js                          |    218 +
 ui/scripts/autoscaler.js                        |   2817 +-
 ui/scripts/cloud.core.callbacks.js              |     84 +-
 ui/scripts/cloudStack.js                        |    889 +-
 ui/scripts/configuration.js                     |   4873 +-
 ui/scripts/dashboard.js                         |    434 +-
 ui/scripts/docs.js                              |   2040 +-
 ui/scripts/domains.js                           |   1097 +-
 ui/scripts/events.js                            |   1107 +-
 ui/scripts/globalSettings.js                    |    624 +-
 ui/scripts/installWizard.js                     |    664 +-
 ui/scripts/instanceWizard.js                    |   1444 +-
 ui/scripts/instances.js                         |   3142 +-
 ui/scripts/lbStickyPolicy.js                    |    559 +-
 ui/scripts/network.js                           |  10183 +-
 ui/scripts/plugins.js                           |    174 +-
 ui/scripts/projects.js                          |   2278 +-
 ui/scripts/regions.js                           |   1145 +-
 ui/scripts/sharedFunctions.js                   |   2613 +-
 ui/scripts/storage.js                           |   3368 +-
 ui/scripts/system.js                            |  26520 +-
 ui/scripts/templates.js                         |   3103 +-
 ui/scripts/ui-custom/accountsWizard.js          |    169 +
 ui/scripts/ui-custom/affinity.js                |    174 +
 ui/scripts/ui-custom/autoscaler.js              |    763 +-
 ui/scripts/ui-custom/dashboard.js               |    343 +-
 ui/scripts/ui-custom/enableStaticNAT.js         |    299 +-
 ui/scripts/ui-custom/granularSettings.js        |     54 +
 ui/scripts/ui-custom/healthCheck.js             |    677 +-
 ui/scripts/ui-custom/installWizard.js           |   1632 +-
 ui/scripts/ui-custom/instanceWizard.js          |   1898 +-
 ui/scripts/ui-custom/ipRules.js                 |    275 +-
 ui/scripts/ui-custom/login.js                   |    245 +-
 ui/scripts/ui-custom/physicalResources.js       |    238 +-
 ui/scripts/ui-custom/pluginListing.js           |    121 +
 ui/scripts/ui-custom/plugins.js                 |    109 -
 ui/scripts/ui-custom/projectSelect.js           |     67 +
 ui/scripts/ui-custom/projects.js                |   1375 +-
 ui/scripts/ui-custom/recurringSnapshots.js      |    385 +-
 ui/scripts/ui-custom/regions.js                 |    217 +-
 ui/scripts/ui-custom/securityRules.js           |     98 +-
 ui/scripts/ui-custom/uploadVolume.js            |    301 +-
 ui/scripts/ui-custom/vpc.js                     |   1698 +-
 ui/scripts/ui-custom/zoneChart.js               |    769 +-
 ui/scripts/ui-custom/zoneFilter.js              |     38 +
 ui/scripts/ui-custom/zoneWizard.js              |   2397 +-
 ui/scripts/ui/core.js                           |    819 +-
 ui/scripts/ui/dialog.js                         |   1331 +-
 ui/scripts/ui/events.js                         |     72 +-
 ui/scripts/ui/utils.js                          |    214 +-
 ui/scripts/ui/widgets/cloudBrowser.js           |    795 +-
 ui/scripts/ui/widgets/dataTable.js              |    504 +-
 ui/scripts/ui/widgets/detailView.js             |   2533 +-
 ui/scripts/ui/widgets/listView.js               |   3726 +-
 ui/scripts/ui/widgets/multiEdit.js              |   2086 +-
 ui/scripts/ui/widgets/notifications.js          |    667 +-
 ui/scripts/ui/widgets/overlay.js                |     58 +-
 ui/scripts/ui/widgets/tagger.js                 |    430 +-
 ui/scripts/ui/widgets/toolTip.js                |    266 +-
 ui/scripts/ui/widgets/treeView.js               |    226 +-
 ui/scripts/vm_snapshots.js                      |    337 +-
 ui/scripts/vpc.js                               |   6253 +-
 ui/scripts/zoneWizard.js                        |   7357 +-
 usage/pom.xml                                   |     87 +-
 .../com/cloud/usage/UsageAlertManagerImpl.java  |      3 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java |    287 +-
 usage/src/com/cloud/usage/UsageServer.java      |     16 +-
 .../cloud/usage/parser/NetworkUsageParser.java  |      8 +-
 .../cloud/usage/parser/StorageUsageParser.java  |     21 +-
 .../usage/parser/VMSnapshotUsageParser.java     |    153 +
 .../cloud/usage/parser/VmDiskUsageParser.java   |    213 +
 .../test/com/cloud/usage/UsageManagerTest.java  |      3 +
 .../usage/UsageManagerTestConfiguration.java    |     10 +-
 utils/pom.xml                                   |     95 +-
 utils/src/com/cloud/maint/Version.java          |     66 +
 utils/src/com/cloud/utils/AnnotationHelper.java |     59 -
 utils/src/com/cloud/utils/CleanupDelegate.java  |     22 -
 utils/src/com/cloud/utils/EnumUtils.java        |     26 +
 utils/src/com/cloud/utils/EnumerationImpl.java  |     61 -
 utils/src/com/cloud/utils/FileUtil.java         |     41 +-
 utils/src/com/cloud/utils/MethodCapturer.java   |    113 +
 utils/src/com/cloud/utils/Predicate.java        |     21 +
 utils/src/com/cloud/utils/ProcessUtil.java      |     22 +-
 utils/src/com/cloud/utils/ReflectUtil.java      |     90 +-
 utils/src/com/cloud/utils/S3Utils.java          |    106 +-
 utils/src/com/cloud/utils/SerialVersionUID.java |      2 +
 utils/src/com/cloud/utils/StringUtils.java      |     51 +-
 utils/src/com/cloud/utils/SwiftUtil.java        |    241 +
 utils/src/com/cloud/utils/Ternary.java          |      2 +-
 utils/src/com/cloud/utils/UriUtils.java         |    151 +-
 utils/src/com/cloud/utils/UuidUtils.java        |     23 +
 .../utils/cisco/n1kv/vsm/NetconfHelper.java     |     22 +
 .../cloud/utils/cisco/n1kv/vsm/VsmCommand.java  |    218 +
 .../com/cloud/utils/component/AdapterBase.java  |     15 +-
 .../com/cloud/utils/component/AdapterList.java  |     34 +
 .../cloud/utils/component/ComponentContext.java |    198 +-
 .../utils/component/ComponentLifecycleBase.java |     94 +-
 .../com/cloud/utils/component/ManagerBase.java  |      9 +-
 .../component/SpringComponentScanUtils.java     |     41 -
 .../utils/crypt/EncryptionSecretKeyChanger.java |    427 -
 utils/src/com/cloud/utils/db/Attribute.java     |    253 -
 utils/src/com/cloud/utils/db/Condition.java     |    100 -
 .../com/cloud/utils/db/ConnectionConcierge.java |    223 -
 .../utils/db/ConnectionConciergeMBean.java      |     30 -
 utils/src/com/cloud/utils/db/DB.java            |     59 -
 utils/src/com/cloud/utils/db/DbUtil.java        |    342 -
 utils/src/com/cloud/utils/db/EcInfo.java        |    106 -
 utils/src/com/cloud/utils/db/Encrypt.java       |     32 -
 utils/src/com/cloud/utils/db/EntityManager.java |     65 +
 utils/src/com/cloud/utils/db/Filter.java        |    115 -
 utils/src/com/cloud/utils/db/FirstWhere.java    |     29 -
 utils/src/com/cloud/utils/db/GenericDao.java    |    282 -
 .../src/com/cloud/utils/db/GenericDaoBase.java  |   1879 -
 .../cloud/utils/db/GenericSearchBuilder.java    |    444 -
 utils/src/com/cloud/utils/db/GlobalLock.java    |    244 -
 utils/src/com/cloud/utils/db/GroupBy.java       |    108 -
 utils/src/com/cloud/utils/db/JoinBuilder.java   |     79 -
 .../com/cloud/utils/db/JoinQueryBuilder.java    |     31 -
 utils/src/com/cloud/utils/db/JoinType.java      |     32 -
 utils/src/com/cloud/utils/db/Merovingian2.java  |    461 -
 .../com/cloud/utils/db/MerovingianMBean.java    |     32 -
 utils/src/com/cloud/utils/db/NextWhere.java     |     27 -
 utils/src/com/cloud/utils/db/On.java            |     21 -
 utils/src/com/cloud/utils/db/QueryBuilder.java  |    194 -
 utils/src/com/cloud/utils/db/ScriptRunner.java  |    233 -
 utils/src/com/cloud/utils/db/SearchBuilder.java |     64 -
 .../src/com/cloud/utils/db/SearchCriteria.java  |    358 -
 .../src/com/cloud/utils/db/SearchCriteria2.java |    213 -
 .../cloud/utils/db/SearchCriteriaService.java   |     29 -
 utils/src/com/cloud/utils/db/Select.java        |     52 -
 .../com/cloud/utils/db/SelectQueryBuilder.java  |     28 -
 .../src/com/cloud/utils/db/SequenceFetcher.java |    171 -
 .../com/cloud/utils/db/SimpleQueryBuilder.java  |     47 -
 utils/src/com/cloud/utils/db/SqlGenerator.java  |    669 -
 utils/src/com/cloud/utils/db/StateMachine.java  |     30 -
 utils/src/com/cloud/utils/db/Transaction.java   |   1173 -
 .../cloud/utils/db/TransactionAttachment.java   |     34 -
 .../utils/db/TransactionContextBuilder.java     |     65 -
 .../com/cloud/utils/db/TransactionMBean.java    |     33 -
 .../cloud/utils/db/TransactionMBeanImpl.java    |    113 -
 utils/src/com/cloud/utils/db/UpdateBuilder.java |    147 -
 utils/src/com/cloud/utils/db/UpdateFilter.java  |     29 -
 utils/src/com/cloud/utils/db/Where.java         |     81 -
 .../utils/exception/CloudRuntimeException.java  |     49 +-
 .../com/cloud/utils/exception/ErrorContext.java |     28 +
 .../utils/exception/ExceptionProxyObject.java   |     50 +
 utils/src/com/cloud/utils/net/NetUtils.java     |    151 +-
 utils/src/com/cloud/utils/nio/NioClient.java    |      3 +-
 .../src/com/cloud/utils/nio/NioConnection.java  |      2 +-
 utils/src/com/cloud/utils/script/Executor.java  |     27 -
 utils/src/com/cloud/utils/script/Script.java    |     16 +-
 .../com/cloud/utils/script/ScriptBuilder.java   |     73 -
 .../src/com/cloud/utils/ssh/SSHKeysHelper.java  |      2 +-
 utils/src/com/cloud/utils/ssh/SshHelper.java    |      4 -
 .../cloud/utils/storage/encoding/Decoder.java   |      2 +-
 .../com/cloud/utils/xmlobject/XmlObject.java    |    353 +-
 .../cloud/utils/xmlobject/XmlObjectParser.java  |    214 +-
 .../utils/identity/ManagementServerNode.java    |     60 +
 .../ssl/EasySSLProtocolSocketFactory.java       |    232 +
 .../contrib/ssl/EasyX509TrustManager.java       |    118 +
 utils/test/com/cloud/utils/ProcessUtilTest.java |     73 +
 utils/test/com/cloud/utils/ReflectUtilTest.java |     91 +
 utils/test/com/cloud/utils/ScriptTest.java      |    100 +
 utils/test/com/cloud/utils/StringUtilsTest.java |    109 +-
 utils/test/com/cloud/utils/TernaryTest.java     |     35 +
 .../com/cloud/utils/crypto/RSAHelperTest.java   |     50 +
 .../com/cloud/utils/db/DbAnnotatedBase.java     |     44 -
 .../cloud/utils/db/DbAnnotatedBaseDerived.java  |     27 -
 utils/test/com/cloud/utils/db/DbTestDao.java    |     66 -
 utils/test/com/cloud/utils/db/DbTestUtils.java  |     90 -
 utils/test/com/cloud/utils/db/DbTestVO.java     |     56 -
 .../test/com/cloud/utils/db/DummyComponent.java |     27 -
 .../cloud/utils/db/ElementCollectionTest.java   |     72 -
 .../test/com/cloud/utils/db/GlobalLockTest.java |     83 -
 .../com/cloud/utils/db/Merovingian2Test.java    |     77 -
 .../utils/db/TransactionContextBuilderTest.java |     63 -
 .../com/cloud/utils/db/TransactionTest.java     |    214 -
 .../utils/log/CglibThrowableRendererTest.java   |    104 -
 .../test/com/cloud/utils/net/NetUtilsTest.java  |     45 +
 .../com/cloud/utils/ssh/SSHKeysHelperTest.java  |     69 +
 .../test/com/cloud/utils/testcase/NioTest.java  |     14 +-
 .../cloud/utils/xmlobject/TestXmlObject.java    |     66 +-
 .../cloud/utils/xmlobject/TestXmlObject2.java   |     74 +-
 .../com/cloud/utils/QualifierTestContext.xml    |      3 +-
 .../utils/db/transactionContextBuilderTest.xml  |      3 +-
 vmware-base/pom.xml                             |     20 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |     49 +-
 .../vmware/mo/CustomFieldConstants.java         |      2 +
 .../hypervisor/vmware/mo/DatacenterMO.java      |      7 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java |     84 +-
 .../vmware/mo/DistributedVirtualSwitchMO.java   |     77 +
 .../vmware/mo/FeatureKeyConstants.java          |     26 +
 .../vmware/mo/HostDatastoreBrowserMO.java       |     20 +-
 .../vmware/mo/HostDatastoreSystemMO.java        |     39 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |    166 +-
 .../vmware/mo/HostStorageSystemMO.java          |     55 +
 .../vmware/mo/HypervisorHostHelper.java         |   1286 +-
 .../vmware/mo/LicenseAssignmentManagerMO.java   |     87 +
 .../hypervisor/vmware/mo/LicenseManagerMO.java  |     45 +
 .../hypervisor/vmware/mo/PerfManagerMO.java     |      2 +-
 .../vmware/mo/VirtualDiskManagerMO.java         |      4 +
 .../vmware/mo/VirtualMachineDiskInfo.java       |     42 +
 .../mo/VirtualMachineDiskInfoBuilder.java       |     97 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |    374 +-
 .../vmware/mo/VmwareHypervisorHost.java         |     11 +-
 .../hypervisor/vmware/util/VmwareClient.java    |     55 +-
 .../hypervisor/vmware/util/VmwareContext.java   |     92 +-
 .../vmware/util/VmwareContextPool.java          |    202 +
 .../vmware/util/VmwareGuestOsMapper.java        |     11 +-
 .../hypervisor/vmware/util/VmwareHelper.java    |    128 +-
 .../vmware/mo/TestVmwareContextFactory.java     |     61 +-
 .../hypervisor/vmware/mo/TestVmwareMO.java      |     39 -
 .../hypervisor/vmware/mo/VmwareMOTest.java      |     45 +
 .../hypervisor/vmware/util/TestVmwareUtil.java  |    107 -
 .../test/com/cloud/vmware/TestVMWare.java       |   1342 -
 5692 files changed, 989097 insertions(+), 376894 deletions(-)
----------------------------------------------------------------------



Mime
View raw message