You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/23 20:20:02 UTC
[2/4] git commit: Merge branch 'master' into vpc
Merge branch 'master' into vpc
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7cf70025
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7cf70025
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7cf70025
Branch: refs/heads/vpc
Commit: 7cf70025718e27d6574aa558c371e881dcc0749a
Parents: c8f72c9 7bef9a9
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 23 10:53:34 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Jul 23 10:57:55 2012 -0700
----------------------------------------------------------------------
api/src/com/cloud/api/commands/CreateTagsCmd.java | 1 +
server/src/com/cloud/api/ApiResponseHelper.java | 4 ----
.../network/security/dao/SecurityGroupDaoImpl.java | 14 ++++++++++++++
.../com/cloud/tags/TaggedResourceManagerImpl.java | 12 +++++++++---
4 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7cf70025/api/src/com/cloud/api/commands/CreateTagsCmd.java
----------------------------------------------------------------------
diff --cc api/src/com/cloud/api/commands/CreateTagsCmd.java
index 9d287fe,a981363..18adbaa
--- a/api/src/com/cloud/api/commands/CreateTagsCmd.java
+++ b/api/src/com/cloud/api/commands/CreateTagsCmd.java
@@@ -33,8 -33,14 +33,9 @@@ import com.cloud.api.Parameter
import com.cloud.api.ServerApiException;
import com.cloud.api.response.SuccessResponse;
import com.cloud.event.EventTypes;
+ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.server.ResourceTag;
import com.cloud.server.ResourceTag.TaggedResourceType;
-
-/**
- * @author Alena Prokharchyk
- */
-
@Implementation(description = "Creates resource tag(s)", responseObject = SuccessResponse.class, since = "Burbank")
public class CreateTagsCmd extends BaseAsyncCmd{
public static final Logger s_logger = Logger.getLogger(CreateTagsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7cf70025/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiResponseHelper.java
index 898c676,4c88e2b..f957223
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@@ -3633,170 -3585,5 +3633,166 @@@ public class ApiResponseHelper implemen
return response;
}
+ @Override
+ public VpcOfferingResponse createVpcOfferingResponse(VpcOffering offering) {
+ VpcOfferingResponse response = new VpcOfferingResponse();
+ response.setId(offering.getId());
+ response.setName(offering.getName());
+ response.setDisplayText(offering.getDisplayText());
+ response.setIsDefault(offering.isDefault());
+ response.setState(offering.getState().name());
+
+ Map<Service, Set<Provider>> serviceProviderMap = ApiDBUtils.listVpcOffServices(offering.getId());
+ List<ServiceResponse> serviceResponses = new ArrayList<ServiceResponse>();
+ for (Service service : serviceProviderMap.keySet()) {
+ ServiceResponse svcRsp = new ServiceResponse();
+ // skip gateway service
+ if (service == Service.Gateway) {
+ continue;
+ }
+ svcRsp.setName(service.getName());
+ List<ProviderResponse> providers = new ArrayList<ProviderResponse>();
+ for (Provider provider : serviceProviderMap.get(service)) {
+ if (provider != null) {
+ ProviderResponse providerRsp = new ProviderResponse();
+ providerRsp.setName(provider.getName());
+ providers.add(providerRsp);
+ }
+ }
+ svcRsp.setProviders(providers);
+
+ serviceResponses.add(svcRsp);
+ }
+ response.setServices(serviceResponses);
+ response.setObjectName("vpcoffering");
+ return response;
+ }
+
+
+ @Override
+ public VpcResponse createVpcResponse(Vpc vpc) {
+ VpcResponse response = new VpcResponse();
+ response.setId(vpc.getId());
+ response.setName(vpc.getName());
+ response.setDisplayText(vpc.getDisplayText());
+ response.setState(vpc.getState().name());
+ response.setVpcOfferingId(vpc.getVpcOfferingId());
+ response.setCidr(vpc.getCidr());
+ response.setRestartRequired(vpc.isRestartRequired());
+ response.setNetworkDomain(vpc.getNetworkDomain());
+
+ Map<Service, Set<Provider>> serviceProviderMap = ApiDBUtils.listVpcOffServices(vpc.getVpcOfferingId());
+ List<ServiceResponse> serviceResponses = new ArrayList<ServiceResponse>();
+ for (Service service : serviceProviderMap.keySet()) {
+ ServiceResponse svcRsp = new ServiceResponse();
+ // skip gateway service
+ if (service == Service.Gateway) {
+ continue;
+ }
+ svcRsp.setName(service.getName());
+ List<ProviderResponse> providers = new ArrayList<ProviderResponse>();
+ for (Provider provider : serviceProviderMap.get(service)) {
+ if (provider != null) {
+ ProviderResponse providerRsp = new ProviderResponse();
+ providerRsp.setName(provider.getName());
+ providers.add(providerRsp);
+ }
+ }
+ svcRsp.setProviders(providers);
+
+ serviceResponses.add(svcRsp);
+ }
+
+ List<NetworkResponse> networkResponses = new ArrayList<NetworkResponse>();
+ List<? extends Network> networks = ApiDBUtils.listVpcNetworks(vpc.getId());
+ for (Network network : networks) {
+ NetworkResponse ntwkRsp = createNetworkResponse(network);
+ networkResponses.add(ntwkRsp);
+ }
+
+ DataCenter zone = ApiDBUtils.findZoneById(vpc.getZoneId());
+ response.setZoneId(vpc.getZoneId());
+ response.setZoneName(zone.getName());
+
+ response.setNetworks(networkResponses);
+ response.setServices(serviceResponses);
+ response.setObjectName("vpc");
+ return response;
+ }
+
+ @Override
+ public PrivateGatewayResponse createPrivateGatewayResponse(PrivateGateway result) {
+ PrivateGatewayResponse response = new PrivateGatewayResponse();
+ response.setId(result.getId());
+ response.setVlan(result.getVlanTag());
+ response.setGateway(result.getGateway());
+ response.setNetmask(result.getNetmask());
+ response.setVpcId(result.getVpcId());
+ response.setZoneId(result.getZoneId());
+ DataCenter zone = ApiDBUtils.findZoneById(result.getZoneId());
+ response.setZoneName(zone.getName());
+ response.setAddress(result.getIp4Address());
+ response.setPhysicalNetworkId(result.getPhysicalNetworkId());
+
+ populateAccount(response, result.getAccountId());
+ populateDomain(response, result.getDomainId());
+ response.setState(result.getState().toString());
+
+ response.setObjectName("privategateway");
+
+ return response;
+ }
+
+ @Override
+ public StaticRouteResponse createStaticRouteResponse(StaticRoute result) {
+ StaticRouteResponse response = new StaticRouteResponse();
+ response.setId(result.getId());
+ response.setVpcId(result.getVpcId());
+ response.setCidr(result.getCidr());
+
+ StaticRoute.State state = result.getState();
+ String stateToSet = state.toString();
+ if (state.equals(FirewallRule.State.Revoke)) {
+ stateToSet = "Deleting";
+ }
+ response.setState(stateToSet);
+ populateAccount(response, result.getAccountId());
+ populateDomain(response, result.getDomainId());
+ response.setObjectName("staticroute");
+
+ return response;
+ }
+ @Override
+ public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVpnGateway result) {
+ Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse();
+ response.setId(result.getId());
+ response.setIp(ApiDBUtils.findIpAddressById(result.getAddrId()).getAddress().toString());
- response.setVpcId(result.getVpcId());
+ response.setRemoved(result.getRemoved());
+ response.setObjectName("vpngateway");
+
- populateAccount(response, result.getAccountId());
- populateDomain(response, result.getDomainId());
-
+ return response;
+ }
+
+ @Override
+ public Site2SiteCustomerGatewayResponse createSite2SiteCustomerGatewayResponse(Site2SiteCustomerGateway result) {
+ Site2SiteCustomerGatewayResponse response = new Site2SiteCustomerGatewayResponse();
+ response.setId(result.getId());
+ response.setGatewayIp(result.getGatewayIp());
+ response.setGuestCidrList(result.getGuestCidrList());
+ response.setIpsecPsk(result.getIpsecPsk());
+ response.setRemoved(result.getRemoved());
+ return response;
+ }
+
+ @Override
+ public Site2SiteVpnConnectionResponse createSite2SiteVpnConnectionResponse(Site2SiteVpnConnection result) {
+ Site2SiteVpnConnectionResponse response = new Site2SiteVpnConnectionResponse();
+ response.setId(result.getId());
+ response.setVpnGatewayId(result.getVpnGatewayId());
+ response.setCustomerGatewayId(result.getCustomerGatewayId());
+ response.setCreated(result.getCreated());
+ response.setRemoved(result.getRemoved());
+ return response;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7cf70025/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------