apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused code

Browse Source
This commit is contained in:
Alena Prokharchyk 2011-11-08 15:54:56 -08:00
parent 3aff7f00ff
commit 50cf9cb8fb
2 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,10 +181,7 @@ public interface NetworkManager extends NetworkService {
Nic getDefaultNic(long vmId);
List<? extends UserDataServiceProvider> getPasswordResetElements();
@Deprecated
boolean zoneIsConfiguredForExternalNetworking(long zoneId);
boolean networkIsConfiguredForExternalNetworking(long zoneId, long networkId);
Map<Capability, String> getNetworkServiceCapabilities(long networkId, Service service);

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

@ -3005,28 +3005,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
return elements;
}
@Override
@Deprecated
// try to use the method networkIsConfiguredForExternalNetworking instead
public boolean zoneIsConfiguredForExternalNetworking(long zoneId) {
DataCenterVO zone = _dcDao.findById(zoneId);
if (zone.getNetworkType() == NetworkType.Advanced) {
if (zone.getGatewayProvider() != null && zone.getGatewayProvider().equals(Network.Provider.JuniperSRX.getName()) &&
zone.getFirewallProvider() != null && zone.getFirewallProvider().equals(Network.Provider.JuniperSRX.getName())) {
return true;
} else if (zone.getGatewayProvider() != null && zone.getLoadBalancerProvider() != null && zone.getLoadBalancerProvider().equals(Network.Provider.Netscaler.getName())) {
return true;
} else {
return false;
}
} else {
return (zone.getFirewallProvider() != null && zone.getFirewallProvider().equals(Network.Provider.JuniperSRX.getName()));
}
}
@Override
public boolean networkIsConfiguredForExternalNetworking(long zoneId, long networkId) {
@ -3171,7 +3150,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
// Save usage event
if (ip.getAccountId() != Account.ACCOUNT_ID_SYSTEM) {
NetworkVO network = _networksDao.findByIdIncludingRemoved(ip.getSourceNetworkId());
VlanVO vlan = _vlanDao.findById(ip.getVlanId());
String guestType = vlan.getVlanType().toString();
@ -3426,11 +3404,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
protected String getZoneNetworkDomain(long zoneId) {
private String getZoneNetworkDomain(long zoneId) {
return _dcDao.findById(zoneId).getDomain();
}
protected String getDomainNetworkDomain(long domainId, long zoneId) {
private String getDomainNetworkDomain(long domainId, long zoneId) {
String networkDomain = _domainDao.findById(domainId).getNetworkDomain();
if (networkDomain == null) {
return getZoneNetworkDomain(zoneId);
@ -3439,7 +3417,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return networkDomain;
}
protected String getAccountNetworkDomain(long accountId, long zoneId) {
private String getAccountNetworkDomain(long accountId, long zoneId) {
String networkDomain = _accountDao.findById(accountId).getNetworkDomain();
if (networkDomain == null) {
@ -4853,7 +4831,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
public Map<String, String> finalizeServicesAndProvidersForNetwork(NetworkOffering offering, Long physicalNetworkId) {
protected Map<String, String> finalizeServicesAndProvidersForNetwork(NetworkOffering offering, Long physicalNetworkId) {
Map<String, String> svcProviders = new HashMap<String, String>();
List<NetworkOfferingServiceMapVO> servicesMap = _ntwkOfferingSrvcDao.listByNetworkOfferingId(offering.getId());