pass mtu for vpc tier network

Author: Pearl1594

core/src/main/java/com/cloud/agent/api/SetupGuestNetworkCommand.java

@@ -36,6 +36,8 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand {
     String routerIpv6Gateway = null;
     String routerIpv6Cidr = null;
 
+    Integer mtu = null;
+
     public NicTO getNic() {
         return nic;
     }
@@ -114,4 +116,12 @@ public void setDefaultIp6Dns1(String defaultIp6Dns1) {
     public void setDefaultIp6Dns2(String defaultIp6Dns2) {
         this.defaultIp6Dns2 = defaultIp6Dns2;
     }
+
+    public Integer getMtu() {
+        return mtu;
+    }
+
+    public void setMtu(Integer mtu) {
+        this.mtu = mtu;
+    }
 }

core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetGuestNetworkConfigItem.java

@@ -31,13 +31,13 @@
 import com.cloud.agent.resource.virtualnetwork.model.ConfigBase;
 import com.cloud.agent.resource.virtualnetwork.model.GuestNetwork;
 import com.cloud.utils.net.NetUtils;
+import org.apache.log4j.Logger;
 
 public class SetGuestNetworkConfigItem extends AbstractConfigItemFacade {
-
+    private static final Logger LOG = Logger.getLogger(SetGuestNetworkConfigItem.class);
     @Override
     public List<ConfigItem> generateConfig(final NetworkElementCommand cmd) {
         final SetupGuestNetworkCommand command = (SetupGuestNetworkCommand) cmd;
-
         final NicTO nic = command.getNic();
         final String routerGIP = command.getAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP);
         final String gateway = command.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY);

core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/GuestNetwork.java

@@ -198,4 +198,8 @@ public void setRouterIp6Cidr(String routerIp6Cidr) {
     public void setMtu(Integer mtu) {
         this.mtu = mtu;
     }
+
+    public Integer getMtu() {
+        return mtu;
+    }
 }

server/src/main/java/com/cloud/network/router/CommandSetupHelper.java

@@ -823,6 +823,9 @@ public int compare(final PublicIpAddress o1, final PublicIpAddress o2) {
                 final IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, ipAddr.isSourceNat(), BroadcastDomainType.fromString(ipAddr.getVlanTag()).toString(), ipAddr.getGateway(),
                         ipAddr.getNetmask(), macAddress, networkRate, ipAddr.isOneToOneNat());
                 setIpAddressNetworkParams(ip, network, router);
+                if (network.getPublicIfaceMtu() != null) {
+                    ip.setMtu(network.getPublicIfaceMtu());
+                }
                 ipsToSend[i++] = ip;
                 if (ipAddr.isSourceNat()) {
                     sourceNatIpAdd = new Pair<IpAddressTO, Long>(ip, ipAddr.getNetworkId());
@@ -1086,7 +1089,9 @@ public void createVpcAssociatePrivateIPCommands(final VirtualRouter router, fina
                 final Network network = _networkModel.getNetwork(ipAddr.getNetworkId());
                 final IpAddressTO ip = new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, ipAddr.getIpAddress(), add, false, ipAddr.getSourceNat(), ipAddr.getBroadcastUri(),
                         ipAddr.getGateway(), ipAddr.getNetmask(), ipAddr.getMacAddress(), null, false);
-
+                if (network.getPrivateIfaceMtu() != null) {
+                    ip.setMtu(network.getPublicIfaceMtu());
+                }
                 setIpAddressNetworkParams(ip, network, router);
                 ipsToSend[i++] = ip;
 
@@ -1145,6 +1150,10 @@ public SetupGuestNetworkCommand createSetupGuestNetworkCommand(final DomainRoute
             updateSetupGuestNetworkCommandIpv6(setupCmd, network, publicNic, defaultIp6Dns1, defaultIp6Dns2);
         }
 
+        if (nic.getMtu() != null) {
+            setupCmd.setMtu(nic.getMtu());
+        }
+
         final String brd = NetUtils.long2Ip(NetUtils.ip2Long(guestNic.getIPv4Address()) | ~NetUtils.ip2Long(guestNic.getIPv4Netmask()));
         setupCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
         setupCmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(network.getId(), router.getId()));

systemvm/debian/opt/cloud/bin/setup/common.sh

@@ -94,12 +94,12 @@ setup_interface() {
        echo "  netmask $mask" >> /etc/network/interfaces
      fi
 
-     if [ ! -z "$PUBLICMTU" ] && [ $intf == "eth0" ]; then
-       echo "  mtu $PUBLICMTU" >> /etc/network/interfaces
+     if [ ! -z "$PRIVATEMTU" ] && [ $intf == "eth0" ]; then
+       echo "  mtu $PRIVATEMTU" >> /etc/network/interfaces
      fi
 
-     if [ ! -z "$PRIVATEMTU" ] && [ $intf == "eth2" ]; then
-       echo "  mtu $PRIVATEMTU" >> /etc/network/interfaces
+     if [ ! -z "$PUBLICMTU" ] && [ $intf == "eth2" ]; then
+       echo "  mtu $PUBLICMTU" >> /etc/network/interfaces
      fi
   fi