feat(provider/azure): Enable highlight effect for server group in loa…

…d balancer section (#3768)
spinnaker · Jun 10, 2019 · 96a4835 · 96a4835
1 parent 6f48e6b
commit 96a4835
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...flix/spinnaker/clouddriver/azure/resources/appgateway/view/AzureAppGatewayProvider.groovy b/...flix/spinnaker/clouddriver/azure/resources/appgateway/view/AzureAppGatewayProvider.groovy
@@ -24,8 +24,10 @@ import com.netflix.spinnaker.cats.cache.RelationshipCacheFilter
 import com.netflix.spinnaker.clouddriver.azure.AzureCloudProvider
 import com.netflix.spinnaker.clouddriver.azure.common.AzureUtilities
 import com.netflix.spinnaker.clouddriver.azure.resources.appgateway.model.AzureAppGatewayDescription
+import com.netflix.spinnaker.clouddriver.azure.resources.cluster.view.AzureClusterProvider
 import com.netflix.spinnaker.clouddriver.azure.resources.common.cache.Keys
 import com.netflix.spinnaker.clouddriver.azure.resources.loadbalancer.model.AzureLoadBalancer
+import com.netflix.spinnaker.clouddriver.azure.resources.servergroup.model.AzureServerGroupDescription
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
 import com.netflix.spinnaker.clouddriver.security.AccountCredentialsProvider
@@ -44,6 +46,9 @@ class AzureAppGatewayProvider implements LoadBalancerProvider<AzureLoadBalancer>
   @Autowired
   AccountCredentialsProvider accountCredentialsProvider
 
+  @Autowired
+  AzureClusterProvider clusterProvider
+
   @Autowired
   AzureAppGatewayProvider(AzureCloudProvider azureCloudProvider, Cache cacheView, ObjectMapper objectMapper) {
     this.azureCloudProvider = azureCloudProvider
@@ -91,10 +96,11 @@ class AzureAppGatewayProvider implements LoadBalancerProvider<AzureLoadBalancer>
       loadBalancerType: AzureLoadBalancer.AzureLoadBalancerType.AZURE_APPLICATION_GATEWAY
     )
     description.serverGroups?.each { serverGroup ->
-      // TODO: add proper check for enable/disable server groups
+      AzureServerGroupDescription asg = clusterProvider.getServerGroup(loadBalancer.account, loadBalancer.region, serverGroup)
+
       loadBalancer.serverGroups.add(new LoadBalancerServerGroup (
         name: serverGroup,
-        isDisabled: false,
+        isDisabled: asg.isDisabled(),
         detachedInstances: [],
         instances: [],
         cloudProvider: AzureCloudProvider.ID

diff --git a/.../spinnaker/clouddriver/azure/resources/loadbalancer/view/AzureLoadBalancerProvider.groovy b/.../spinnaker/clouddriver/azure/resources/loadbalancer/view/AzureLoadBalancerProvider.groovy
@@ -23,9 +23,11 @@ import com.netflix.spinnaker.cats.cache.CacheData
 import com.netflix.spinnaker.cats.cache.RelationshipCacheFilter
 import com.netflix.spinnaker.clouddriver.azure.AzureCloudProvider
 import com.netflix.spinnaker.clouddriver.azure.common.AzureUtilities
+import com.netflix.spinnaker.clouddriver.azure.resources.cluster.view.AzureClusterProvider
 import com.netflix.spinnaker.clouddriver.azure.resources.common.cache.Keys
 import com.netflix.spinnaker.clouddriver.azure.resources.loadbalancer.model.AzureLoadBalancer
 import com.netflix.spinnaker.clouddriver.azure.resources.loadbalancer.model.AzureLoadBalancerDescription
+import com.netflix.spinnaker.clouddriver.azure.resources.servergroup.model.AzureServerGroupDescription
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerProvider
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup
 import com.netflix.spinnaker.clouddriver.security.AccountCredentialsProvider
@@ -49,6 +51,9 @@ class AzureLoadBalancerProvider implements LoadBalancerProvider<AzureLoadBalance
   @Autowired
   AccountCredentialsProvider accountCredentialsProvider
 
+  @Autowired
+  AzureClusterProvider clusterProvider
+
   @Autowired
   AzureLoadBalancerProvider azureLoadBalancerProvider
 
@@ -202,10 +207,11 @@ class AzureLoadBalancerProvider implements LoadBalancerProvider<AzureLoadBalance
     )
 
     loadBalancerDescription.serverGroups?.each { serverGroup ->
-      // TODO: add proper check for enable/disable server groups
+      AzureServerGroupDescription asg = clusterProvider.getServerGroup(loadBalancer.account, loadBalancer.region, serverGroup)
+
       loadBalancer.serverGroups.add(new LoadBalancerServerGroup (
         name: serverGroup,
-        isDisabled: false,
+        isDisabled: asg.isDisabled(),
         detachedInstances: [],
         instances: [],
         cloudProvider: AzureCloudProvider.ID