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

CLOUDSTACK-10364: Change the "setXXX" method names to "generateXXX" (#2601) 

The three methods are named as "setXXX", actually, they are not simple setter or getter.
They are further renamed as "generateXXX" with dahn's comments.
This commit is contained in:
Kui LIU 2018-05-01 17:17:54 +02:00 committed by Rohit Yadav
parent 2c681b8c5f
commit 503b2c649c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View File

@ -298,11 +298,11 @@ public class BridgeVifDriver extends VifDriverBase {
Script.runSimpleBashScript("test -d /sys/class/net/" + iface.getBrName() + "/brif/" + iface.getDevName() + " && brctl delif " + iface.getBrName() + " " + iface.getDevName());
}
private String setVnetBrName(String pifName, String vnetId) {
private String generateVnetBrName(String pifName, String vnetId) {
return "br" + pifName + "-" + vnetId;
}
private String setVxnetBrName(String pifName, String vnetId) {
private String generateVxnetBrName(String pifName, String vnetId) {
return "brvx-" + vnetId;
}
@ -317,9 +317,9 @@ public class BridgeVifDriver extends VifDriverBase {
}
String brName = "";
if (protocol.equals(Networks.BroadcastDomainType.Vxlan.scheme())) {
brName = setVxnetBrName(nic, vNetId);
brName = generateVxnetBrName(nic, vNetId);
} else {
brName = setVnetBrName(nic, vNetId);
brName = generateVnetBrName(nic, vNetId);
}
createVnet(vNetId, nic, brName, protocol);
return brName;

4
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
View File

@ -168,12 +168,12 @@ public class IvsVifDriver extends VifDriverBase {
}
}
String brName = "";
brName = setVnetBrName(nic, vNetId);
brName = generateVnetBrName(nic, vNetId);
createVnet(vNetId, nic, brName, protocol);
return brName;
}
private String setVnetBrName(String pifName, String vnetId) {
private String generateVnetBrName(String pifName, String vnetId) {
return "br" + pifName + "-" + vnetId;
}