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

List asa api to return guest network if associated. From this it can be inferred if asa is available or not

This commit is contained in:
Koushik Das 2013-03-01 01:19:43 +05:30
parent 32223736c9
commit 22e1455142
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java
View File

@ -21,6 +21,7 @@ import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import com.cloud.network.cisco.CiscoAsa1000vDevice;
@ -34,28 +35,36 @@ public class CiscoAsa1000vResourceResponse extends BaseResponse {
private String id;
@SerializedName(ApiConstants.PHYSICAL_NETWORK_ID)
@Parameter(description="the physical network to which this VNMC belongs to", entityType = PhysicalNetworkResponse.class)
@Parameter(description="the physical network to which this ASA 1000v belongs to", entityType = PhysicalNetworkResponse.class)
private Long physicalNetworkId ;
public Long getPhysicalNetworkId() {
return physicalNetworkId;
}
return physicalNetworkId;
}
@SerializedName(ApiConstants.HOST_NAME)
@Parameter(description="management ip address of ASA 1000v")
@SerializedName(ApiConstants.HOST_NAME)
@Parameter(description="management ip address of ASA 1000v")
private String managementIp;
public String getManagementIp() {
return managementIp;
}
public String getManagementIp() {
return managementIp;
}
@SerializedName(ApiConstants.ASA_INSIDE_PORT_PROFILE)
@Parameter(description="management ip address of ASA 1000v")
@SerializedName(ApiConstants.ASA_INSIDE_PORT_PROFILE)
@Parameter(description="management ip address of ASA 1000v")
private String inPortProfile;
public String getInPortProfile() {
return inPortProfile;
}
public String getInPortProfile() {
return inPortProfile;
}
@SerializedName(ApiConstants.NETWORK_ID)
@Parameter(description="the guest network to which ASA 1000v is associated", entityType = NetworkResponse.class)
private Long guestNetworkId;
public Long getGuestNetworkId() {
return guestNetworkId;
}
public void setId(String ciscoAsa1000vResourceId) {
this.id = ciscoAsa1000vResourceId;
@ -72,5 +81,8 @@ public class CiscoAsa1000vResourceResponse extends BaseResponse {
public void setInPortProfile(String inPortProfile) {
this.inPortProfile = inPortProfile;
}
public void setGuestNetworkId(Long guestNetworkId) {
this.guestNetworkId = guestNetworkId;
}
}

15
plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
View File

@ -421,8 +421,14 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro
@Override
public List<Class<?>> getCommands() {
// TODO Auto-generated method stub
return null;
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(AddCiscoVnmcResourceCmd.class);
cmdList.add(DeleteCiscoVnmcResourceCmd.class);
cmdList.add(ListCiscoVnmcResourcesCmd.class);
cmdList.add(AddCiscoAsa1000vResourceCmd.class);
cmdList.add(DeleteCiscoAsa1000vResourceCmd.class);
cmdList.add(ListCiscoAsa1000vResourcesCmd.class);
return cmdList;
}
@Override
@ -774,6 +780,11 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro
response.setManagementIp(ciscoAsa1000vDeviceVO.getManagementIp());
response.setInPortProfile(ciscoAsa1000vDeviceVO.getInPortProfile());
NetworkAsa1000vMapVO networkAsaMap = _networkAsa1000vMapDao.findByAsa1000vId(ciscoAsa1000vDeviceVO.getId());
if (networkAsaMap != null) {
response.setGuestNetworkId(networkAsaMap.getNetworkId());
}
return response;
}