Skip to content

Commit af4e23f

Browse files
shwstpprshwstppr
committed
refactor
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 47da99e commit af4e23f

17 files changed

Lines changed: 38 additions & 35 deletions

‎api/src/main/java/com/cloud/network/NetworkModel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ List<String[]> generateVmData(String userData, String serviceOffering, long data
325325

326326
String getValidNetworkCidr(Network guestNetwork);
327327

328-
Pair<String, String> getNetworkIp4Dns(final Long networkId, final DataCenter zone);
328+
Pair<String, String> getNetworkIp4Dns(final Network network, final DataCenter zone);
329329

330-
Pair<String, String> getNetworkIp6Dns(final Long networkId, final DataCenter zone);
330+
Pair<String, String> getNetworkIp6Dns(final Network network, final DataCenter zone);
331331

332332
}

‎plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
129129
}
130130

131131
DataCenter dc = _dcDao.findById(network.getDataCenterId());
132-
Pair<String, String> dns = networkModel.getNetworkIp4Dns(network.getId(), dc);
132+
Pair<String, String> dns = networkModel.getNetworkIp4Dns(network, dc);
133133
nic.setIPv4Dns1(dns.first());
134134
nic.setIPv4Dns2(dns.second());
135135

@@ -172,7 +172,7 @@ private void getBaremetalIp(NicProfile nic, Pod pod, VirtualMachineProfile vm, N
172172
nic.setReservationId(String.valueOf(ip.getVlanTag()));
173173
nic.setMacAddress(ip.getMacAddress());
174174
}
175-
Pair<String, String> dns = networkModel.getNetworkIp4Dns(network.getId(), dc);
175+
Pair<String, String> dns = networkModel.getNetworkIp4Dns(network, dc);
176176
nic.setIPv4Dns1(dns.first());
177177
nic.setIPv4Dns2(dns.second());
178178
}

‎server/src/main/java/com/cloud/network/IpAddressManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,7 +2211,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) throws Insuff
22112211
nic.setMacAddress(ip.getMacAddress());
22122212
}
22132213
}
2214-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
2214+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
22152215
nic.setIPv4Dns1(dns.first());
22162216
nic.setIPv4Dns2(dns.second());
22172217
}
@@ -2262,7 +2262,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) throws Insuff
22622262
nic.setMacAddress(_networkModel.getNextAvailableMacAddressInNetwork(network.getId()));
22632263
}
22642264
}
2265-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
2265+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
22662266
nic.setIPv4Dns1(dns.first());
22672267
nic.setIPv4Dns2(dns.second());
22682268
}

‎server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Ne
227227
IPv6Address.class.getName(), null);
228228
}
229229
}
230-
Pair<String, String> dns = _networkModel.getNetworkIp6Dns(network.getId(), dc);
230+
Pair<String, String> dns = _networkModel.getNetworkIp6Dns(network, dc);
231231
nic.setIPv6Dns1(dns.first());
232232
nic.setIPv6Dns2(dns.second());
233233
}

‎server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ public void updateNicIpv6(NicProfile nic, DataCenter dc, Network network) throws
449449
} else {
450450
nic.setFormat(Networks.AddressFormat.Ip6);
451451
}
452-
Pair<String, String> dns = _networkModel.getNetworkIp6Dns(network.getId(), dc);
452+
Pair<String, String> dns = _networkModel.getNetworkIp6Dns(network, dc);
453453
nic.setIPv6Dns1(dns.first());
454454
nic.setIPv6Dns2(dns.second());
455455
}

‎server/src/main/java/com/cloud/network/NetworkModelImpl.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,10 +2643,9 @@ public String getValidNetworkCidr(Network guestNetwork) {
26432643
}
26442644

