Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Conflicts:
server/src/com/cloud/netapp/NetappAllocator.java
server/src/com/cloud/netapp/dao/LunDao.java
server/src/com/cloud/netapp/dao/PoolDao.java
server/src/com/cloud/netapp/dao/VolumeDao.java
server/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java
server/src/com/cloud/servlet/ConsoleProxyClientParam.java
server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java
server/src/com/cloud/servlet/ConsoleProxyServlet.java
server/src/com/cloud/storage/dao/VolumeHostDao.java
server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/082d5634
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/082d5634
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/082d5634
Branch: refs/heads/master
Commit: 082d5634d1d7ec8d2d3bb9eac357ceb9ad61a284
Parents: 4533f67 f157b70
Author: Chip Childers <[email protected]>
Authored: Mon Jul 9 11:48:34 2012 -0400
Committer: Chip Childers <[email protected]>
Committed: Mon Jul 9 11:48:34 2012 -0400
----------------------------------------------------------------------
.../com/cloud/api/BaseListDomainResourcesCmd.java | 9 +-
.../api/BaseListProjectAndAccountResourcesCmd.java | 2 +-
.../com/cloud/api/BaseListTaggedResourcesCmd.java | 47 +
api/src/com/cloud/api/ResponseGenerator.java | 3 +-
api/src/com/cloud/api/commands/CreateTagsCmd.java | 29 +-
api/src/com/cloud/api/commands/DeleteTagsCmd.java | 21 +-
.../cloud/api/commands/ListFirewallRulesCmd.java | 5 +-
api/src/com/cloud/api/commands/ListIsosCmd.java | 4 +-
.../api/commands/ListLoadBalancerRulesCmd.java | 5 +-
.../com/cloud/api/commands/ListNetworksCmd.java | 4 +-
.../api/commands/ListPortForwardingRulesCmd.java | 14 +-
.../api/commands/ListPublicIpAddressesCmd.java | 13 +-
.../cloud/api/commands/ListSecurityGroupsCmd.java | 30 +-
.../com/cloud/api/commands/ListSnapshotsCmd.java | 13 +-
api/src/com/cloud/api/commands/ListTagsCmd.java | 31 +-
.../com/cloud/api/commands/ListTemplatesCmd.java | 4 +-
api/src/com/cloud/api/commands/ListVMsCmd.java | 4 +-
api/src/com/cloud/api/commands/ListVolumesCmd.java | 13 +-
.../com/cloud/api/commands/UpgradeSystemVMCmd.java | 17 -
.../com/cloud/api/response/FirewallResponse.java | 12 +-
.../cloud/api/response/FirewallRuleResponse.java | 11 +-
.../com/cloud/api/response/IPAddressResponse.java | 10 +-
.../cloud/api/response/LoadBalancerResponse.java | 11 +-
.../com/cloud/api/response/NetworkResponse.java | 7 +
.../cloud/api/response/ResourceTagResponse.java | 28 +-
.../cloud/api/response/SecurityGroupResponse.java | 9 +-
.../com/cloud/api/response/SnapshotResponse.java | 10 +-
.../com/cloud/api/response/TemplateResponse.java | 8 +
api/src/com/cloud/api/response/UserVmResponse.java | 9 +-
api/src/com/cloud/api/response/VolumeResponse.java | 12 +-
api/src/com/cloud/server/ResourceTag.java | 36 +-
.../com/cloud/server/TaggedResourceService.java | 32 +-
.../bridge/auth/ec2/AuthenticationHandler.java | 15 -
.../bridge/auth/ec2/AuthenticationModule.java | 15 -
.../bridge/auth/s3/AuthenticationHandler.java | 15 -
.../cloud/bridge/auth/s3/AuthenticationModule.java | 15 -
.../com/cloud/bridge/io/FileRangeDataSource.java | 15 -
.../com/cloud/bridge/io/FileRangeInputStream.java | 15 -
.../cloud/bridge/io/MultiPartDimeInputStream.java | 15 -
.../cloud/bridge/io/S3FileSystemBucketAdapter.java | 15 -
.../bridge/lifecycle/ServiceEngineLifecycle.java | 15 -
awsapi/src/com/cloud/bridge/model/MHost.java | 15 -
awsapi/src/com/cloud/bridge/model/MHostMount.java | 15 -
awsapi/src/com/cloud/bridge/model/SAcl.java | 15 -
awsapi/src/com/cloud/bridge/model/SBucket.java | 15 -
awsapi/src/com/cloud/bridge/model/SHost.java | 15 -
awsapi/src/com/cloud/bridge/model/SMeta.java | 15 -
awsapi/src/com/cloud/bridge/model/SObject.java | 15 -
awsapi/src/com/cloud/bridge/model/SObjectItem.java | 15 -
.../com/cloud/bridge/model/UserCredentials.java | 15 -
awsapi/src/com/cloud/bridge/persist/EntityDao.java | 15 -
.../cloud/bridge/persist/GMTDateTimeUserType.java | 15 -
.../com/cloud/bridge/persist/PersistContext.java | 15 -
.../com/cloud/bridge/persist/PersistException.java | 15 -
.../src/com/cloud/bridge/persist/dao/BaseDao.java | 15 -
.../cloud/bridge/persist/dao/BucketPolicyDao.java | 15 -
.../bridge/persist/dao/CloudStackAccountDao.java | 15 -
.../persist/dao/CloudStackConfigurationDao.java | 15 -
.../persist/dao/CloudStackSvcOfferingDao.java | 15 -
.../src/com/cloud/bridge/persist/dao/MHostDao.java | 15 -
.../cloud/bridge/persist/dao/MHostMountDao.java | 15 -
.../cloud/bridge/persist/dao/MultipartLoadDao.java | 15 -
.../com/cloud/bridge/persist/dao/OfferingDao.java | 15 -
.../src/com/cloud/bridge/persist/dao/SAclDao.java | 15 -
.../com/cloud/bridge/persist/dao/SBucketDao.java | 15 -
.../src/com/cloud/bridge/persist/dao/SHostDao.java | 15 -
.../src/com/cloud/bridge/persist/dao/SMetaDao.java | 15 -
.../com/cloud/bridge/persist/dao/SObjectDao.java | 15 -
.../cloud/bridge/persist/dao/SObjectItemDao.java | 15 -
.../bridge/persist/dao/UserCredentialsDao.java | 15 -
.../com/cloud/bridge/service/EC2RestServlet.java | 17 +-
.../com/cloud/bridge/service/EC2SoapService.java | 17 +-
.../cloud/bridge/service/EC2SoapServiceImpl.java | 17 +-
.../src/com/cloud/bridge/service/S3Constants.java | 19 -
.../com/cloud/bridge/service/S3RestServlet.java | 20 +-
.../src/com/cloud/bridge/service/UserContext.java | 18 -
awsapi/src/com/cloud/bridge/service/UserInfo.java | 18 -
.../service/controller/s3/S3BucketAction.java | 15 -
.../service/controller/s3/S3ObjectAction.java | 17 +-
.../s3/S3SerializableServiceImplementation.java | 15 -
.../service/controller/s3/ServiceProvider.java | 17 -
.../service/controller/s3/ServletAction.java | 15 -
.../cloud/bridge/service/core/ec2/DiskOffer.java | 15 -
.../bridge/service/core/ec2/DiskOfferings.java | 15 -
.../cloud/bridge/service/core/ec2/EC2Address.java | 15 -
.../service/core/ec2/EC2AddressFilterSet.java | 15 -
.../service/core/ec2/EC2AssociateAddress.java | 15 -
.../core/ec2/EC2AvailabilityZonesFilterSet.java | 18 -
.../bridge/service/core/ec2/EC2CreateImage.java | 15 -
.../service/core/ec2/EC2CreateImageResponse.java | 15 -
.../bridge/service/core/ec2/EC2CreateKeyPair.java | 19 -
.../bridge/service/core/ec2/EC2CreateVolume.java | 15 -
.../bridge/service/core/ec2/EC2DeleteKeyPair.java | 19 -
.../service/core/ec2/EC2DescribeAddresses.java | 15 -
.../core/ec2/EC2DescribeAddressesResponse.java | 15 -
.../core/ec2/EC2DescribeAvailabilityZones.java | 15 -
.../ec2/EC2DescribeAvailabilityZonesResponse.java | 15 -
.../core/ec2/EC2DescribeImageAttribute.java | 15 -
.../bridge/service/core/ec2/EC2DescribeImages.java | 15 -
.../core/ec2/EC2DescribeImagesResponse.java | 15 -
.../service/core/ec2/EC2DescribeInstances.java | 15 -
.../core/ec2/EC2DescribeInstancesResponse.java | 15 -
.../service/core/ec2/EC2DescribeKeyPairs.java | 15 -
.../core/ec2/EC2DescribeKeyPairsResponse.java | 15 -
.../service/core/ec2/EC2DescribeSnapshots.java | 15 -
.../core/ec2/EC2DescribeSnapshotsResponse.java | 15 -
.../service/core/ec2/EC2DescribeVolumes.java | 15 -
.../core/ec2/EC2DescribeVolumesResponse.java | 15 -
.../service/core/ec2/EC2DisassociateAddress.java | 19 -
.../cloud/bridge/service/core/ec2/EC2Engine.java | 23 +-
.../cloud/bridge/service/core/ec2/EC2Filter.java | 15 -
.../bridge/service/core/ec2/EC2GroupFilterSet.java | 15 -
.../cloud/bridge/service/core/ec2/EC2Image.java | 15 -
.../service/core/ec2/EC2ImageAttributes.java | 15 -
.../bridge/service/core/ec2/EC2ImportKeyPair.java | 19 -
.../cloud/bridge/service/core/ec2/EC2Instance.java | 15 -
.../service/core/ec2/EC2InstanceFilterSet.java | 15 -
.../bridge/service/core/ec2/EC2IpPermission.java | 15 -
.../service/core/ec2/EC2KeyPairFilterSet.java | 15 -
.../service/core/ec2/EC2ModifyImageAttribute.java | 15 -
.../service/core/ec2/EC2RebootInstances.java | 15 -
.../bridge/service/core/ec2/EC2RegisterImage.java | 15 -
.../bridge/service/core/ec2/EC2ReleaseAddress.java | 15 -
.../bridge/service/core/ec2/EC2RunInstances.java | 15 -
.../service/core/ec2/EC2RunInstancesResponse.java | 15 -
.../cloud/bridge/service/core/ec2/EC2Snapshot.java | 15 -
.../service/core/ec2/EC2SnapshotFilterSet.java | 15 -
.../bridge/service/core/ec2/EC2StartInstances.java | 15 -
.../core/ec2/EC2StartInstancesResponse.java | 15 -
.../bridge/service/core/ec2/EC2StopInstances.java | 15 -
.../service/core/ec2/EC2StopInstancesResponse.java | 15 -
.../cloud/bridge/service/core/ec2/EC2Volume.java | 15 -
.../service/core/ec2/EC2VolumeFilterSet.java | 15 -
.../service/core/ec2/IpForwardingRuleResponse.java | 17 -
.../bridge/service/core/ec2/OfferingBundle.java | 15 -
.../bridge/service/core/ec2/ServiceOffer.java | 15 -
.../bridge/service/core/ec2/ServiceOfferings.java | 15 -
.../service/core/s3/S3AccessControlList.java | 15 -
.../service/core/s3/S3AccessControlPolicy.java | 15 -
.../bridge/service/core/s3/S3BucketAdapter.java | 18 -
.../bridge/service/core/s3/S3BucketPolicy.java | 15 -
.../bridge/service/core/s3/S3CanonicalUser.java | 15 -
.../bridge/service/core/s3/S3ConditionFactory.java | 15 -
.../service/core/s3/S3CopyObjectRequest.java | 7 -
.../core/s3/S3CreateBucketConfiguration.java | 18 -
.../service/core/s3/S3CreateBucketRequest.java | 18 -
.../service/core/s3/S3CreateBucketResponse.java | 18 -
.../service/core/s3/S3DeleteBucketRequest.java | 18 -
.../service/core/s3/S3DeleteObjectRequest.java | 18 -
.../com/cloud/bridge/service/core/s3/S3Engine.java | 16 -
.../s3/S3GetBucketAccessControlPolicyRequest.java | 18 -
.../s3/S3GetObjectAccessControlPolicyRequest.java | 18 -
.../bridge/service/core/s3/S3GetObjectRequest.java | 18 -
.../service/core/s3/S3GetObjectResponse.java | 18 -
.../com/cloud/bridge/service/core/s3/S3Grant.java | 16 -
.../service/core/s3/S3HostCallingFormat.java | 4 +-
.../service/core/s3/S3ListAllMyBucketsEntry.java | 18 -
.../service/core/s3/S3ListAllMyBucketsRequest.java | 18 -
.../core/s3/S3ListAllMyBucketsResponse.java | 18 -
.../service/core/s3/S3ListBucketObjectEntry.java | 18 -
.../service/core/s3/S3ListBucketPrefixEntry.java | 18 -
.../service/core/s3/S3ListBucketRequest.java | 18 -
.../service/core/s3/S3ListBucketResponse.java | 18 -
.../bridge/service/core/s3/S3MetaDataEntry.java | 18 -
.../bridge/service/core/s3/S3MultipartPart.java | 15 -
.../bridge/service/core/s3/S3MultipartUpload.java | 15 -
.../bridge/service/core/s3/S3PolicyAction.java | 15 -
.../service/core/s3/S3PolicyArnCondition.java | 15 -
.../service/core/s3/S3PolicyBoolCondition.java | 15 -
.../bridge/service/core/s3/S3PolicyCondition.java | 15 -
.../service/core/s3/S3PolicyConditionBlock.java | 15 -
.../bridge/service/core/s3/S3PolicyContext.java | 15 -
.../service/core/s3/S3PolicyDateCondition.java | 15 -
.../core/s3/S3PolicyIPAddressCondition.java | 15 -
.../service/core/s3/S3PolicyNumericCondition.java | 15 -
.../bridge/service/core/s3/S3PolicyPrincipal.java | 15 -
.../bridge/service/core/s3/S3PolicyStatement.java | 15 -
.../service/core/s3/S3PolicyStringCondition.java | 15 -
.../service/core/s3/S3PutObjectInlineRequest.java | 15 -
.../service/core/s3/S3PutObjectInlineResponse.java | 15 -
.../bridge/service/core/s3/S3PutObjectRequest.java | 15 -
.../service/core/s3/S3PutObjectResponse.java | 15 -
.../cloud/bridge/service/core/s3/S3Request.java | 15 -
.../cloud/bridge/service/core/s3/S3Response.java | 18 -
.../s3/S3SetBucketAccessControlPolicyRequest.java | 18 -
.../s3/S3SetObjectAccessControlPolicyRequest.java | 18 -
.../service/exception/ConfigurationException.java | 18 -
.../service/exception/EC2ServiceException.java | 15 -
.../service/exception/FileNotExistException.java | 18 -
.../service/exception/HostNotMountedException.java | 18 -
.../service/exception/InternalErrorException.java | 18 -
.../exception/InvalidRequestContentException.java | 18 -
.../service/exception/NetworkIOException.java | 18 -
.../service/exception/NoSuchObjectException.java | 18 -
.../exception/ObjectAlreadyExistsException.java | 18 -
.../service/exception/OutOfServiceException.java | 18 -
.../service/exception/OutOfStorageException.java | 18 -
.../exception/PermissionDeniedException.java | 18 -
.../src/com/cloud/bridge/tool/CloudS3CmdTool.java | 18 -
.../com/cloud/bridge/util/AuthenticationUtils.java | 15 -
.../com/cloud/bridge/util/CalendarDateParam.java | 18 -
.../com/cloud/bridge/util/CloudSessionFactory.java | 18 -
.../bridge/util/CloudStackSessionFactory.java | 15 -
.../com/cloud/bridge/util/ConfigurationHelper.java | 18 -
awsapi/src/com/cloud/bridge/util/Converter.java | 18 -
awsapi/src/com/cloud/bridge/util/CryptoHelper.java | 18 -
.../bridge/util/DatabindingConverterUtil.java | 16 -
awsapi/src/com/cloud/bridge/util/DateHelper.java | 18 -
awsapi/src/com/cloud/bridge/util/EC2RestAuth.java | 15 -
awsapi/src/com/cloud/bridge/util/EntityParam.java | 18 -
.../bridge/util/ISO8601SimpleDateTimeFormat.java | 15 -
.../src/com/cloud/bridge/util/IpAddressRange.java | 15 -
.../src/com/cloud/bridge/util/IteratorHelper.java | 18 -
awsapi/src/com/cloud/bridge/util/JsonAccessor.java | 16 -
awsapi/src/com/cloud/bridge/util/NetHelper.java | 18 -
awsapi/src/com/cloud/bridge/util/OrderedPair.java | 16 -
awsapi/src/com/cloud/bridge/util/PolicyParser.java | 15 -
awsapi/src/com/cloud/bridge/util/QueryHelper.java | 18 -
awsapi/src/com/cloud/bridge/util/RestAuth.java | 16 -
awsapi/src/com/cloud/bridge/util/S3SoapAuth.java | 15 -
.../bridge/util/ServletRequestDataSource.java | 18 -
awsapi/src/com/cloud/bridge/util/StringHelper.java | 16 -
awsapi/src/com/cloud/bridge/util/TextParam.java | 18 -
awsapi/src/com/cloud/bridge/util/TimeParam.java | 18 -
.../src/com/cloud/bridge/util/TimestampParam.java | 18 -
awsapi/src/com/cloud/bridge/util/Triple.java | 18 +-
awsapi/src/com/cloud/bridge/util/XElement.java | 18 -
awsapi/src/com/cloud/bridge/util/XFlatten.java | 15 -
awsapi/src/com/cloud/bridge/util/XOmitNull.java | 18 -
.../src/com/cloud/bridge/util/XSerializable.java | 18 -
awsapi/src/com/cloud/bridge/util/XSerializer.java | 18 -
.../com/cloud/bridge/util/XSerializerAdapter.java | 18 -
.../cloud/bridge/util/XSerializerJsonAdapter.java | 18 -
.../cloud/bridge/util/XSerializerXmlAdapter.java | 18 -
awsapi/src/com/cloud/bridge/util/XmlHelper.java | 18 -
awsapi/src/com/cloud/stack/CloudStackApi.java | 24 +-
awsapi/src/com/cloud/stack/CloudStackClient.java | 16 -
awsapi/src/com/cloud/stack/CloudStackCommand.java | 16 -
.../src/com/cloud/stack/models/ApiConstants.java | 16 +-
.../com/cloud/stack/models/CloudStackAccount.java | 19 -
.../cloud/stack/models/CloudStackCapabilities.java | 19 -
.../cloud/stack/models/CloudStackDiskOffering.java | 19 -
.../com/cloud/stack/models/CloudStackEvent.java | 19 -
.../cloud/stack/models/CloudStackEventType.java | 19 -
.../stack/models/CloudStackExtractTemplate.java | 19 -
.../cloud/stack/models/CloudStackIdentifier.java | 19 -
.../cloud/stack/models/CloudStackInfoResponse.java | 15 -
.../cloud/stack/models/CloudStackIngressRule.java | 15 -
.../stack/models/CloudStackInstanceGroup.java | 19 -
.../cloud/stack/models/CloudStackIpAddress.java | 15 -
.../com/cloud/stack/models/CloudStackKeyPair.java | 15 -
.../com/cloud/stack/models/CloudStackKeyValue.java | 19 -
.../stack/models/CloudStackLoadBalancerRule.java | 19 -
.../com/cloud/stack/models/CloudStackNetwork.java | 19 -
.../stack/models/CloudStackNetworkOffering.java | 19 -
.../stack/models/CloudStackNetworkService.java | 19 -
.../models/CloudStackNetworkServiceCapability.java | 19 -
.../src/com/cloud/stack/models/CloudStackNic.java | 15 -
.../cloud/stack/models/CloudStackOsCategory.java | 19 -
.../com/cloud/stack/models/CloudStackOsType.java | 19 -
.../cloud/stack/models/CloudStackPasswordData.java | 19 -
.../stack/models/CloudStackPortForwardingRule.java | 19 -
.../stack/models/CloudStackResourceLimit.java | 15 -
.../stack/models/CloudStackSecurityGroup.java | 15 -
.../models/CloudStackSecurityGroupIngress.java | 19 -
.../stack/models/CloudStackServiceOffering.java | 19 -
.../com/cloud/stack/models/CloudStackSnapshot.java | 15 -
.../stack/models/CloudStackSnapshotPolicy.java | 19 -
.../com/cloud/stack/models/CloudStackTemplate.java | 19 -
.../stack/models/CloudStackTemplatePermission.java | 19 -
.../src/com/cloud/stack/models/CloudStackUser.java | 19 -
.../com/cloud/stack/models/CloudStackUserVm.java | 15 -
.../com/cloud/stack/models/CloudStackVolume.java | 15 -
.../src/com/cloud/stack/models/CloudStackZone.java | 15 -
build.xml | 2 +-
build/build-cloud-plugins.xml | 25 +-
build/build-clouddev.xml | 96 -
build/build-devcloud.xml | 98 +
.../WEB-INF/classes/resources/messages.properties | 6 +-
client/tomcatconf/components.xml.in | 6 +
cloud.spec | 15 +
docs/runbook/en-US/Environment.xml | 2 +-
docs/runbook/en-US/Management.xml | 2 +-
docs/runbook/en-US/Overview.xml | 21 +-
patches/systemvm/debian/buildsystemvm.sh | 26 +-
patches/systemvm/debian/convert.sh | 26 +-
patches/systemvm/debian/qemuconvert.sh | 26 +-
patches/systemvm/debian/vhdconvert.sh | 26 +-
plugins/file-systems/netapp/.classpath | 11 +
plugins/file-systems/netapp/.project | 17 +
plugins/file-systems/netapp/build.xml | 129 +
.../cloud/api/commands/netapp/AssociateLunCmd.java | 100 +
.../cloud/api/commands/netapp/CreateLunCmd.java | 98 +
.../commands/netapp/CreateVolumeOnFilerCmd.java | 146 +
.../api/commands/netapp/CreateVolumePoolCmd.java | 84 +
.../api/commands/netapp/DeleteVolumePoolCmd.java | 76 +
.../cloud/api/commands/netapp/DestroyLunCmd.java | 78 +
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 87 +
.../api/commands/netapp/DissociateLunCmd.java | 79 +
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 88 +
.../api/commands/netapp/ListVolumePoolsCmd.java | 84 +
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 94 +
.../api/commands/netapp/ModifyVolumePoolCmd.java | 73 +
.../netapp/src/com/cloud/netapp/LunVO.java | 121 +
.../src/com/cloud/netapp/NetappAllocator.java | 25 +
.../cloud/netapp/NetappDefaultAllocatorImpl.java | 142 +
.../netapp/src/com/cloud/netapp/NetappManager.java | 66 +
.../src/com/cloud/netapp/NetappManagerImpl.java | 1040 +++++++
.../src/com/cloud/netapp/NetappVolumeVO.java | 183 ++
.../netapp/src/com/cloud/netapp/PoolVO.java | 74 +
.../netapp/src/com/cloud/netapp/dao/LunDao.java | 31 +
.../src/com/cloud/netapp/dao/LunDaoImpl.java | 70 +
.../netapp/src/com/cloud/netapp/dao/PoolDao.java | 28 +
.../src/com/cloud/netapp/dao/PoolDaoImpl.java | 67 +
.../netapp/src/com/cloud/netapp/dao/VolumeDao.java | 30 +
.../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 100 +
.../com/cloud/network/CiscoNexusVSMDeviceVO.java | 2 +-
.../hypervisor/xen/resource/XcpOssResource.java | 39 +
.../elastic-loadbalancer/.classpath | 11 +
.../network-elements/elastic-loadbalancer/.project | 17 +
.../elastic-loadbalancer/build.xml | 129 +
.../src/com/cloud/network/ElasticLbVmMapVO.java | 101 +
.../element/ElasticLoadBalancerElement.java | 199 ++
.../network/lb/ElasticLoadBalancerManager.java | 41 +
.../network/lb/ElasticLoadBalancerManagerImpl.java | 990 +++++++
.../cloud/network/lb/dao/ElasticLbVmMapDao.java | 37 +
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 134 +
scripts/vm/hypervisor/xenserver/xcposs/vmops | 15 +-
scripts/vm/hypervisor/xenserver/xcpserver/patch | 3 +
server/src/com/cloud/api/ApiDBUtils.java | 6 +-
server/src/com/cloud/api/ApiResponseHelper.java | 190 ++-
.../cloud/api/commands/netapp/AssociateLunCmd.java | 100 -
.../cloud/api/commands/netapp/CreateLunCmd.java | 98 -
.../commands/netapp/CreateVolumeOnFilerCmd.java | 146 -
.../api/commands/netapp/CreateVolumePoolCmd.java | 84 -
.../api/commands/netapp/DeleteVolumePoolCmd.java | 76 -
.../cloud/api/commands/netapp/DestroyLunCmd.java | 78 -
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 87 -
.../api/commands/netapp/DissociateLunCmd.java | 79 -
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 88 -
.../api/commands/netapp/ListVolumePoolsCmd.java | 84 -
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 94 -
.../api/commands/netapp/ModifyVolumePoolCmd.java | 73 -
.../configuration/ConfigurationManagerImpl.java | 1 +
.../configuration/DefaultComponentLibrary.java | 4 -
.../configuration/PremiumComponentLibrary.java | 8 -
.../consoleproxy/ConsoleProxyManagerImpl.java | 15 +-
server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 41 +-
server/src/com/cloud/netapp/LunVO.java | 121 -
server/src/com/cloud/netapp/NetappAllocator.java | 25 -
.../cloud/netapp/NetappDefaultAllocatorImpl.java | 142 -
server/src/com/cloud/netapp/NetappManager.java | 66 -
server/src/com/cloud/netapp/NetappManagerImpl.java | 1040 -------
server/src/com/cloud/netapp/NetappVolumeVO.java | 183 --
server/src/com/cloud/netapp/PoolVO.java | 74 -
server/src/com/cloud/netapp/dao/LunDao.java | 31 -
server/src/com/cloud/netapp/dao/LunDaoImpl.java | 70 -
server/src/com/cloud/netapp/dao/PoolDao.java | 28 -
server/src/com/cloud/netapp/dao/PoolDaoImpl.java | 67 -
server/src/com/cloud/netapp/dao/VolumeDao.java | 30 -
server/src/com/cloud/netapp/dao/VolumeDaoImpl.java | 99 -
server/src/com/cloud/network/ElasticLbVmMapVO.java | 101 -
.../src/com/cloud/network/NetworkManagerImpl.java | 49 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 25 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 17 +
.../com/cloud/network/dao/LoadBalancerDaoImpl.java | 2 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 17 +-
.../element/ElasticLoadBalancerElement.java | 199 --
.../network/firewall/FirewallManagerImpl.java | 30 +
.../network/lb/ElasticLoadBalancerManager.java | 41 -
.../network/lb/ElasticLoadBalancerManagerImpl.java | 990 -------
.../network/lb/LoadBalancingRulesManagerImpl.java | 40 +-
.../cloud/network/lb/dao/ElasticLbVmMapDao.java | 37 -
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 134 -
.../com/cloud/network/rules/RulesManagerImpl.java | 30 +-
.../network/security/SecurityGroupManagerImpl.java | 29 +
.../network/security/dao/SecurityGroupDaoImpl.java | 40 +-
.../src/com/cloud/projects/dao/ProjectDaoImpl.java | 2 -
.../resourcelimit/ResourceLimitManagerImpl.java | 27 +-
.../src/com/cloud/server/ManagementServerImpl.java | 62 +-
.../com/cloud/servlet/ConsoleProxyClientParam.java | 180 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 242 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 258 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 28 +
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 19 +-
.../src/com/cloud/storage/dao/VMTemplateDao.java | 25 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 112 +-
.../src/com/cloud/storage/dao/VolumeDaoImpl.java | 18 +
.../src/com/cloud/storage/dao/VolumeHostDao.java | 42 +-
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 197 +-
.../secondary/SecondaryStorageManagerImpl.java | 2 +-
.../storage/snapshot/SnapshotManagerImpl.java | 30 +
server/src/com/cloud/tags/ResourceTagVO.java | 12 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 38 +-
server/src/com/cloud/tags/dao/ResourceTagDao.java | 20 +
.../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 40 +-
.../com/cloud/uuididentity/dao/IdentityDao.java | 22 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 328 ++--
server/src/com/cloud/vm/UserVmManager.java | 3 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 33 +-
server/src/com/cloud/vm/dao/UserVmDao.java | 1 +
server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 1008 ++++----
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 18 +
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 2 +-
setup/db/create-schema.sql | 6 +-
setup/db/deploy-db-clouddev.sh | 22 +-
setup/db/deploy-db-simulator.sh | 46 +-
tools/bugs-wiki/search-bugs.py | 16 +
tools/bugs-wiki/search-wiki.py | 16 +
tools/devcloud/devcloudsetup.sh | 136 +
tools/marvin/LICENSE.txt | 26 +-
tools/marvin/marvin/NoseTestExecuteEngine.py | 17 +
tools/marvin/marvin/TestCaseExecuteEngine.py | 28 +-
tools/marvin/marvin/asyncJobMgr.py | 27 +-
tools/marvin/marvin/cloudstackConnection.py | 27 +-
tools/marvin/marvin/cloudstackException.py | 28 +-
tools/marvin/marvin/cloudstackTestCase.py | 27 +-
tools/marvin/marvin/cloudstackTestClient.py | 29 +-
tools/marvin/marvin/codegenerator.py | 27 +-
tools/marvin/marvin/configGenerator.py | 28 +-
tools/marvin/marvin/dbConnection.py | 27 +-
tools/marvin/marvin/deployAndRun.py | 27 +-
tools/marvin/marvin/deployDataCenter.py | 60 +-
tools/marvin/marvin/jsonHelper.py | 27 +-
tools/marvin/marvin/remoteSSHClient.py | 29 +-
.../marvin/marvin/sandbox/advanced/advanced_env.py | 41 +-
.../marvin/sandbox/advanced/setup.properties | 22 +-
tools/marvin/marvin/sandbox/basic/basic_env.py | 134 +
.../marvin/sandbox/demo/live/testSshDeployVM.py | 26 +-
.../sandbox/demo/simulator/simulator_setup.py | 17 +
.../sandbox/demo/simulator/testcase/libs/base.py | 19 +-
.../sandbox/demo/simulator/testcase/libs/common.py | 21 +-
.../sandbox/demo/simulator/testcase/libs/utils.py | 19 +-
.../demo/simulator/testcase/test_vm_life_cycle.py | 27 +-
tools/marvin/setup.py | 21 +-
tools/migration/paramiko/__init__.py | 138 -
tools/migration/paramiko/agent.py | 148 -
tools/migration/paramiko/auth_handler.py | 423 ---
tools/migration/paramiko/ber.py | 126 -
tools/migration/paramiko/buffered_pipe.py | 197 --
tools/migration/paramiko/channel.py | 1231 ---------
tools/migration/paramiko/client.py | 483 ----
tools/migration/paramiko/common.py | 122 -
tools/migration/paramiko/compress.py | 36 -
tools/migration/paramiko/config.py | 107 -
tools/migration/paramiko/dsskey.py | 194 --
tools/migration/paramiko/file.py | 453 ----
tools/migration/paramiko/hostkeys.py | 313 ---
tools/migration/paramiko/kex_gex.py | 241 --
tools/migration/paramiko/kex_group1.py | 133 -
tools/migration/paramiko/logging22.py | 63 -
tools/migration/paramiko/message.py | 298 --
tools/migration/paramiko/packet.py | 485 ----
tools/migration/paramiko/pipe.py | 144 -
tools/migration/paramiko/pkey.py | 377 ---
tools/migration/paramiko/primes.py | 148 -
tools/migration/paramiko/resource.py | 69 -
tools/migration/paramiko/rng.py | 105 -
tools/migration/paramiko/rng_posix.py | 93 -
tools/migration/paramiko/rng_win32.py | 117 -
tools/migration/paramiko/rsakey.py | 183 --
tools/migration/paramiko/server.py | 629 -----
tools/migration/paramiko/sftp.py | 185 --
tools/migration/paramiko/sftp_attr.py | 220 --
tools/migration/paramiko/sftp_client.py | 723 -----
tools/migration/paramiko/sftp_file.py | 473 ----
tools/migration/paramiko/sftp_handle.py | 199 --
tools/migration/paramiko/sftp_server.py | 441 ---
tools/migration/paramiko/sftp_si.py | 307 ---
tools/migration/paramiko/ssh_exception.py | 112 -
tools/migration/paramiko/transport.py | 2096 ---------------
tools/migration/paramiko/util.py | 299 --
tools/migration/paramiko/win_pageant.py | 143 -
tools/test/apisession.py | 27 +-
tools/test/cloudkit.py | 27 +-
tools/test/db.py | 27 +-
tools/test/globalconfig.py | 27 +-
tools/test/physicalresource.py | 27 +-
tools/test/vm.py | 27 +-
tools/test/vmcreate.py | 27 +-
ui/css/cloudstack3.css | 2 +-
ui/scripts/accounts.js | 9 +-
ui/scripts/storage.js | 2 +-
utils/src/com/cloud/utils/ssh/SshHelper.java | 29 +-
wscript_build | 1 +
wscript_configure | 4 +-
486 files changed, 8444 insertions(+), 22674 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/082d5634/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
index c1ff6b7,389f8c0..1b91c05
--- a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
@@@ -14,101 -14,101 +14,102 @@@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
- package com.cloud.storage.dao;
-
-
- import java.util.List;
-
- import javax.ejb.Local;
-
- import com.cloud.host.HostVO;
- import com.cloud.storage.VMTemplateHostVO;
- import com.cloud.storage.VolumeHostVO;
- import com.cloud.utils.db.GenericDaoBase;
- import com.cloud.utils.db.SearchBuilder;
- import com.cloud.utils.db.SearchCriteria;
- @Local(value={VolumeHostDao.class})
- public class VolumeHostDaoImpl extends GenericDaoBase<VolumeHostVO, Long>
implements VolumeHostDao {
-
- protected final SearchBuilder<VolumeHostVO> HostVolumeSearch;
- protected final SearchBuilder<VolumeHostVO> ZoneVolumeSearch;
- protected final SearchBuilder<VolumeHostVO> VolumeSearch;
- protected final SearchBuilder<VolumeHostVO> HostSearch;
- protected final SearchBuilder<VolumeHostVO> HostDestroyedSearch;
-
- VolumeHostDaoImpl(){
- HostVolumeSearch = createSearchBuilder();
- HostVolumeSearch.and("host_id",
HostVolumeSearch.entity().getHostId(), SearchCriteria.Op.EQ);
- HostVolumeSearch.and("volume_id",
HostVolumeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
- HostVolumeSearch.and("destroyed",
HostVolumeSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
- HostVolumeSearch.done();
-
- ZoneVolumeSearch = createSearchBuilder();
- ZoneVolumeSearch.and("zone_id",
ZoneVolumeSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
- ZoneVolumeSearch.and("volume_id",
ZoneVolumeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
- ZoneVolumeSearch.and("destroyed",
ZoneVolumeSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
- ZoneVolumeSearch.done();
-
- HostSearch = createSearchBuilder();
- HostSearch.and("host_id", HostSearch.entity().getHostId(),
SearchCriteria.Op.EQ);
- HostSearch.and("destroyed", HostSearch.entity().getDestroyed(),
SearchCriteria.Op.EQ);
- HostSearch.done();
-
- VolumeSearch = createSearchBuilder();
- VolumeSearch.and("volume_id",
VolumeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
- VolumeSearch.and("destroyed",
VolumeSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
- VolumeSearch.done();
-
- HostDestroyedSearch = createSearchBuilder();
- HostDestroyedSearch.and("host_id",
HostDestroyedSearch.entity().getHostId(), SearchCriteria.Op.EQ);
- HostDestroyedSearch.and("destroyed",
HostDestroyedSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
- HostDestroyedSearch.done();
- }
-
-
-
- @Override
- public VolumeHostVO findByHostVolume(long hostId, long volumeId) {
- SearchCriteria<VolumeHostVO> sc = HostVolumeSearch.create();
- sc.setParameters("host_id", hostId);
- sc.setParameters("volume_id", volumeId);
- sc.setParameters("destroyed", false);
- return findOneIncludingRemovedBy(sc);
- }
-
- @Override
- public VolumeHostVO findVolumeByZone(long volumeId, long zoneId) {
- SearchCriteria<VolumeHostVO> sc = ZoneVolumeSearch.create();
- sc.setParameters("zone_id", zoneId);
- sc.setParameters("volume_id", volumeId);
- sc.setParameters("destroyed", false);
- return findOneIncludingRemovedBy(sc);
- }
-
- @Override
- public VolumeHostVO findByVolumeId(long volumeId) {
- SearchCriteria<VolumeHostVO> sc = VolumeSearch.create();
- sc.setParameters("volume_id", volumeId);
- sc.setParameters("destroyed", false);
- return findOneBy(sc);
- }
-
-
-
- @Override
- public List<VolumeHostVO> listBySecStorage(long ssHostId) {
- SearchCriteria<VolumeHostVO> sc = HostSearch.create();
- sc.setParameters("host_id", ssHostId);
- sc.setParameters("destroyed", false);
- return listAll();
- }
-
- @Override
- public List<VolumeHostVO> listDestroyed(long hostId){
- SearchCriteria<VolumeHostVO> sc = HostDestroyedSearch.create();
- sc.setParameters("host_id", hostId);
- sc.setParameters("destroyed", true);
- return listIncludingRemovedBy(sc);
- }
-
- }
+ package com.cloud.storage.dao;
+
+
+ import java.util.List;
+
+ import javax.ejb.Local;
+
+ import com.cloud.host.HostVO;
+ import com.cloud.storage.VMTemplateHostVO;
+ import com.cloud.storage.VolumeHostVO;
+ import com.cloud.utils.db.GenericDaoBase;
+ import com.cloud.utils.db.SearchBuilder;
+ import com.cloud.utils.db.SearchCriteria;
+ @Local(value={VolumeHostDao.class})
+ public class VolumeHostDaoImpl extends GenericDaoBase<VolumeHostVO, Long>
implements VolumeHostDao {
+
+ protected final SearchBuilder<VolumeHostVO> HostVolumeSearch;
+ protected final SearchBuilder<VolumeHostVO> ZoneVolumeSearch;
+ protected final SearchBuilder<VolumeHostVO> VolumeSearch;
+ protected final SearchBuilder<VolumeHostVO> HostSearch;
+ protected final SearchBuilder<VolumeHostVO> HostDestroyedSearch;
+
+ VolumeHostDaoImpl(){
+ HostVolumeSearch = createSearchBuilder();
+ HostVolumeSearch.and("host_id",
HostVolumeSearch.entity().getHostId(), SearchCriteria.Op.EQ);
+ HostVolumeSearch.and("volume_id",
HostVolumeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
+ HostVolumeSearch.and("destroyed",
HostVolumeSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
+ HostVolumeSearch.done();
+
+ ZoneVolumeSearch = createSearchBuilder();
+ ZoneVolumeSearch.and("zone_id",
ZoneVolumeSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
+ ZoneVolumeSearch.and("volume_id",
ZoneVolumeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
+ ZoneVolumeSearch.and("destroyed",
ZoneVolumeSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
+ ZoneVolumeSearch.done();
+
+ HostSearch = createSearchBuilder();
+ HostSearch.and("host_id", HostSearch.entity().getHostId(),
SearchCriteria.Op.EQ);
+ HostSearch.and("destroyed", HostSearch.entity().getDestroyed(),
SearchCriteria.Op.EQ);
+ HostSearch.done();
+
+ VolumeSearch = createSearchBuilder();
+ VolumeSearch.and("volume_id",
VolumeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
+ VolumeSearch.and("destroyed",
VolumeSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
+ VolumeSearch.done();
+
+ HostDestroyedSearch = createSearchBuilder();
+ HostDestroyedSearch.and("host_id",
HostDestroyedSearch.entity().getHostId(), SearchCriteria.Op.EQ);
+ HostDestroyedSearch.and("destroyed",
HostDestroyedSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
+ HostDestroyedSearch.done();
+ }
+
+
+
+ @Override
+ public VolumeHostVO findByHostVolume(long hostId, long volumeId) {
+ SearchCriteria<VolumeHostVO> sc = HostVolumeSearch.create();
+ sc.setParameters("host_id", hostId);
+ sc.setParameters("volume_id", volumeId);
+ sc.setParameters("destroyed", false);
+ return findOneIncludingRemovedBy(sc);
+ }
+
+ @Override
+ public VolumeHostVO findVolumeByZone(long volumeId, long zoneId) {
+ SearchCriteria<VolumeHostVO> sc = ZoneVolumeSearch.create();
+ sc.setParameters("zone_id", zoneId);
+ sc.setParameters("volume_id", volumeId);
+ sc.setParameters("destroyed", false);
+ return findOneIncludingRemovedBy(sc);
+ }
+
+ @Override
+ public VolumeHostVO findByVolumeId(long volumeId) {
+ SearchCriteria<VolumeHostVO> sc = VolumeSearch.create();
+ sc.setParameters("volume_id", volumeId);
+ sc.setParameters("destroyed", false);
+ return findOneBy(sc);
+ }
+
+
+
+ @Override
+ public List<VolumeHostVO> listBySecStorage(long ssHostId) {
+ SearchCriteria<VolumeHostVO> sc = HostSearch.create();
+ sc.setParameters("host_id", ssHostId);
+ sc.setParameters("destroyed", false);
+ return listAll();
+ }
+
+ @Override
+ public List<VolumeHostVO> listDestroyed(long hostId){
+ SearchCriteria<VolumeHostVO> sc = HostDestroyedSearch.create();
+ sc.setParameters("host_id", hostId);
+ sc.setParameters("destroyed", true);
+ return listIncludingRemovedBy(sc);
+ }
+
+ }
++>>>>>>> f157b702e4c6821fc4af4c27e085dea097b79101
