Fixed jenkinsci#157

khmarbaise · khmarbaise · commit 80fd834059f2 · 2016-05-03T22:46:15.000+02:00
o Added toggleOffline(crumbFlag)
   toggleOffline() to ComputerWithDetails class.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -5,6 +5,16 @@
 
 ### API Changes
 
+  [Added toggleOffline Node][issue-157]
+  Added toggleOffline to `ComputerWithDetails` class.
+
+```java
+public class ComputerWithDetails {
+  public void toggleOffline(boolean crumbFlag) throws IOException;
+  public void toggleOffline() throws IOException;
+}
+```
+
   [deleteJob throws exception but works anyway][issue-154]
   [Some HTTP calls to jenkins result in a 302, which currently throws an HttpResponseException #7[issue-7]
   [Create Job is failing - any idea on this error][issue-121]
diff --git a/src/main/java/com/offbytwo/jenkins/model/ComputerSet.java b/src/main/java/com/offbytwo/jenkins/model/ComputerSet.java
@@ -2,12 +2,22 @@
 
 import java.util.List;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
 public class ComputerSet extends BaseModel {
     private int busyExecutors;
     List<ComputerWithDetails> computer;
     private String displayName;
     private int totalExecutors;
 
+    public ComputerSet()
+    {
+    }
+
+    
     public int getBusyExecutors() {
         return busyExecutors;
     }
@@ -33,7 +43,13 @@ public void setTotalExecutors(int totalExecutors) {
     }
 
     public List<ComputerWithDetails> getComputer() {
-        return computer;
+        return Lists.transform( computer, new Function<ComputerWithDetails, ComputerWithDetails>() {
+            @Override
+            public ComputerWithDetails apply(ComputerWithDetails computerWithDetails) {
+                computerWithDetails.setClient(client);
+                return computerWithDetails;
+            }
+        });
     }
 
     public void setComputer(List<ComputerWithDetails> computers) {
diff --git a/src/main/java/com/offbytwo/jenkins/model/ComputerWithDetails.java b/src/main/java/com/offbytwo/jenkins/model/ComputerWithDetails.java
@@ -7,6 +7,7 @@
 package com.offbytwo.jenkins.model;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,6 +31,9 @@ public class ComputerWithDetails extends Computer {
     List oneOffExecutors;
     Boolean temporarilyOffline;
 
+    public ComputerWithDetails()
+    {
+    }
     public String getDisplayName() {
         return displayName;
     }
@@ -75,6 +79,24 @@ public LoadStatistics getLoadStatistics() throws IOException {
         return client.get("/computer/" + name + "/" + "loadStatistics/?depth=2", LoadStatistics.class);
     }
 
+    public void toggleOffline(boolean crumbFlag) throws IOException {
+        // curl --data "json=init" -X POST "http://192.168.99.100:8080/computer/(master)/toggleOffline"
+        String name;
+        if ("master".equals(displayName)) {
+            name = "(master)";
+        } else {
+            name = UrlEscapers.urlPathSegmentEscaper().escape(displayName);
+        }
+        
+        Map<String, String> data = new HashMap<String, String>();
+        data.put( "json", "init" );
+        client.post( "/computer/" + name + "/toggleOffline", crumbFlag);
+    }
+
+    public void toggleOffline() throws IOException {
+        toggleOffline( false );
+    }
+
     public Boolean getManualLaunchAllowed() {
         return manualLaunchAllowed;
     }
diff --git a/src/test/java/com/offbytwo/jenkins/integration/ComputerSetIT.java b/src/test/java/com/offbytwo/jenkins/integration/ComputerSetIT.java
@@ -38,4 +38,14 @@ public void shouldGetComputerWithDetailsAndExecutors() throws IOException {
         assertThat(computerWithDetails.getNumExecutors()).isEqualTo(ji.getNumExecutors());
         assertThat(computerWithDetails.getOfflineCause()).isNull();
     }
+    
+    @Test
+    public void shouldTrunFromOnlineToOffline() throws IOException {
+        ComputerWithDetails computerWithDetails = jenkinsServer.getComputerSet().getComputer().get( 0 );
+        computerWithDetails.toggleOffline(true);
+
+        ComputerWithDetails computerWithDetailsAfterStarting = jenkinsServer.getComputerSet().getComputer().get( 0 );
+
+        assertThat( computerWithDetailsAfterStarting.getOffline() ).isTrue();
+    }
 }
diff --git a/src/test/java/com/offbytwo/jenkins/integration/JenkinsServerIT.java b/src/test/java/com/offbytwo/jenkins/integration/JenkinsServerIT.java
@@ -158,7 +158,7 @@ public void shouldBuildAJob() throws Exception {
         assertTrue(jenkinsRule.getInstance().getJobNames().contains(jobName));
 
         JobWithDetails job = server.getJob(jobName);
-        job.build();
+        job.build(true);
 
         while (project.isInQueue() || project.isBuilding()) {
         }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public void shouldBuildAJob() throws Exception {`
`158`	`158`	`assertTrue(jenkinsRule.getInstance().getJobNames().contains(jobName));`
`159`	`159`
`160`	`160`	`JobWithDetails job = server.getJob(jobName);`
`161`		`- job.build();`
	`161`	`+ job.build(true);`
`162`	`162`
`163`	`163`	`while (project.isInQueue() \|\| project.isBuilding()) {`
`164`	`164`	`}`