system testage

Author: stephenplusplus

lib/compute/index.js

@@ -65,12 +65,6 @@ var streamRouter = require('../common/stream-router.js');
  */
 var util = require('../common/util.js');
 
-/**
- * @type {module:compute/vm}
- * @private
- */
-var VM = require('./vm.js');
-
 /**
  * @type {module:compute/zone}
  * @private
@@ -173,7 +167,7 @@ Compute.prototype.createFirewall = function(name, config, callback) {
     throw new Error('A firewall name must be provided.');
   }
 
-  if (!is.obj(config)) {
+  if (!is.object(config)) {
     throw new Error('A firewall configuration object must be provided.');
   }
 
@@ -248,90 +242,6 @@ Compute.prototype.createNetwork = function(name, config, callback) {
   });
 };
 
-/**
- * Create a virtual machine. This is a convenience method that wraps
- * {module:compute/zone#createVM}. See that method for a full list of supported
- * arguments.
- *
- * @param {string} name - Name of the instance.
- * @param {object} config - See an
- *     [Instance resource](https://goo.gl/fuLRMj) for more information.
- * @param {string|module:compute/zone} config.zone - The zone to create the VM
- *     in.
- * @param {function} callback - The callback function.
- *
- * @example
- * //-
- * // Create a new instance using the latest Debian version as the source image
- * // for a new boot disk.
- * //-
- * var config = {
- *   os: 'debian',
- *   http: true,
- *   zone: 'us-central1-a'
- * };
- *
- * //-
- * // The above object will auto-expand behind the scenes to something like the
- * // following. The Debian version may be different when you run the command.
- * //-
- * var config = {
- *   machineType: 'n1-standard-1',
- *   disks: [
- *     {
- *       boot: true,
- *       initializeParams: {
- *         sourceImage:
- *           'https://www.googleapis.com/compute/v1/projects' +
- *           '/debian-cloud/global/images/debian-7-wheezy-v20150710'
- *       }
- *     }
- *   ],
- *   networkInterfaces: [
- *     {
- *       network: 'global/networks/default'
- *     }
- *   ],
- *   tags: [
- *     {
- *       items: [
- *         'http-server'
- *       ]
- *     }
- *   ],
- *   zone: 'us-central1-a'
- * };
- *
- * function callback(err, instance, operation, apiResponse) {
- *   // `instance` is an Instance object.
- *
- *   // `operation` is an Operation object that can be used to check the status
- *   // of the request.
- * }
- *
- * gce.createVM('new-vm-name', config, callback);
- */
-Compute.prototype.createVM = function(name, config, callback) {
-  config = config || {};
-
-  var zoneName = config.zone;
-  delete config.zone;
-
-  if (!zoneName) {
-    throw new Error('A zone is required to create a virtual machine.');
-  }
-
-  var zone;
-
-  if (zoneName instanceof Zone) {
-    zone = zoneName;
-  } else {
-    zone = this.zone(zoneName);
-  }
-
-  zone.createVM(name, config, callback);
-};
-
 /**
  * Get a reference to a Google Compute Engine firewall.
  *
@@ -438,9 +348,7 @@ Compute.prototype.getAddresses = function(options, callback) {
     var regions = resp.items || {};
 
     var addresses = Object.keys(regions).reduce(function(acc, regionName) {
-      regionName = regionName.replace('regions/', '');
-
-      var region = self.region(regionName);
+      var region = self.region(regionName.replace('regions/', ''));
       var regionAddresses = regions[regionName].addresses || [];
 
       regionAddresses.forEach(function(address) {
@@ -543,9 +451,7 @@ Compute.prototype.getDisks = function(options, callback) {
     var zones = resp.items || {};
 
     var disks = Object.keys(zones).reduce(function(acc, zoneName) {
-      zoneName = zoneName.replace('zones/', '');
-
-      var zone = self.zone(zoneName);
+      var zone = self.zone(zoneName.replace('zones/', ''));
       var disks = zones[zoneName].disks || [];
 
       disks.forEach(function(disk) {
@@ -555,7 +461,7 @@ Compute.prototype.getDisks = function(options, callback) {
       });
 
       return acc;
-    });
+    }, []);
 
     callback(null, disks, nextQuery, resp);
   });
@@ -1096,19 +1002,6 @@ Compute.prototype.snapshot = function(name) {
   return new Snapshot(this, name);
 };
 
-/**
- * Get a reference to a Google Compute Engine virtual machine instance.
- *
- * @param {string} name - Name of the existing virtual machine.
- * @return {module:compute/vm}
- *
- * @example
- * var vm = gce.vm('vm-name');
- */
-Compute.prototype.vm = function(name) {
-  return new VM(this, null, name);
-};
-
 /**
  * Get a reference to a Google Compute Engine zone.
  *

lib/compute/operation.js

@@ -58,13 +58,13 @@ var util = require('../common/util.js');
  * //-
  * // Reference a zone operation.
  * //-
- * var zone = compute.zone('us-central1-a');
+ * var zone = gce.zone('us-central1-a');
  * var operation = zone.operation('operation-id');
  *
  * //-
  * // Reference a regional operation.
  * //-
- * var region = compute.region('us-central1');
+ * var region = gce.region('us-central1');
  * var operation = region.operation('operation-id');
  */
 function Operation(scope, name) {
@@ -152,36 +152,32 @@ Operation.prototype.onComplete = function(options, callback) {
     interval: 3000
   }, options);
 
