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

move baremetalDhcpManager to networkservice pacakge

This commit is contained in:
frank 2012-05-21 15:58:13 -07:00
parent cea10499fe
commit 57e37be6f2
9 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baremetal/src/com/cloud/baremetal/networkservice/AddBaremetalDhcpCmd.java
View File

@ -11,7 +11,6 @@ import com.cloud.api.PlugService;
import com.cloud.api.ServerApiException;
import com.cloud.api.BaseCmd.CommandType;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.baremetal.manager.BaremetalDhcpManager;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;

1
baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
View File

@ -11,7 +11,6 @@ import org.apache.log4j.Logger;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.baremetal.manager.BaremetalDhcpManager;
import com.cloud.dc.Pod;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.deploy.DeployDestination;

5
baremetal/src/com/cloud/baremetal/manager/BaremetalDhcpManager.java → baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java
View File

@ -10,14 +10,11 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.baremetal.manager;
package com.cloud.baremetal.networkservice;
import java.util.List;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.baremetal.networkservice.AddBaremetalDhcpCmd;
import com.cloud.baremetal.networkservice.BaremetalDhcpResponse;
import com.cloud.baremetal.networkservice.ListBaremetalDhcpCmd;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.Host;

7
baremetal/src/com/cloud/baremetal/manager/BaremetalDhcpManagerImpl.java → baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.baremetal.manager;
package com.cloud.baremetal.networkservice;
import java.net.URI;
import java.util.ArrayList;
@ -30,11 +30,6 @@ import com.cloud.agent.api.StartupExternalDhcpCommand;
import com.cloud.agent.api.routing.DhcpEntryCommand;
import com.cloud.baremetal.database.BaremetalDhcpDao;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.baremetal.networkservice.AddBaremetalDhcpCmd;
import com.cloud.baremetal.networkservice.BaremetalDhcpResponse;
import com.cloud.baremetal.networkservice.BaremetalDhcpdResource;
import com.cloud.baremetal.networkservice.BaremetalDnsmasqResource;
import com.cloud.baremetal.networkservice.ListBaremetalDhcpCmd;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;

1
baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
View File

@ -10,7 +10,6 @@ import org.apache.log4j.Logger;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.baremetal.manager.BaremetalDhcpManager;
import com.cloud.dc.Pod;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.deploy.DeployDestination;

1
baremetal/src/com/cloud/baremetal/networkservice/ListBaremetalDhcpCmd.java
View File

@ -11,7 +11,6 @@ import com.cloud.api.Parameter;
import com.cloud.api.PlugService;
import com.cloud.api.ServerApiException;
import com.cloud.api.BaseCmd.CommandType;
import com.cloud.baremetal.manager.BaremetalDhcpManager;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.NetworkRuleConflictException;

6
client/tomcatconf/components.xml.in
View File

@ -157,14 +157,14 @@
<adapter name="BasicAgentAuthorizer" class="com.cloud.agent.manager.authn.impl.BasicAgentAuthManager"/>
</adapters>
<manager name="BarmetalDhcpManager" class="com.cloud.baremetal.manager.BaremetalDhcpManagerImpl" />
<manager name="BarmetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl" />
<manager name="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl" />
<manager name="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" />
<dao name="BaremetalPxeDao" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl"/>
<dao name="BaremetalDhcpDao" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl"/>
<pluggableservice name="VirtualRouterElementService" key="com.cloud.network.element.VirtualRouterElementService" class="com.cloud.network.element.VirtualRouterElement"/>
<pluggableservice name="BaremetalPxeService" key="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl"/>
<pluggableservice name="BaremetalPxeService" key="com.cloud.baremetal.networkservice.BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl"/>
<pluggableservice name="BaremetalDhcpService" key="com.cloud.baremetal.networkservice.BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/>
<pluggableservice name="VirtualRouterElementService" key="com.cloud.network.element.VirtualRouterElementService" class="com.cloud.network.element.VirtualRouterElement"/>
</management-server>

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

@ -263,7 +263,7 @@ public interface NetworkManager extends NetworkService {
PhysicalNetworkServiceProvider addDefaultSecurityGroupProviderToPhysicalNetwork(
long physicalNetworkId);
List<PhysicalNetworkSetupInfo> getPhysicalNetworkInfo(long dcId,
HypervisorType hypervisorType);

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

@ -4702,6 +4702,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
// add security group provider to the physical network
addDefaultSecurityGroupProviderToPhysicalNetwork(pNetwork.getId());
// add baremetal pxe/dhcp provider to the physical network
addDefaultBaremetalProvidersToPhysicalNetwork(pNetwork.getId());
txn.commit();
return pNetwork;
@ -6067,6 +6070,16 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return nsp;
}
private PhysicalNetworkServiceProvider addDefaultBaremetalProvidersToPhysicalNetwork(long physicalNetworkId) {
PhysicalNetworkVO pvo = _physicalNetworkDao.findById(physicalNetworkId);
DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId());
if (dvo.getNetworkType() == NetworkType.Basic) {
addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null);
addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null);
}
return null;
}
@Override
public boolean isNetworkSystem(Network network) {