fog-maestrodev 1.18.0.20131121075022 → 1.18.0.20131122203507

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

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

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

@@ -4,8 +4,25 @@ module Fog
 
       class Mock
 
-        def delete_disk(disk_name)
-          Fog::Mock.not_implemented
+        def delete_disk(disk_name, zone_name)
+          get_disk(disk_name, zone_name)
+          self.data[:disks].delete disk_name
+
+          build_response(:body => {
+            "kind" => "compute#operation",
+            "id" => "7145812689701515415",
+            "name" => "operation-1385125998242-4ebc3c7173e70-11e1ad0b",
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
+            "operationType" => "delete",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
+            "targetId" => "6817095360746367667",
+            "status" => "PENDING",
+            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
+            "progress" => 0,
+            "insertTime" => Time.now.iso8601,
+            "startTime" => Time.now.iso8601,
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/operation-1385125998242-4ebc3c7173e70-11e1ad0b"
+          })
         end
 
       end

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

@@ -32,16 +32,16 @@ module Fog
             "kind" => "compute#operation",
             "id" => "10035781241131638365",
             "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
-            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
             "targetId" => "14544909043643897380",
             "status" => "PENDING",
             "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
             "progress" => 0,
             "insertTime" => Time.now.iso8601,
             "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
           })
         end
 

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

@@ -4,8 +4,32 @@ module Fog
 
       class Mock
 
-        def get_disk(disk_name)
-          Fog::Mock.not_implemented
+        def get_disk(disk_name, zone_name)
+          disk = self.data[:disks][disk_name]
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+          get_zone(zone_name)
+          zone = self.data[:zones][zone_name]
+          if disk.nil? or disk["zone"] != zone["selfLink"]
+            return build_response(:body => {
+              "error" => {
+                "errors" => [
+                 {
+                  "domain" => "global",
+                  "reason" => "notFound",
+                  "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}' was not found"
+                 }
+                ],
+                "code" => 404,
+                "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}' was not found"
+              }
+            })
+          end
+
+          # TODO transition the disk through the states
+
+          build_response(:body => disk)
         end
 
       end

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

@@ -5,17 +5,17 @@ module Fog
       class Mock
 
         def get_image(image_name, project=@project)
