Skip to content

server: set network rate for additional public IPs #5670

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
Nov 18, 2021
Merged

server: set network rate for additional public IPs #5670

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
2 changes: 1 addition & 1 deletion api/src/main/java/com/cloud/vm/NicProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public long getNetworkId() {
return networkId;
}

public void setNetworId(long networkId){
public void setNetworkId(long networkId){
this.networkId = networkId;
}

Expand Down
4 changes: 2 additions & 2 deletions ...tration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,6 @@ public void prepareAllNicsForMigration(final VirtualMachineProfile vm, final Dep
//Create nic profile for migration
s_logger.debug("Creating nic profile for migration. BroadcastUri: "+broadcastUri.toString()+" NetworkId: "+ntwkId+" Vm: "+vm.getId());
final NetworkVO network = _networksDao.findById(ntwkId);
_networkModel.getNetworkRate(network.getId(), vm.getId());
final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName());
final NicProfile profile = new NicProfile();
profile.setDeviceId(255); //dummyId
Expand All @@ -2069,7 +2068,8 @@ public void prepareAllNicsForMigration(final VirtualMachineProfile vm, final Dep
profile.setIsolationUri(Networks.IsolationType.Vlan.toUri(publicIp.getVlanTag()));
profile.setSecurityGroupEnabled(_networkModel.isSecurityGroupSupportedInNetwork(network));
profile.setName(_networkModel.getNetworkTag(vm.getHypervisorType(), network));
profile.setNetworId(network.getId());
profile.setNetworkRate(_networkModel.getNetworkRate(network.getId(), vm.getId()));
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Nov 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will the network id not be needed anymore?

Copy link
Copy Markdown
Member Author

@weizhouapache weizhouapache Nov 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland
it is still needed. see line 2072
I changed setNetworId to setNetworkId

profile.setNetworkId(network.getId());

guru.updateNicProfile(profile, network);
vm.addNic(profile);
Expand Down