knife-google 1.1.0 → 1.2.0

data/spec/google/compute/global_operation_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::GlobalOperation do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -29,8 +29,8 @@ describe Google::Compute::GlobalOperation do
 
   it '#list should return an array of global operations' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.global_operations.list, 
-           :parameters=>{ :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.global_operations.list,
+           :parameters => { :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::GlobalOperation, true))
 
     operations = client.globalOperations.list
@@ -40,8 +40,8 @@ describe Google::Compute::GlobalOperation do
 
   it '#get should return an individual global operation' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.global_operations.get, 
-           :parameters=>{'globalOperation'=>'mock-global-operation', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.global_operations.get,
+           :parameters => {'globalOperation' => 'mock-global-operation', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::GlobalOperation))
 
     operation = client.globalOperations.get('mock-global-operation')
@@ -53,8 +53,8 @@ describe Google::Compute::GlobalOperation do
 
   it '#delete should delete an existing global operation' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.global_operations.delete, 
-           :parameters=>{'globalOperation'=>'mock-global-operation', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.global_operations.delete,
+           :parameters => {'globalOperation' => 'mock-global-operation', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response)
 
     client.globalOperations.delete('mock-global-operation')

data/spec/google/compute/image_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::Image do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -29,8 +29,8 @@ describe Google::Compute::Image do
 
   it '#get should return an individual image' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.images.get, 
-           :parameters=>{'image'=>'mock-image', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.images.get,
+           :parameters => {'image' => 'mock-image', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Image))
     image = client.images.get('mock-image')
     image.should be_a_kind_of Google::Compute::Image
@@ -41,8 +41,8 @@ describe Google::Compute::Image do
 
   it '#list should return an array of images' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.images.list, 
-           :parameters=>{ :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.images.list,
+           :parameters => { :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Image, true))
     images = client.images.list
     images.should_not be_empty
@@ -51,23 +51,23 @@ describe Google::Compute::Image do
   it '#create should create a new image' do
     storage = 'https://www.googleapis.com/storage/projects/mock-project/bucket/object'
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.images.insert, 
-           :parameters=>{ :project=>'mock-project'},
-           :body_object=>{:name=>'mock-image',
-              :rawDisk=>{'containerType'=>'TAR','source'=>storage},
-              :sourceType=>'RAW'}).
+      with(:api_method => mock_compute.images.insert,
+           :parameters => { :project => 'mock-project'},
+           :body_object => {:name => 'mock-image',
+              :rawDisk => {'containerType' => 'TAR', 'source' => storage},
+              :sourceType => 'RAW'}).
            and_return(mock_response(Google::Compute::GlobalOperation))
-    o = client.images.create(:name=>'mock-image',
-              :rawDisk=>{'containerType'=>'TAR','source'=>storage},
-              :sourceType=>'RAW')
+    o = client.images.create(:name => 'mock-image',
+              :rawDisk => {'containerType' => 'TAR', 'source' => storage},
+              :sourceType => 'RAW')
 
     o.should be_a_kind_of Google::Compute::GlobalOperation
   end
 
   it '#delete should delete an existing image' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.images.delete, 
-           :parameters=>{ :project=>'mock-project','image'=>'mock-image'},:body_object =>nil).
+      with(:api_method => mock_compute.images.delete,
+           :parameters => { :project => 'mock-project', 'image' => 'mock-image'}, :body_object => nil).
            and_return(mock_response(Google::Compute::GlobalOperation))
     o = client.images.delete('mock-image')
     o.should be_a_kind_of Google::Compute::GlobalOperation

data/spec/google/compute/machine_type_spec.rb

@@ -18,9 +18,9 @@ require 'spec_helper'
 describe Google::Compute::MachineType do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -32,8 +32,8 @@ describe Google::Compute::MachineType do
   it '#get should return an individual machine types' do
 
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.machine_types.get, 
-           :parameters=>{'machineType'=>'mock-machine-type', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.machine_types.get,
+           :parameters => {'machineType' => 'mock-machine-type', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::MachineType))
 
     machine_type = client.machine_types.get('mock-machine-type')
