From 3e3b3eb1adb0562d9e15d57138ed4f60adcfb95d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 8 Nov 2021 10:10:41 +0100 Subject: [PATCH] server: set network rate for additional public IPs --- api/src/main/java/com/cloud/vm/NicProfile.java | 2 +- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/com/cloud/vm/NicProfile.java b/api/src/main/java/com/cloud/vm/NicProfile.java index 7ac5342ee167..ebbe6d88bfee 100644 --- a/api/src/main/java/com/cloud/vm/NicProfile.java +++ b/api/src/main/java/com/cloud/vm/NicProfile.java @@ -147,7 +147,7 @@ public long getNetworkId() { return networkId; } - public void setNetworId(long networkId){ + public void setNetworkId(long networkId){ this.networkId = networkId; } diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index f6e80f3a38bd..136c2a7d7669 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -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 @@ -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())); + profile.setNetworkId(network.getId()); guru.updateNicProfile(profile, network); vm.addNic(profile);