Updated Branches: refs/heads/4.1 540f68f4c -> 42d9cc443
CLOUDSTACK-1362: EC2 dns-name filter support for EC2 describeInstances API is broken Mapped CS UserVm 'name' propertyto the dns-name value to filter out the results. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/42d9cc44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/42d9cc44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/42d9cc44 Branch: refs/heads/4.1 Commit: 42d9cc4439c4cf1b8d0d53e6f4027a691b75e4cf Parents: 540f68f Author: Prachi Damle <[email protected]> Authored: Thu Feb 21 14:01:52 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Thu Feb 21 14:51:26 2013 -0800 ---------------------------------------------------------------------- .../service/core/ec2/EC2InstanceFilterSet.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42d9cc44/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java index e0aae73..b5b7c78 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java @@ -50,6 +50,7 @@ public class EC2InstanceFilterSet { filterTypes.put( "group-id", "string" ); filterTypes.put( "tag-key", "string" ); filterTypes.put( "tag-value", "string" ); + filterTypes.put( "dns-name", "string" ); } @@ -184,6 +185,8 @@ public class EC2InstanceFilterSet { } } return false; + }else if (filterName.equalsIgnoreCase( "dns-name" )){ + return containsString( vm.getName(), valueSet ); } else return false; }
