From 2f0f78ff73e7660c184f47e8fd75dbe5f1d5c29f Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 9 Dec 2010 20:43:49 -0800 Subject: [PATCH] Set trafficType to Public insteand of Guest for Direct network --- .../com/cloud/network/NetworkManagerImpl.java | 4 ++-- .../com/cloud/network/element/DhcpElement.java | 14 -------------- .../network/element/DomainRouterElement.java | 18 +----------------- .../cloud/network/guru/DirectNetworkGuru.java | 3 +-- .../cloud/network/guru/PublicNetworkGuru.java | 4 ++-- .../router/DomainRouterManagerImpl.java | 1 - 6 files changed, 6 insertions(+), 38 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 9ed9a41ac78..d663c5a0486 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -756,9 +756,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag NetworkOfferingVO defaultGuestNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultVirtualizedNetworkOffering, "Virtual Vlan", TrafficType.Guest, GuestIpType.Virtual, false, false, rateMbps, multicastRateMbps, null, true); defaultGuestNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultGuestNetworkOffering); - NetworkOfferingVO defaultGuestDirectNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultDirectNetworkOffering, "Direct", TrafficType.Guest, GuestIpType.Direct, false, false, rateMbps, multicastRateMbps, null, true); + NetworkOfferingVO defaultGuestDirectNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultDirectNetworkOffering, "Direct", TrafficType.Public, GuestIpType.Direct, false, false, rateMbps, multicastRateMbps, null, true); defaultGuestNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultGuestDirectNetworkOffering); - NetworkOfferingVO defaultGuestDirectPodBasedNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultDirectPodBasedNetworkOffering, "DirectPodBased", TrafficType.Guest, GuestIpType.DirectPodBased, true, false, rateMbps, multicastRateMbps, null, true); + NetworkOfferingVO defaultGuestDirectPodBasedNetworkOffering = new NetworkOfferingVO(NetworkOffering.DefaultDirectPodBasedNetworkOffering, "DirectPodBased", TrafficType.Public, GuestIpType.DirectPodBased, true, false, rateMbps, multicastRateMbps, null, true); defaultGuestNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultGuestDirectPodBasedNetworkOffering); diff --git a/server/src/com/cloud/network/element/DhcpElement.java b/server/src/com/cloud/network/element/DhcpElement.java index f130000dabd..0979555aea0 100644 --- a/server/src/com/cloud/network/element/DhcpElement.java +++ b/server/src/com/cloud/network/element/DhcpElement.java @@ -32,7 +32,6 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.NetworkManager; -import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; import com.cloud.network.router.DomainRouterManager; import com.cloud.network.rules.FirewallRule; @@ -47,7 +46,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.UserVmManager; import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; @@ -90,10 +88,6 @@ public class DhcpElement extends AdapterBase implements NetworkElement { @Override public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientNetworkCapacityException, ResourceUnavailableException { if (canHandle(config.getGuestType(), dest)) { - if (config.getTrafficType() != TrafficType.Guest || vm.getType() != Type.User) { - s_logger.trace("DHCP only cares about guest network and User VMs"); - return false; - } if (vm.getType() != VirtualMachine.Type.User) { return false; @@ -110,19 +104,11 @@ public class DhcpElement extends AdapterBase implements NetworkElement { @Override public boolean release(Network config, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) { - if (config.getTrafficType() != TrafficType.Guest || vm.getType() != Type.User) { - s_logger.trace("DHCP only cares about guest network and User VMs"); - return false; - } return true; } @Override public boolean shutdown(Network config, ReservationContext context) throws ConcurrentOperationException { - if (config.getTrafficType() != TrafficType.Guest) { - s_logger.trace("DHCP only cares about guet network."); - return false; - } DomainRouterVO router = _routerDao.findByNetworkConfiguration(config.getId()); if (router == null) { return true; diff --git a/server/src/com/cloud/network/element/DomainRouterElement.java b/server/src/com/cloud/network/element/DomainRouterElement.java index c8e2ff2f416..6170516cc7b 100644 --- a/server/src/com/cloud/network/element/DomainRouterElement.java +++ b/server/src/com/cloud/network/element/DomainRouterElement.java @@ -32,14 +32,12 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.NetworkManager; -import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; import com.cloud.network.router.DomainRouterManager; import com.cloud.network.rules.FirewallRule; import com.cloud.network.service.Providers; import com.cloud.offering.NetworkOffering; import com.cloud.offering.NetworkOffering.GuestIpType; -import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.uservm.UserVm; import com.cloud.utils.component.AdapterBase; @@ -49,7 +47,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.UserVmManager; import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; @@ -90,11 +87,7 @@ public class DomainRouterElement extends AdapterBase implements NetworkElement { @Override public boolean prepare(Network config, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientNetworkCapacityException, ResourceUnavailableException { if (canHandle(config.getGuestType(), dest)) { - if (config.getTrafficType() != TrafficType.Guest || vm.getType() != Type.User) { - s_logger.trace("Domain Router only cares about guest network and User VMs"); - return false; - } - + if (vm.getType() != VirtualMachine.Type.User) { return false; } @@ -111,19 +104,11 @@ public class DomainRouterElement extends AdapterBase implements NetworkElement { @Override public boolean release(Network config, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) { - if (config.getTrafficType() != TrafficType.Guest || vm.getType() != Type.User) { - s_logger.trace("Domain Router only cares about guest network and User VMs"); - return false; - } return true; } @Override public boolean shutdown(Network config, ReservationContext context) throws ConcurrentOperationException { - if (config.getTrafficType() != TrafficType.Guest) { - s_logger.trace("Domain Router only cares about guet network."); - return false; - } DomainRouterVO router = _routerDao.findByNetworkConfiguration(config.getId()); if (router == null) { return true; @@ -137,7 +122,6 @@ public class DomainRouterElement extends AdapterBase implements NetworkElement { @Override public boolean applyRules(Network config, List rules) throws ResourceUnavailableException { - return false; } diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index 1ab35c1e1f3..e62fcff36a4 100644 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -55,8 +55,7 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { @Override public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) { - //Change traffic type to Public after Alex's fix - if (!(offering.getTrafficType() == TrafficType.Guest && offering.getGuestIpType() == GuestIpType.Direct)) { + if (!(offering.getTrafficType() == TrafficType.Public && offering.getGuestIpType() == GuestIpType.Direct)) { s_logger.trace("We only take care of public direct network, so this is no ours"); return null; } diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index a0e692901ae..e83c66a1a6b 100644 --- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java @@ -53,8 +53,8 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru { @Override public Network design(NetworkOffering offering, DeploymentPlan plan, Network network, Account owner) { - if (offering.getTrafficType() != TrafficType.Public || (offering.getTrafficType() == TrafficType.Guest && offering.getGuestIpType() != GuestIpType.Direct)) { - s_logger.trace("We only take care of two types of networks. Public or Guest direct so this is no ours"); + if (offering.getTrafficType() != TrafficType.Public || (offering.getGuestIpType() != null && offering.getGuestIpType() != GuestIpType.Virtual)) { + s_logger.trace("We only take care of Public Virtual Network"); return null; } diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java index c6809e5fde6..39d06d50a59 100644 --- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java +++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java @@ -2131,7 +2131,6 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute s_logger.debug("Starting a dhcp for network configurations: dhcp=" + guestConfig + " in " + dest); } assert guestConfig.getState() == Network.State.Implemented || guestConfig.getState() == Network.State.Setup : "Network is not yet fully implemented: " + guestConfig; - assert guestConfig.getTrafficType() == TrafficType.Guest; DataCenterDeployment plan = new DataCenterDeployment(dcId);