-  var attempts = 0;
+  var numAttempts = 1;
 
-  checkIfComplete();
+  this.getMetadata(onMetadata);
 
-  function checkIfComplete() {
-    setTimeout(function() {
-      attempts++;
-
-      self.getMetadata(function(err, metadata) {
-        if (err) {
-          callback(err);
-          return;
-        }
+  function onMetadata(err, metadata) {
+    if (err) {
+      callback(err);
+      return;
+    }
 
-        if (metadata.status !== 'DONE') {
-          if (attempts < options.maxAttempts) {
-            checkIfComplete();
-          } else {
-            var didNotCompleteError = new Error('Operation did not complete.');
-            didNotCompleteError.code = 'OPERATION_INCOMPLETE';
-            callback(didNotCompleteError, metadata);
-          }
+    if (metadata.status !== 'DONE') {
+      if (numAttempts < options.maxAttempts) {
+        setTimeout(function() {
+          self.getMetadata(onMetadata);
+        }, options.interval);
+      } else {
+        var didNotCompleteError = new Error('Operation did not complete.');
+        didNotCompleteError.code = 'OPERATION_INCOMPLETE';
+        callback(didNotCompleteError, metadata);
+      }
 
-          return;
-        }
+      return;
+    }
 
-        // The operation is complete.
-        callback(null, metadata);
-      });
-    }, options.interval);
+    // The operation is complete.
+    callback(null, metadata);
   }
 };
 

lib/compute/region.js

@@ -60,7 +60,7 @@ var streamRouter = require('../common/stream-router.js');
  *
  * var gce = gcloud.compute();
  *
- * var region = gce.region('region-name');
+ * var region = gce.region('us-central1');
  */
 function Region(compute, name) {
   this.compute = compute;
@@ -85,6 +85,8 @@ Region.prototype.address = function(name) {
  * options see [API reference](https://goo.gl/lY8Y3u).
  *
  * @param {string} name - Name of the address.
+ * @param {object=} options - See an
+ *     [Address resource](https://goo.gl/TyL9SS) for more information.
  * @param {function} callback - The callback function.
  *
  * @example
@@ -97,12 +99,17 @@ Region.prototype.address = function(name) {
  *
  * region.createAddress('new-address', callback);
  */
-Region.prototype.createAddress = function(name, callback) {
+Region.prototype.createAddress = function(name, options, callback) {
   var self = this;
 
-  var body = {
+  if (is.fn(options)) {
+    callback = options;
+    options = {};
+  }
+
+  var body = extend({}, options, {
     name: name
-  };
+  });
 
   this.makeReq_('POST', '/addresses', null, body, function(err, resp) {
     if (err) {