From d981edb4bcd84e387ad8986f5792245892900f40 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 21 Nov 2019 07:14:41 +0100 Subject: [PATCH] server: acquire IPv4 address when add secondary IP to nic if IP is not specified (#3635) After commit fbf488497fb863c13fc0908281e3f4f86906df43, admin need to specify an ipv4 or ipv6 addresses when add IP to nic which breaks backward compatibity. If IP is not specified, a IPv4 address should be returned. --- .../src/main/java/com/cloud/network/NetworkServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index 3359b2773ac..f440ced13b2 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -732,11 +732,10 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } try { - if (ipv4Address != null) { - ipaddr = _ipAddrMgr.allocatePublicIpForGuestNic(network, podId, ipOwner, ipv4Address); - } if (ipv6Address != null) { ip6addr = ipv6AddrMgr.allocatePublicIp6ForGuestNic(network, podId, ipOwner, ipv6Address); + } else { + ipaddr = _ipAddrMgr.allocatePublicIpForGuestNic(network, podId, ipOwner, ipv4Address); } if (ipaddr == null && ipv6Address == null) { throw new InvalidParameterValueException("Allocating ip to guest nic " + nicId + " failed");