You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/07/09 22:46:32 UTC
[50/50] [abbrv] git commit: updated refs/heads/ui-ucs to 9334dab
Merge branch 'master' into ui-ucs
Conflicts:
ui/scripts/system.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9334dab7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9334dab7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9334dab7
Branch: refs/heads/ui-ucs
Commit: 9334dab7f76d3b53af930633bc4901bc2e4839b2
Parents: c01f96c 5e13327
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jul 9 13:38:22 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jul 9 13:38:22 2013 -0700
----------------------------------------------------------------------
.gitignore | 1 +
INSTALL.md | 19 +-
.../tomcatconf/components-simulator.xml.in | 54 -
agent/bindir/cloud-setup-agent.in | 7 +-
agent/conf/agent.properties | 5 +
agent/src/com/cloud/agent/AgentShell.java | 1 +
agent/src/com/cloud/agent/VmmAgentShell.java | 504 -
api/src/com/cloud/agent/api/Answer.java | 1 +
.../CopyTemplateToPrimaryStorageAnswer.java | 17 +
.../cloud/agent/api/storage/PasswordAuth.java | 39 +
api/src/com/cloud/agent/api/storage/Proxy.java | 72 +
.../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 | 30 +
api/src/com/cloud/agent/api/to/DiskTO.java | 70 +
api/src/com/cloud/agent/api/to/DnsmasqTO.java | 13 +-
.../com/cloud/agent/api/to/FirewallRuleTO.java | 25 +-
api/src/com/cloud/agent/api/to/NfsTO.java | 60 +
api/src/com/cloud/agent/api/to/S3TO.java | 27 +-
api/src/com/cloud/agent/api/to/SwiftTO.java | 10 +-
.../cloud/agent/api/to/VirtualMachineTO.java | 15 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 37 +
.../agent/manager/allocator/HostAllocator.java | 85 +
.../agent/manager/allocator/PodAllocator.java | 33 +
api/src/com/cloud/async/AsyncJob.java | 37 +-
.../configuration/ConfigurationService.java | 13 +
api/src/com/cloud/dc/DedicatedResources.java | 33 +
.../cloud/deploy/DeploymentClusterPlanner.java | 4 +-
api/src/com/cloud/event/EventCategory.java | 1 +
api/src/com/cloud/event/EventTypes.java | 10 +
.../InsufficientServerCapacityException.java | 11 +
api/src/com/cloud/network/IpAddress.java | 4 +-
.../network/NetworkMigrationResponder.java | 70 +
api/src/com/cloud/network/NetworkModel.java | 6 +
api/src/com/cloud/network/NetworkService.java | 5 +
api/src/com/cloud/network/PhysicalNetwork.java | 3 +-
.../com/cloud/network/element/VpcProvider.java | 3 +-
.../network/vpn/RemoteAccessVpnService.java | 2 +-
api/src/com/cloud/offering/DiskOffering.java | 32 +-
api/src/com/cloud/offering/NetworkOffering.java | 5 +-
.../ha/GlobalLoadBalancingRulesService.java | 3 +
api/src/com/cloud/server/ManagementService.java | 47 +-
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/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 +-
api/src/com/cloud/storage/StorageService.java | 12 +
api/src/com/cloud/storage/Upload.java | 2 +-
api/src/com/cloud/storage/Volume.java | 16 +-
api/src/com/cloud/storage/VolumeApiService.java | 28 +-
.../storage/snapshot/SnapshotApiService.java | 109 +
.../cloud/storage/snapshot/SnapshotService.java | 109 -
.../cloud/storage/template/TemplateInfo.java | 81 -
.../cloud/storage/template/TemplateProp.java | 81 +
.../com/cloud/template/TemplateApiService.java | 106 +
api/src/com/cloud/template/TemplateService.java | 100 -
.../cloud/template/VirtualMachineTemplate.java | 2 +
api/src/com/cloud/user/AccountService.java | 13 +-
api/src/com/cloud/vm/DiskProfile.java | 36 +
api/src/com/cloud/vm/VirtualMachine.java | 2 +
api/src/com/cloud/vm/VirtualMachineProfile.java | 8 +-
api/src/com/cloud/vm/VmDiskStats.java | 30 +
api/src/com/cloud/vm/VmStats.java | 8 +
.../affinity/AffinityGroupService.java | 5 +-
.../cloudstack/api/ApiCommandJobType.java | 52 +
.../org/apache/cloudstack/api/ApiConstants.java | 23 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 4 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 10 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 5 +-
.../api/BaseUpdateTemplateOrIsoCmd.java | 14 +
.../cloudstack/api/ResponseGenerator.java | 192 +-
.../cloudstack/api/ServerApiException.java | 3 +-
.../command/admin/account/DeleteAccountCmd.java | 6 +-
.../admin/account/DisableAccountCmd.java | 6 +-
.../admin/autoscale/CreateCounterCmd.java | 6 +-
.../admin/autoscale/DeleteCounterCmd.java | 6 +-
.../command/admin/cluster/AddClusterCmd.java | 36 +-
.../command/admin/cluster/ListClustersCmd.java | 8 +-
.../command/admin/cluster/UpdateClusterCmd.java | 6 +-
.../config/UpdateHypervisorCapabilitiesCmd.java | 8 +-
.../admin/host/AddSecondaryStorageCmd.java | 40 +-
.../admin/host/CancelMaintenanceCmd.java | 6 +-
.../admin/host/FindHostsForMigrationCmd.java | 3 +-
.../api/command/admin/host/ListHostsCmd.java | 16 +-
.../admin/host/PrepareForMaintenanceCmd.java | 6 +-
.../command/admin/host/ReconnectHostCmd.java | 6 +-
.../admin/host/ReleaseHostReservationCmd.java | 6 +-
...ConfigureInternalLoadBalancerElementCmd.java | 23 +-
.../admin/internallb/ListInternalLBVMsCmd.java | 16 +-
.../admin/internallb/StartInternalLBVMCmd.java | 6 +-
.../admin/internallb/StopInternalLBVMCmd.java | 6 +-
.../api/command/admin/ldap/LDAPConfigCmd.java | 37 +-
.../network/AddNetworkServiceProviderCmd.java | 6 +-
.../admin/network/CreateNetworkOfferingCmd.java | 12 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 6 +-
.../DeleteNetworkServiceProviderCmd.java | 6 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 6 +-
.../ReleaseDedicatedGuestVlanRangeCmd.java | 5 +-
.../UpdateNetworkServiceProviderCmd.java | 6 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 6 +-
.../admin/offering/CreateDiskOfferingCmd.java | 51 +-
.../offering/CreateServiceOfferingCmd.java | 28 +
.../api/command/admin/pod/ListPodsByCmd.java | 7 -
.../admin/region/CreatePortableIpRangeCmd.java | 156 +
.../admin/region/DeletePortableIpRangeCmd.java | 92 +
.../admin/region/ListPortableIpRangesCmd.java | 108 +
.../ConfigureVirtualRouterElementCmd.java | 6 +-
.../command/admin/router/DestroyRouterCmd.java | 6 +-
.../command/admin/router/ListRoutersCmd.java | 13 +-
.../command/admin/router/RebootRouterCmd.java | 6 +-
.../command/admin/router/StartRouterCmd.java | 6 +-
.../api/command/admin/router/StopRouterCmd.java | 6 +-
.../command/admin/storage/AddImageStoreCmd.java | 154 +
.../api/command/admin/storage/AddS3Cmd.java | 55 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 6 +-
.../admin/storage/CreateCacheStoreCmd.java | 135 +
.../admin/storage/CreateStoragePoolCmd.java | 44 +-
.../admin/storage/DeleteImageStoreCmd.java | 80 +
.../FindStoragePoolsForMigrationCmd.java | 29 +-
.../admin/storage/ListCacheStoresCmd.java | 104 +
.../admin/storage/ListImageStoresCmd.java | 104 +
.../api/command/admin/storage/ListS3sCmd.java | 34 +-
.../admin/storage/ListStoragePoolsCmd.java | 21 +-
.../PreparePrimaryStorageForMaintenanceCmd.java | 6 +-
.../api/command/admin/swift/AddSwiftCmd.java | 43 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 26 +-
.../admin/systemvm/DestroySystemVmCmd.java | 6 +-
.../admin/systemvm/ListSystemVMsCmd.java | 13 +-
.../admin/systemvm/RebootSystemVmCmd.java | 6 +-
.../admin/systemvm/StartSystemVMCmd.java | 6 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 6 +-
.../admin/template/PrepareTemplateCmd.java | 2 +-
.../command/admin/usage/AddTrafficTypeCmd.java | 6 +-
.../admin/usage/DeleteTrafficTypeCmd.java | 6 +-
.../admin/usage/UpdateTrafficTypeCmd.java | 6 +-
.../api/command/admin/user/DisableUserCmd.java | 6 +-
.../admin/vpc/CreatePrivateGatewayCmd.java | 6 +-
.../admin/vpc/DeletePrivateGatewayCmd.java | 6 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 2 +-
.../zone/MarkDefaultZoneForAccountCmd.java | 6 +-
.../user/account/AddAccountToProjectCmd.java | 2 +-
.../user/address/AssociateIPAddrCmd.java | 87 +-
.../user/address/DisassociateIPAddrCmd.java | 24 +-
.../user/address/ListPublicIpAddressesCmd.java | 6 +-
.../affinitygroup/CreateAffinityGroupCmd.java | 6 +-
.../affinitygroup/DeleteAffinityGroupCmd.java | 24 +-
.../affinitygroup/ListAffinityGroupsCmd.java | 13 +-
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 6 +-
.../autoscale/CreateAutoScalePolicyCmd.java | 6 +-
.../autoscale/CreateAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 6 +-
.../user/autoscale/CreateConditionCmd.java | 6 +-
.../autoscale/DeleteAutoScalePolicyCmd.java | 6 +-
.../autoscale/DeleteAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 6 +-
.../user/autoscale/DeleteConditionCmd.java | 6 +-
.../autoscale/DisableAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/EnableAutoScaleVmGroupCmd.java | 6 +-
.../user/autoscale/ListConditionsCmd.java | 9 +-
.../autoscale/UpdateAutoScalePolicyCmd.java | 6 +-
.../autoscale/UpdateAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 6 +-
.../firewall/CreateEgressFirewallRuleCmd.java | 6 +-
.../user/firewall/CreateFirewallRuleCmd.java | 6 +-
.../firewall/CreatePortForwardingRuleCmd.java | 12 +-
.../firewall/DeleteEgressFirewallRuleCmd.java | 7 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 6 +-
.../firewall/DeletePortForwardingRuleCmd.java | 6 +-
.../api/command/user/iso/DeleteIsoCmd.java | 6 +-
.../api/command/user/iso/ExtractIsoCmd.java | 13 +-
.../api/command/user/iso/ListIsosCmd.java | 24 +-
.../api/command/user/iso/RegisterIsoCmd.java | 13 +-
.../api/command/user/iso/UpdateIsoCmd.java | 4 +-
.../CreateApplicationLoadBalancerCmd.java | 6 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 6 +-
.../DeleteApplicationLoadBalancerCmd.java | 6 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 6 +-
.../loadbalancer/ListLoadBalancerRulesCmd.java | 9 +
.../user/nat/CreateIpForwardingRuleCmd.java | 6 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 6 +-
.../command/user/nat/EnableStaticNatCmd.java | 6 +
.../user/network/CreateNetworkACLCmd.java | 11 +-
.../command/user/network/ListNetworksCmd.java | 7 -
.../gslb/AssignToGlobalLoadBalancerRuleCmd.java | 45 +
.../gslb/CreateGlobalLoadBalancerRuleCmd.java | 5 +-
.../gslb/DeleteGlobalLoadBalancerRuleCmd.java | 17 +-
.../gslb/UpdateGlobalLoadBalancerRuleCmd.java | 14 +-
.../AuthorizeSecurityGroupEgressCmd.java | 6 +-
.../AuthorizeSecurityGroupIngressCmd.java | 6 +-
.../securitygroup/ListSecurityGroupsCmd.java | 6 +-
.../RevokeSecurityGroupEgressCmd.java | 8 +-
.../RevokeSecurityGroupIngressCmd.java | 8 +-
.../user/snapshot/CreateSnapshotCmd.java | 26 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 2 +-
.../user/snapshot/DeleteSnapshotCmd.java | 6 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 22 +-
.../command/user/template/CopyTemplateCmd.java | 8 +-
.../user/template/CreateTemplateCmd.java | 38 +-
.../user/template/DeleteTemplateCmd.java | 6 +-
.../user/template/ExtractTemplateCmd.java | 13 +-
.../command/user/template/ListTemplatesCmd.java | 30 +-
.../user/template/RegisterTemplateCmd.java | 33 +-
.../user/template/UpdateTemplateCmd.java | 5 +-
.../api/command/user/vm/AddIpToVmNicCmd.java | 6 +-
.../api/command/user/vm/DeployVMCmd.java | 17 +-
.../api/command/user/vm/DestroyVMCmd.java | 6 +-
.../api/command/user/vm/ListNicsCmd.java | 6 +-
.../api/command/user/vm/ListVMsCmd.java | 13 +-
.../api/command/user/vm/RebootVMCmd.java | 6 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 7 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 6 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 7 +-
.../api/command/user/vm/RestoreVMCmd.java | 5 +-
.../api/command/user/vm/StartVMCmd.java | 20 +-
.../api/command/user/vm/StopVMCmd.java | 6 +-
.../api/command/user/vm/UpdateVMCmd.java | 7 +
.../command/user/volume/AttachVolumeCmd.java | 6 +-
.../command/user/volume/CreateVolumeCmd.java | 37 +-
.../command/user/volume/DetachVolumeCmd.java | 6 +-
.../command/user/volume/ExtractVolumeCmd.java | 53 +-
.../api/command/user/volume/ListVolumesCmd.java | 11 +-
.../command/user/volume/MigrateVolumeCmd.java | 21 +-
.../user/volume/RemoveResourceDetailCmd.java | 6 +-
.../command/user/volume/ResizeVolumeCmd.java | 6 +-
.../command/user/volume/UpdateVolumeCmd.java | 6 +-
.../command/user/volume/UploadVolumeCmd.java | 8 +-
.../command/user/vpc/CreateStaticRouteCmd.java | 6 +-
.../command/user/vpc/DeleteStaticRouteCmd.java | 6 +-
.../api/command/user/vpc/RestartVPCCmd.java | 2 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 4 +-
.../user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +-
.../api/command/user/zone/ListZonesByCmd.java | 8 +-
.../api/response/AccountResponse.java | 63 +-
.../api/response/ClusterResponse.java | 36 +-
.../api/response/DiskOfferingResponse.java | 61 +
.../api/response/DomainRouterResponse.java | 11 -
.../api/response/ExceptionResponse.java | 12 +-
.../api/response/FirewallResponse.java | 8 +-
.../cloudstack/api/response/HostResponse.java | 9 +-
.../HypervisorCapabilitiesResponse.java | 32 +
.../api/response/IPAddressResponse.java | 7 +
.../api/response/ImageStoreDetailResponse.java | 86 +
.../api/response/ImageStoreResponse.java | 149 +
.../api/response/LoadBalancerResponse.java | 11 +-
.../api/response/NetworkOfferingResponse.java | 7 +
.../api/response/NetworkResponse.java | 19 +-
.../cloudstack/api/response/PodResponse.java | 9 +-
.../api/response/PortableIpRangeResponse.java | 93 +
.../api/response/PortableIpResponse.java | 106 +
.../api/response/ProjectResponse.java | 268 +-
.../response/ResourceLimitAndCountResponse.java | 90 +
.../api/response/ServiceOfferingResponse.java | 39 +
.../api/response/SnapshotResponse.java | 22 +-
.../StoragePoolForMigrationResponse.java | 248 -
.../api/response/StoragePoolResponse.java | 59 +-
.../api/response/SystemVmResponse.java | 11 -
.../api/response/TemplateResponse.java | 45 +-
.../api/response/TemplateZoneResponse.java | 131 +
.../cloudstack/api/response/UserVmResponse.java | 42 +-
.../cloudstack/api/response/VolumeResponse.java | 68 +-
.../apache/cloudstack/query/QueryService.java | 14 +-
.../apache/cloudstack/region/PortableIp.java | 58 +
.../cloudstack/region/PortableIpRange.java | 38 +
.../org/apache/cloudstack/usage/UsageTypes.java | 8 +
.../test/AddSecondaryStorageCmdTest.java | 67 +-
.../api/command/test/AddSwiftCmdTest.java | 97 -
awsapi-setup/setup/cloudstack-aws-api-register | 2 +-
awsapi/conf/ec2-service.properties.in | 2 +-
awsapi/pom.xml | 148 +-
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 | 1 +
.../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 | 452 +-
.../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 +-
.../service/exception/EC2ServiceException.java | 120 +-
.../src/com/cloud/stack/CloudStackClient.java | 5 +-
.../stack/models/CloudStackDiskOffering.java | 9 +
.../stack/models/CloudStackSecurityGroup.java | 7 +
awsapi/web/web.xml | 11 +-
.../classes/resources/messages.properties | 23 +-
.../classes/resources/messages_ar.properties | 4 +-
.../classes/resources/messages_ca.properties | 1 -
.../classes/resources/messages_de_DE.properties | 1 -
.../classes/resources/messages_es.properties | 1 -
.../classes/resources/messages_fr_FR.properties | 18 +-
.../classes/resources/messages_it_IT.properties | 197 +-
.../classes/resources/messages_ja.properties | 41 +-
.../classes/resources/messages_ko_KR.properties | 6 +-
.../classes/resources/messages_nb_NO.properties | 1 -
.../classes/resources/messages_pt_BR.properties | 6 +-
.../classes/resources/messages_ru_RU.properties | 6 +-
.../classes/resources/messages_zh_CN.properties | 12 +-
client/pom.xml | 53 +-
client/tomcatconf/applicationContext.xml.in | 216 +-
client/tomcatconf/commands.properties.in | 49 +-
client/tomcatconf/componentContext.xml.in | 93 +-
client/tomcatconf/db.properties.in | 1 +
client/tomcatconf/log4j-cloud.xml.in | 8 +
client/tomcatconf/nonossComponentContext.xml.in | 66 +-
.../tomcatconf/simulatorComponentContext.xml.in | 57 +-
core/src/com/cloud/agent/Listener.java | 38 +-
.../com/cloud/agent/api/AttachVolumeAnswer.java | 16 +-
.../cloud/agent/api/AttachVolumeCommand.java | 142 +-
.../agent/api/CleanupSnapshotBackupCommand.java | 75 -
.../cloud/agent/api/ComputeChecksumCommand.java | 16 +-
.../agent/api/DeleteObjectFromSwiftCommand.java | 61 -
.../agent/api/DeleteSnapshotBackupAnswer.java | 32 -
.../agent/api/DeleteSnapshotBackupCommand.java | 96 -
.../agent/api/DeleteSnapshotsDirCommand.java | 34 +-
.../agent/api/DeleteTemplateFromS3Command.java | 106 -
.../cloud/agent/api/GetVmDiskStatsAnswer.java | 47 +
.../cloud/agent/api/GetVmDiskStatsCommand.java | 54 +
.../agent/api/MigrateWithStorageAnswer.java | 10 +-
.../agent/api/MigrateWithStorageCommand.java | 12 +
.../api/MigrateWithStorageCompleteAnswer.java | 9 +-
.../agent/api/ModifyStoragePoolAnswer.java | 10 +-
.../src/com/cloud/agent/api/ScaleVmCommand.java | 27 +-
.../cloud/agent/api/SecStorageSetupCommand.java | 15 +-
.../com/cloud/agent/api/SnapshotCommand.java | 4 +-
core/src/com/cloud/agent/api/StartCommand.java | 10 +-
.../cloud/agent/api/StartupStorageCommand.java | 12 +-
core/src/com/cloud/agent/api/StopCommand.java | 15 +-
.../com/cloud/agent/api/UnPlugNicCommand.java | 2 +-
.../com/cloud/agent/api/VmDiskStatsEntry.java | 90 +
core/src/com/cloud/agent/api/VmStatsEntry.java | 48 +
.../agent/api/routing/DhcpEntryCommand.java | 10 +-
.../api/routing/NetworkElementCommand.java | 1 +
.../agent/api/routing/SavePasswordCommand.java | 6 +-
.../agent/api/routing/SetNetworkACLCommand.java | 13 +-
.../api/routing/SiteLoadBalancerConfig.java | 13 +
.../agent/api/routing/UserDataCommand.java | 6 +-
.../cloud/agent/api/routing/VmDataCommand.java | 10 +-
.../api/storage/AbstractDownloadCommand.java | 2 +-
.../agent/api/storage/CopyVolumeAnswer.java | 1 +
.../agent/api/storage/CopyVolumeCommand.java | 6 +-
.../cloud/agent/api/storage/CreateAnswer.java | 1 +
.../cloud/agent/api/storage/CreateCommand.java | 32 +-
.../storage/CreateEntityDownloadURLCommand.java | 1 -
.../storage/CreatePrivateTemplateAnswer.java | 4 +-
.../api/storage/DeleteTemplateCommand.java | 40 -
.../agent/api/storage/DeleteVolumeCommand.java | 38 -
.../agent/api/storage/DownloadCommand.java | 219 -
.../api/storage/DownloadProgressCommand.java | 48 -
.../agent/api/storage/ListTemplateAnswer.java | 12 +-
.../agent/api/storage/ListTemplateCommand.java | 31 +-
.../agent/api/storage/ListVolumeAnswer.java | 12 +-
.../agent/api/storage/ListVolumeCommand.java | 9 +-
.../storage/ManageVolumeAvailabilityAnswer.java | 1 +
.../storage/PrimaryStorageDownloadAnswer.java | 1 +
.../storage/PrimaryStorageDownloadCommand.java | 9 +
.../agent/api/storage/ResizeVolumeAnswer.java | 2 +-
.../agent/api/storage/UpgradeDiskAnswer.java | 4 +-
.../cloud/agent/api/storage/UploadCommand.java | 1 -
.../virtualnetwork/VirtualRoutingResource.java | 60 +-
.../cloud/agent/transport/ArrayTypeAdaptor.java | 6 +-
.../agent/transport/InterfaceTypeAdaptor.java | 66 +
.../hyperv/resource/HypervResource.java | 978 -
.../com/cloud/network/DnsMasqConfigurator.java | 30 +-
.../com/cloud/network/HAProxyConfigurator.java | 22 +-
core/src/com/cloud/serializer/GsonHelper.java | 9 +
.../com/cloud/storage/GuestOSHypervisorVO.java | 73 +
.../storage/resource/StorageProcessor.java | 45 +
.../StorageSubsystemCommandHandler.java | 27 +
.../StorageSubsystemCommandHandlerBase.java | 139 +
.../template/HttpTemplateDownloader.java | 101 +-
.../storage/template/S3TemplateDownloader.java | 418 +
.../storage/template/TemplateConstants.java | 11 +-
.../storage/template/TemplateLocation.java | 76 +-
.../storage/command/DownloadCommand.java | 184 +
.../command/DownloadProgressCommand.java | 49 +
.../com/cloud/agent/transport/RequestTest.java | 58 +-
.../api/agent/test/AttachVolumeAnswerTest.java | 6 +-
.../api/agent/test/AttachVolumeCommandTest.java | 10 +-
.../agent/test/BackupSnapshotCommandTest.java | 43 +-
.../api/agent/test/CheckNetworkAnswerTest.java | 210 +
.../api/agent/test/SnapshotCommandTest.java | 12 +-
.../agent/api/test/ResizeVolumeCommandTest.java | 229 -
debian/cloudstack-management.install | 23 +-
debian/control | 2 +-
debian/rules | 10 +-
developer/pom.xml | 11 +-
docs/en-US/CloudStack_GSoC_Guide.ent | 22 +
docs/en-US/CloudStack_GSoC_Guide.xml | 52 +
docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 1 +
docs/en-US/Release_Notes.xml | 87 +-
docs/en-US/about-password-encryption.xml | 2 +-
docs/en-US/acquire-new-ip-address.xml | 38 +-
docs/en-US/acquire-new-ip-for-vpc.xml | 33 +-
docs/en-US/add-gateway-vpc.xml | 73 +-
docs/en-US/add-ip-range.xml | 103 +
docs/en-US/add-loadbalancer-rule-vpc.xml | 484 +-
docs/en-US/add-portforward-rule-vpc.xml | 36 +-
docs/en-US/add-remove-nic-ui.xml | 147 +
docs/en-US/add-remove-nic.xml | 2 +
docs/en-US/add-tier.xml | 14 +-
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.2.xml | 16 +
docs/en-US/attaching-volume.xml | 57 +-
docs/en-US/build-rpm.xml | 1 +
docs/en-US/building-devcloud.xml | 2 +-
docs/en-US/citrix-xenserver-installation.xml | 5 +-
docs/en-US/configure-acl.xml | 368 +-
docs/en-US/configure-package-repository.xml | 4 +-
docs/en-US/configure-vpc.xml | 1 +
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-my-first-plugin.xml | 216 +
docs/en-US/creating-network-offerings.xml | 4 +-
docs/en-US/creating-new-volumes.xml | 99 +-
docs/en-US/creating-vms.xml | 97 +-
docs/en-US/database-replication.xml | 12 +-
docs/en-US/delete-reset-vpn.xml | 28 +-
docs/en-US/detach-move-volumes.xml | 58 +-
docs/en-US/egress-firewall-rule.xml | 4 +-
docs/en-US/elastic-ip.xml | 161 +-
docs/en-US/enable-disable-static-nat-vpc.xml | 35 +-
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 | 28 +
docs/en-US/gsoc-midsummer-ian.xml | 28 +
docs/en-US/gsoc-midsummer-meng.xml | 28 +
docs/en-US/gsoc-midsummer-nguyen.xml | 28 +
docs/en-US/gsoc-midsummer-shiva.xml | 28 +
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 | 2 +-
docs/en-US/images/add-ip-range.png | Bin 0 -> 16572 bytes
docs/en-US/images/add-new-gateway-vpc.png | Bin 23184 -> 21912 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/addvm-tier-sharednw.png | Bin 0 -> 111465 bytes
docs/en-US/images/del-tier.png | Bin 0 -> 815 bytes
docs/en-US/images/mesos-integration-arch.jpg | 0
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/remove-nic.png | Bin 0 -> 735 bytes
docs/en-US/images/replace-acl-icon.png | Bin 0 -> 930 bytes
docs/en-US/images/replace-acl-list.png | Bin 0 -> 7706 bytes
docs/en-US/images/set-default-nic.png | Bin 0 -> 1012 bytes
docs/en-US/images/vpc-lb.png | Bin 0 -> 181811 bytes
docs/en-US/inter-vlan-routing.xml | 2 +-
docs/en-US/ip-vlan-tenant.xml | 205 +
docs/en-US/management-server-install-client.xml | 6 +-
.../management-server-install-db-external.xml | 2 +-
.../management-server-install-db-local.xml | 12 +-
.../management-server-install-multi-node.xml | 4 +-
docs/en-US/multiple-ip-nic.xml | 3 +-
docs/en-US/multiple-ip-range.xml | 42 +
docs/en-US/networks.xml | 4 +
docs/en-US/plugin-development.xml | 28 +
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 | 132 +
docs/en-US/pvlan.xml | 247 +
docs/en-US/region-add.xml | 6 +-
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/source-build.xml | 4 +-
docs/en-US/storage.xml | 15 +-
docs/en-US/upload-existing-volume-to-vm.xml | 129 +-
docs/en-US/using-multiple-guest-networks.xml | 1 +
docs/en-US/vlan-assign-isolated-nw.xml | 62 +
docs/en-US/vlan-provisioning.xml | 1 +
docs/en-US/vm-storage-migration.xml | 27 +-
.../volume-deletion-garbage-collection.xml | 29 +-
docs/en-US/vpc.xml | 4 +-
docs/en-US/working-with-volumes.xml | 51 +-
docs/pot/configure-package-repository.pot | 4 +-
docs/publican-gsoc-2013.cfg | 27 +
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 +
.../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 | 19 +-
.../api/storage/DataStoreProvider.java | 33 +-
.../api/storage/DataStoreProviderManager.java | 9 +-
.../subsystem/api/storage/DataStoreRole.java | 54 -
.../engine/subsystem/api/storage/EndPoint.java | 12 +-
.../subsystem/api/storage/EndPointSelector.java | 31 +
.../engine/subsystem/api/storage/HostScope.java | 16 +-
.../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 | 29 +-
.../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 | 32 +-
.../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 | 64 +
.../subsystem/api/storage/TemplateState.java | 6 +-
.../api/storage/VolumeDataFactory.java | 3 +-
.../subsystem/api/storage/VolumeInfo.java | 28 +-
.../subsystem/api/storage/VolumeProfile.java | 34 -
.../subsystem/api/storage/VolumeService.java | 34 +-
.../engine/subsystem/api/storage/ZoneScope.java | 6 +-
.../api/storage/disktype/DiskFormat.java | 5 +-
.../subsystem/api/storage/type/BaseImage.java | 6 +-
.../subsystem/api/storage/type/DataDisk.java | 6 +-
.../engine/subsystem/api/storage/type/Iso.java | 6 +-
.../subsystem/api/storage/type/RootDisk.java | 6 +-
.../subsystem/api/storage/type/Unknown.java | 6 +-
.../api/storage/type/VolumeTypeBase.java | 54 +-
.../api/storage/type/VolumeTypeHelper.java | 34 +-
.../storage/command/AttachAnswer.java | 47 +
.../storage/command/AttachCommand.java | 126 +
.../command/AttachPrimaryDataStoreAnswer.java | 56 +
.../command/AttachPrimaryDataStoreCmd.java | 39 +
.../storage/command/CommandResult.java | 52 +
.../storage/command/CopyCmdAnswer.java | 37 +
.../cloudstack/storage/command/CopyCommand.java | 55 +
.../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 | 72 +
.../command/DownloadSystemTemplateCommand.java | 129 +
.../command/StorageSubSystemCommand.java | 23 +
.../datastore/db/DataStoreProviderDao.java | 25 -
.../datastore/db/DataStoreProviderDaoImpl.java | 38 -
.../datastore/db/DataStoreProviderVO.java | 60 -
.../storage/datastore/db/ImageStoreDao.java | 37 +
.../datastore/db/ImageStoreDetailVO.java | 82 +
.../datastore/db/ImageStoreDetailsDao.java | 30 +
.../storage/datastore/db/ImageStoreVO.java | 193 +
.../datastore/db/PrimaryDataStoreDao.java | 110 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 565 +-
.../datastore/db/PrimaryDataStoreDetailVO.java | 22 +-
.../db/PrimaryDataStoreDetailsDao.java | 3 +-
.../db/PrimaryDataStoreDetailsDaoImpl.java | 71 -
.../datastore/db/SnapshotDataStoreDao.java | 40 +
.../datastore/db/SnapshotDataStoreVO.java | 260 +
.../datastore/db/StoragePoolDetailVO.java | 22 +-
.../datastore/db/StoragePoolDetailsDao.java | 5 +-
.../storage/datastore/db/StoragePoolVO.java | 79 +-
.../datastore/db/TemplateDataStoreDao.java | 63 +
.../datastore/db/TemplateDataStoreVO.java | 372 +
.../datastore/db/VolumeDataStoreDao.java | 41 +
.../storage/datastore/db/VolumeDataStoreVO.java | 348 +
.../image/datastore/ImageStoreEntity.java | 46 +
.../storage/image/datastore/ImageStoreInfo.java | 27 +
.../cloudstack/storage/to/ImageStoreTO.java | 79 +
.../storage/to/PrimaryDataStoreTO.java | 103 +
.../cloudstack/storage/to/SnapshotObjectTO.java | 126 +
.../cloudstack/storage/to/TemplateObjectTO.java | 199 +
.../cloudstack/storage/to/VolumeObjectTO.java | 215 +
.../engine/subsystem/api/storage/ScopeTest.java | 18 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 27 +-
.../entity/api/db/VolumeReservationVO.java | 22 +-
.../api/db/dao/VolumeReservationDaoImpl.java | 2 +-
.../orchestration/CloudOrchestrator.java | 11 +-
engine/pom.xml | 18 +-
.../src/com/cloud/alert/dao/AlertDaoImpl.java | 10 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 37 +-
.../configuration/dao/ResourceCountDao.java | 2 +
.../configuration/dao/ResourceCountDaoImpl.java | 16 +
.../configuration/dao/ResourceLimitDao.java | 2 +
.../configuration/dao/ResourceLimitDaoImpl.java | 14 +
engine/schema/src/com/cloud/dc/VlanVO.java | 8 +
.../schema/src/com/cloud/dc/dao/ClusterDao.java | 1 +
.../src/com/cloud/dc/dao/ClusterDaoImpl.java | 14 +-
.../src/com/cloud/dc/dao/DataCenterDao.java | 2 +-
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 15 +-
.../src/com/cloud/domain/dao/DomainDaoImpl.java | 2 +-
.../src/com/cloud/event/dao/EventDaoImpl.java | 5 +
.../schema/src/com/cloud/host/dao/HostDao.java | 6 +
.../src/com/cloud/host/dao/HostDaoImpl.java | 37 +-
.../dao/ExternalLoadBalancerDeviceVO.java | 2 +-
.../com/cloud/network/dao/FirewallRulesDao.java | 4 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 11 +
.../src/com/cloud/network/dao/IPAddressDao.java | 6 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 24 +
.../src/com/cloud/network/dao/IPAddressVO.java | 28 +
.../com/cloud/network/dao/NetworkDaoImpl.java | 5 +
.../com/cloud/network/rules/FirewallRuleVO.java | 7 +
.../rules/dao/PortForwardingRulesDao.java | 2 +-
.../rules/dao/PortForwardingRulesDaoImpl.java | 9 +-
.../cloud/network/vpc/dao/StaticRouteDao.java | 2 +-
.../network/vpc/dao/StaticRouteDaoImpl.java | 6 +-
.../cloud/network/vpc/dao/VpcGatewayDao.java | 2 +
.../network/vpc/dao/VpcGatewayDaoImpl.java | 8 +
.../com/cloud/offerings/NetworkOfferingVO.java | 14 +-
.../src/com/cloud/storage/DiskOfferingVO.java | 192 +-
.../com/cloud/storage/GuestOSCategoryVO.java | 23 +-
.../schema/src/com/cloud/storage/GuestOSVO.java | 35 +-
.../com/cloud/storage/LaunchPermissionVO.java | 11 +-
engine/schema/src/com/cloud/storage/S3VO.java | 24 +-
.../src/com/cloud/storage/SnapshotPolicyVO.java | 40 +-
.../com/cloud/storage/SnapshotScheduleVO.java | 80 +-
.../src/com/cloud/storage/SnapshotVO.java | 129 +-
.../com/cloud/storage/StoragePoolHostAssoc.java | 16 +-
.../com/cloud/storage/StoragePoolHostVO.java | 94 +-
.../com/cloud/storage/StoragePoolWorkVO.java | 38 +-
.../schema/src/com/cloud/storage/SwiftVO.java | 31 +-
.../schema/src/com/cloud/storage/UploadVO.java | 288 +-
.../com/cloud/storage/VMTemplateDetailVO.java | 79 +-
.../src/com/cloud/storage/VMTemplateHostVO.java | 393 +-
.../src/com/cloud/storage/VMTemplateS3VO.java | 34 +-
.../cloud/storage/VMTemplateStoragePoolVO.java | 379 +-
.../com/cloud/storage/VMTemplateSwiftVO.java | 3 +-
.../src/com/cloud/storage/VMTemplateVO.java | 273 +-
.../src/com/cloud/storage/VMTemplateZoneVO.java | 128 +-
.../src/com/cloud/storage/VolumeHostVO.java | 415 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 127 +-
.../com/cloud/storage/dao/DiskOfferingDao.java | 8 +-
.../cloud/storage/dao/DiskOfferingDaoImpl.java | 57 +-
.../cloud/storage/dao/GuestOSCategoryDao.java | 2 +-
.../storage/dao/GuestOSCategoryDaoImpl.java | 10 +-
.../src/com/cloud/storage/dao/GuestOSDao.java | 2 +-
.../com/cloud/storage/dao/GuestOSDaoImpl.java | 18 +-
.../cloud/storage/dao/LaunchPermissionDao.java | 28 +-
.../storage/dao/LaunchPermissionDaoImpl.java | 31 +-
.../src/com/cloud/storage/dao/S3DaoImpl.java | 3 +-
.../src/com/cloud/storage/dao/SnapshotDao.java | 31 +-
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 152 +-
.../cloud/storage/dao/SnapshotPolicyDao.java | 12 +-
.../storage/dao/SnapshotPolicyDaoImpl.java | 46 +-
.../cloud/storage/dao/SnapshotScheduleDao.java | 5 +-
.../storage/dao/SnapshotScheduleDaoImpl.java | 87 +-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 35 +-
.../storage/dao/StoragePoolHostDaoImpl.java | 18 +-
.../cloud/storage/dao/StoragePoolWorkDao.java | 3 +-
.../storage/dao/StoragePoolWorkDaoImpl.java | 62 +-
.../src/com/cloud/storage/dao/SwiftDaoImpl.java | 2 +-
.../src/com/cloud/storage/dao/UploadDao.java | 11 +-
.../com/cloud/storage/dao/UploadDaoImpl.java | 111 +-
.../com/cloud/storage/dao/VMTemplateDao.java | 79 +-
.../cloud/storage/dao/VMTemplateDaoImpl.java | 1526 +-
.../cloud/storage/dao/VMTemplateDetailsDao.java | 10 +-
.../storage/dao/VMTemplateDetailsDaoImpl.java | 60 +-
.../cloud/storage/dao/VMTemplateHostDao.java | 15 +-
.../storage/dao/VMTemplateHostDaoImpl.java | 550 +-
.../cloud/storage/dao/VMTemplatePoolDao.java | 36 +-
.../storage/dao/VMTemplatePoolDaoImpl.java | 433 +-
.../cloud/storage/dao/VMTemplateS3DaoImpl.java | 25 +-
.../cloud/storage/dao/VMTemplateZoneDao.java | 14 +-
.../storage/dao/VMTemplateZoneDaoImpl.java | 112 +-
.../src/com/cloud/storage/dao/VolumeDao.java | 11 +-
.../com/cloud/storage/dao/VolumeDaoImpl.java | 365 +-
.../com/cloud/storage/dao/VolumeHostDao.java | 13 +-
.../cloud/storage/dao/VolumeHostDaoImpl.java | 37 +-
.../src/com/cloud/upgrade/DatabaseCreator.java | 7 +
.../cloud/upgrade/DatabaseUpgradeChecker.java | 5 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 4 -
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade302to40.java | 41 +
.../com/cloud/upgrade/dao/Upgrade410to420.java | 1074 +-
.../src/com/cloud/usage/UsageVMInstanceVO.java | 12 +-
.../src/com/cloud/usage/UsageVmDiskVO.java | 180 +
.../src/com/cloud/usage/dao/UsageDao.java | 5 +
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 169 +
.../com/cloud/usage/dao/UsageNetworkDao.java | 2 +
.../cloud/usage/dao/UsageNetworkDaoImpl.java | 34 +
.../src/com/cloud/usage/dao/UsageVmDiskDao.java | 29 +
.../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 139 +
.../src/com/cloud/user/VmDiskStatisticsVO.java | 216 +
.../com/cloud/user/dao/VmDiskStatisticsDao.java | 35 +
.../cloud/user/dao/VmDiskStatisticsDaoImpl.java | 134 +
.../schema/src/com/cloud/vm/VMInstanceVO.java | 1 +
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 18 +-
.../schema/src/com/cloud/vm/dao/UserVmDao.java | 3 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 3 +-
.../schema/src/com/cloud/vm/dao/UserVmData.java | 36 +
.../lb/dao/ApplicationLoadBalancerRuleDao.java | 2 +
.../dao/ApplicationLoadBalancerRuleDaoImpl.java | 40 +-
.../region/gslb/GlobalLoadBalancerDaoImpl.java | 12 +
.../gslb/GlobalLoadBalancerLbRuleMapVO.java | 16 +-
.../region/gslb/GlobalLoadBalancerRuleDao.java | 3 +
engine/storage/backup/pom.xml | 50 -
.../storage/backup/BackupMotionService.java | 23 -
.../storage/backup/BackupService.java | 26 -
engine/storage/cache/pom.xml | 50 +
.../cache/allocator/StorageCacheAllocator.java | 26 +
.../allocator/StorageCacheRandomAllocator.java | 56 +
.../cache/manager/StorageCacheManagerImpl.java | 260 +
.../StorageCacheReplacementAlgorithm.java | 26 +
.../StorageCacheReplacementAlgorithmLRU.java | 106 +
engine/storage/datamotion/pom.xml | 62 +
.../motion/AncientDataMotionStrategy.java | 431 +
.../storage/motion/DataMotionServiceImpl.java | 77 +
.../storage/image/ImageDataFactoryImpl.java | 93 -
.../storage/image/ImageOrchestrator.java | 29 -
.../storage/image/ImageServiceImpl.java | 235 -
.../storage/image/TemplateDataFactoryImpl.java | 105 +
.../storage/image/TemplateServiceImpl.java | 670 +
.../image/downloader/ImageDownloader.java | 25 -
.../driver/AncientImageDataStoreDriverImpl.java | 254 -
.../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 | 370 +-
.../DefaultImageDataStoreLifeCycle.java | 107 -
.../lifecycle/ImageDataStoreLifeCycle.java | 24 -
.../store/lifecycle/ImageStoreLifeCycle.java | 24 +
engine/storage/imagemotion/pom.xml | 62 -
.../motion/DefaultImageMotionStrategy.java | 158 -
.../image/motion/ImageMotionServiceImpl.java | 70 -
.../image/motion/ImageMotionStrategy.java | 24 -
engine/storage/integration-test/pom.xml | 50 +-
.../MockLocalNfsSecondaryStorageResource.java | 135 +
.../storage/allocator/StorageAllocatorTest.java | 738 +-
.../StorageAllocatorTestConfiguration.java | 47 +-
...StorageCacheReplacementAlgorithmLRUTest.java | 226 +
.../apache/cloudstack/storage/test/AopTest.java | 2 +-
.../cloudstack/storage/test/AopTestAdvice.java | 20 +-
.../storage/test/ChildTestConfiguration.java | 157 +-
.../storage/test/CloudStackTestNGBase.java | 132 +-
.../test/DirectAgentManagerSimpleImpl.java | 115 +-
.../storage/test/DirectAgentTest.java | 66 +-
...HostEndpointRpcServerDirectCallResource.java | 70 -
.../MockHypervisorHostEndPointRpcServer.java | 72 -
.../storage/test/MockLocalHostEndPoint.java | 39 +
.../storage/test/MockRpcCallBack.java | 12 +-
.../storage/test/MockStorageMotionStrategy.java | 5 +-
.../cloudstack/storage/test/S3TemplateTest.java | 180 +
.../cloudstack/storage/test/SnapshotTest.java | 500 +
.../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 +-
.../test/resource/component.xml | 9 -
.../test/resource/s3_testng.xml | 47 +
.../test/resource/storageContext.xml | 78 +-
.../integration-test/test/resource/testng.xml | 19 +-
engine/storage/pom.xml | 7 +-
engine/storage/snapshot/pom.xml | 5 +
.../snapshot/SnapshotDataFactoryImpl.java | 51 +-
.../storage/snapshot/SnapshotObject.java | 353 +-
.../storage/snapshot/SnapshotServiceImpl.java | 390 +-
.../snapshot/SnapshotStateMachineManager.java | 2 +-
.../SnapshotStateMachineManagerImpl.java | 47 +-
.../storage/snapshot/SnapshotStrategyBase.java | 38 +
.../snapshot/XenserverSnapshotStrategy.java | 204 +
.../storage/snapshot/db/SnapshotDao2.java | 25 -
.../storage/snapshot/db/SnapshotDao2Impl.java | 28 -
.../storage/snapshot/db/SnapshotVO.java | 296 -
.../strategy/AncientSnapshotStrategy.java | 608 -
.../test/src/SnapshotDataFactoryTest.java | 23 +-
.../org/apache/cloudstack/storage/BaseType.java | 1 +
.../storage/HostEndpointRpcServer.java | 29 -
.../storage/HypervisorHostEndPoint.java | 75 -
.../HypervisorHostEndPointRpcServer.java | 119 -
.../cloudstack/storage/LocalHostEndpoint.java | 101 +
.../cloudstack/storage/RemoteHostEndPoint.java | 178 +
.../allocator/AbstractStoragePoolAllocator.java | 170 +-
.../ClusterScopeStoragePoolAllocator.java | 45 +-
.../GarbageCollectingStoragePoolAllocator.java | 17 +-
.../allocator/LocalStoragePoolAllocator.java | 32 +-
.../allocator/UseLocalForRootAllocator.java | 10 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 68 +-
.../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 | 248 +-
.../storage/datastore/DataStoreManagerImpl.java | 78 +-
.../datastore/ObjectInDataStoreManager.java | 21 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 340 +-
.../storage/datastore/PrimaryDataStore.java | 3 +-
.../datastore/PrimaryDataStoreEntityImpl.java | 257 -
.../PrimaryDataStoreProviderManager.java | 3 +-
.../datastore/protocol/DataStoreProtocol.java | 8 +-
.../provider/DataStoreProviderManagerImpl.java | 107 +-
.../storage/db/ObjectInDataStoreDao.java | 3 +-
.../storage/db/ObjectInDataStoreDaoImpl.java | 29 +-
.../storage/db/ObjectInDataStoreVO.java | 100 +-
.../endpoint/DefaultEndPointSelector.java | 128 +-
.../storage/endpoint/EndPointSelector.java | 40 -
.../storage/image/BaseImageStoreDriverImpl.java | 213 +
.../storage/image/ImageDataStoreDriver.java | 24 -
.../storage/image/ImageStoreDriver.java | 28 +
.../storage/image/TemplateEntityImpl.java | 14 +-
.../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 | 107 +
.../image/db/ImageStoreDetailsDaoImpl.java | 88 +
.../image/db/SnapshotDataStoreDaoImpl.java | 168 +
.../image/db/TemplateDataStoreDaoImpl.java | 325 +
.../image/db/VolumeDataStoreDaoImpl.java | 172 +
.../image/motion/ImageMotionService.java | 8 +-
.../motion/AncientDataMotionStrategy.java | 806 -
.../storage/motion/DataMotionDriver.java | 25 -
.../storage/motion/DataMotionService.java | 37 -
.../storage/motion/DataMotionServiceImpl.java | 77 -
.../storage/motion/DataMotionStrategy.java | 40 -
.../storage/snapshot/SnapshotEntityImpl.java | 316 +-
.../storage/snapshot/SnapshotService.java | 27 -
.../cloudstack/storage/to/ImageDataStoreTO.java | 36 -
.../storage/to/ImageOnPrimaryDataStoreTO.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 | 418 -
.../datastore/DefaultPrimaryDataStore.java | 343 -
.../storage/datastore/PrimaryDataStoreImpl.java | 354 +
.../DefaultPrimaryDataStoreDriverImpl.java | 249 -
.../driver/PrimaryDataStoreDriver.java | 16 -
.../DefaultPrimaryDataStoreLifeCycleImpl.java | 147 -
...aultPrimaryDataStoreProviderManagerImpl.java | 85 -
.../PrimaryDataStoreProviderManagerImpl.java | 88 +
.../datastore/provider/DefaultHostListener.java | 36 +-
.../DefaultPrimaryDatastoreProviderImpl.java | 83 -
.../PrimaryDataStoreProviderManager.java | 16 -
.../storage/volume/TemplateInstallStrategy.java | 28 -
.../volume/TemplateInstallStrategyImpl.java | 289 -
.../storage/volume/VolumeDataFactoryImpl.java | 25 +-
.../storage/volume/VolumeEntityImpl.java | 204 -
.../storage/volume/VolumeMotionService.java | 23 -
.../cloudstack/storage/volume/VolumeObject.java | 376 +-
.../storage/volume/VolumeServiceImpl.java | 995 +-
.../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 +-
.../async/AsyncCallbackDispatcher.java | 51 +-
.../framework/async/AsyncRpcConext.java | 30 -
.../framework/async/AsyncRpcContext.java | 30 +
.../AsyncSampleEventDrivenStyleCaller.java | 4 +-
framework/jobs/pom.xml | 1 +
packaging/centos63/cloud-management.rc | 10 +-
packaging/centos63/cloud.spec | 21 +-
patches/systemvm/debian/README | 5 +
patches/systemvm/debian/buildsystemvm.sh | 43 +-
.../debian/config/etc/init.d/cloud-early-config | 43 +-
.../debian/config/etc/iptables/iptables-router | 1 +
patches/systemvm/debian/config/etc/rc.local | 3 +
.../opt/cloud/bin/get_template_version.sh | 26 +
.../debian/config/opt/cloud/bin/ipassoc.sh | 6 +-
.../debian/config/opt/cloud/bin/vpc_func.sh | 2 +-
.../debian/config/root/createIpAlias.sh | 5 +-
.../debian/config/root/deleteIpAlias.sh | 2 +-
.../systemvm/debian/config/root/edithosts.sh | 8 +-
.../debian/config/root/firewallRule_egress.sh | 26 +-
.../root/redundant_router/backup.sh.templ | 2 +
.../systemvm/debian/config/root/savepassword.sh | 4 +-
patches/systemvm/debian/config/root/userdata.sh | 4 +-
.../explicit-dedication/pom.xml | 33 +
.../affinity/ExplicitDedicationProcessor.java | 383 +
.../affinity/HostAntiAffinityProcessor.java | 31 +-
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 | 105 +
.../api/commands/ListDedicatedHostsCmd.java | 105 +
.../api/commands/ListDedicatedPodsCmd.java | 105 +
.../api/commands/ListDedicatedZonesCmd.java | 105 +
.../commands/ReleaseDedicatedClusterCmd.java | 91 +
.../api/commands/ReleaseDedicatedHostCmd.java | 91 +
.../api/commands/ReleaseDedicatedPodCmd.java | 91 +
.../api/commands/ReleaseDedicatedZoneCmd.java | 91 +
.../api/response/DedicateClusterResponse.java | 79 +
.../api/response/DedicateHostResponse.java | 79 +
.../api/response/DedicatePodResponse.java | 82 +
.../api/response/DedicateZoneResponse.java | 83 +
.../dedicated/DedicatedResourceManagerImpl.java | 815 +
.../cloudstack/dedicated/DedicatedService.java | 63 +
.../dedicated/manager/DedicatedApiUnitTest.java | 317 +
.../test/resource/dedicatedContext.xml | 45 +
.../cloud/deploy/ImplicitDedicationPlanner.java | 117 +-
.../implicitplanner/ImplicitPlannerTest.java | 18 +-
.../manager/allocator/impl/RandomAllocator.java | 5 +-
.../baremetal/manager/AddBaremetalHostCmd.java | 48 -
.../baremetal/manager/BareMetalDiscoverer.java | 3 +-
.../manager/BareMetalTemplateAdapter.java | 128 +-
.../baremetal/manager/BaremetalManagerImpl.java | 1 +
.../networkservice/AddBaremetalDhcpCmd.java | 153 -
.../AddBaremetalKickStartPxeCmd.java | 37 -
.../networkservice/AddBaremetalPxeCmd.java | 147 -
.../AddBaremetalPxePingServerCmd.java | 82 -
.../BareMetalPingServiceImpl.java | 3 +
.../networkservice/BareMetalResourceBase.java | 28 +-
.../networkservice/BaremetalDhcpElement.java | 6 +-
.../networkservice/BaremetalDhcpManager.java | 3 +
.../BaremetalDhcpManagerImpl.java | 7 +-
.../BaremetalKickStartServiceImpl.java | 3 +
.../networkservice/BaremetalPxeManager.java | 5 +-
.../networkservice/BaremetalPxeManagerImpl.java | 8 +-
.../networkservice/BaremetalPxeService.java | 3 +
.../networkservice/ListBaremetalDhcpCmd.java | 104 -
.../ListBaremetalPxePingServersCmd.java | 94 -
.../cloudstack/api/AddBaremetalDhcpCmd.java | 155 +
.../cloudstack/api/AddBaremetalHostCmd.java | 50 +
.../api/AddBaremetalKickStartPxeCmd.java | 39 +
.../cloudstack/api/AddBaremetalPxeCmd.java | 148 +
.../api/AddBaremetalPxePingServerCmd.java | 84 +
.../cloudstack/api/ListBaremetalDhcpCmd.java | 106 +
.../api/ListBaremetalPxePingServersCmd.java | 97 +
plugins/hypervisors/kvm/pom.xml | 9 +
.../kvm/resource/BridgeVifDriver.java | 14 +-
.../kvm/resource/DirectVifDriver.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 523 +-
.../kvm/resource/LibvirtConnection.java | 23 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 97 +-
.../kvm/resource/LibvirtStorageVolumeDef.java | 2 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 84 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 16 +-
.../kvm/storage/KVMStorageProcessor.java | 862 +
.../kvm/storage/KVMStorageResource.java | 87 +
.../kvm/storage/LibvirtStorageAdaptor.java | 248 +-
.../resource/LibvirtComputingResourceTest.java | 22 +-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 31 +-
plugins/hypervisors/simulator/pom.xml | 75 +-
.../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 | 127 +-
.../commands/SimulatorAddSecondaryAgent.java | 28 +
.../SimulatorComponentLibrary.java | 40 -
.../com/cloud/resource/AgentResourceBase.java | 29 +-
.../cloud/resource/AgentRoutingResource.java | 4 +-
.../cloud/resource/AgentStorageResource.java | 4 +-
.../com/cloud/resource/SimulatorDiscoverer.java | 6 +-
.../resource/SimulatorSecondaryDiscoverer.java | 54 +-
.../resource/SimulatorStorageProcessor.java | 187 +
.../driver/SimulatorImageStoreDriverImpl.java | 115 +
.../SimulatorImageStoreLifeCycleImpl.java | 132 +
.../SimulatorImageStoreProviderImpl.java | 98 +
.../motion/SimulatorDataMotionStrategy.java | 52 +
.../SimulatorSecondaryStorageResource.java | 23 +
.../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/UcsBladeResponse.java | 84 -
.../src/com/cloud/ucs/manager/UcsManager.java | 8 +
.../com/cloud/ucs/manager/UcsManagerImpl.java | 8 +
.../cloud/ucs/manager/UcsManagerResponse.java | 73 -
.../cloud/ucs/manager/UcsProfileResponse.java | 37 -
.../apache/cloudstack/api/AddUcsManagerCmd.java | 128 +
.../api/AssociateUcsProfileToBladeCmd.java | 99 +
.../apache/cloudstack/api/ListUcsBladeCmd.java | 90 +
.../cloudstack/api/ListUcsManagerCmd.java | 90 +
.../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 | 6 +
.../com/cloud/hypervisor/guru/VMwareGuru.java | 26 +-
.../com/cloud/hypervisor/vmware/LegacyZone.java | 28 +
.../cloud/hypervisor/vmware/LegacyZoneVO.java | 81 +
.../hypervisor/vmware/VmwareDatacenter.java | 36 +
.../vmware/VmwareDatacenterService.java | 32 +
.../hypervisor/vmware/VmwareDatacenterVO.java | 160 +
.../vmware/VmwareDatacenterZoneMap.java | 30 +
.../vmware/VmwareDatacenterZoneMapVO.java | 78 +
.../vmware/VmwareServerDiscoverer.java | 88 +-
.../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/VmwareManager.java | 3 +
.../vmware/manager/VmwareManagerImpl.java | 327 +-
.../manager/VmwareStorageManagerImpl.java | 49 +-
.../vmware/resource/VmwareResource.java | 1221 +-
.../com/cloud/network/VmwareTrafficLabel.java | 5 +-
.../VmwareSecondaryStorageResourceHandler.java | 126 +-
.../resource/VmwareStorageProcessor.java | 1288 +
.../api/command/admin/zone/AddVmwareDcCmd.java | 123 +
.../command/admin/zone/RemoveVmwareDcCmd.java | 99 +
.../api/response/VmwareDatacenterResponse.java | 51 +
.../motion/VmwareStorageMotionStrategy.java | 205 +
.../vmware/VmwareDatacenterApiUnitTest.java | 431 +
.../vmware/resource/VmwareResourceTest.java | 7 +-
.../motion/VmwareStorageMotionStrategyTest.java | 271 +
.../src/com/cloud/hypervisor/XenServerGuru.java | 1 +
.../xen/discoverer/XcpServerDiscoverer.java | 246 +-
.../hypervisor/xen/resource/CitrixHelper.java | 780 +-
.../xen/resource/CitrixResourceBase.java | 954 +-
.../hypervisor/xen/resource/XcpOssResource.java | 38 +-
.../xen/resource/XcpServer16Resource.java | 32 +
.../xen/resource/XcpServerResource.java | 120 +-
.../xen/resource/XenServer56FP1Resource.java | 140 +-
.../xen/resource/XenServer56SP2Resource.java | 29 +
.../xen/resource/XenServer600Resource.java | 29 +
.../xen/resource/XenServer602Resource.java | 28 +
.../xen/resource/XenServer610Resource.java | 53 +-
.../xen/resource/XenServerConnectionPool.java | 2 +-
.../xen/resource/XenServerStorageProcessor.java | 1527 +
.../xen/resource/XenServerStorageResource.java | 662 -
.../motion/XenServerStorageMotionStrategy.java | 21 +-
.../xen/resource/CitrixResourceBaseTest.java | 17 +-
.../guru/BigSwitchVnsGuestNetworkGuru.java | 2 +-
.../network/cisco/CiscoVnmcConnection.java | 22 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 114 +-
.../cloud/network/element/CiscoVnmcElement.java | 47 +-
.../network/resource/CiscoVnmcResource.java | 22 +-
.../network/resource/CiscoVnmcResourceTest.java | 22 +-
.../resources/components-example.xml | 10 -
.../element/InternalLoadBalancerElement.java | 92 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 30 +-
.../ElementChildTestConfiguration.java | 2 +-
.../LbChildTestConfiguration.java | 2 +-
.../JuniperSRXExternalFirewallElement.java | 1 +
.../network/resource/JuniperSrxResource.java | 121 +-
.../network/element/MidoNetElementTest.java | 3 +-
.../response/NetscalerLoadBalancerResponse.java | 21 +
.../cloud/network/element/NetscalerElement.java | 4 +
.../network/resource/NetscalerResource.java | 104 +-
.../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/SourceNatRule.java | 123 +
.../network/resource/NiciraNvpResource.java | 57 +-
.../com/cloud/network/nicira/NatRuleTest.java | 43 +-
.../network/resource/NiciraNvpResourceTest.java | 113 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 3 +-
.../network-elements/stratosphere-ssp/pom.xml | 31 +
.../cloudstack/api/commands/AddSspCmd.java | 138 +
.../cloudstack/api/commands/DeleteSspCmd.java | 74 +
.../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 | 619 +
.../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 | 153 +
plugins/pom.xml | 10 +-
.../allocator/RandomStoragePoolAllocator.java | 51 +-
plugins/storage/image/default/pom.xml | 71 +
.../driver/CloudStackImageStoreDriverImpl.java | 95 +
.../CloudStackImageStoreLifeCycleImpl.java | 153 +
.../CloudStackImageStoreProviderImpl.java | 103 +
plugins/storage/image/s3/pom.xml | 15 +
.../driver/S3ImageStoreDriverImpl.java | 92 +
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 135 +
.../provider/S3ImageStoreProviderImpl.java | 100 +
plugins/storage/image/sample/pom.xml | 71 +
.../driver/SampleImageStoreDriverImpl.java | 51 +
.../SampleImageStoreLifeCycleImpl.java | 82 +
.../provider/SampleImageStoreProviderImpl.java | 96 +
plugins/storage/image/swift/pom.xml | 71 +
.../driver/SwiftImageStoreDriverImpl.java | 55 +
.../lifecycle/SwiftImageStoreLifeCycleImpl.java | 116 +
.../provider/SwiftImageStoreProviderImpl.java | 102 +
.../CloudStackPrimaryDataStoreDriverImpl.java | 490 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 168 +-
.../CloudStackPrimaryDataStoreProviderImpl.java | 14 +-
plugins/storage/volume/sample/pom.xml | 56 +
.../SamplePrimaryDataStoreDriverImpl.java | 186 +
.../SamplePrimaryDataStoreLifeCycleImpl.java | 122 +
.../SamplePrimaryDatastoreProviderImpl.java | 79 +
plugins/storage/volume/solidfire/pom.xml | 7 +-
.../driver/SolidfirePrimaryDataStoreDriver.java | 522 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 274 +
.../SolidfirePrimaryDataStoreProvider.java | 118 +-
.../storage/datastore/util/SolidFireUtil.java | 917 +
.../cloudstack/storage/test/AopTestAdvice.java | 20 +-
.../storage/test/ChildTestConfiguration.java | 47 +-
.../storage/test/TestConfiguration.java | 17 +-
.../cloudstack/storage/test/VolumeTest.java | 169 +-
pom.xml | 3 +-
python/lib/cloudutils/globalEnv.py | 2 +
python/lib/cloudutils/networkConfig.py | 16 +-
python/lib/cloudutils/serviceConfig.py | 66 +-
scripts/network/domr/call_dnsmasq.sh | 29 +
scripts/network/domr/createipAlias.sh | 26 +
scripts/network/domr/deleteipAlias.sh | 25 +
scripts/network/juniper/security-policy-add.xml | 3 +-
scripts/storage/qcow2/createtmplt.sh | 4 +-
scripts/storage/qcow2/managesnapshot.sh | 2 +-
scripts/storage/qcow2/modifyvlan.sh | 269 -
.../create_privatetemplate_from_snapshot_xen.sh | 98 +
scripts/vm/hypervisor/kvm/patchviasocket.pl | 0
scripts/vm/hypervisor/xenserver/vmops | 1 +
scripts/vm/hypervisor/xenserver/xcposs/patch | 2 +
scripts/vm/hypervisor/xenserver/xcpserver/patch | 4 +-
.../vm/hypervisor/xenserver/xenserver56/patch | 4 +-
.../hypervisor/xenserver/xenserver56fp1/patch | 4 +-
.../vm/hypervisor/xenserver/xenserver60/patch | 4 +-
scripts/vm/network/ovs-pvlan-vm.sh | 3 +-
server/pom.xml | 5 +
server/src/com/cloud/acl/DomainChecker.java | 13 +-
server/src/com/cloud/agent/AgentManager.java | 31 +-
.../cloud/agent/manager/AgentManagerImpl.java | 52 +-
.../com/cloud/agent/manager/AgentMonitor.java | 2 +-
.../manager/ClusteredAgentManagerImpl.java | 4 +-
.../agent/manager/SynchronousListener.java | 4 +-
.../agent/manager/allocator/HostAllocator.java | 85 -
.../agent/manager/allocator/PodAllocator.java | 35 -
.../allocator/impl/FirstFitAllocator.java | 378 +-
.../allocator/impl/TestingAllocator.java | 8 +-
.../impl/UserConcentratedAllocator.java | 76 +-
server/src/com/cloud/api/ApiDBUtils.java | 146 +-
server/src/com/cloud/api/ApiResponseHelper.java | 778 +-
server/src/com/cloud/api/ApiServer.java | 33 +-
.../com/cloud/api/query/QueryManagerImpl.java | 1237 +-
.../com/cloud/api/query/ViewResponseHelper.java | 139 +-
.../com/cloud/api/query/dao/AccountJoinDao.java | 6 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 134 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 8 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 1 -
.../cloud/api/query/dao/HostJoinDaoImpl.java | 1 -
.../cloud/api/query/dao/ImageStoreJoinDao.java | 36 +
.../api/query/dao/ImageStoreJoinDaoImpl.java | 162 +
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 14 +-
.../query/dao/ServiceOfferingJoinDaoImpl.java | 5 +
.../cloud/api/query/dao/StoragePoolJoinDao.java | 12 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 64 +-
.../cloud/api/query/dao/TemplateJoinDao.java | 45 +
.../api/query/dao/TemplateJoinDaoImpl.java | 448 +
.../com/cloud/api/query/dao/UserVmJoinDao.java | 2 +
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 43 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 11 +-
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 9 +-
.../cloud/api/query/vo/DiskOfferingJoinVO.java | 75 +
.../cloud/api/query/vo/DomainRouterJoinVO.java | 12 -
.../src/com/cloud/api/query/vo/HostJoinVO.java | 11 -
.../cloud/api/query/vo/ImageStoreJoinVO.java | 207 +
.../com/cloud/api/query/vo/ProjectJoinVO.java | 8 +-
.../api/query/vo/ServiceOfferingJoinVO.java | 52 +
.../cloud/api/query/vo/StoragePoolJoinVO.java | 44 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 1062 +
.../com/cloud/api/query/vo/UserVmJoinVO.java | 24 +-
.../com/cloud/api/query/vo/VolumeJoinVO.java | 79 +-
.../api/response/ApiResponseSerializer.java | 23 +-
server/src/com/cloud/async/AsyncJobManager.java | 3 +-
.../com/cloud/async/AsyncJobManagerImpl.java | 96 +-
server/src/com/cloud/async/AsyncJobVO.java | 12 +-
server/src/com/cloud/async/dao/AsyncJobDao.java | 10 +-
.../com/cloud/async/dao/AsyncJobDaoImpl.java | 93 +-
.../src/com/cloud/capacity/CapacityManager.java | 8 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 46 +-
.../cloud/capacity/ComputeCapacityListener.java | 4 +-
.../cloud/capacity/StorageCapacityListener.java | 4 +-
server/src/com/cloud/configuration/Config.java | 45 +-
.../configuration/ConfigurationManager.java | 20 +-
.../configuration/ConfigurationManagerImpl.java | 2152 +-
.../src/com/cloud/consoleproxy/AgentHook.java | 9 +-
.../com/cloud/consoleproxy/AgentHookBase.java | 21 +-
.../consoleproxy/ConsoleProxyListener.java | 4 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 1 -
.../consoleproxy/ConsoleProxyManagerImpl.java | 47 +-
.../src/com/cloud/dc/DedicatedResourceVO.java | 136 +
.../com/cloud/dc/dao/DedicatedResourceDao.java | 49 +
.../cloud/dc/dao/DedicatedResourceDaoImpl.java | 304 +
.../deploy/DeploymentPlanningManagerImpl.java | 114 +-
.../src/com/cloud/deploy/FirstFitPlanner.java | 3 +-
.../src/com/cloud/event/ActionEventUtils.java | 5 +
server/src/com/cloud/event/UsageEventUtils.java | 4 +
.../com/cloud/ha/UserVmDomRInvestigator.java | 3 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 24 +-
.../com/cloud/hypervisor/guru/HypervGuru.java | 73 -
.../hyperv/HypervServerDiscoverer.java | 243 -
.../kvm/discoverer/LibvirtServerDiscoverer.java | 99 +-
.../network/ExternalDeviceUsageManager.java | 33 +
.../network/ExternalDeviceUsageManagerImpl.java | 673 +
.../ExternalFirewallDeviceManagerImpl.java | 30 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 22 +-
.../ExternalLoadBalancerUsageManager.java | 33 -
.../ExternalLoadBalancerUsageManagerImpl.java | 673 -
.../src/com/cloud/network/NetworkManager.java | 69 +-
.../com/cloud/network/NetworkManagerImpl.java | 873 +-
.../src/com/cloud/network/NetworkModelImpl.java | 103 +-
.../com/cloud/network/NetworkServiceImpl.java | 434 +-
.../cloud/network/NetworkUsageManagerImpl.java | 31 +-
.../com/cloud/network/SshKeysDistriMonitor.java | 4 +-
server/src/com/cloud/network/addr/PublicIp.java | 9 +
.../element/CloudZonesNetworkElement.java | 4 +-
.../network/element/VirtualRouterElement.java | 70 +-
.../element/VpcVirtualRouterElement.java | 6 +-
.../network/firewall/FirewallManagerImpl.java | 32 +
.../cloud/network/guru/DirectNetworkGuru.java | 5 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 3 +-
.../cloud/network/guru/GuestNetworkGuru.java | 11 +-
.../lb/LoadBalancingRulesManagerImpl.java | 103 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 179 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 6 +-
.../cloud/network/rules/FirewallManager.java | 1 +
.../com/cloud/network/rules/RulesManager.java | 27 -
.../cloud/network/rules/RulesManagerImpl.java | 161 +-
.../network/security/SecurityGroupListener.java | 4 +-
.../security/SecurityGroupManagerImpl.java | 13 +-
.../cloud/network/vpc/NetworkACLManager.java | 2 +-
.../network/vpc/NetworkACLManagerImpl.java | 91 +-
.../network/vpc/NetworkACLServiceImpl.java | 99 +-
.../src/com/cloud/network/vpc/VpcManager.java | 2 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 99 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +-
.../com/cloud/projects/ProjectManagerImpl.java | 34 +-
.../src/com/cloud/resource/DiscovererBase.java | 1 +
.../src/com/cloud/resource/ResourceManager.java | 94 +-
.../com/cloud/resource/ResourceManagerImpl.java | 1415 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 13 +-
.../cloud/server/ConfigurationServerImpl.java | 94 +-
.../src/com/cloud/server/ManagementServer.java | 36 +-
.../com/cloud/server/ManagementServerImpl.java | 514 +-
server/src/com/cloud/server/StatsCollector.java | 416 +-
.../cloud/storage/CreateSnapshotPayload.java | 50 +
.../cloud/storage/LocalStoragePoolListener.java | 4 +-
.../src/com/cloud/storage/StorageManager.java | 18 +-
.../com/cloud/storage/StorageManagerImpl.java | 1435 +-
.../storage/StoragePoolAutomationImpl.java | 64 +-
.../src/com/cloud/storage/TemplateProfile.java | 89 +-
server/src/com/cloud/storage/VolumeManager.java | 18 +-
.../com/cloud/storage/VolumeManagerImpl.java | 823 +-
.../cloud/storage/dao/GuestOSHypervisorDao.java | 27 +
.../storage/dao/GuestOSHypervisorDaoImpl.java | 49 +
.../download/DownloadAbandonedState.java | 7 +-
.../storage/download/DownloadActiveState.java | 4 +-
.../storage/download/DownloadCompleteState.java | 3 +-
.../storage/download/DownloadErrorState.java | 8 +-
.../storage/download/DownloadListener.java | 430 +-
.../cloud/storage/download/DownloadMonitor.java | 29 +-
.../storage/download/DownloadMonitorImpl.java | 1122 +-
.../cloud/storage/download/DownloadState.java | 2 +-
.../storage/download/NotDownloadedState.java | 3 +-
.../storage/listener/StoragePoolMonitor.java | 11 +-
.../storage/listener/StorageSyncListener.java | 4 +-
.../resource/DummySecondaryStorageResource.java | 14 +-
server/src/com/cloud/storage/s3/S3Manager.java | 5 +-
.../src/com/cloud/storage/s3/S3ManagerImpl.java | 116 +-
.../secondary/SecondaryStorageListener.java | 4 +-
.../secondary/SecondaryStorageManagerImpl.java | 286 +-
.../secondary/SecondaryStorageVmManager.java | 14 +-
.../cloud/storage/snapshot/SnapshotManager.java | 18 +-
.../storage/snapshot/SnapshotManagerImpl.java | 506 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 12 +-
.../cloud/storage/swift/SwiftManagerImpl.java | 15 +-
.../cloud/storage/upload/UploadListener.java | 814 +-
.../com/cloud/storage/upload/UploadMonitor.java | 16 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 279 +-
.../template/HypervisorTemplateAdapter.java | 608 +-
.../src/com/cloud/template/TemplateAdapter.java | 17 +-
.../com/cloud/template/TemplateAdapterBase.java | 145 +-
.../src/com/cloud/template/TemplateManager.java | 41 +-
.../com/cloud/template/TemplateManagerImpl.java | 2056 +-
server/src/com/cloud/test/DatabaseConfig.java | 30 +-
server/src/com/cloud/user/AccountManager.java | 16 +-
.../src/com/cloud/user/AccountManagerImpl.java | 176 +-
.../src/com/cloud/user/DomainManagerImpl.java | 51 +-
server/src/com/cloud/vm/UserVmManager.java | 6 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 607 +-
.../src/com/cloud/vm/UserVmStateListener.java | 2 +-
.../src/com/cloud/vm/VirtualMachineManager.java | 3 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 104 +-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 82 +-
server/src/com/cloud/vm/dao/NicIpAliasDao.java | 1 -
.../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 9 -
.../affinity/AffinityGroupServiceImpl.java | 22 +-
.../lb/ApplicationLoadBalancerManagerImpl.java | 2 +-
.../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 +
.../GlobalLoadBalancingRulesServiceImpl.java | 125 +-
server/test/async-job-component.xml | 1 +
.../com/cloud/agent/MockAgentManagerImpl.java | 12 +-
.../configuration/ValidateIpRangeTest.java | 11 +-
.../network/DedicateGuestVlanRangesTest.java | 4 +-
.../cloud/network/MockFirewallManagerImpl.java | 5 +
.../cloud/network/MockNetworkManagerImpl.java | 102 +-
.../com/cloud/network/MockNetworkModelImpl.java | 16 +
.../com/cloud/network/MockRulesManagerImpl.java | 63 -
.../network/UpdatePhysicalNetworkTest.java | 3 +
.../security/SecurityGroupManagerImplTest.java | 76 +
.../cloud/resource/MockResourceManagerImpl.java | 23 +-
.../server/ConfigurationServerImplTest.java | 61 +
.../com/cloud/user/MockAccountManagerImpl.java | 54 +-
.../vm/DeploymentPlanningManagerImplTest.java | 9 +
.../com/cloud/vm/MockUserVmManagerImpl.java | 18 +
.../cloud/vm/MockVirtualMachineManagerImpl.java | 3 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 42 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 40 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 67 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 147 +-
.../com/cloud/vpc/MockNetworkModelImpl.java | 15 +
.../test/com/cloud/vpc/MockVpcManagerImpl.java | 2 +-
.../MockVpcVirtualNetworkApplianceManager.java | 6 +
.../com/cloud/vpc/NetworkACLManagerTest.java | 8 +
.../com/cloud/vpc/NetworkACLServiceTest.java | 1 +
server/test/com/cloud/vpc/VpcApiUnitTest.java | 10 +-
.../affinity/AffinityApiUnitTest.java | 27 +-
.../networkoffering/ChildTestConfiguration.java | 22 +-
.../CreateNetworkOfferingTest.java | 20 +-
...GlobalLoadBalancingRulesServiceImplTest.java | 17 +-
services/console-proxy/server/js/ajaxkeys.js | 42 +-
.../console-proxy/server/scripts/ssvm-check.sh | 136 -
.../consoleproxy/ConsoleProxyClientBase.java | 4 +-
.../consoleproxy/ConsoleProxyGCThread.java | 5 +-
.../consoleproxy/ConsoleProxyVncClient.java | 5 +-
.../consoleproxy/vnc/VncClientPacketSender.java | 4 +-
.../vnc/VncServerPacketReceiver.java | 4 +-
.../server/systemvm-descriptor.xml | 9 +
.../secondary-storage/scripts/ssvm-check.sh | 4 +-
.../resource/CifsSecondaryStorageResource.java | 755 -
.../LocalNfsSecondaryStorageResource.java | 233 +
.../resource/LocalSecondaryStorageResource.java | 24 +-
.../resource/NfsSecondaryStorageResource.java | 1637 +-
.../resource/SecondaryStorageDiscoverer.java | 79 +-
.../resource/SecondaryStorageResource.java | 3 +-
.../storage/template/DownloadManager.java | 37 +-
.../storage/template/DownloadManagerImpl.java | 287 +-
setup/bindir/cloud-set-guest-sshkey.in | 44 +-
setup/db/create-schema.sql | 1 -
setup/db/db/schema-2214to30.sql | 1 +
setup/db/db/schema-302to40.sql | 15 +-
setup/db/db/schema-40to410.sql | 20 +-
setup/db/db/schema-410to420.sql | 637 +-
setup/db/templates.simulator.sql | 8 +-
setup/db/templates.sql | 5 +
setup/dev/advanced.cfg | 24 +-
setup/dev/advancedsg.cfg | 186 +
setup/dev/basic.cfg | 3 +-
test/integration/component/maint/__init__.py | 21 +
.../component/maint/test_high_availability.py | 1079 +
.../maint/test_host_high_availability.py | 810 +
.../maint/test_vpc_host_maintenance.py | 557 +
.../maint/test_vpc_on_host_maintenance.py | 323 +
test/integration/component/test_accounts.py | 26 +-
.../component/test_advancedsg_networks.py | 756 +
.../component/test_affinity_groups.py | 1498 +
test/integration/component/test_assign_vm.py | 460 +
test/integration/component/test_baremetal.py | 123 +
test/integration/component/test_blocker_bugs.py | 303 -
.../component/test_custom_hostname.py | 369 +
test/integration/component/test_egress_rules.py | 21 +-
test/integration/component/test_eip_elb.py | 6 -
.../component/test_explicit_dedication.py | 228 +
.../component/test_high_availability.py | 1080 -
.../component/test_host_high_availability.py | 814 -
.../component/test_implicit_planner.py | 3 -
test/integration/component/test_ldap.py | 366 +
.../component/test_netscaler_configs.py | 30 +-
test/integration/component/test_netscaler_lb.py | 85 +-
.../component/test_netscaler_lb_algo.py | 56 +-
.../component/test_netscaler_lb_sticky.py | 6 +-
.../component/test_netscaler_nw_off.py | 5 +-
.../component/test_network_offering.py | 148 -
.../component/test_project_configs.py | 2 -
.../component/test_project_limits.py | 14 +-
.../component/test_project_resources.py | 4 +-
.../integration/component/test_project_usage.py | 2 +-
test/integration/component/test_projects.py | 35 +-
.../component/test_recurring_snapshots.py | 405 +
.../component/test_redundant_router.py | 4114 +-
.../component/test_redundant_router_cleanups.py | 675 +
...test_redundant_router_deployment_planning.py | 1006 +
.../test_redundant_router_network_rules.py | 1416 +
.../component/test_redundant_router_services.py | 376 +
.../component/test_redundant_router_upgrades.py | 486 +
.../component/test_security_groups.py | 22 +-
.../component/test_shared_network_offering.py | 213 +
.../component/test_shared_networks.py | 110 +-
test/integration/component/test_snapshot_gc.py | 474 +
.../component/test_snapshot_limits.py | 384 +
test/integration/component/test_snapshots.py | 2171 +-
test/integration/component/test_stopped_vm.py | 87 +-
.../component/test_storage_motion.py | 5 -
test/integration/component/test_tags.py | 120 +-
test/integration/component/test_templates.py | 90 -
test/integration/component/test_update_vm.py | 159 +
.../component/test_vm_passwdenabled.py | 5 +-
test/integration/component/test_volumes.py | 68 +-
test/integration/component/test_vpc.py | 587 +-
.../component/test_vpc_host_maintenance.py | 891 -
test/integration/component/test_vpc_network.py | 459 +-
.../component/test_vpc_network_lbrules.py | 47 +-
.../component/test_vpc_network_pfrules.py | 513 +-
.../component/test_vpc_network_staticnatrule.py | 37 +-
.../integration/component/test_vpc_offerings.py | 106 +-
test/integration/component/test_vpc_routers.py | 189 +-
.../component/test_vpc_vm_life_cycle.py | 1251 +-
.../component/test_vpc_vms_deployment.py | 155 +-
test/integration/component/test_vpn_users.py | 4 +-
test/integration/smoke/test_affinity_groups.py | 2 +-
test/integration/smoke/test_deploy_vm.py | 3 +
.../smoke/test_deploy_vm_with_userdata.py | 8 +-
...deploy_vms_with_varied_deploymentplanners.py | 421 +-
test/integration/smoke/test_internal_lb.py | 355 +-
test/integration/smoke/test_iso.py | 10 +-
test/integration/smoke/test_loadbalance.py | 598 +
test/integration/smoke/test_network.py | 823 +-
test/integration/smoke/test_network_acl.py | 229 +-
test/integration/smoke/test_nic.py | 54 +-
test/integration/smoke/test_nicdetail.py | 224 -
.../integration/smoke/test_portable_publicip.py | 235 +
test/integration/smoke/test_primary_storage.py | 134 +-
test/integration/smoke/test_privategw_acl.py | 3 +
test/integration/smoke/test_public_ip_range.py | 6 +-
test/integration/smoke/test_pvlan.py | 1 +
test/integration/smoke/test_resource_detail.py | 3 -
test/integration/smoke/test_routers.py | 174 +-
test/integration/smoke/test_scale_vm.py | 217 +-
.../integration/smoke/test_service_offerings.py | 379 +-
test/integration/smoke/test_snapshots.py | 345 +
test/integration/smoke/test_ssvm.py | 42 +-
test/integration/smoke/test_templates.py | 11 +-
test/integration/smoke/test_vm_life_cycle.py | 405 +-
test/integration/smoke/test_vm_snapshots.py | 619 +-
test/integration/smoke/test_volumedetail.py | 239 -
test/integration/smoke/test_volumes.py | 35 +-
test/pom.xml | 2 +-
test/setup-test-data.sh | 102 -
tools/apidoc/build-apidoc.sh | 11 +-
tools/apidoc/gen_toc.py | 12 +
tools/apidoc/generateadmincommands.xsl | 6 +-
tools/apidoc/generatecommand.xsl | 4 +-
tools/apidoc/generatedomainadmincommands.xsl | 4 +-
tools/apidoc/generatetoc_footer.xsl | 4 +-
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/appliance/README.md | 18 +
tools/appliance/build.sh | 34 +-
.../definitions/devcloud/definition.rb | 6 +-
.../definitions/systemvmtemplate/definition.rb | 2 +-
.../definitions/systemvmtemplate/postinstall.sh | 23 +-
.../systemvmtemplate64/definition.rb | 2 +-
.../systemvmtemplate64/postinstall.sh | 19 +-
tools/cli/cloudmonkey/cachemaker.py | 2 +-
tools/cli/cloudmonkey/config.py | 2 +-
tools/cli/cloudmonkey/requester.py | 47 +-
tools/devcloud-kvm/devcloud-kvm.cfg | 2 +-
tools/devcloud/devcloud-advancedsg.cfg | 119 +
tools/devcloud/devcloud.cfg | 10 +-
tools/devcloud/devcloud_internal-mgt.cfg | 2 +-
tools/devcloud/devcloud_s3.cfg | 141 +
tools/devcloud/quickcloud.cfg | 2 +-
tools/eclipse/eclipse.epf | 616 +
tools/marvin/marvin/TestCaseExecuteEngine.py | 45 +-
tools/marvin/marvin/__init__.py | 4 +-
tools/marvin/marvin/asyncJobMgr.py | 46 +-
tools/marvin/marvin/cloudstackConnection.py | 12 +-
tools/marvin/marvin/cloudstackException.py | 22 +-
tools/marvin/marvin/cloudstackTestCase.py | 11 +-
tools/marvin/marvin/cloudstackTestClient.py | 70 +-
tools/marvin/marvin/codegenerator.py | 153 +-
tools/marvin/marvin/configGenerator.py | 502 +-
tools/marvin/marvin/dbConnection.py | 41 +-
tools/marvin/marvin/deployAndRun.py | 53 +-
tools/marvin/marvin/deployDataCenter.py | 266 +-
tools/marvin/marvin/integration/lib/base.py | 279 +-
tools/marvin/marvin/integration/lib/utils.py | 85 +-
tools/marvin/marvin/jsonHelper.py | 283 +-
tools/marvin/marvin/marvinPlugin.py | 79 +-
tools/marvin/marvin/remoteSSHClient.py | 58 +-
.../marvin/sandbox/advanced/advanced_env.py | 1 +
.../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 | 1 +
tools/marvin/marvin/settings.py | 10 +-
tools/marvin/marvin/testSetupSuccess.py | 40 +-
tools/marvin/setup.py | 2 +-
ui/css/cloudstack3.css | 172 +-
ui/dictionary.jsp | 19 +
ui/images/sprites.png | Bin 192407 -> 193277 bytes
ui/index.jsp | 3 +-
ui/modules/modules.js | 1 +
ui/modules/vpc/vpc.css | 384 +
ui/modules/vpc/vpc.js | 426 +
ui/scripts/autoscaler.js | 2 +-
ui/scripts/cloudStack.js | 36 +-
ui/scripts/configuration.js | 539 +-
ui/scripts/docs.js | 39 +-
ui/scripts/domains.js | 48 +-
ui/scripts/globalSettings.js | 2 +-
ui/scripts/instances.js | 171 +-
ui/scripts/lbStickyPolicy.js | 63 +-
ui/scripts/network.js | 329 +-
ui/scripts/projects.js | 3 +
ui/scripts/regions.js | 215 +-
ui/scripts/sharedFunctions.js | 16 +-
ui/scripts/storage.js | 58 +-
ui/scripts/system.js | 4279 +-
ui/scripts/templates.js | 8 +-
ui/scripts/ui-custom/installWizard.js | 32 +-
ui/scripts/ui-custom/ipRules.js | 4 +-
ui/scripts/ui-custom/physicalResources.js | 7 +-
ui/scripts/ui-custom/projectSelect.js | 4 +-
ui/scripts/ui-custom/projects.js | 29 +-
ui/scripts/ui-custom/zoneChart.js | 9 +-
ui/scripts/ui-custom/zoneWizard.js | 15 +-
ui/scripts/ui/core.js | 8 +-
ui/scripts/ui/dialog.js | 102 +-
ui/scripts/ui/utils.js | 2 +-
ui/scripts/ui/widgets/detailView.js | 34 +-
ui/scripts/ui/widgets/listView.js | 79 +-
ui/scripts/ui/widgets/multiEdit.js | 1338 +-
ui/scripts/ui/widgets/tagger.js | 2 +
ui/scripts/vpc.js | 1682 +-
ui/scripts/zoneWizard.js | 493 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 184 +-
.../cloud/usage/parser/NetworkUsageParser.java | 11 +-
.../cloud/usage/parser/VmDiskUsageParser.java | 217 +
.../test/com/cloud/usage/UsageManagerTest.java | 3 +
.../usage/UsageManagerTestConfiguration.java | 2 +
utils/pom.xml | 1 +
utils/src/com/cloud/utils/CleanupDelegate.java | 22 -
utils/src/com/cloud/utils/EnumerationImpl.java | 61 -
utils/src/com/cloud/utils/FileUtil.java | 41 +-
utils/src/com/cloud/utils/S3Utils.java | 106 +-
utils/src/com/cloud/utils/StringUtils.java | 14 +-
utils/src/com/cloud/utils/Ternary.java | 2 +-
utils/src/com/cloud/utils/UriUtils.java | 82 +
.../cloud/utils/db/GenericSearchBuilder.java | 18 +-
utils/src/com/cloud/utils/db/Transaction.java | 3 +-
.../utils/exception/CloudRuntimeException.java | 24 +-
.../utils/exception/ExceptionProxyObject.java | 50 +
utils/src/com/cloud/utils/net/NetUtils.java | 105 +-
utils/src/com/cloud/utils/script/Script.java | 10 +-
.../src/com/cloud/utils/ssh/SSHKeysHelper.java | 2 +-
utils/src/com/cloud/utils/ssh/SshHelper.java | 4 -
utils/test/com/cloud/utils/StringUtilsTest.java | 5 +
utils/test/com/cloud/utils/TernaryTest.java | 35 +
.../com/cloud/utils/crypto/RSAHelperTest.java | 50 +
.../test/com/cloud/utils/net/NetUtilsTest.java | 37 +
.../com/cloud/utils/ssh/SSHKeysHelperTest.java | 69 +
.../test/com/cloud/utils/testcase/NioTest.java | 14 +-
vmware-base/pom.xml | 5 +
.../cloud/hypervisor/vmware/mo/ClusterMO.java | 12 +-
.../vmware/mo/CustomFieldConstants.java | 1 +
.../hypervisor/vmware/mo/DatacenterMO.java | 5 +
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 44 +-
.../vmware/mo/FeatureKeyConstants.java | 26 +
.../vmware/mo/HostDatastoreBrowserMO.java | 20 +-
.../vmware/mo/HostDatastoreSystemMO.java | 20 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 28 +-
.../vmware/mo/HostStorageSystemMO.java | 51 +
.../vmware/mo/HypervisorHostHelper.java | 1132 +-
.../vmware/mo/LicenseAssignmentManagerMO.java | 87 +
.../hypervisor/vmware/mo/LicenseManagerMO.java | 45 +
.../vmware/mo/VirtualDiskManagerMO.java | 4 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 81 +-
.../vmware/mo/VmwareHypervisorHost.java | 9 +-
.../hypervisor/vmware/util/VmwareClient.java | 7 +-
.../hypervisor/vmware/util/VmwareHelper.java | 37 +-
2619 files changed, 604496 insertions(+), 170321 deletions(-)
----------------------------------------------------------------------