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

bug 11417: support for netscaler SDX

Browse Source 
- fixed bug in the destroying the VPX instance on SDX
- added method to acuire priavate IP from the zone, needed for the management IP of provisioned LB appliane
This commit is contained in:
Murali reddy 2012-01-05 02:36:03 +05:30
parent b557750eab
commit 76d50fb0bf
5 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/cloud/network/resource/NetscalerResource.java
View File

@ -653,7 +653,9 @@ public class NetscalerResource implements ServerResource {
}
// destroy the VPX instance
vpxToDelete = ns.delete(_netscalerSdxService, vpxToDelete);
ns nsDelObj = new ns();
nsDelObj.set_id(vpxToDelete.get_id());
vpxToDelete = ns.delete(_netscalerSdxService, nsDelObj);
String msg = "Deleted VPX instance " + vpxName + " on Netscaler SDX " + _ip + " successfully.";
s_logger.info(msg);
return new DestroyLoadBalancerApplianceAnswer(cmd, true,msg);

2
server/src/com/cloud/dc/dao/DataCenterDao.java
View File

@ -20,6 +20,7 @@ package com.cloud.dc.dao;
import java.util.List;
import com.cloud.dc.DataCenterIpAddressVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.DataCenterVnetVO;
import com.cloud.utils.Pair;
@ -35,6 +36,7 @@ public interface DataCenterDao extends GenericDao<DataCenterVO, Long> {
String[] getNextAvailableMacAddressPair(long id);
String[] getNextAvailableMacAddressPair(long id, long mask);
Pair<String, Long> allocatePrivateIpAddress(long id, long podId, long instanceId, String reservationId);
DataCenterIpAddressVO allocatePrivateIpAddress(long id, String reservationId);
String allocateLinkLocalIpAddress(long id, long podId, long instanceId, String reservationId);
String allocateVnet(long dcId, long physicalNetworkId, long accountId, String reservationId);

7
server/src/com/cloud/dc/dao/DataCenterDaoImpl.java
View File

@ -200,7 +200,12 @@ public class DataCenterDaoImpl extends GenericDaoBase<DataCenterVO, Long> implem
}
return new Pair<String, Long>(vo.getIpAddress(), vo.getMacAddress());
}
public DataCenterIpAddressVO allocatePrivateIpAddress(long dcId, String reservationId) {
DataCenterIpAddressVO vo = _ipAllocDao.takeDataCenterIpAddress(dcId, reservationId);
return vo;
}
@Override
public String allocateLinkLocalIpAddress(long dcId, long podId, long instanceId, String reservationId) {
DataCenterLinkLocalIpAddressVO vo = _LinkLocalIpAllocDao.takeIpAddress(dcId, podId, instanceId, reservationId);

22
server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
View File

@ -65,7 +65,27 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
txn.commit();
return vo;
}
@DB
public DataCenterIpAddressVO takeDataCenterIpAddress(long dcId, String reservationId) {
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
sc.setParameters("dc", dcId);
sc.setParameters("taken", (Date)null);
Transaction txn = Transaction.currentTxn();
txn.start();
DataCenterIpAddressVO vo = lockOneRandomRow(sc, true);
if (vo == null) {
txn.rollback();
return null;
}
vo.setTakenAt(new Date());
vo.setReservationId(reservationId);
update(vo.getId(), vo);
txn.commit();
return vo;
}
@Override
public boolean deleteIpAddressByPod(long podId) {
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();

56
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
View File

@ -51,9 +51,12 @@ import com.cloud.api.ApiConstants;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterIpAddressVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.Pod;
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.dc.dao.VlanDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.InsufficientCapacityException;
@ -179,6 +182,8 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
NetworkExternalFirewallDao _networkExternalFirewallDao;
@Inject
ExternalFirewallDeviceDao _externalFirewallDeviceDao;
@Inject
protected HostPodDao _podDao = null;
ScheduledExecutorService _executor;
private int _externalNetworkStatsInterval;
@ -429,26 +434,24 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
if ((providerLbDevices != null) && (!providerLbDevices.isEmpty())) {
for (ExternalLoadBalancerDeviceVO lbProviderDevice : providerLbDevices) {
if (lbProviderDevice.getState() == LBDeviceState.Enabled) {
// acquire a private IP from the data center which will be used as management IP of provisioned LB appliance,
DataCenterIpAddressVO dcPrivateIp = _dcDao.allocatePrivateIpAddress(guestConfig.getDataCenterId(), lbProviderDevice.getUuid());
if (dcPrivateIp == null) {
throw new InsufficientNetworkCapacityException("failed to acquire a priavate IP in the zone " + guestConfig.getDataCenterId() +
" needed for management IP of the load balancer appliance", DataCenter.class, guestConfig.getDataCenterId());
}
Pod pod = _podDao.findById(dcPrivateIp.getPodId());
String lbIP = dcPrivateIp.getIpAddress();
String netmask = NetUtils.getCidrNetmask(pod.getCidrSize());
String gateway = pod.getGateway();
String username = "admin";
String password = "admin";
// FIXME: acquire a private IP from Pod network Guru needed for LB appliance to be provisioned
// and a public IP from the public network guru, for self-if on the public subnet
String lbIP = null;
String netmask = null;
String gateway = null;
String username = null;
String password = null;
String publicIf = null;
String privateIf = null;
/*
String lbIP = "10.223.103.254";
String netmask = "255.255.248.0";
String gateway = "10.223.102.1";
String username = "nsroot1";
String password = "nsroot1";
String publicIf = "0/1";
String privateIf = "0/2";
*/
DetailVO lbHostDetails = null;
lbHostDetails = _hostDetailDao.findDetail(lbProviderDevice.getHostId(), ApiConstants.PUBLIC_INTERFACE);
String publicIf = lbHostDetails.getValue();
lbHostDetails = _hostDetailDao.findDetail(lbProviderDevice.getHostId(), ApiConstants.PRIVATE_INTERFACE);
String privateIf = lbHostDetails.getValue();
// send CreateLoadBalancerApplianceCommand to the host capable of provisioning
CreateLoadBalancerApplianceCommand lbProvisionCmd = new CreateLoadBalancerApplianceCommand(lbIP, netmask, gateway, username, password);
@ -467,7 +470,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
//we have provisioned load balancer so add the appliance as cloudstack provisioned external load balancer
String dedicatedLb = offering.getDedicatedLB()?"true":"false";
String url = "https://" + lbIP + "?publicinterface="+publicIf+"&privateinterface="+privateIf+"&lbdevicededicated="+dedicatedLb;;
ExternalLoadBalancerDeviceVO lbAppliance = addExternalLoadBalancer(physicalNetworkId, url, "nsroot", "nsroot", answer.getDeviceName(), answer.getServerResource());
ExternalLoadBalancerDeviceVO lbAppliance = addExternalLoadBalancer(physicalNetworkId, url, username, password, answer.getDeviceName(), answer.getServerResource());
if (lbAppliance != null) {
// mark the load balancer as cloudstack managed
@ -611,8 +614,14 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
if (s_logger.isDebugEnabled()) {
s_logger.debug("Successfully destroyed load balancer appliance used for the network" + guestConfig.getId());
}
deviceMapLock.unlock();
// release the private IP back to dc pool, as the load balancer appliance is now destroyed
_dcDao.releasePrivateIpAddress(lbHost.getPrivateIpAddress(), guestConfig.getDataCenterId(), null);
} else {
deviceMapLock.unlock();
}
deviceMapLock.unlock();
return true;
} else {
s_logger.error("Failed to release load balancer device for the network" + guestConfig.getId() + "as failed to acquire lock ");
@ -839,6 +848,11 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
if (add) {
ExternalLoadBalancerDeviceVO lbDeviceVO = allocateLoadBalancerForNetwork(guestConfig);
if (lbDeviceVO == null) {
String msg = "failed to alloacate a external load balancer for the network " + guestConfig.getId();
s_logger.error(msg);
throw new InsufficientNetworkCapacityException(msg, DataCenter.class, guestConfig.getDataCenterId());
}
externalLoadBalancer = _hostDao.findById(lbDeviceVO.getHostId());
s_logger.debug("Allocated external load balancer device:" + lbDeviceVO.getId() + " for the network: " + guestConfig.getId());
} else {