-          image = self.class.data[project][:images][image_name] || {
+          image = data(project)[:images][image_name] || {
             "error" => {
               "errors" => [
                 {
                   "domain" => "global",
                   "reason" => "invalid",
-                  "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
+                  "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/#{api_version}/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
                 }
               ],
               "code" => 400,
-              "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
+              "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/#{api_version}/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
             }
           }
           build_response(:body => image)

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

@@ -6,6 +6,7 @@ module Fog
 
         def get_server(server_name, zone_name)
           server = self.data[:servers][server_name]
+          get_zone(zone_name)
           zone = self.data[:zones][zone_name]
           if server.nil? or server["zone"] != zone["selfLink"]
             return build_response(:body => {

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

@@ -4,8 +4,43 @@ module Fog
 
       class Mock
 
-        def insert_disk(disk_name)
-          Fog::Mock.not_implemented
+        def insert_disk(disk_name, zone_name, image_name=nil, options={})
+          # check that image and zone exist
+          image_project = nil
+          unless image_name.nil?
+            ([ @project ] + Fog::Compute::Google::Images::GLOBAL_PROJECTS).each do |project|
+              image_project = project
+              break if data(project)[:images][options['image']]
+            end
+            get_image(image_name, image_project) # ok if image exists, will fail otherwise
+          end
+          get_zone(zone_name)
+
+          self.data[:disks][disk_name] = {
+            "kind" => "compute#disk",
+            "id" => Fog::Mock.random_numbers(19),
+            "creationTimestamp" => Time.now.iso8601,
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
+            "status" => "READY",
+            "name" => disk_name,
+            "sizeGb" => options['sizeGb'] || "10",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}"
+          }
+
+          build_response(:body => {
+            "kind" => "compute#operation",
+            "id" => "12498846269172327286",
+            "name" => "operation-1385124218076-4ebc35cfbe9f1-476486c5",
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
+            "operationType" => "insert",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
+            "status" => "PENDING",
+            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
+            "progress" => 0,
+            "insertTime" => Time.now.iso8601,
+            "startTime" => Time.now.iso8601,
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/operation-1385124218076-4ebc35cfbe9f1-476486c5"
+          })
         end
 
       end

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

@@ -4,7 +4,8 @@ module Fog
 
       class Mock
 
-        def insert_firewall(firewall_name)
+        def insert_firewall(firewall_name, source_range, allowed,
+                            network=@default_network)
           Fog::Mock.not_implemented
         end
 

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

@@ -4,7 +4,7 @@ module Fog
 
       class Mock
 
-        def insert_image(image_name)
+        def insert_image(image_name, options={})
           Fog::Mock.not_implemented
         end
 

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

@@ -2,7 +2,25 @@ module Fog
   module Compute
     class Google
 
+      module Shared
+        private
+
+        def handle_disks(options)
+          disks = []
+          options.delete('disks').each do |disk|
+            if disk.is_a? Disk
+              disks << disk.get_object
+            else
+              disks << disk
+            end
+          end
+          disks
+        end
+      end
+
       class Mock
+        include Shared
+
         def insert_server(server_name, zone_name, options={}, *deprecated_args)
 
           # check that image and zone exist
@@ -10,7 +28,7 @@ module Fog
           if options.has_key? 'image'
             ([ @project ] + Fog::Compute::Google::Images::GLOBAL_PROJECTS).each do |project|
               image_project = project
-              break if self.class.data[project][:images][options['image']]
+              break if data(project)[:images][options['image']]
             end
             get_image(options['image'], image_project) # ok if image exists, will fail otherwise
           end
@@ -20,17 +38,17 @@ module Fog
             "kind" => "compute#instance",
             "id" => Fog::Mock.random_numbers(19),
             "creationTimestamp" => Time.now.iso8601,
-            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "status" => "PROVISIONING",
             "name" => server_name,
             "tags" => { "fingerprint" => "42WmSpB8rSM=" },
-            "machineType" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/machineTypes/#{options['machineType']}",
-            "image" => "https://www.googleapis.com/compute/v1beta15/projects/centos-cloud/global/images/#{options['image']}",
-            "kernel" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130813",
+            "machineType" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/machineTypes/#{options['machineType']}",
+            "image" => "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/images/#{options['image']}",
+            "kernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
             "canIpForward" => false,
             "networkInterfaces" => [
               {
-                "network" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/global/networks/default",
+                "network" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/networks/default",
                 "networkIP" => Fog::Mock.random_ip,
                 "name" => "nic0",
                 "accessConfigs" => [
@@ -43,7 +61,7 @@ module Fog
                 ]
               }
             ],
-            "disks" => [
+            "disks" => options['disks'] ? handle_disks(options) : [
               {
                 "kind" => "compute#attachedDisk",
                 "index" => 0,
@@ -61,28 +79,29 @@ module Fog
                 }
               ]
             },
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}"
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}"
           }
 
           build_response(:body => {
             "kind" => "compute#operation",
             "id" => "4639689000254420481",
             "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
-            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "insert",
-            "targetLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
             "status" => "PENDING",
             "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
             "progress" => 0,
             "insertTime" => Time.now.iso8601,
             "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
           })
         end
 
       end
 
       class Real
+        include Shared
 
         def format_metadata(metadata)
           { "items" => metadata.map {|k,v| {"key" => k, "value" => v}} }
@@ -131,17 +150,7 @@ module Fog
           # TODO: add other networks
           body_object['networkInterfaces'] = networkInterfaces
 
-          if options['disks']
-            disks = []
-            options.delete('disks').each do |disk|
-              if disk.is_a? Disk
-                disks << disk.get_object
-              else
-                disks << disk
-              end
-            end
-            body_object['disks'] = disks
-          end
+          body_object['disks'] = handle_disks(options) if options['disks']
 
           options['metadata'] = format_metadata options['metadata'] if options['metadata']
 

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

@@ -4,8 +4,14 @@ module Fog
 
       class Mock
 
-        def list_disks
-          Fog::Mock.not_implemented
+        def list_disks(zone_name)
+          disks = self.data[:disks].values.select{|d| d["zone"].split("/")[-1] == zone_name}
+          build_response(:body => {
+            "kind" => "compute#diskList",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks",
+            "id" => "projects/#{@project}/zones/#{zone_name}/disks",
+            "items" => disks
+          })
         end
 
       end

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

@@ -5,10 +5,10 @@ module Fog
       class Mock
 
         def list_images(project=@project)
-          images = self.class.data[project][:images].values
+          images = data(project)[:images].values
           build_response(:body => {
             "kind" => "compute#imageList",
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{project}/global/images",
             "id" => "projects/#{project}/global/images",
             "items" => images
           })

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

@@ -6,10 +6,10 @@ module Fog
 
         def list_machine_types(zone_name)
           get_zone(zone_name)
-          machine_types = self.class.data[project][:machine_types][zone_name].values
+          machine_types = data[:machine_types][zone_name].values
           build_response(:body => {
             "kind" => "compute#machineTypeList",
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/machineTypes",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/machineTypes",
             "id" => "projects/high-cistern-340/zones/us-central1-a/machineTypes",
             "items" => machine_types
           })

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

