Fix Jenkins 61702

src/main/java/org/jenkinsci/plugins/vSphereCloudProvisionedSlave.java

@@ -100,89 +100,19 @@ public void preLaunch(Computer c, TaskListener taskListener) throws IOException,
     }
 
     @Extension
-    public static class DescriptorVisibilityFilterImpl extends DescriptorVisibilityFilter {
-        @Override
-        public boolean filter(@CheckForNull Object context, @NonNull Descriptor descriptor) {
-            return !(descriptor instanceof DescriptorImpl);
-        }
-    }
-
-    @Extension
-    public static final class DescriptorImpl extends SlaveDescriptor {
-
-        public DescriptorImpl() {
-            load();
-        }
-
+    public static final class DescriptorImpl extends vSphereCloudSlave.DescriptorImpl {
         @Override
         public String getDisplayName() {
-            return "Slave created from a vSphere Cloud slave template";
+            return super.getDisplayName()+", auto-provisioned by Jenkins from cloud template";
         }
 
         @Override
         public boolean isInstantiable() {
+            /*
+             * This type of agent can't be directly created by the user through the UI.
+             * The user defines a vSphere agent template and _that_ then creates these "on demand".
+             */
             return false;
         }
-
-        public List<vSphereCloud> getvSphereClouds() {
-            List<vSphereCloud> result = new ArrayList<vSphereCloud>();
-            for (Cloud cloud : Jenkins.getInstance().clouds) {
-                if (cloud instanceof vSphereCloud) {
-                    result.add((vSphereCloud) cloud);
-                }
-            }
-            return result;
-        }
-
-        public vSphereCloud getSpecificvSphereCloud(String vsDescription)
-                throws Exception {
-            for (vSphereCloud vs : getvSphereClouds()) {
-                if (vs.getVsDescription().equals(vsDescription)) {
-                    return vs;
-                }
-            }
-            throw new Exception("The vSphere Cloud doesn't exist");
-        }
-
-        public List<String> getIdleOptions() {
-            List<String> options = new ArrayList<String>();
-            options.add("Shutdown");
-            options.add("Shutdown and Revert");
-            options.add("Revert and Restart");
-            options.add("Revert and Reset");
-            options.add("Suspend");
-            options.add("Reset");
-            options.add("Reconnect and Revert");
-            options.add("Nothing");
-            return options;
-        }
-
-        public FormValidation doCheckLaunchDelay(@QueryParameter String value) {
-            return FormValidation.validatePositiveInteger(value);
-        }
-
-        @RequirePOST
-        public FormValidation doTestConnection(@AncestorInPath ItemGroup<?> context,
-                @QueryParameter String vsDescription,
-                @QueryParameter String vmName,
-                @QueryParameter String snapName) {
-            throwUnlessUserHasPermissionToConfigureSlave(context);
-            try {
-                vSphereCloud vsC = getSpecificvSphereCloud(vsDescription);
-                VirtualMachine vm = vsC.vSphereInstance().getVmByName(vmName);
-                if (vm == null) {
-                    return FormValidation.error("Virtual Machine was not found");
-                }
-                if (!snapName.isEmpty()) {
-                    VirtualMachineSnapshot snap = vsC.vSphereInstance().getSnapshotInTree(vm, snapName);
-                    if (snap == null) {
-                        return FormValidation.error("Virtual Machine snapshot was not found");
-                    }
-                }
-                return FormValidation.ok("Virtual Machine found successfully");
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
     }
 }

src/main/java/org/jenkinsci/plugins/vSphereCloudSlave.java

@@ -2,17 +2,13 @@
 
 import static org.jenkinsci.plugins.vsphere.tools.PermissionUtils.throwUnlessUserHasPermissionToConfigureSlave;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.Extension;
 import hudson.Util;
-import hudson.model.DescriptorVisibilityFilter;
 import hudson.model.Queue.BuildableItem;
 import hudson.model.Result;
 import hudson.model.TaskListener;
 import hudson.model.Computer;
-import hudson.model.Descriptor;
 import hudson.model.Descriptor.FormException;
 import hudson.model.Run;
 import hudson.model.queue.CauseOfBlockage;
@@ -368,28 +364,14 @@ public void preLaunch(Computer c, TaskListener taskListener) throws IOException,
     }
 
     @Extension
-    public static class DescriptorVisibilityFilterImpl extends DescriptorVisibilityFilter {
-        @Override
-        public boolean filter(@CheckForNull Object context, @NonNull Descriptor descriptor) {
-            return !(descriptor instanceof DescriptorImpl);
-        }
-    }
-
-    @Extension
-    public static final class DescriptorImpl extends SlaveDescriptor {
-
+    public static class DescriptorImpl extends SlaveDescriptor {
         public DescriptorImpl() {
             load();
         }
 
         @Override
         public String getDisplayName() {
-            return "Slave virtual computer running under vSphere Cloud";
-        }
-
-        @Override
-        public boolean isInstantiable() {
-            return true;
+            return "Agent running within a vSphere hypervisor";
         }
 
         public List<vSphereCloud> getvSphereClouds() {

src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/configure-entries.jelly

@@ -57,7 +57,7 @@
 
     <f:dropdownList name="slave.delegateLauncher" title="${%Secondary launch method}"
                     help="${descriptor.getHelpFile('launcher')}">
-        <j:forEach var="d" items="${descriptor.getComputerLauncherDescriptors()}" varStatus="loop">
+        <j:forEach var="d" items="${descriptor.computerLauncherDescriptors(it)}" varStatus="loop">
             <f:dropdownListBlock value="${d.clazz.name}" name="${d.displayName}"
                                  selected="${it.delegateLauncher.descriptor==d}"
                                  title="${d.displayName}">

src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/newInstanceDetail.jelly

@@ -0,0 +1,4 @@
+<?jelly escape-by-default='true'?>
+<div>
+  ${%detail}
+</div>

src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/newInstanceDetail.properties

@@ -0,0 +1,5 @@
+detail=\
+  Adds a permanent managed vSphere agent to Jenkins. \
+  This is called "managed" because Jenkins can perform vSphere-specific actions (e.g. to revert the agent back to a previous state) upon build completion etc. \
+  Use this if you have defined permanent virtual machines in your vSphere cloud and want Jenkins to handle them. \
+  If you want Jenkins to create, use and destroy machines "on demand" then you should use the Cloud functionality and define a Jenkins agent template instead.