[FIXED JENKINS-43704] add separator to the VMCloud name and revert ch…

…anges with only blank lines
jenkinsci · May 23, 2017 · 9543eb8 · 9543eb8
1 parent 19413ef
commit 9543eb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgent.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgent.java
@@ -259,6 +259,9 @@ public Localizable getCleanUpReason() {
         return cleanUpReason;
     }
 
+    /**
+     * @param cleanUpReason
+     */
     private void setCleanUpAction(CleanUpAction cleanUpAction) {
         // Translate a default cleanup action into what we want for a particular
         // node

diff --git a/src/main/java/com/microsoft/azure/vmagent/util/AzureUtil.java b/src/main/java/com/microsoft/azure/vmagent/util/AzureUtil.java
@@ -250,7 +250,7 @@ public static boolean isDeploymentAlreadyOccupied(String errorMessage) {
      * @return Name of the cloud
      */
     public static String getCloudName(final String subscriptionId, final String resourceGroupName) {
-        return Constants.AZURE_CLOUD_PREFIX + subscriptionId + resourceGroupName;
+        return Constants.AZURE_CLOUD_PREFIX + subscriptionId + "-" + resourceGroupName;
     }
 
     /**