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 CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Browse Source 
Description:

	1. Added a new VO class to represent a new table
	   "cluster_vsm_map". The class is ClusterVSMMapVO
	   in ClusterVSMMapVO.java. This table has only
	   two fields - clusterId, VSMId. The clusterId can
	   occur only once. But the same VSMId can be tied
	   to different clusterIds.

	2. Added the Dao interface + implementation of the
	   interface. This provides the functions required
	   to populate objects of type ClusterVSMMapVO with
	   records from the cluster_vsm_map table. The
	   interface is defined in ClusterVSMMapDao.java,
	   and the implementation is in ClusterVSMMapDaoImpl.java.

	3. Changed the table name that represents the VSM to
	   "virtual_supervisor_module" from the earlier overly
	   generic "external_virtual_switch_management_devices".

	4. Added search/remove functions to the Dao of the VSM.
	   This is the Dao for the Cisco Nexus VSM -

		CiscoNexusVSMDeviceDao:CiscoNexusVSMDeviceDaoImpl
		 --> This is the Dao Implementation that would let
		     us query/update records on the
		     "virtual_supervisor_module" table that contains
		     the records of all the VSMs that are added to
		     the Management Server.

NOTE::
======
These were some of the changes made as part of the previous commit (#7):

	1. Renamed CiscoNexusVSMResource.java to CiscoNexusVSM.java.

	2. Changed it to not implement a true resource, but to be
	   just a class providing functionality to talk to a VSM.

	3. Modified the AddCiscoNexusVSMCmd class to take in clusterId
	   instead of zoneId + your fix of the String to Long.
This commit is contained in:
Vijayendra Bhamidipati 2012-04-30 19:07:15 -07:00
parent 28568e694b
commit a940d962ca
8 changed files with 345 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
server/src/com/cloud/dc/ClusterVSMMapVO.java Normal file
View File

@ -0,0 +1,54 @@
// Copyright 2012 Citrix Systems, Inc. Licensed under the
// Apache License, Version 2.0 (the "License"); you may not use this
// file except in compliance with the License. Citrix Systems, Inc.
// reserves all rights not expressly granted by the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.dc;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
// NOTE: This particular table is totally internal to the CS MS.
// Do not ever include a uuid/guid field in this table. We just
// need it map cluster Ids with Cisco Nexus VSM Ids.
@Entity
@Table(name="cluster_vsm_map")
public class ClusterVSMMapVO {
@Column(name="cluster_id")
long clusterId;
@Column(name="vsm_id")
long vsmId;
public ClusterVSMMapVO(long clusterId, long vsmId) {
this.clusterId = clusterId;
this.vsmId = vsmId;
}
public long getClusterId() {
return clusterId;
}
public long getVsmId() {
return vsmId;
}
public void setClusterId(long clusterId) {
this.clusterId = clusterId;
}
public void setVsmId(long vsmId) {
this.vsmId = vsmId;
}
}

25
server/src/com/cloud/dc/dao/ClusterVSMMapDao.java Normal file
View File

@ -0,0 +1,25 @@
// Copyright 2012 Citrix Systems, Inc. Licensed under the
// Apache License, Version 2.0 (the "License"); you may not use this
// file except in compliance with the License. Citrix Systems, Inc.
// reserves all rights not expressly granted by the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.dc.dao;
import java.util.List;
import com.cloud.dc.ClusterVSMMapVO;
import com.cloud.utils.db.GenericDao;
public interface ClusterVSMMapDao extends GenericDao<ClusterVSMMapVO, Long> {
public ClusterVSMMapVO findByClusterId(long clusterId);
public List<ClusterVSMMapVO> listByVSMId(long vsmId);
public boolean removeByVsmId(long vsmId);
}

79
server/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java Normal file
View File

@ -0,0 +1,79 @@
// Copyright 2012 Citrix Systems, Inc. Licensed under the
// Apache License, Version 2.0 (the "License"); you may not use this
// file except in compliance with the License. Citrix Systems, Inc.
// reserves all rights not expressly granted by the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.dc.dao;
import java.util.List;
import javax.ejb.Local;
import com.cloud.dc.ClusterVSMMapVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
@Local(value=ClusterVSMMapDao.class)
public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long> implements ClusterVSMMapDao {
protected final SearchBuilder<ClusterVSMMapVO> ClusterSearch;
protected final SearchBuilder<ClusterVSMMapVO> VsmSearch;
protected ClusterVSMMapDaoImpl() {
super();
ClusterSearch = createSearchBuilder();
ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
ClusterSearch.done();
VsmSearch = createSearchBuilder();
VsmSearch.and("vsmId", VsmSearch.entity().getVsmId(), SearchCriteria.Op.EQ);
VsmSearch.done();
}
@Override
public boolean removeByVsmId(long vsmId) {
SearchCriteria<ClusterVSMMapVO> sc = VsmSearch.create();
sc.setParameters("vsmId", vsmId);
this.remove(sc);
return true;
}
@Override
public ClusterVSMMapVO findByClusterId(long clusterId) {
SearchCriteria<ClusterVSMMapVO> sc = ClusterSearch.create();
sc.setParameters("clusterId", clusterId);
return findOneBy(sc);
}
@Override
public List<ClusterVSMMapVO> listByVSMId(long vsmId) {
SearchCriteria<ClusterVSMMapVO> sc = VsmSearch.create();
sc.setParameters("vsmId", vsmId);
return listBy(sc);
}
public boolean remove(Long id) {
Transaction txn = Transaction.currentTxn();
txn.start();
ClusterVSMMapVO cluster = createForUpdate();
//cluster.setClusterId(null);
//cluster.setVsmId(null);
update(id, cluster);
boolean result = super.remove(id);
txn.commit();
return result;
}
}

243
server/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java
View File

@ -13,6 +13,7 @@
package com.cloud.network;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@ -23,10 +24,13 @@ import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.StartupCommand;
import com.cloud.alert.AlertManager;
import com.cloud.api.ApiConstants;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.ClusterDetailsDao;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.ClusterVSMMapVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterIpAddressVO;
import com.cloud.dc.DataCenterVO;
@ -34,9 +38,11 @@ import com.cloud.dc.Pod;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.ClusterVSMMapDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.dc.dao.VlanDao;
import com.cloud.exception.DiscoveredWithErrorException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InsufficientNetworkCapacityException;
import com.cloud.exception.InvalidParameterValueException;
@ -47,6 +53,7 @@ import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.host.dao.HostDetailsDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.vmware.manager.VmwareManager;
import com.cloud.network.ExternalNetworkDeviceManager.NetworkDevice;
import com.cloud.network.Network.Service;
import com.cloud.network.Networks.TrafficType;
@ -63,6 +70,7 @@ import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceState;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.dao.AccountDao;
@ -79,8 +87,8 @@ import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
import com.cloud.network.dao.CiscoNexusVSMDeviceDao;
import com.cloud.network.resource.CiscoNexusVSM;
import com.cloud.exception.ResourceInUseException;
//public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase implements CiscoNexusVSMDeviceManager, ResourceStateAdapter {
public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase {
@Inject
@ -95,8 +103,7 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase {
NicDao _nicDao;
@Inject
AgentManager _agentMgr;
@Inject
ResourceManager _resourceMgr;
@Inject
IPAddressDao _ipAddressDao;
@Inject
@ -121,133 +128,181 @@ public abstract class CiscoNexusVSMDeviceManagerImpl extends AdapterBase {
PortForwardingRulesDao _portForwardingRulesDao;
@Inject
ConfigurationDao _configDao;
@Inject
HostDetailsDao _hostDetailDao;
@Inject
NetworkExternalLoadBalancerDao _networkLBDao;
@Inject
NetworkServiceMapDao _ntwkSrvcProviderDao;
@Inject
protected HostPodDao _podDao = null;
@Inject
ClusterDao _clusterDao;
@Inject
ClusterVSMMapDao _clusterVSMDao;
@Inject
ResourceManager _resourceMgr;
@Inject VmwareManager _vmwareMgr;
@Inject AlertManager _alertMgr;
@Inject VMTemplateDao _tmpltDao;
@Inject ClusterDetailsDao _clusterDetailsDao;
@Inject
HostDetailsDao _hostDetailDao;
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalLoadBalancerDeviceManagerImpl.class);
// dummy func, will remove later.
private boolean vsmIsReachable(String ipaddress, String username, String password) {
return true; // dummy true for now.
}
@DB
//public CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String username, String password, ServerResource resource, String vsmName) {
public CiscoNexusVSMDeviceVO addCiscoNexusVSM(long clusterId, String ipaddress, String username, String password, String vsmName) {
// In this function, we associate this VSM with the vCenter
// that is associated with the provided clusterId.
// In this function, we associate this VSM with each host
// in the clusterId specified.
// First check if the cluster is of type vmware. If not,
// throw an exception. VSMs are tightly integrated with vmware clusters.
ClusterVO cluster = _clusterDao.findById(clusterId);
// Check if the ClusterVO's hypervisor type is "vmware". If not,
// throw an exception.
if (cluster.getHypervisorType() != HypervisorType.VMware) {
InvalidParameterValueException ex = new InvalidParameterValueException("Cluster with specified id is not a VMWare hypervisor cluster");
throw ex;
}
// Now we need a reference to the vmWareResource for this cluster.
// Next, check if the cluster already has a VSM associated with it.
// If so, throw an exception disallowing this operation. The user must first
// delete the current VSM and then only attempt to add the new one.
if (_clusterVSMDao.findByClusterId(clusterId) != null) {
// We can't have two VSMs for the same cluster. Throw exception.
throw new InvalidParameterValueException("Cluster with specified id already has a VSM tied to it. Please remove that first and retry the operation.");
}
// TODO: Confirm whether we should be checking for VSM reachability here.
DataCenterVO zone = _dcDao.findById(cluster.getDataCenterId());
// Else, check if this VSM is reachable. Use the XML-RPC VSM API Java bindings to talk to
// Next, check if this VSM is reachable. Use the XML-RPC VSM API Java bindings to talk to
// the VSM.
// Create a new VSM object.
CiscoNexusVSM vsmObj = new CiscoNexusVSM(ipaddress, username, password);
if (!vsmObj.connectToVSM()) {
throw new CloudRuntimeException("Couldn't login to the specified VSM");
}
// Since we can reached the VSM, and are logged into it, let's add it to the vCenter.
// In this function, we create a record for this Cisco Nexus VSM, in the database.
// We also hand off interaction with the actual Cisco Nexus VSM via XML-RPC, to the
// Resource Manager. The resource manager invokes the CiscoNexusVSMResource class's
// functionality to talk to the VSM via Java bindings for the VSM's XML-RPC commands.
// Now, go ahead and associate the cluster with this VSM.
// First, check if VSM already exists in the table "virtual_supervisor_module".
// If it's not there already, create it.
// If it's there already, return success.
Map hostDetails = new HashMap<String, String>();
// Do we need guid, zone id, account id, etc???
hostDetails.put(ApiConstants.IP_ADDRESS, ipaddress);
hostDetails.put(ApiConstants.USERNAME, username);
hostDetails.put(ApiConstants.PASSWORD, password);
// Q1) Do we need a zoneUuid to dbzoneId translation? How will the user send in the zoneId?
// We get the zoneId as a uuid, so we need to look up the db zoneId.
// Ask Frank how to do this lookup.
long dbZoneId = clusterId;
// TODO - Right now, we only check if the ipaddress matches for both requests.
// We must really check whether every field of the VSM matches. Anyway, the
// advantage of our approach for now is that existing infrastructure using
// the existing VSM won't be affected if the new request to add the VSM
// assumed different information on the VSM (mgmt vlan, username, password etc).
CiscoNexusVSMDeviceVO VSMObj = _ciscoNexusVSMDeviceDao.getVSMbyIpaddress(ipaddress);
if (VSMObj == null) {
// Create the VSM record. For now, we aren't using the vsmName field.
VSMObj = new CiscoNexusVSMDeviceVO(ipaddress, username, password);
Transaction txn = Transaction.currentTxn();
try {
txn.start();
_ciscoNexusVSMDeviceDao.persist(VSMObj);
txn.commit();
} catch (Exception e) {
txn.rollback();
throw new CloudRuntimeException(e.getMessage());
}
}
// At this stage, we have a VSM record for sure. Connect the VSM to the cluster Id.
ClusterVSMMapVO connectorObj = new ClusterVSMMapVO(clusterId, _ciscoNexusVSMDeviceDao.getVSMbyIpaddress(ipaddress).getId());
Transaction txn = Transaction.currentTxn();
try {
txn.start();
_clusterVSMDao.persist(connectorObj);
txn.commit();
} catch (Exception e) {
txn.rollback();
throw new CloudRuntimeException(e.getMessage());
}
// Now, get a list of all the ESXi servers in this cluster.
// This is effectively a select * from host where cluster_id=clusterId;
// All ESXi servers are stored in the host table, and their resource
// type is vmwareresource.
List<HostVO> hosts = _resourceMgr.listAllHostsInCluster(clusterId);
hostDetails.put(ApiConstants.ZONE_ID, dbZoneId);
hostDetails.put(ApiConstants.GUID, UUID.randomUUID().toString());
// leave parameter validation to be part of server resource configure
Map<String, String> configParams = new HashMap<String, String>();
hostDetails.putAll(configParams);
// Iterate through each of the hosts in this list. Each host has a host id.
// Given this host id, we can reconfigure the in-memory resource representing
// the host via the agent manager. Thus we inject VSM related information
// into each host's resource. Also, we first configure each resource's
// entries in the database to contain this VSM information before the injection.
for (HostVO host : hosts) {
// Create a host details VO object and write it out for this hostid.
long vsmId = _ciscoNexusVSMDeviceDao.getVSMbyIpaddress(ipaddress).getId();
Long hostid = new Long(vsmId);
DetailVO vsmDetail = new DetailVO(host.getId(), "vsmId", hostid.toString());
Transaction tx = Transaction.currentTxn();
try {
tx.start();
_hostDetailDao.persist(vsmDetail);
tx.commit();
} catch (Exception e) {
tx.rollback();
throw new CloudRuntimeException(e.getMessage());
}
// Reconfigure the resource.
Map hostDetails = new HashMap<String, String>();
hostDetails.put(ApiConstants.ID, vsmId);
hostDetails.put(ApiConstants.IP_ADDRESS, ipaddress);
hostDetails.put(ApiConstants.USERNAME, username);
hostDetails.put(ApiConstants.PASSWORD, password);
//_agentMrg.send(host.getId(), )
}
return VSMObj;
}
@DB
public boolean deleteCiscoNexusVSM(long vsmId) throws ResourceInUseException {
CiscoNexusVSMDeviceVO cisconexusvsm = _ciscoNexusVSMDeviceDao.findById(vsmId);
if (cisconexusvsm == null) {
// This entry is already not present. Return success.
return true;
}
// First, check whether this VSM is part of any non-empty cluster.
// Search ClusterVSMMap's table for a list of clusters using this vsmId.
List<ClusterVSMMapVO> clusterList = _clusterVSMDao.listByVSMId(vsmId);
for (ClusterVSMMapVO record : clusterList) {
// If this cluster id has any hosts in it, fail this operation.
Long clusterId = record.getClusterId();
List<HostVO> hosts = _resourceMgr.listAllHostsInCluster(clusterId);
if (hosts != null && hosts.size() > 0) {
throw new ResourceInUseException("Non-empty cluster with id" + clusterId + "still uses VSM. Please empty the cluster first");
}
}
// Iterate through the cluster list again, this time, delete the VSM.
Transaction txn = Transaction.currentTxn();
try {
resource.configure(vsmName, hostDetails);
//resource.discover(vsmName, hostDetails);
// we get a hostVO object.
Host host = _resourceMgr.addHost(dbZoneId, resource, Host.Type.ExternalVirtualSwitchSupervisor, hostDetails);
if (host != null) {
txn.start();
// host.getId() is the zoneId
// Create a VO object from the info that came in from the command.
CiscoNexusVSMDeviceVO vsmDeviceVO = new CiscoNexusVSMDeviceVO(host.getId(), ipaddress, username, password);
// Write the VO record to the table for our Cisco N1KV VSM (external_virtual_switch_management_devices).
_ciscoNexusVSMDeviceDao.persist(vsmDeviceVO);
// Write out another standard VO to another table host_details. We always do this when adding a host.
DetailVO hostDetail = new DetailVO(host.getId(), ApiConstants.EXTERNAL_SWITCH_MGMT_DEVICE_ID, String.valueOf(vsmDeviceVO.getId()));
_hostDetailDao.persist(hostDetail);
txn.commit();
return vsmDeviceVO;
} else {
throw new CloudRuntimeException("Failed to add load balancer device due to internal error.");
txn.start();
for (ClusterVSMMapVO record : clusterList) {
// Remove the VSM entry in CiscoNexusVSMDeviceVO's table.
_ciscoNexusVSMDeviceDao.remove(vsmId);
// Remove the current record as well from ClusterVSMMapVO's table.
_clusterVSMDao.removeByVsmId(vsmId);
// There are no hosts at this stage in the cluster, so we don't need
// to notify any resources or remove host details.
}
} catch (ConfigurationException e) {
txn.rollback();
throw new CloudRuntimeException(e.getMessage());
}
}
public boolean deleteCiscoNexusVSM(long hostId) {
HostVO cisconexusvsm = _hostDao.findById(hostId);
if (cisconexusvsm == null) {
throw new InvalidParameterValueException("Could not find a Cisco Nexus 1000v VSM with specified ID" + hostId);
}
DetailVO vsmHostDetails = _hostDetailDao.findDetail(hostId, ApiConstants.EXTERNAL_SWITCH_MGMT_DEVICE_ID);
long vsmDeviceId = Long.parseLong(vsmHostDetails.getValue());
//CiscoNexusVSMDeviceVO vsmDeviceVO = _ciscoNexusVSMDeviceDao.findById(vsmDeviceId);
try {
_hostDao.update(hostId, cisconexusvsm);
_resourceMgr.deleteHost(hostId, false, false);
// delete the db entry
_ciscoNexusVSMDeviceDao.remove(vsmDeviceId);
return true;
} catch (Exception e) {
s_logger.debug(e);
return false;
txn.commit();
} catch (CloudRuntimeException e) {
throw e;
}
return true;
}
public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd) {

16
server/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
View File

@ -36,7 +36,7 @@ import javax.persistence.Table;
*/
@Entity
@Table(name="external_virtual_switch_management_devices")
@Table(name="virtual_supervisor_module")
public class CiscoNexusVSMDeviceVO {
// We need to know what properties a VSM has. Put them here.
@ -271,15 +271,23 @@ public class CiscoNexusVSMDeviceVO {
// Constructor methods.
public CiscoNexusVSMDeviceVO(long id, String vsmIpAddr, String username, String password) {
public CiscoNexusVSMDeviceVO(String vsmIpAddr, String username, String password) {
// Set all the VSM's properties here.
this.id = id;
this.uuid = UUID.randomUUID().toString();
this.vsmMgmtIPAddr = vsmIpAddr;
this.vsmUserName = username;
this.vsmPassword = password;
}
public CiscoNexusVSMDeviceVO(String vsmIpAddr, String username, String password, String vsmName) {
// Set all the VSM's properties here.
this.uuid = UUID.randomUUID().toString();
this.vsmMgmtIPAddr = vsmIpAddr;
this.vsmUserName = username;
this.vsmPassword = password;
this.vsmName = vsmName;
}
public CiscoNexusVSMDeviceVO() {
this.uuid = UUID.randomUUID().toString();
}

6
server/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java
View File

@ -32,6 +32,12 @@ public interface CiscoNexusVSMDeviceDao extends GenericDao<CiscoNexusVSMDeviceVO
*/
CiscoNexusVSMDeviceVO getVSMbyName(String vsmName);
/**
* Return a Cisco Nexus VSM VO (db record) given its ipaddress.
* @param vsmIpaddr
*/
CiscoNexusVSMDeviceVO getVSMbyIpaddress(String ipaddress);
/**
* Return a list of VSM devices that use the same VLAN for no matter what interface. Unlikely, but oh well.
* @param vlanId

30
server/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
View File

@ -27,6 +27,7 @@ public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDevi
final SearchBuilder<CiscoNexusVSMDeviceVO> mgmtVlanIdSearch;
final SearchBuilder<CiscoNexusVSMDeviceVO> domainIdSearch;
final SearchBuilder<CiscoNexusVSMDeviceVO> nameSearch;
final SearchBuilder<CiscoNexusVSMDeviceVO> ipaddrSearch;
final SearchBuilder<CiscoNexusVSMDeviceVO> genericVlanIdSearch;
// We will add more searchbuilder objects.
@ -35,14 +36,14 @@ public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDevi
super();
mgmtVlanIdSearch = createSearchBuilder();
mgmtVlanIdSearch.and("management_vlan", mgmtVlanIdSearch.entity().getManagementVlan(), Op.EQ);
mgmtVlanIdSearch.and("managementVlan", mgmtVlanIdSearch.entity().getManagementVlan(), Op.EQ);
mgmtVlanIdSearch.done();
genericVlanIdSearch = createSearchBuilder();
genericVlanIdSearch.and("management_vlan", genericVlanIdSearch.entity().getManagementVlan(), Op.EQ);
genericVlanIdSearch.or("control_vlan", genericVlanIdSearch.entity().getControlVlan(), Op.EQ);
genericVlanIdSearch.or("packet_vlan", genericVlanIdSearch.entity().getPacketVlan(), Op.EQ);
genericVlanIdSearch.or("storage_vlan", genericVlanIdSearch.entity().getStorageVlan(), Op.EQ);
genericVlanIdSearch.and("managementVlan", genericVlanIdSearch.entity().getManagementVlan(), Op.EQ);
genericVlanIdSearch.or("controlVlan", genericVlanIdSearch.entity().getControlVlan(), Op.EQ);
genericVlanIdSearch.or("packetVlan", genericVlanIdSearch.entity().getPacketVlan(), Op.EQ);
genericVlanIdSearch.or("storageVlan", genericVlanIdSearch.entity().getStorageVlan(), Op.EQ);
genericVlanIdSearch.done();
domainIdSearch = createSearchBuilder();
@ -53,6 +54,9 @@ public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDevi
nameSearch.and("vsmName", nameSearch.entity().getvsmName(), Op.EQ);
nameSearch.done();
ipaddrSearch = createSearchBuilder();
ipaddrSearch.and("vsmIp", nameSearch.entity().getvsmName(), Op.EQ);
ipaddrSearch.done();
// We may add more and conditions by specifying more fields, like say, accountId.
}
@ -69,18 +73,24 @@ public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDevi
return findOneBy(sc);
}
public CiscoNexusVSMDeviceVO getVSMbyIpaddress(String ipaddress) {
SearchCriteria<CiscoNexusVSMDeviceVO> sc = ipaddrSearch.create();
sc.setParameters("vsmMgmtIPAddr", ipaddress);
return findOneBy(sc);
}
public List<CiscoNexusVSMDeviceVO> listByMgmtVlan(int vlanId) {
SearchCriteria<CiscoNexusVSMDeviceVO> sc = mgmtVlanIdSearch.create();
sc.setParameters("management_vlan", vlanId);
sc.setParameters("managementVlan", vlanId);
return search(sc, null);
}
public List<CiscoNexusVSMDeviceVO> listByVlanId(int vlanId) {
SearchCriteria<CiscoNexusVSMDeviceVO> sc = genericVlanIdSearch.create();
sc.setParameters("management_vlan", vlanId);
sc.setParameters("storage_vlan", vlanId);
sc.setParameters("packet_vlan", vlanId);
sc.setParameters("control_vlan", vlanId);
sc.setParameters("managementVlan", vlanId);
sc.setParameters("storageVlan", vlanId);
sc.setParameters("packetVlan", vlanId);
sc.setParameters("controlVlan", vlanId);
return search(sc, null);
}
}

1
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
View File

@ -45,7 +45,6 @@ import com.cloud.network.Network.Service;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkServiceMapDao;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.resource.CiscoNexusVSMResource;
import com.cloud.resource.ServerResource;
import com.cloud.utils.component.Inject;
import com.cloud.vm.NicProfile;