pkgcloud · morsh · Dec 12, 2016 · Dec 13, 2016 · Dec 13, 2016 · Dec 13, 2016
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,8 +14,16 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "Launch Azure V2",
-      "program": "${workspaceRoot}\\examples\\compute\\azure-v2.js",
+      "name": "Launch Azure V2 Destroy",
+      "program": "${workspaceRoot}//examples//compute//azure-v2-destroy.js",
+      "cwd": "${workspaceRoot}",
+      "stopOnEntry": true
+    },
+     {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Azure V2 Create",
+      "program": "${workspaceRoot}//examples//compute//azure-v2.js",
       "cwd": "${workspaceRoot}",
       "stopOnEntry": true
     },

diff --git a/examples/compute/azure-v2-destroy.js b/examples/compute/azure-v2-destroy.js
@@ -0,0 +1,38 @@
+var pkgcloud = require('../../lib/pkgcloud'),
+  fs = require('fs'),
+  client,
+  options;
+
+//
+// Create a pkgcloud compute instance
+//
+options = {
+  resourceGroup: '{resourceGroup}',
+  provider: 'azure-v2',
+  storageAccount: '{storeName}',
+  storageAccessKey: '{storeKey}',
+  subscriptionId: '{subscriptionId}',
+  spClientId: '{spClientId}',
+  spSecret: '{spSecret}',
+  spDomain: '{spDomain}',
+  spSubscriptionId: '{spSubscriptionId}'
+};
+client = pkgcloud.compute.createClient(options);
+
+//
+// Create a server.
+// This may take several minutes.
+//
+options = {
+  name:  'ms-pkgc-vm-test',   // name of the server
+};
+
+console.log('deleting server...');
+
+client.destroyServer(options, function (err, server) {
+  if (err) {
+    console.log(err);
+  } else {
+    console.log('Started DELETE of VM');
+  }
+});
diff --git a/examples/compute/azure-v2.js b/examples/compute/azure-v2.js
@@ -12,10 +12,10 @@ options = {
   storageAccount: '{storeName}',
   storageAccessKey: '{storeKey}',
   subscriptionId: '{subscriptionId}',
-  spClientId: "{spClientId}",
-  spSecret: "{spSecret}",
-  spDomain: "{spDomain}",
-  spSubscriptionId: "{spSubscriptionId}"
+  spClientId: '{spClientId}',
+  spSecret: '{spSecret}',
+  spDomain: '{spDomain}',
+  spSubscriptionId: '{spSubscriptionId}'
 };
 client = pkgcloud.compute.createClient(options);
 
@@ -25,12 +25,12 @@ client = pkgcloud.compute.createClient(options);
 //
 options = {
   // pkgcloud compute properties
-  name:  'ms-pkgc-test2',   // name of the server
+  name:  'ms-pkgc-vm-test',   // name of the server
   flavor: 'Standard_D1',     // azure vm size
   //image: '5112500ae3b842c8b9c604889f8753c3__OpenLogic-CentOS63DEC20121220', // OS Image to use
   image: {
-    uri: 'https://{storename}.blob.core.windows.net/osdiks/ms-pkgc-test-os2.vhd', 
-    OS: 'linux' 
+    uri: 'https://{storename}.blob.core.windows.net/osdiks/ms-pkgc-test-os2.vhd',
+    OS: 'linux'
   },
   nic: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Network/networkInterfaces/{nicName}',
 
@@ -58,6 +58,3 @@ client.createServer(options, function (err, server) {
     });
   }
 });
-
-
-
diff --git a/lib/pkgcloud/azure-v2/compute/client/servers.js b/lib/pkgcloud/azure-v2/compute/client/servers.js
@@ -119,12 +119,12 @@ exports.createServer = function createServer(options, callback) {
 // Destroy a server in Azure.
 //
 exports.destroyServer = function destroyServer(server, callback) {
-  var serverId = server instanceof base.Server ? server.id : server;
+  var serverName = server.name;
 
-  azureApi.destroyServer(this, serverId, function (err) {
+  azureApi.destroyServer(this, serverName, function (err) {
     if (callback) {
       return !err
-        ? callback && callback(null, { ok: serverId })
+        ? callback && callback(null, { ok: serverName })
         : callback && callback(err);
     }
   });