@@ -43,8 +43,8 @@ describe Google::Compute::MachineType do
   end
   it '#list should return an array of machine types' do
   @mock_api_client.should_receive(:execute).
-    with(:api_method=>mock_compute.machine_types.list, 
-         :parameters=>{ :project=>'mock-project'},:body_object=>nil).
+    with(:api_method => mock_compute.machine_types.list,
+         :parameters => { :project => 'mock-project'}, :body_object => nil).
          and_return(mock_response(Google::Compute::MachineType, true))
     mts = client.machine_types.list
     mts.should_not be_empty

data/spec/google/compute/network_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::Network do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -26,11 +26,11 @@ describe Google::Compute::Network do
   end
 
   it_should_behave_like Google::Compute::Resource
-  
+
   it '#get should return an individual network' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.networks.get, 
-           :parameters=>{'network'=>'mock-network', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.networks.get,
+           :parameters => {'network' => 'mock-network', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Network))
     network = client.networks.get('mock-network')
     network.should be_a_kind_of Google::Compute::Network
@@ -40,8 +40,8 @@ describe Google::Compute::Network do
 
   it '#list should return an array of networks' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.networks.list, 
-           :parameters=>{ :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.networks.list,
+           :parameters => { :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Network, true))
     networks = client.networks.list
     networks.should_not be_empty
@@ -50,18 +50,18 @@ describe Google::Compute::Network do
 
   it '#create should create a new network' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.networks.insert, 
-           :parameters=>{ :project=>'mock-project'},
-           :body_object=>{:name=>'mock-network', :IPv4Range=>'122.12.0.0/16'}).
+      with(:api_method => mock_compute.networks.insert,
+           :parameters => { :project => 'mock-project'},
+           :body_object => {:name => 'mock-network', :IPv4Range => '122.12.0.0/16'}).
            and_return(mock_response(Google::Compute::GlobalOperation))
-    o = client.networks.create(:name=>'mock-network', :IPv4Range=>'122.12.0.0/16')
+    o = client.networks.create(:name => 'mock-network', :IPv4Range => '122.12.0.0/16')
     o.should be_a_kind_of Google::Compute::GlobalOperation
   end
 
   it '#delete should delete an existing network' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.networks.delete, 
-           :parameters=>{'network'=>'mock-network', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.networks.delete,
+           :parameters => {'network' => 'mock-network', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::GlobalOperation))
     client.networks.delete('mock-network')
   end

data/spec/google/compute/project_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::Project do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -29,8 +29,8 @@ describe Google::Compute::Project do
 
   it '#get should return an individual project' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.projects.get, 
-           :parameters=>{:project=>'mock-project','project'=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.projects.get,
+           :parameters => {:project => 'mock-project', 'project' => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Project))
     project = client.projects.get('mock-project')
     project.should be_a_kind_of Google::Compute::Project
@@ -44,28 +44,28 @@ describe Google::Compute::Project do
 
     let(:project) do
       Google::Compute::Project.new(mock_hash(Google::Compute::Project).
-                                    merge(:dispatcher=>client.dispatcher))
+                                   merge(:dispatcher => client.dispatcher))
     end
 
     it 'should be able to add common instance metadata' do
       @mock_api_client.should_receive(:execute).
-        with(:api_method=>mock_compute.projects.set_common_instance_metadata, 
-           :parameters=>{:project=>'mock-project'},
-           :body_object=>{'kind'=>'compute#metadata', 
-             'items'=>[{'key'=>'mock-key', 'value'=>'mock-value'}, 
-               {'key'=>'testKey', 'value'=>'testValue'}]}).
+        with(:api_method => mock_compute.projects.set_common_instance_metadata,
+             :parameters => {:project => 'mock-project'},
+             :body_object => {'kind' => 'compute#metadata',
+             'items' => [{'key' => 'mock-key', 'value' => 'mock-value'},
+               {'key' => 'testKey', 'value' => 'testValue'}]}).
                and_return(mock_response)
-      project.add_common_instance_metadata!('testKey'=>'testValue')
+      project.add_common_instance_metadata!('testKey' => 'testValue')
     end
 
     it 'should be able to remove common instance metadata' do
       @mock_api_client.should_receive(:execute).
