From 6a07a19d98910e91e7461362eb6566f25190f602 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 17 May 2012 16:21:33 -0700 Subject: [PATCH 1/2] CS-14869: Fix KVM fail to apply DNS/ROUTER option of the network --- .../resource/virtualnetwork/VirtualRoutingResource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index d4ae4fa86ac..876e3fe4a2c 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -459,14 +459,14 @@ public class VirtualRoutingResource implements Manager { command.add("-n", cmd.getVmName()); if (cmd.getDefaultRouter() != null) { - command.add(" -d " + cmd.getDefaultRouter()); + command.add("-d", cmd.getDefaultRouter()); } if (cmd.getStaticRoutes() != null) { - command.add(" -s " + cmd.getStaticRoutes()); + command.add("-s", cmd.getStaticRoutes()); } if (cmd.getDefaultDns() != null) { - command.add(" -N " + cmd.getDefaultDns()); + command.add("-N", cmd.getDefaultDns()); } final String result = command.execute(); From 6d4c6a4f6b810f2f4ac0e0e7307437627ecf8d99 Mon Sep 17 00:00:00 2001 From: prachi Date: Thu, 17 May 2012 17:26:14 -0700 Subject: [PATCH 2/2] CS 14640: Output of ec2-describe-instances should provide security group,private ipaddress, ipaddress and hypervisor information. Changes: - Fixed setting multiple group -removed EBS --- .../bridge/service/EC2SoapServiceImpl.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java index 52d6fe8d356..a70d930d3fc 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java +++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java @@ -1162,16 +1162,18 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { param3.setRequesterId( "" ); GroupSetType param4 = new GroupSetType(); - GroupItemType param5 = new GroupItemType(); + String[] groups = inst.getGroupSet(); if (null == groups || 0 == groups.length) { + GroupItemType param5 = new GroupItemType(); param5.setGroupId(""); param4.addItem( param5 ); } else { for (String group : groups) { + GroupItemType param5 = new GroupItemType(); param5.setGroupId(group); - param4.addItem( param5 ); + param4.addItem( param5 ); } } param3.setGroupSet( param4 ); @@ -1234,20 +1236,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { String devicePath = engine.cloudDeviceIdToDevicePath( inst.getHypervisor(), inst.getRootDeviceId()); param7.setRootDeviceName( devicePath ); - InstanceBlockDeviceMappingResponseType param14 = new InstanceBlockDeviceMappingResponseType(); - InstanceBlockDeviceMappingResponseItemType param15 = new InstanceBlockDeviceMappingResponseItemType(); - InstanceBlockDeviceMappingResponseItemTypeChoice_type0 param16 = new InstanceBlockDeviceMappingResponseItemTypeChoice_type0(); - param15.setDeviceName( "" ); - EbsInstanceBlockDeviceMappingResponseType param17 = new EbsInstanceBlockDeviceMappingResponseType(); - param17.setVolumeId( "" ); - param17.setStatus( "" ); - param17.setAttachTime( cal ); - - param17.setDeleteOnTermination( true ); - param16.setEbs( param17 ); - param15.setInstanceBlockDeviceMappingResponseItemTypeChoice_type0( param16 ); - param14.addItem( param15 ); - param7.setBlockDeviceMapping( param14 ); + param7.setInstanceLifecycle( "" ); param7.setSpotInstanceRequestId( "" ); param7.setHypervisor(inst.getHypervisor());