Skip to content

Commit 4857703

Browse files
committed
Move setting the name to a new method
1 parent a73d4d0 commit 4857703

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,6 +1476,11 @@ private void isIPv6AddressValid(String routerIPv6) {
14761476
}
14771477
}
14781478

1479+
private String getVpcPrependedNetworkName(String networkName, Vpc vpc) {
1480+
final String delimiter = VpcManager.VpcTierNamePrependDelimiter.value();
1481+
return vpc.getName() + delimiter + networkName;
1482+
}
1483+
14791484
@Override
14801485
@DB
14811486
@ActionEvent(eventType = EventTypes.EVENT_NETWORK_CREATE, eventDescription = "creating network")
@@ -1789,10 +1794,9 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
17891794
checkNetworkDns(ipv6, ntwkOff, vpcId, ip4Dns1, ip4Dns2, ip6Dns1, ip6Dns2);
17901795

17911796
if (vpcId != null && VpcManager.VpcTierNamePrepend.value()) {
1792-
final String delimiter = VpcManager.VpcTierNamePrependDelimiter.value();
17931797
Vpc vpc = _vpcDao.findById(vpcId);
17941798
if (vpc != null) {
1795-
name = vpc.getName() + delimiter + name;
1799+
name = getVpcPrependedNetworkName(name, vpc);
17961800
}
17971801
}
17981802

0 commit comments

Comments
 (0)