Skip to content

Commit cadca5f

Browse files
chiradeepchiradeep
committed
Merge branch 'master' into network-refactor-merge2
Conflicts: api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java server/src/com/cloud/acl/DomainChecker.java server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2 parents 7fad27b + 975021d commit cadca5f

1,348 files changed

Lines changed: 40679 additions & 22003 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012 The Apache Software Foundation
1+
Copyright (c) 2013 The Apache Software Foundation
22

33

44
Apache License

‎agent/pom.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,57 @@
5555
</execution>
5656
</executions>
5757
</plugin>
58+
<plugin>
59+
<artifactId>maven-antrun-plugin</artifactId>
60+
<version>1.7</version>
61+
<executions>
62+
<execution>
63+
<id>generate-resource</id>
64+
<phase>generate-resources</phase>
65+
<goals>
66+
<goal>run</goal>
67+
</goals>
68+
<configuration>
69+
<target>
70+
<copy
71+
todir="${basedir}/target/transformed">
72+
<fileset dir="${basedir}/conf">
73+
<include name="agent.properties" />
74+
</fileset>
75+
</copy>
76+
<copy overwrite="true"
77+
todir="${basedir}/target/transformed">
78+
<fileset dir="${basedir}/conf">
79+
<include name="*.in" />
80+
</fileset>
81+
<globmapper from="*.in" to="*" />
82+
<filterchain>
83+
<filterreader
84+
classname="org.apache.tools.ant.filters.ReplaceTokens">
85+
<param type="propertiesfile"
86+
value="${basedir}/../build/replace.properties" />
87+
</filterreader>
88+
</filterchain>
89+
</copy>
90+
<copy overwrite="true"
91+
todir="${basedir}/target/transformed">
92+
<fileset dir="${basedir}/bindir">
93+
<include name="*.in" />
94+
</fileset>
95+
<globmapper from="*.in" to="*" />
96+
<filterchain>
97+
<filterreader
98+
classname="org.apache.tools.ant.filters.ReplaceTokens">
99+
<param type="propertiesfile"
100+
value="${basedir}/../build/replace.properties" />
101+
</filterreader>
102+
</filterchain>
103+
</copy>
104+
</target>
105+
</configuration>
106+
</execution>
107+
</executions>
108+
</plugin>
58109
</plugins>
59110
</build>
60111
</project>

