From 07557eb5705e4a822055b204f2d4d86d31eb1d67 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 8 Jan 2014 14:15:18 -0800 Subject: [PATCH] CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse --- .../org/apache/cloudstack/api/response/ProviderResponse.java | 3 +-- server/src/com/cloud/api/ApiResponseHelper.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java index 5d6ec0d5ca3..4d410837476 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") diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 41f254f8390..cfec2b19de5 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; }