@@ -5,12 +5,12 @@ module Fog
       class Mock
 
         def list_servers(zone_name)
+          get_zone(zone_name)
           zone = self.data[:zones][zone_name]
-          raise Fog::Errors::Error.new("Invalid value for field 'zone': '#{zone_name}'.  Unknown zone.") if zone.nil?
           servers = self.data[:servers].values.select{|s| s["zone"] == zone["selfLink"]}
           build_response(:body => {
             "kind" => "compute#instanceList",
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances",
             "id" => "projects/#{@project}/zones/#{zone_name}/instances",
             "items" => servers
           })

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

@@ -4,7 +4,7 @@ module Fog
 
       class Mock
 
-        def list_zone_operations
+        def list_zone_operations(zone)
           Fog::Mock.not_implemented
         end
 

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

@@ -8,7 +8,7 @@ module Fog
           zones = self.data[:zones].values
           build_response(:body => {
             "kind" => "compute#zoneList",
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones",
             "id" => "projects/#{@project}/zones",
             "items" => zones
           })

data/lib/fog/hp.rb

@@ -26,7 +26,7 @@ module Fog
               if message.nil? and !data.values.first.nil?
                 message = data.values.first['message']
               end
-            rescue MultiJson::DecodeError
+            rescue Fog::JSON::DecodeError
               message = error.response.body  #### body is not in JSON format, so just return as is
             end
           end

data/lib/fog/hp/README.md

@@ -0,0 +1,57 @@
+# Getting Started with HP Cloud Extensions to Ruby Fog Bindings
+
+[HP Cloud](http://www.hpcloud.com) has been creating and contributing bindings so
+that developers can work with Ruby Fog and the HP Cloud services based on
+[OpenStack](http://www.openstack.org/). By using the HP Cloud Extensions to Fog,
+developers can write applications using Ruby that interacts with the
+HP Cloud Services without having to deal with the underlying REST API or
+JSON/XML document formats. We have officially turned these bindings over to the
+Ruby Fog community where you can contribute and develop additional functionality
+around these bindings.
+
+This section of documentation provides information, examples and articles for working with the different HP Cloud services such as Compute, Object Storage and others.
+
+Please note that HP Cloud recently released version 13.5 which updates and adds functionality provided by OpenStack Havana. Some of our HP Ruby Fog examples are developed to work with earlier versions so please take note which HP Cloud version you are working with.
+
+**Note:** The Networking service examples only work with version 13.5.
+
+## Installation
+
+To install and use HP Cloud Ruby bindings for Fog, please install the [latest release](http://fog.io/) of Fog.
+
+Then follow the installation instructions for the operating system you are using and connect to the service:
+
+* [Installation Instructions](https://github.com/fog/fog/blob/master/lib/fog/hp/docs/install.md)
+* [Connecting to the Service](https://github.com/fog/fog/blob/master/lib/fog/hp/docs/connect.md)
+
+## Requirements
+
+For working with the HP Cloud Extension to Fog, the following pre-requisites are needed:
+
+* HP Cloud Services account. If you have not already signed up, please [sign up for your free trial](http://www.hpcloud.com/free-trial).
+* Ruby version 1.8.x or 1.9.x
+* `fog` gem
+
+
+## Examples
+
+Apart from the overall [Fog documentation](http://fog.io), we have HP Cloud specific examples that will help you in using the Ruby Fog bindings with HP Cloud services. 
+
+[Examples for using Fog with HP Cloud Services](https://github.com/fog/fog/blob/master/lib/fog/hp/examples/getting_started_examples.md)
+
+## Articles 
+
+In addition to the examples we have provided, for Compute, Object Storage, and other HP Cloud services, we wanted to give you a few additional tips and "how-tos' to make using your Ruby Fog bindings even easier. Take a look at the articles listed below to find out more!
+
+* [Using authentication caching](https://github.com/fog/fog/blob/master/lib/fog/hp/articles/auth_caching.md)
+
+## Additional Resources
+* [Fog cloud library](http://fog.io)
+* [Fog documentation](http://rubydoc.info/gems/fog)
+* [Fog Github repo](https://github.com/fog/fog)
+* [Fog Release Notes](https://github.com/fog/fog/blob/master/changelog.txt)
+
+## Support and Feedback
+
+Your feedback is essential to the maturity of the bindings and is highly appreciated! If you have specific issues with the HP Cloud Extensions to Fog bindings, please file an [issue via Github](https://github.com/fog/fog/issues).
+