-        with(:api_method=>mock_compute.projects.set_common_instance_metadata, 
-           :parameters=>{:project=>'mock-project'},
-           :body_object=>{'kind'=>'compute#metadata', 
-             'items'=>[]}).
+        with(:api_method => mock_compute.projects.set_common_instance_metadata,
+             :parameters => {:project => 'mock-project'},
+             :body_object => {'kind' => 'compute#metadata',
+             'items' => []}).
                and_return(mock_response)
-      project.remove_common_instance_metadata!('mock-key'=>'mock-value')
+      project.remove_common_instance_metadata!('mock-key' => 'mock-value')
     end
 end
 

data/spec/google/compute/region_spec.rb

@@ -0,0 +1,51 @@
+# Copyright 2013 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe Google::Compute::Region do
+
+  before(:each) do
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
+  end
+
+  let(:client) do
+    Google::Compute::Client.from_json(mock_data_file(Google::Compute::Client))
+  end
+
+  it_should_behave_like Google::Compute::Resource
+
+  it '#get should return an individual region' do
+    @mock_api_client.should_receive(:execute).
+      with(:api_method => mock_compute.regions.get,
+           :parameters => {"region" => "mock-region", :project => "mock-project"}, :body_object => nil).
+           and_return(mock_response(Google::Compute::Region))
+    region = client.regions.get('mock-region')
+    region.should be_a_kind_of Google::Compute::Region
+    region.name.should eq('mock-region')
+  end
+
+  it '#list should return an array of regions' do
+    @mock_api_client.should_receive(:execute).
+      with(:api_method => mock_compute.regions.list,
+           :parameters => {:project => 'mock-project'}, :body_object => nil).
+           and_return(mock_response(Google::Compute::Region, true))
+    regions = client.regions.list
+    regions.should_not be_empty
+    regions.all?{|region| region.is_a?(Google::Compute::Region)}.should be_true
+  end
+
+end

data/spec/google/compute/server_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::Server do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -29,10 +29,10 @@ describe Google::Compute::Server do
 
   it '#get should return an individual Server' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.instances.get, 
-           :parameters=>{:instance=>'mock-instance', :project=>'mock-project', :zone=>'mock-zone'},:body_object=>nil).
+      with(:api_method => mock_compute.instances.get,
+           :parameters => {:instance => 'mock-instance', :project => 'mock-project', :zone => 'mock-zone'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Server))
-    instance = client.instances.get(:name=>'mock-instance', :zone=>'mock-zone')
+    instance = client.instances.get(:name => 'mock-instance', :zone => 'mock-zone')
     instance.should be_a_kind_of Google::Compute::Server
     instance.name.should eq('mock-instance')
     instance.disks.should be_a_kind_of(Array)
@@ -41,57 +41,50 @@ describe Google::Compute::Server do
 
   it '#list should return an array of Servers' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.instances.list, 
-           :parameters=>{:project=>'mock-project', :zone=>'mock-zone'},:body_object=>nil).
-           and_return(mock_response(Google::Compute::Server,true))
-    instances = client.instances.list(:zone=>'mock-zone')
+      with(:api_method => mock_compute.instances.list,
+           :parameters => {:project => 'mock-project', :zone => 'mock-zone'}, :body_object => nil).
+           and_return(mock_response(Google::Compute::Server, true))
+    instances = client.instances.list(:zone => 'mock-zone')
     instances.should_not be_empty
     instances.all?{|i| i.is_a?(Google::Compute::Server)}.should be_true
   end
 
   it '#create should create an server' do
-    project_url ='https://www.googleapis.com/compute/v1beta15/projects/mock-project'
+    project_url ='https://www.googleapis.com/compute/v1/projects/mock-project'
     zone = project_url + '/zones/europe-west1-a'
     disk = project_url + zone + '/disks/mock-disk'
     machine_type = project_url + '/global/machineTypes/n1-highcpu-2'
