Handle null l2 network ipaddress during preserve ip

Author: abh1sar

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9428,7 +9428,7 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
             size = cmd.getSize();
         }
 
-        return createVirtualMachine(cmd, zone, owner, serviceOffering, template, diskOfferingId, size, overrideDiskOfferingId, dataDiskOfferingsInfo, networkIds, cmd.getIpToNetworkMap());
+        return createVirtualMachine(cmd, zone, owner, serviceOffering, template, diskOfferingId, size, overrideDiskOfferingId, dataDiskOfferingsInfo, networkIds, ipToNetworkMap);
     }
 
     @Override

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -343,7 +343,7 @@ public Map<String, String> getVmDetailsForBackup(VirtualMachine vm) {
             if (!networkIds.isEmpty()) {
                 details.put(ApiConstants.NETWORK_IDS, String.join(",", networkIds));
                 details.put(ApiConstants.IP_ADDRESSES, String.join(",", ipAddresses));
-                details.put(ApiConstants.IP6_ADDRESS, String.join(",", ip6Addresses));
+                details.put(ApiConstants.IP6_ADDRESSES, String.join(",", ip6Addresses));
                 details.put(ApiConstants.MAC_ADDRESSES, String.join(",", macAddresses));
             }
         }
@@ -1058,6 +1058,13 @@ public List<DiskOfferingInfo> getDataDiskOfferingListFromBackup(Backup backup) {
         return diskOfferingInfoList;
     }
 
+    private List<String> parseAddressString(String input) {
+        if (input == null) return null;
+        return Arrays.stream(input.split(","))
+                .map(s -> "null".equalsIgnoreCase(s.trim()) ? null : s.trim())
+                .collect(Collectors.toList());
+    }
+
     @Override
     public Map<Long, Network.IpAddresses> getIpToNetworkMapFromBackup(Backup backup, boolean preserveIps, List<Long> networkIds)
     {
@@ -1080,19 +1087,9 @@ public Map<Long, Network.IpAddresses> getIpToNetworkMapFromBackup(Backup backup,
             }
         }
         if (preserveIpAddresses) {
-            String ipAddressString = backup.getDetail(ApiConstants.IP_ADDRESSES);
-            String ip6AddressString = backup.getDetail(ApiConstants.IP6_ADDRESSES);
-            String macAddressString = backup.getDetail(ApiConstants.MAC_ADDRESSES);
-
-            if (ipAddressString != null) {
-                requestedIp = List.of(ipAddressString.split(","));
-            }
-            if (macAddressString != null) {
-                requestedMac = List.of(macAddressString.split(","));
-            }
-            if (ip6AddressString != null) {
-                requestedIpv6 = List.of(ip6AddressString.split(","));
-            }
+            requestedIp = parseAddressString(backup.getDetail(ApiConstants.IP_ADDRESSES));
+            requestedMac = parseAddressString(backup.getDetail(ApiConstants.MAC_ADDRESSES));
+            requestedIpv6 = parseAddressString(backup.getDetail(ApiConstants.IP6_ADDRESSES));
         }
 
         int index = 0;