Fixup

Author: vishesh92

engine/storage/configdrive/src/main/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilder.java

@@ -22,6 +22,7 @@
 import static com.cloud.network.NetworkModel.CONFIGDATA_FILE;
 import static com.cloud.network.NetworkModel.PASSWORD_FILE;
 import static com.cloud.network.NetworkModel.USERDATA_FILE;
+import static com.cloud.network.NetworkService.DEFAULT_MTU;
 
 import java.io.File;
 import java.io.IOException;
@@ -274,41 +275,51 @@ static JsonObject createJsonObjectWithNic(NicProfile nic) {
         if (StringUtils.isNotBlank(nic.getMacAddress())) {
             JsonObject link = new JsonObject();
             link.addProperty("ethernet_mac_address", nic.getMacAddress());
-            link.addProperty("id", "eth0");
-            link.addProperty("mtu", 1500);
+            link.addProperty("id", String.format("eth%d", nic.getDeviceId()));
+            link.addProperty("mtu", nic.getMtu() != null ? nic.getMtu() : DEFAULT_MTU);
             link.addProperty("type", "phy");
             links.add(link);
         }
 
         if (StringUtils.isNotBlank(nic.getIPv4Address())) {
             JsonObject ipv4Network = new JsonObject();
-            ipv4Network.addProperty("id", nic.getIPv4Address());
+            ipv4Network.addProperty("id", String.format("eth%d", nic.getDeviceId()));
             ipv4Network.addProperty("ip_address", nic.getIPv4Address());
-            ipv4Network.addProperty("link", "eth0");
+            ipv4Network.addProperty("link", String.format("eth%d", nic.getDeviceId()));
             ipv4Network.addProperty("netmask", nic.getIPv4Netmask());
-            ipv4Network.addProperty("network_id", nic.getNetworkId());
+            ipv4Network.addProperty("network_id", nic.getUuid());
             ipv4Network.addProperty("type", "ipv4");
 
+            JsonArray ipv4RouteArray = new JsonArray();
             JsonObject ipv4Route = new JsonObject();
             ipv4Route.addProperty("gateway", nic.getIPv4Gateway());
             ipv4Route.addProperty("netmask", "0.0.0.0");
             ipv4Route.addProperty("network", "0.0.0.0");
+            ipv4RouteArray.add(ipv4Route);
+
+            ipv4Network.add("routes", ipv4RouteArray);
+
             networks.add(ipv4Network);
         }
 
         if (StringUtils.isNotBlank(nic.getIPv6Address())) {
             JsonObject ipv6Network = new JsonObject();
-            ipv6Network.addProperty("id", nic.getIPv6Address());
+            ipv6Network.addProperty("id", String.format("eth%d", nic.getDeviceId()));
             ipv6Network.addProperty("ip_address", nic.getIPv6Address());
-            ipv6Network.addProperty("link", "eth0");
+            ipv6Network.addProperty("link", String.format("eth%d", nic.getDeviceId()));
             ipv6Network.addProperty("netmask", IPv6Network.fromString(nic.getIPv6Cidr()).getNetmask().toString());
             ipv6Network.addProperty("network_id", nic.getNetworkId());
             ipv6Network.addProperty("type", "ipv6");
 
+            JsonArray ipv6RouteArray = new JsonArray();
             JsonObject ipv6Route = new JsonObject();
             ipv6Route.addProperty("gateway", nic.getIPv6Gateway());
             ipv6Route.addProperty("netmask", "0");
             ipv6Route.addProperty("network", "::");
+            ipv6RouteArray.add(ipv6Route);
+
+            ipv6Network.add("routes", ipv6RouteArray);
+
             networks.add(ipv6Network);
         }
 
@@ -328,6 +339,10 @@ static JsonObject createJsonObjectWithNic(NicProfile nic) {
             services.add(getDnsServiceObject(nic.getIPv6Dns2()));
         }
 
+        networkData.add("links", links);
+        networkData.add("networks", networks);
+        networkData.add("services", services);
+
         return networkData;
     }
 

server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java

@@ -198,8 +198,8 @@ public Map<Service, Map<Capability, String>> getCapabilities() {
     private static Map<Service, Map<Capability, String>> setCapabilities() {
         Map<Service, Map<Capability, String>> capabilities = new HashMap<>();
         capabilities.put(Service.UserData, null);
-        capabilities.put(Service.Dhcp, null);
-        capabilities.put(Service.Dns, null);
+        capabilities.put(Service.Dhcp, new HashMap<>());
+        capabilities.put(Service.Dns, new HashMap<>());
         return capabilities;
     }
 
@@ -227,8 +227,7 @@ private String getSshKey(VirtualMachineProfile profile) {
     public boolean addPasswordAndUserdata(Network network, NicProfile nic, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context)
             throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
         return (canHandle(network.getTrafficType())
-                && configureConfigDriveData(profile, nic, dest))
-                && createConfigDriveIso(nic, profile, dest, null);
+                && configureConfigDriveData(profile, nic, dest));
     }
 
     @Override