‎api/src/com/cloud/agent/api/AgentControlAnswer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
public class AgentControlAnswer extends Answer {
2020
public AgentControlAnswer() {
2121
}
22-
22+
2323
public AgentControlAnswer(Command command) {
2424
super(command);
2525
}
26-
26+
2727
public AgentControlAnswer(Command command, boolean success, String details) {
2828
super(command, success, details);
2929
}

‎api/src/com/cloud/agent/api/AgentControlCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package com.cloud.agent.api;
1818

1919
public class AgentControlCommand extends Command {
20-
20+
2121
public AgentControlCommand() {
2222
}
23-
23+
2424
public boolean executeInSequence() {
2525
return false;
2626
}

‎api/src/com/cloud/agent/api/Answer.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,40 +21,40 @@
2121
public class Answer extends Command {
2222
protected boolean result;
2323
protected String details;
24-
24+
2525
protected Answer() {
2626
}
27-
27+
2828
public Answer(Command command) {
2929
this(command, true, null);
3030
}
31-
31+
3232
public Answer(Command command, boolean success, String details) {
3333
result = success;
3434
this.details = details;
3535
}
36-
36+
3737
public Answer(Command command, Exception e) {
3838
this(command, false, ExceptionUtil.toString(e));
3939
}
40-
40+
4141
public boolean getResult() {
4242
return result;
4343
}
44-
44+
4545
public String getDetails() {
4646
return details;
4747
}
48-
48+
4949
@Override
5050
public boolean executeInSequence() {
5151
return false;
5252
}
53-
53+
5454
public static UnsupportedAnswer createUnsupportedCommandAnswer(Command cmd) {
5555
return new UnsupportedAnswer(cmd, "Unsupported command issued:" + cmd.toString() + ". Are you sure you got the right type of server?");
5656
}
57-
57+
5858
public static UnsupportedAnswer createUnsupportedVersionAnswer(Command cmd) {
5959
return new UnsupportedAnswer(cmd, "Unsuppored Version.");
6060
}

‎api/src/com/cloud/agent/api/AttachIsoCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public String getIsoPath() {
4848
public boolean isAttach() {
4949
return attach;
5050
}
51-
51+
5252
public String getStoreUrl() {
5353
return storeUrl;
5454
}
55-
55+
5656
public void setStoreUrl(String url) {
5757
storeUrl = url;
5858
}

‎api/src/com/cloud/agent/api/AttachVolumeAnswer.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,38 @@
2020
public class AttachVolumeAnswer extends Answer {
2121
private Long deviceId;
2222
private String chainInfo;
23-
23+
2424
protected AttachVolumeAnswer() {
25-
25+
2626
}
27-
27+
2828
public AttachVolumeAnswer(AttachVolumeCommand cmd, String result) {
2929
super(cmd, false, result);
3030
this.deviceId = null;
3131
}
32-
32+
3333
public AttachVolumeAnswer(AttachVolumeCommand cmd, Long deviceId) {
3434
super(cmd);
3535
this.deviceId = deviceId;
3636
}
3737

38-
38+
3939
public AttachVolumeAnswer(AttachVolumeCommand cmd) {
4040
super(cmd);
4141
this.deviceId = null;
4242
}
43-
43+
4444
/**
4545
* @return the deviceId
4646
*/
4747
public Long getDeviceId() {
4848
return deviceId;
4949
}
50-
50+
5151
public void setChainInfo(String chainInfo) {
5252
this.chainInfo = chainInfo;
5353
}
54-
54+
5555
public String getChainInfo() {
5656
return chainInfo;
5757
}

‎api/src/com/cloud/agent/api/AttachVolumeCommand.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.cloud.storage.Storage.StoragePoolType;
2020

2121
public class AttachVolumeCommand extends Command {
22-
22+
2323
boolean attach;
2424
String vmName;
2525
StoragePoolType pooltype;
@@ -29,10 +29,10 @@ public class AttachVolumeCommand extends Command {
2929
String volumeName;
3030
Long deviceId;
3131
String chainInfo;
32-
32+
3333
protected AttachVolumeCommand() {
3434
}
35-
35+
3636
public AttachVolumeCommand(boolean attach, String vmName, StoragePoolType pooltype, String volumeFolder, String volumePath, String volumeName, Long deviceId, String chainInfo) {
3737
this.attach = attach;
3838
this.vmName = vmName;
@@ -43,20 +43,20 @@ public AttachVolumeCommand(boolean attach, String vmName, StoragePoolType poolty
4343
this.deviceId = deviceId;
4444
this.chainInfo = chainInfo;
4545
}
46-
46+
4747
@Override
4848
public boolean executeInSequence() {
4949
return true;
5050
}
51-
51+
5252
public boolean getAttach() {
5353
return attach;
5454
}
55-
55+
5656
public String getVmName() {
5757
return vmName;
5858
}
59-
59+
6060
public StoragePoolType getPooltype() {
6161
return pooltype;
6262
}
@@ -68,11 +68,11 @@ public void setPooltype(StoragePoolType pooltype) {
6868
public String getVolumeFolder() {
6969
return volumeFolder;
7070
}
71-
71+
7272
public String getVolumePath() {
7373
return volumePath;
7474
}
75-
75+
7676
public String getVolumeName() {
7777
return volumeName;
7878
}
@@ -84,15 +84,15 @@ public Long getDeviceId() {
8484
public void setDeviceId(Long deviceId) {
8585
this.deviceId = deviceId;
8686
}
87-
87+
8888
public String getPoolUuid() {
8989
return poolUuid;
9090
}
91-
91+
9292
public void setPoolUuid(String poolUuid) {
9393
this.poolUuid = poolUuid;
9494
}
95-
95+
9696
public String getChainInfo() {
9797
return chainInfo;
9898
}

‎api/src/com/cloud/agent/api/BackupSnapshotAnswer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
public class BackupSnapshotAnswer extends Answer {
2121
private String backupSnapshotName;
2222
private boolean full;
23-
23+
2424
protected BackupSnapshotAnswer() {
25-
25+
2626
}
27-
27+
2828
public BackupSnapshotAnswer(BackupSnapshotCommand cmd, boolean success, String result, String backupSnapshotName, boolean full) {
2929
super(cmd, success, result);
3030
this.backupSnapshotName = backupSnapshotName;
@@ -37,7 +37,7 @@ public BackupSnapshotAnswer(BackupSnapshotCommand cmd, boolean success, String r
3737
public String getBackupSnapshotName() {
3838
return backupSnapshotName;
3939
}
40-
40+
4141
public boolean isFull() {
4242
return full;
4343
}

‎api/src/com/cloud/agent/api/BackupSnapshotCommand.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.cloud.storage.StoragePool;
2424

2525
/**
26-
* This currently assumes that both primary and secondary storage are mounted on the XenServer.
26+
* This currently assumes that both primary and secondary storage are mounted on the XenServer.
2727
*/
2828
public class BackupSnapshotCommand extends SnapshotCommand {
2929
private String prevSnapshotUuid;
@@ -37,18 +37,18 @@ public class BackupSnapshotCommand extends SnapshotCommand {
3737
StorageFilerTO pool;
3838

3939
protected BackupSnapshotCommand() {
40-
40+
4141
}
42-
42+
4343
/**
4444
* @param primaryStoragePoolNameLabel The UUID of the primary storage Pool
4545
* @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
4646
* @param snapshotUuid The UUID of the snapshot which is going to be backed up
4747
* @param prevSnapshotUuid The UUID of the previous snapshot for this volume. This will be destroyed on the primary storage.
4848
* @param prevBackupUuid This is the UUID of the vhd file which was last backed up on secondary storage.
49-
* @param firstBackupUuid This is the backup of the first ever snapshot taken by the volume.
49+
* @param firstBackupUuid This is the backup of the first ever snapshot taken by the volume.
5050
* @param isFirstSnapshotOfRootVolume true if this is the first snapshot of a root volume. Set the parent of the backup to null.
51-
* @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached.
51+
* @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached.
5252
*/
5353
public BackupSnapshotCommand(String secondaryStoragePoolURL,
5454
Long dcId,
@@ -63,7 +63,7 @@ public BackupSnapshotCommand(String secondaryStoragePoolURL,
6363
String prevBackupUuid,
6464
boolean isVolumeInactive,
6565
String vmName,
66-
int wait)
66+
int wait)
6767
{
6868
super(pool, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId);
6969
this.snapshotId = snapshotId;
@@ -82,11 +82,11 @@ public String getPrevSnapshotUuid() {
8282
public String getPrevBackupUuid() {
8383
return prevBackupUuid;
8484
}
85-
85+
8686
public boolean isVolumeInactive() {
8787
return isVolumeInactive;
8888
}
89-
89+
9090
public String getVmName() {
9191
return vmName;
9292
}

0 commit comments

Comments
 (0)