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

fix warnings in NetworkServiceImpl: removed unused code and add cases to switches

Browse Source
This commit is contained in:
Daan Hoogland 2013-08-03 11:46:35 +02:00 committed by Sheng Yang
parent 84ed1fee6b
commit d9202100e0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -548,7 +548,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
long callerUserId = CallContext.current().getCallingUserId(); long callerUserId = CallContext.current().getCallingUserId();
DataCenter zone = _configMgr.getZone(zoneId); DataCenter zone = _configMgr.getZone(zoneId);
if ((networkId == null && vpcId == null) && (networkId != null && vpcId != null)) { if ((networkId == null && vpcId == null) || (networkId != null && vpcId != null)) {
throw new InvalidParameterValueException("One of Network id or VPC is should be passed"); throw new InvalidParameterValueException("One of Network id or VPC is should be passed");
} }
@ -652,7 +652,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
throw new InvalidParameterValueException("The nic is not belongs to user vm"); throw new InvalidParameterValueException("The nic is not belongs to user vm");
} }
Nic nic = _nicDao.findById(nicId);
VirtualMachine vm = _userVmDao.findById(nicVO.getInstanceId()); VirtualMachine vm = _userVmDao.findById(nicVO.getInstanceId());
if (vm == null) { if (vm == null) {
throw new InvalidParameterValueException("There is no vm with the nic"); throw new InvalidParameterValueException("There is no vm with the nic");
@ -672,7 +671,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(network.getNetworkOfferingId()); NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(network.getNetworkOfferingId());
DataCenter dc = _dcDao.findById(network.getDataCenterId()); DataCenter dc = _dcDao.findById(network.getDataCenterId());
Long id = nicVO.getInstanceId();
DataCenter zone = _configMgr.getZone(zoneId); DataCenter zone = _configMgr.getZone(zoneId);
if (zone == null) { if (zone == null) {
@ -3336,12 +3334,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
boolean update = false; boolean update = false;
if (state != null) { if (state != null) {
if (state == PhysicalNetworkServiceProvider.State.Shutdown) {
throw new InvalidParameterValueException("Updating the provider state to 'Shutdown' is not supported");
}
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("updating state of the service provider id=" + id + " on physical network: " + provider.getPhysicalNetworkId() + " to state: " + stateStr); s_logger.debug("trying to update the state of the service provider id=" + id + " on physical network: " + provider.getPhysicalNetworkId() + " to state: " + stateStr);
} }
switch (state) { switch (state) {
case Enabled: case Enabled:
@ -3357,6 +3351,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
provider.setState(PhysicalNetworkServiceProvider.State.Disabled); provider.setState(PhysicalNetworkServiceProvider.State.Disabled);
update = true; update = true;
break; break;
case Shutdown:
throw new InvalidParameterValueException("Updating the provider state to 'Shutdown' is not supported");
} }
} }
@ -3564,6 +3560,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
case Control: case Control:
xenLabel = "cloud_link_local_network"; xenLabel = "cloud_link_local_network";
break; break;
case Vpn:
case None:
break;
} }
return xenLabel; return xenLabel;
} }