26452645
@Override
2646-
public Pair<String, String> getNetworkIp4Dns(final Long networkId, final DataCenter zone) {
2646+
public Pair<String, String> getNetworkIp4Dns(final Network network, final DataCenter zone) {
26472647
String dns1 = null;
26482648
String dns2 = null;
2649-
NetworkVO network = _networksDao.findById(networkId);
26502649
if (org.apache.commons.lang3.StringUtils.isNotEmpty(network.getDns1())) {
26512650
dns1 = network.getDns1();
26522651
if (org.apache.commons.lang3.StringUtils.isNotEmpty(network.getDns2())) {
@@ -2663,10 +2662,9 @@ public Pair<String, String> getNetworkIp4Dns(final Long networkId, final DataCen
26632662
}
26642663

26652664
@Override
2666-
public Pair<String, String> getNetworkIp6Dns(final Long networkId, final DataCenter zone) {
2665+
public Pair<String, String> getNetworkIp6Dns(final Network network, final DataCenter zone) {
26672666
String dns1 = null;
26682667
String dns2 = null;
2669-
NetworkVO network = _networksDao.findById(networkId);
26702668
if (org.apache.commons.lang3.StringUtils.isNotEmpty(network.getIp6Dns1())) {
26712669
dns1 = network.getIp6Dns1();
26722670
if (org.apache.commons.lang3.StringUtils.isNotEmpty(network.getIp6Dns2())) {

‎server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ public IsolationMethod[] getIsolationMethods() {
241241
@Override
242242
public void updateNicProfile(NicProfile profile, Network network) {
243243
DataCenter dc = _dcDao.findById(network.getDataCenterId());
244-
Pair<String, String> ip4Dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
245-
Pair<String, String> ip6Dns = _networkModel.getNetworkIp6Dns(network.getId(), dc);
244+
Pair<String, String> ip4Dns = _networkModel.getNetworkIp4Dns(network, dc);
245+
Pair<String, String> ip6Dns = _networkModel.getNetworkIp6Dns(network, dc);
246246
if (profile != null) {
247247
profile.setIPv4Dns1(ip4Dns.first());
248248
profile.setIPv4Dns2(ip4Dns.second());
@@ -416,7 +416,8 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
416416
@Override
417417
public void updateNetworkProfile(NetworkProfile networkProfile) {
418418
DataCenter dc = _dcDao.findById(networkProfile.getDataCenterId());
419-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(networkProfile.getId(), dc);
419+
Network network = _networkModel.getNetwork(networkProfile.getId());
420+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
420421
networkProfile.setDns1(dns.first());
421422
networkProfile.setDns2(dns.second());
422423
}

‎server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
158158
}
159159

160160
DataCenter dc = _dcDao.findById(network.getDataCenterId());
161-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
161+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
162162
nic.setIPv4Dns1(dns.first());
163163
nic.setIPv4Dns2(dns.second());
164164
}
@@ -242,7 +242,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) throws Insuff
242242
}
243243
});
244244

245-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
245+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
246246
nic.setIPv4Dns1(dns.first());
247247
nic.setIPv4Dns2(dns.second());
248248
}

‎server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public void reserve(NicProfile nic, Network config, VirtualMachineProfile vm, De
322322
if (_networkModel.networkIsConfiguredForExternalNetworking(config.getDataCenterId(), config.getId())) {
323323
nic.setBroadcastUri(config.getBroadcastUri());
324324
nic.setIsolationUri(config.getBroadcastUri());
325-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(config.getId(), dc);
325+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(config, dc);
326326
nic.setIPv4Dns1(dns.first());
327327
nic.setIPv4Dns2(dns.second());
328328
nic.setIPv4Netmask(NetUtils.cidr2Netmask(config.getCidr()));

‎server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public NicProfile allocate(final Network network, NicProfile nic, final VirtualM
445445
nic.setIPv4Netmask(NetUtils.cidr2Netmask(_networkModel.getValidNetworkCidr(network)));
446446
}
447447

448-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
448+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
449449
nic.setIPv4Dns1(dns.first());
450450
nic.setIPv4Dns2(dns.second());
451451
nic.setFormat(AddressFormat.Ip4);
@@ -467,7 +467,7 @@ public NicProfile allocate(final Network network, NicProfile nic, final VirtualM
467467
@Override
468468
public void updateNicProfile(final NicProfile profile, final Network network) {
469469
final DataCenter dc = _dcDao.findById(network.getDataCenterId());
470-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network.getId(), dc);
470+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
471471
if (profile != null) {
472472
profile.setIPv4Dns1(dns.first());
473473
profile.setIPv4Dns2(dns.second());
@@ -516,7 +516,8 @@ public boolean trash(final Network network, final NetworkOffering offering) {
516516
@Override
517517
public void updateNetworkProfile(final NetworkProfile networkProfile) {
518518
final DataCenter dc = _dcDao.findById(networkProfile.getDataCenterId());
519-
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(networkProfile.getId(), dc);
519+
Network network = _networkModel.getNetwork(networkProfile.getId());
520+
Pair<String, String> dns = _networkModel.getNetworkIp4Dns(network, dc);
520521
networkProfile.setDns1(dns.first());
521522
networkProfile.setDns2(dns.second());
522523
}

0 commit comments

Comments
 (0)