etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityGroupProvider is added automatically in Disabled state during the zone creation

This commit is contained in:
Alena Prokharchyk 2011-11-29 10:12:08 -08:00
parent 3db3b92e2b
commit 6e3cbaab6f
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -107,7 +107,6 @@ import com.cloud.network.NetworkVO;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PhysicalNetwork;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PhysicalNetworkVO;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.NetworkDao;
@ -1385,7 +1384,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
long physicalNetworkId = createDefaultPhysicalNetwork(zone, domainId);
//add VirtualRouter as the defualt network service provider
PhysicalNetworkServiceProvider nsp = _networkMgr.addDefaultVirtualRouterToPhysicalNetwork(physicalNetworkId);
_networkMgr.addDefaultVirtualRouterToPhysicalNetwork(physicalNetworkId);
//add security group provider to the physical network
_networkMgr.addDefaultSecurityGroupProviderToPhysicalNetwork(physicalNetworkId);
// Create deafult networks
createDefaultNetworks(zone.getId(), isSecurityGroupEnabled, physicalNetworkId);

3
server/src/com/cloud/network/NetworkManager.java
View File

@ -250,4 +250,7 @@ public interface NetworkManager extends NetworkService {
boolean isProviderForNetwork(Provider provider, long networkId);
void canProviderSupportServices(Map<Provider, Set<Service>> providersMap);
PhysicalNetworkServiceProvider addDefaultSecurityGroupProviderToPhysicalNetwork(
long physicalNetworkId);
}

7
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -4991,6 +4991,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return nsp;
}
@Override
public PhysicalNetworkServiceProvider addDefaultSecurityGroupProviderToPhysicalNetwork(long physicalNetworkId) {
PhysicalNetworkServiceProvider nsp = addProviderToPhysicalNetwork(physicalNetworkId, Network.Provider.SecurityGroupProvider.getName(), null, null);
return nsp;
}
@Override
public boolean isNetworkSystem(Network network) {