utils: print "RSA PRIVATE KEY" instead of "PRIVATE KEY"

Author: weizhouapache

test/integration/smoke/test_network.py

@@ -2349,7 +2349,7 @@ def _get_ip_address_output(self, ssh):
         return '\n'.join(res)
 
     @attr(tags=["advanced", "shared"], required_hardware="true")
-    def test_01_deployVMInSharedNetwork(self):
+    def test_01_deployVMInSharedNetworkWithConfigDrive(self):
         try:
             self.virtual_machine = VirtualMachine.create(self.apiclient, self.services["virtual_machine"],
                                                          networkids=[self.shared_network.id, self.isolated_network.id],

utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java

@@ -20,6 +20,7 @@
 package com.cloud.utils.ssh;
 
 import java.io.ByteArrayOutputStream;
+import java.io.StringWriter;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.security.KeyPair;
@@ -30,6 +31,8 @@
 
 import org.apache.cloudstack.utils.security.CertUtils;
 import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemWriter;
 
 public class SSHKeysHelper {
 
@@ -139,7 +142,12 @@ private static void writeBigInt(ByteArrayOutputStream out, BigInteger value) thr
 
     public String getPrivateKey() {
         try {
-            return CertUtils.privateKeyToPem(keyPair.getPrivate());
+            final PemObject pemObject = new PemObject("RSA PRIVATE KEY", keyPair.getPrivate().getEncoded());
+            final StringWriter sw = new StringWriter();
+            try (final PemWriter pw = new PemWriter(sw)) {
+                pw.writeObject(pemObject);
+            }
+            return sw.toString();
         } catch (Exception e) {
             e.printStackTrace();
         }