etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Vijayendra Bhamidipati 2012-05-17 18:12:44 -07:00
parent 099ed1af6c 6d4c6a4f6b
commit 624312a830
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
View File

@ -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());

6
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -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();