Titus - sets capacity group for v3 grpc

spinnaker · Mar 26, 2018 · 30a8d6a · 30a8d6a
1 parent 4abd3aa
commit 30a8d6a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/model/JobDescription.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/model/JobDescription.java
@@ -185,9 +185,9 @@ public int getGpu() {
     return gpu;
   }
 
-    public void setRetries() { this.retries = retries; }
+  public void setRetries() { this.retries = retries; }
 
-    public int getRetries() { return retries; }
+  public int getRetries() { return retries; }
 
   public int getRuntimeLimitSecs() {
     return runtimeLimitSecs;
@@ -405,7 +405,7 @@ public JobDescriptor getGrpcJobDescriptor() {
 
     SecurityProfile.Builder securityProfile = SecurityProfile.newBuilder();
 
-    if (securityGroups!= null && !securityGroups.isEmpty()) {
+    if (securityGroups != null && !securityGroups.isEmpty()) {
       securityGroups.forEach(sg ->
         {
           securityProfile.addSecurityGroups(sg);
@@ -441,7 +441,7 @@ public JobDescriptor getGrpcJobDescriptor() {
     Capacity.Builder jobCapacity = Capacity.newBuilder();
     jobCapacity.setMin(instancesMin).setMax(instancesMax).setDesired(instancesDesired);
 
-    if (type == "service") {
+    if (type.equals("service")) {
       JobGroupInfo.Builder jobGroupInfoBuilder = JobGroupInfo.newBuilder();
       if (jobGroupStack != null) {
         jobGroupInfoBuilder.setStack(jobGroupStack);
@@ -453,11 +453,11 @@ public JobDescriptor getGrpcJobDescriptor() {
       jobDescriptorBuilder.setJobGroupInfo(jobGroupInfoBuilder);
       jobDescriptorBuilder.setService(
         ServiceJobSpec.newBuilder().setEnabled(inService)
-        .setCapacity(jobCapacity)
-        .setRetryPolicy(RetryPolicy.newBuilder().setExponentialBackOff(RetryPolicy.ExponentialBackOff.newBuilder().setInitialDelayMs(5000).setMaxDelayIntervalMs(300000))));
+          .setCapacity(jobCapacity)
+          .setRetryPolicy(RetryPolicy.newBuilder().setExponentialBackOff(RetryPolicy.ExponentialBackOff.newBuilder().setInitialDelayMs(5000).setMaxDelayIntervalMs(300000))));
     }
 
-    if (type == "batch") {
+    if (type.equals("batch")) {
       BatchJobSpec.Builder batchJobSpec = BatchJobSpec.newBuilder();
       batchJobSpec.setSize(instancesDesired);
       if (runtimeLimitSecs != 0) {
@@ -467,6 +467,12 @@ public JobDescriptor getGrpcJobDescriptor() {
       jobDescriptorBuilder.setBatch(batchJobSpec);
     }
 
+    if (capacityGroup == null || capacityGroup.isEmpty()) {
+      jobDescriptorBuilder.setCapacityGroup(jobDescriptorBuilder.getApplicationName());
+    } else {
+      jobDescriptorBuilder.setCapacityGroup(capacityGroup);
+    }
+
     return jobDescriptorBuilder.build();
   }
 

diff --git a/...ovy/com/netflix/spinnaker/clouddriver/titus/v3client/RegionScopedV3TitusClientSpec.groovy b/...ovy/com/netflix/spinnaker/clouddriver/titus/v3client/RegionScopedV3TitusClientSpec.groovy
@@ -94,6 +94,7 @@ class RegionScopedV3TitusClientSpec extends Specification {
     then:
     logger.info("job {}", job);
     job != null
+    job.capacityGroup == "helix_hello_world_server";
 
     when:
     job = titusClient.findJobByName(submitJobRequest.getJobName());