fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/go_grid/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/go_grid'
+require 'fog/go_grid/core'
 require 'fog/compute'
 
 module Fog

data/lib/fog/go_grid/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module GoGrid
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+  end
+end

data/lib/fog/go_grid/models/compute/server.rb

@@ -71,8 +71,8 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :identity, :public_ip_address, :public_key, :username
-          Fog::SSH.new(public_ip_address, username, credentials).run([
+          requires :identity, :ssh_ip_address, :public_key, :username
+          Fog::SSH.new(ssh_ip_address, username, credentials).run([
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},

data/lib/fog/google.rb

@@ -1,24 +1,2 @@
-require 'fog/core'
-
-module Fog
-  module Google
-
-    extend Fog::Provider
-
-    service(:compute, 'google/compute', 'Compute')
-    service(:storage, 'google/storage', 'Storage')
-
-    class Mock
-
-      def self.etag
-        hex(32)
-      end
-
-      def self.hex(length)
-        max = ('f' * length).to_i(16)
-        rand(max).to_s(16)
-      end
-
-    end
-  end
-end
+require 'fog/google/compute'
+require 'fog/google/storage'

data/lib/fog/google/README.md

@@ -8,21 +8,24 @@ Google Cloud Storage originally was very similar to Amazon's S3. Because of this
 
 ## Compute
 
-Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1beta16](https://developers.google.com/compute/docs/reference/v1beta16/) of the GCE API.
+Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1](https://developers.google.com/compute/docs/reference/v1/) of the GCE API.
 
-Our implementation of the API currently supports 
+Our implementation of the API currently supports
 
  * Server creation, deletion and bootstrapping
- * All server "flavors" (micro and normal)
  * Persistent Disk creation and deletion
  * Image lookup
+ * Network and Firewall configuration
+ * Operations
+ * Snapshots
+ * Instance Metadata
 
 Features we are looking forward to implementing in the future:
 
- * Network and Firewall configuration
  * Global Metadata support
  * Image creation
+ * Load balancer configuration
 
-v1beta16 is still in beta, so we can imagine lots of changes to the API. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog/issues?labels=google) for any anomalies you see.
+If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog/issues?labels=google) for any anomalies you see or features you would like.
 
 Thanks!

data/lib/fog/google/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/google'
+require 'fog/google/core'
 require 'fog/compute'
 
 module Fog
@@ -11,6 +11,7 @@ module Fog
 
       request_path 'fog/google/requests/compute'
       request :list_servers
+      request :list_addresses
       request :list_disks
       request :list_firewalls
       request :list_images
@@ -22,6 +23,7 @@ module Fog
       request :list_snapshots
 
       request :get_server
+      request :get_address
       request :get_disk
       request :get_firewall
       request :get_image
@@ -32,7 +34,9 @@ module Fog
       request :get_global_operation
       request :get_zone_operation
 
+      request :delete_address
       request :delete_disk
+      request :delete_snapshot
       request :delete_firewall
       request :delete_image
       request :delete_network
@@ -40,6 +44,7 @@ module Fog
       request :delete_global_operation
       request :delete_zone_operation
 
+      request :insert_address
       request :insert_disk
       request :insert_firewall
       request :insert_image
@@ -48,6 +53,7 @@ module Fog
       request :insert_snapshot
 
       request :set_metadata
+      request :set_tags
 
       model_path 'fog/google/models/compute'
       model :server
@@ -118,7 +124,6 @@ module Fog
           end
           result
         end
-
       end
 
       class Mock
@@ -818,7 +823,7 @@ module Fog
           @data = nil
         end
 
-        def data(project = @project)
+        def data(project=@project)
           self.class.data(api_version)[project]
         end
 
@@ -836,6 +841,8 @@ module Fog
         include Collections
         include Shared
 
+        attr_reader :client, :compute, :api_url
+
         def initialize(options)
           base_url = 'https://www.googleapis.com/compute/'
           api_scope_url = 'https://www.googleapis.com/auth/compute'

data/lib/fog/google/core.rb

@@ -0,0 +1,24 @@
+require 'fog/core'
+
+module Fog
+  module Google
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+    service(:storage, 'Storage')
+
+    class Mock
+
+      def self.etag
+        hex(32)
+      end
+
+      def self.hex(length)
+        max = ('f' * length).to_i(16)
+        rand(max).to_s(16)
+      end
+
+    end
+  end
+end

data/lib/fog/google/models/compute/flavors.rb

@@ -18,7 +18,7 @@ module Fog
         def get(identity, zone_name = nil)
           data = connection.get_machine_type(identity, zone_name).body
           new(data)
-        rescue Excon::Errors::NotFound
+        rescue Fog::Errors::NotFound
           nil
         end
 

data/lib/fog/google/models/compute/images.rb

@@ -12,6 +12,8 @@ module Fog
         GLOBAL_PROJECTS = [ 'google',
                             'debian-cloud',
                             'centos-cloud',
+                          # RHEL removed from this list because not everyone has access to it.
+                          #  'rhel-cloud', 
                           ]
 
         def all

data/lib/fog/google/models/compute/servers.rb

@@ -40,7 +40,7 @@ module Fog
           else
             new(response.body)
           end
-        rescue Excon::Errors::NotFound
+        rescue Fog::Errors::NotFound
           nil
         end
 

data/lib/fog/google/models/compute/zones.rb

@@ -17,7 +17,7 @@ module Fog
         def get(identity)
           data = service.get_zone(identity).body
           new(data)
-        rescue Excon::Errors::NotFound
+        rescue Fog::Errors::NotFound
           nil
         end
 

data/lib/fog/google/requests/compute/attach_disk.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+        def attach_disk(instance, zone, deviceName)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+
+        def attach_disk(instance, zone, deviceName)
+          api_method = @compute.instances.attach_disk
+          parameters = {
+            'project' => @project,
+            'instance' => instance,
+            'zone' => zone
+          }
+          body_object = {
+            "deviceName" => deviceName
+          }
+          result = self.build_result(api_method, parameters, body_object=body_object)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/compute/delete_address.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def delete_address(address_name, region_name)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def delete_address(address_name, region_name)
+          api_method = @compute.addresses.delete
+          parameters = {
+            'project' => @project,
+            'address' => address_name,
+            'region' => region_name
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/delete_snapshot.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def delete_snapshot(snapshot_name, zone_name)
+          Fog::Mock.not_implemented
+        end  
+
+      end
+
+      class Real
+
+        def delete_snapshot(snapshot_name, zone_name)
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+
+          api_method = @compute.snapshots.delete
+          parameters = {
+            'project' => @project,
+            'snapshot' => snapshot_name,
+            'zone' => zone_name,
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/detach_disk.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+        def detach_disk(instance, zone, deviceName)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+
+        def detach_disk(instance, zone, deviceName)
+          api_method = @compute.instances.detach_disk
+          parameters = {
+            'project' => @project,
+            'instance' => instance,
+            'zone' => zone,
+          }
+          body_object = { "deviceName" => deviceName }
+          result = self.build_result(api_method, parameters, body_object=body_object)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/get_address.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def get_address(address_name, region_name)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def get_address(address_name, region_name)
+          api_method = @compute.addresses.get
+          parameters = {
+            'project' => @project,
+            'address' => address_name,
+            'region' => region_name
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/insert_address.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def insert_address(address_name, region_name)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def insert_address(address_name, region_name)
+          api_method = @compute.addresses.insert
+          parameters = {
+            'project' => @project,
+            'region' => region_name,
+          }
+          body_object = { 'name' => address_name }
+
+          result = self.build_result(api_method, parameters,
+                                     body_object=body_object)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/compute/insert_firewall.rb

@@ -3,9 +3,7 @@ module Fog
     class Google
 
       class Mock
-
-        def insert_firewall(firewall_name, source_range, allowed,
-                            network=@default_network)
+        def insert_firewall(firewall_name, source_range=[],  allowed=[], network=@default_network, source_tags=[])
           Fog::Mock.not_implemented
         end
 
@@ -13,8 +11,7 @@ module Fog
 
       class Real
 
-        def insert_firewall(firewall_name, source_range, allowed,
-                            network=@default_network)
+        def insert_firewall(firewall_name, source_range=[],  allowed=[], network=@default_network, source_tags=[])
           api_method = @compute.firewalls.insert
           parameters = {
             'project' => @project,
@@ -22,12 +19,12 @@ module Fog
           body_object = {
             "name" => firewall_name,
             "network" => "#{@api_url}#{@project}/global/networks/#{network}",
-            "sourceRanges" => source_range,
-            "allowed" => allowed
+            "allowed" => allowed,
           }
+          body_object["sourceRanges"] = source_range if !source_range.empty?
+          body_object["sourceTags"]  = source_tags  if !source_tags.empty?
 
-          result = self.build_result(api_method, parameters,
-                                     body_object=body_object)
+          result = self.build_result(api_method, parameters, body_object=body_object)
           response = self.build_response(result)
         end