-    image = 'https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7'
+    image = 'https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7'
     network = project_url + '/global/networks/api-network'
     access_config = {'name' => 'External NAT', 'type' => 'ONE_TO_ONE_NAT'}
 
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.instances.insert, 
-           :parameters=>{:project=>'mock-project', :zone=>'mock-zone'},
-           :body_object=>{:name =>'mock-instance',
+      with(:api_method => mock_compute.instances.insert,
+           :parameters => {:project => 'mock-project', :zone => 'mock-zone'},
+           :body_object => {:name => 'mock-instance',
              :image => image,
              :zone => 'mock-zone',
              :disks => [disk],
              :machineType => machine_type,
-             :metadata =>{'items'=>[{'key'=>'someKey','value'=>'someValue'}]},
-                 :networkInterfaces => [{'network'=>network,
-                 'accessConfigs' => [access_config]
-                  }]
-             }).
-           and_return(mock_response(Google::Compute::ZoneOperation))
-
-    o = client.instances.create(:name=>'mock-instance',
-                                :image=> image,
-                                :machineType =>machine_type,
-                                :disks=>[disk],
-                                :metadata=>{'items'=>[{'key'=>'someKey','value'=>'someValue'}]},
-                                :zone=>'mock-zone',
-                                :networkInterfaces => [{'network'=>network,
-                                  'accessConfigs' => [access_config]
-                                  }]
-                              )
+             :metadata => {'items' => [{'key' => 'someKey', 'value' => 'someValue'}]},
+             :networkInterfaces => [{'network' => network, 'accessConfigs' => [access_config]}]
+           }).and_return(mock_response(Google::Compute::ZoneOperation))
+    o = client.instances.create(:name => 'mock-instance',
+                                :image => image,
+                                :zone => 'mock-zone',
+                                :disks => [disk],
+                                :machineType => machine_type,
+                                :metadata => {'items' => [{'key' => 'someKey', 'value' => 'someValue'}]},
+                                :networkInterfaces => [{'network' => network, 'accessConfigs' => [access_config]}])
   end
 
   it '#delete should delete an server' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.instances.delete, 
-           :parameters=>{:project=>'mock-project', :instance=>'mock-instance', :zone=>'mock-zone'},
-           :body_object=>nil).
+      with(:api_method => mock_compute.instances.delete,
+           :parameters => {:project => 'mock-project', :instance => 'mock-instance', :zone => 'mock-zone'},
+           :body_object => nil).
            and_return(mock_response(Google::Compute::ZoneOperation))
-    o = client.instances.delete(:instance=>'mock-instance', :zone=>'mock-zone')
+    o = client.instances.delete(:instance => 'mock-instance', :zone => 'mock-zone')
   end
 
   describe 'with a specific server' do
@@ -102,7 +95,7 @@ describe Google::Compute::Server do
 
     let(:instance) do
       Google::Compute::Server.new(mock_hash(Google::Compute::Server).
-                                    merge(:dispatcher=>client.dispatcher))
+                                  merge(:dispatcher => client.dispatcher))
     end
 
     it '#addAccessConfig should add access config to an existing server' do
@@ -112,12 +105,12 @@ describe Google::Compute::Server do
     end
 
     it '#serialPort should return serial port output of an existing server' do
-      zone = 'https://www.googleapis.com/compute/v1beta15/projects/mock-project/zones/mock-zone'
+      zone = 'https://www.googleapis.com/compute/v1/projects/mock-project/zones/mock-zone'
       @mock_api_client.should_receive(:execute).
-        with(:api_method=>mock_compute.instances.get_serial_port_output, 
-           :parameters=>{:project=>'mock-project',:instance=>'mock-instance', :zone=>zone},
-           :body_object=>nil).
-           and_return(mock_response(Google::Compute::SerialPortOutput))
+        with(:api_method => mock_compute.instances.get_serial_port_output,
+             :parameters => {:project => 'mock-project', :instance => 'mock-instance', :zone => zone},
+             :body_object => nil).
+             and_return(mock_response(Google::Compute::SerialPortOutput))
       instance.serial_port_output.should be_a_kind_of(Google::Compute::SerialPortOutput)
       instance.serial_port_output.contents.should_not be_empty
     end