Updated Branches: refs/heads/vpc c2134b431 -> 911ed25fb
Merge branch 'master' into vpc Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/911ed25f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/911ed25f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/911ed25f Branch: refs/heads/vpc Commit: 911ed25fbc8600885173bb66034ad953c34c1585 Parents: c2134b4 84cdf2c Author: Alena Prokharchyk <[email protected]> Authored: Mon Jul 9 18:31:28 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon Jul 9 18:31:28 2012 -0700 ---------------------------------------------------------------------- .../com/cloud/api/commands/ListTemplatesCmd.java | 1 - .../cloud/bridge/service/core/ec2/EC2Engine.java | 8 +- awsapi/src/com/cloud/stack/CloudStackApi.java | 8 +- .../src/com/cloud/stack/models/ApiConstants.java | 1 + build/replace.properties | 12 + server/src/com/cloud/api/ApiResponseHelper.java | 19 + .../src/com/cloud/server/ManagementServerImpl.java | 16 +- .../src/com/cloud/storage/StorageManagerImpl.java | 2 +- .../src/com/cloud/storage/dao/VMTemplateDao.java | 25 +- .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 79 +- .../com/cloud/tags/TaggedResourceManagerImpl.java | 4 + setup/db/create-schema.sql | 5 +- 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 - ui/css/cloudstack3.css | 2 +- ui/scripts/accounts.js | 3 + 52 files changed, 145 insertions(+), 12294 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/911ed25f/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --cc server/src/com/cloud/api/ApiResponseHelper.java index e056b7b,4c88e2b..a97f9bf --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@@ -2132,7 -2120,16 +2132,16 @@@ public class ApiResponseHelper implemen Account owner = ApiDBUtils.findAccountById(iso.getAccountId()); populateAccount(isoResponse, owner.getId()); populateDomain(isoResponse, owner.getDomainId()); - + + //set tag information + List<? extends ResourceTag> tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.ISO, iso.getId()); + List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); + for (ResourceTag tag : tags) { + ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); + tagResponses.add(tagResponse); + } + isoResponse.setTags(tagResponses); + isoResponse.setObjectName("iso"); isoResponses.add(isoResponse); return isoResponses; @@@ -2280,7 -2277,17 +2289,17 @@@ if (isoSize > 0) { isoResponse.setSize(isoSize); } - + + //set tag information + List<? extends ResourceTag> tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.ISO, iso.getId()); + + List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); + for (ResourceTag tag : tags) { + ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); + tagResponses.add(tagResponse); + } + isoResponse.setTags(tagResponses); + isoResponse.setObjectName("iso"); isoResponses.add(isoResponse); return isoResponses; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/911ed25f/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/911ed25f/server/src/com/cloud/tags/TaggedResourceManagerImpl.java ---------------------------------------------------------------------- diff --cc server/src/com/cloud/tags/TaggedResourceManagerImpl.java index 5676b0d,f79eba4..f4bf251 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@@ -323,9 -325,13 +323,13 @@@ public class TaggedResourceManagerImpl sb.and("key", sb.entity().getKey(), SearchCriteria.Op.EQ); sb.and("value", sb.entity().getValue(), SearchCriteria.Op.EQ); + + if (resourceId != null) { - sb.and().op("resourceId", sb.entity().getResourceId(), SearchCriteria.Op.EQ); - sb.or("resourceUuid", sb.entity().getResourceUuid(), SearchCriteria.Op.EQ); - sb.cp(); + sb.and().op("resourceId", sb.entity().getResourceId(), SearchCriteria.Op.EQ); + sb.or("resourceUuid", sb.entity().getResourceUuid(), SearchCriteria.Op.EQ); + sb.cp(); + } + sb.and("resourceType", sb.entity().getResourceType(), SearchCriteria.Op.EQ); sb.and("customer", sb.entity().getCustomer(), SearchCriteria.Op.EQ); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/911ed25f/setup/db/create-schema.sql ----------------------------------------------------------------------
