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 2014/01/08 23:51:39 UTC
git commit: updated refs/heads/master to 07557eb
Updated Branches:
refs/heads/master 9a9de5983 -> 07557eb57
CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/07557eb5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07557eb5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07557eb5
Branch: refs/heads/master
Commit: 07557eb5705e4a822055b204f2d4d86d31eb1d67
Parents: 9a9de59
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 8 14:15:18 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 8 14:40:10 2014 -0800
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/response/ProviderResponse.java | 3 +--
server/src/com/cloud/api/ApiResponseHelper.java | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07557eb5/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
index 5d6ec0d..4d41083 100644
--- a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java
@@ -18,14 +18,13 @@ package org.apache.cloudstack.api.response;
import java.util.List;
-import com.google.gson.annotations.SerializedName;
-
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
@EntityReference(value = PhysicalNetworkServiceProvider.class)
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07557eb5/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 41f254f..cfec2b1 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2683,6 +2683,10 @@ public class ApiResponseHelper implements ResponseGenerator {
}
response.setServices(services);
+ Provider serviceProvider = Provider.getProvider(result.getProviderName());
+ boolean canEnableIndividualServices = ApiDBUtils.canElementEnableIndividualServices(serviceProvider);
+ response.setCanEnableIndividualServices(canEnableIndividualServices);
+
response.setObjectName("networkserviceprovider");
return response;
}