Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

CLOUDSTACK-10364: Change the "setXXX" method names to "getXXX". #2601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
May 1, 2018
Merged

CLOUDSTACK-10364: Change the "setXXX" method names to "getXXX". #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions 8 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@ public void detach(LibvirtVMDef.InterfaceDef iface) {
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;
}

Expand All @@ -317,9 +317,9 @@ private String createVnetBr(String vNetId, String pifKey, String protocol) throw
}
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;
Expand Down
4 changes: 2 additions & 2 deletions 4 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@ private String createVnetBr(String vNetId, String pifKey, String protocol) throw
}
}
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;
}

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.