fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/rackspace/models/auto_scale/policies.rb

@@ -36,9 +36,8 @@ module Fog
         # @raise [Fog::Rackspace::AutoScale:::ServiceError]
         # 
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/GET_getPolicy_v1.0__tenantId__groups__groupId__policies__policyId__Policies.html
-        def get(policy_id)          
+        def get(policy_id)
           data = service.get_policy(group.id, policy_id).body['policy']
-          data['group_id'] = group.id
           new(data)
         rescue Fog::Rackspace::AutoScale::NotFound
           nil
@@ -55,10 +54,13 @@ module Fog
         # 
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/POST_createPolicies_v1.0__tenantId__groups__groupId__policies_Policies.html
         def create(attributes = {})
-          attributes['group_id'] = group.id
           super(attributes)
         end
 
+        def new(attributes = {})
+          super({:group => group}.merge(attributes))
+        end
+
       end
     end
   end

data/lib/fog/rackspace/models/auto_scale/policy.rb

@@ -8,83 +8,87 @@ module Fog
 
         # @!attribute [r] id
         # @return [String] The policy id   
-      	identity :id
+        identity :id
 
-        # @!attribute [r] group_id
-        # @return [String] The autoscale group's id
-      	attribute :group_id
+        # @!attribute [r] group
+        # @return [Group] The autoscale group
+        attribute :group
 
-      	# @!attribute [r] links
+        # @!attribute [r] links
         # @return [Array] Policy links
         attribute :links
-      	
+
         # @!attribute [r] name
         # @return [String] The policy's name
         attribute :name
-      	
-      	# @!attribute [r] change
+
+        # @!attribute [r] change
         # @return [Fixnum] The fixed change to the autoscale group's number of units
         attribute :change
-      	
+
         # @!attribute [r] changePercent
         # @return [Fixnum] The percentage change to the autoscale group's number of units
         attribute :change_percent, :aliases => 'changePercent'
 
-      	# @!attribute [r] cooldown
+        # @!attribute [r] cooldown
         # @return [Fixnum] The policy's cooldown
         attribute :cooldown
 
-      	# @!attribute [r] type
+        # @!attribute [r] type
         # @note Can only be "webhook", "schedule" or "cloud_monitoring"
         # @return [String] The policy's type
         attribute :type
 
-      	# @!attribute [r] args
+        # @!attribute [r] args
         # @example See below:
-     		#	- "cron": "23 * * * *"
-     		#	- "at": "2013-06-05T03:12Z"
-     		#	- "check": {
-    		# 	      "label": "Website check 1",
-    		# 	      "type": "remote.http",
-    		# 	      "details": {
-    		# 	          "url": "http://www.example.com",
-    		# 	          "method": "GET"
-    		# 	      },
-    		# 	      "monitoring_zones_poll": [
-    		# 	          "mzA"
-    		# 	      ],
-    		# 	      "timeout": 30,
-    		# 	      "period": 100,
-    		# 	      "target_alias": "default"
-    		# 	  },
-    		# 	  "alarm_criteria": {
-    		# 	       "criteria": "if (metric[\"duration\"] >= 2) { return new AlarmStatus(OK); } return new AlarmStatus(CRITICAL);"
-    		# 	  }
+        # - "cron": "23 * * * *"
+        # - "at": "2013-06-05T03:12Z"
+        # - "check": {
+        #         "label": "Website check 1",
+        #         "type": "remote.http",
+        #         "details": {
+        #             "url": "http://www.example.com",
+        #             "method": "GET"
+        #         },
+        #         "monitoring_zones_poll": [
+        #             "mzA"
+        #         ],
+        #         "timeout": 30,
+        #         "period": 100,
+        #         "target_alias": "default"
+        #     },
+        #     "alarm_criteria": {
+        #          "criteria": "if (metric[\"duration\"] >= 2) { return new AlarmStatus(OK); } return new AlarmStatus(CRITICAL);"
+        #     }
         #
         # @return [String] Arguments used for the policy
-      	attribute :args
+        attribute :args
 
         # @!attribute [r] desiredCapacity
         # @return [Fixnum] The desired capacity of the group
-      	attribute :desired_capacity, :aliases => 'desiredCapacity'
+        attribute :desired_capacity, :aliases => 'desiredCapacity'
 
         # Basic sanity check to make sure attributes are valid
         #
         # @raise ArgumentError If no type is set
         # @raise ArgumentError If args attribute is missing required keys (if type == 'schedule')
-		    
+
         # @return [Boolean] Returns true if the check passes
         def check_attributes
           raise ArgumentError, "This #{self.name} resource requires the #{type} argument" if type.nil?
 
-        	if type == 'schedule'
-        		raise ArgumentError, "This #{self.name} resource requires the args[cron] OR args[at] argument" if args['cron'].nil? && args['at'].nil?
-        	end
+          if type == 'schedule'
+            raise ArgumentError, "This #{self.name} resource requires the args[cron] OR args[at] argument" if args['cron'].nil? && args['at'].nil?
+          end
+
+          true
+        end
 
-        	true
+        def group=(group)
+          attributes[:group] = group.is_a?(Group) ? group : service.groups.new(:id => group)
         end
 
-      	# Creates policy
+        # Creates policy
         # * requires attributes: :name, :type, :cooldown
         # 
         # @return [Boolean] returns true if policy is being created
@@ -96,7 +100,7 @@ module Fog
         #
         # @see Policies#create
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/POST_createPolicies_v1.0__tenantId__groups__groupId__policies_Policies.html
-        def save
+        def create
           requires :name, :type, :cooldown
 
           check_attributes
@@ -113,12 +117,12 @@ module Fog
             options['args'] = args
           end
 
-          data = service.create_policy(group_id, options)
+          data = service.create_policy(group.id, options)
           merge_attributes(data.body['policies'][0])
           true
         end
 
-      	# Updates the policy
+        # Updates the policy
         #
         # @return [Boolean] returns true if policy has started updating
         #
@@ -129,11 +133,11 @@ module Fog
         #
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/PUT_putPolicy_v1.0__tenantId__groups__groupId__policies__policyId__Policies.html
         def update
-      		requires :identity
+          requires :identity
 
           check_attributes
 
-      		options = {}
+          options = {}
           options['name'] = name unless name.nil?
           options['change'] = change unless change.nil?
           options['changePercent'] = change_percent unless change_percent.nil?
@@ -145,12 +149,24 @@ module Fog
             options['args'] = args
           end
 
-      		data = service.update_policy(group_id, identity, options)
-      		merge_attributes(data.body)
-      		true
-      	end
+          data = service.update_policy(group.id, identity, options)
+          merge_attributes(data.body)
+          true
+        end
+
+        # Saves the policy
+        # Creates policy if it is new, otherwise it will update it
+        # @return [Boolean] true if policy has saved
+        def save
+          if persisted?
+            update
+          else
+            create
+          end
+          true
+        end
 
-      	# Destroy the policy
+        # Destroy the policy
         #
         # @return [Boolean] returns true if policy has started deleting
         #
@@ -161,12 +177,12 @@ module Fog
         #
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/DELETE_deletePolicy_v1.0__tenantId__groups__groupId__policies__policyId__Policies.html
         def destroy
-      		requires :identity
-      		service.delete_policy(group_id, identity)
+          requires :identity
+          service.delete_policy(group.id, identity)
           true
-      	end
+        end
 
-      	# Executes the scaling policy
+        # Executes the scaling policy
         #
         # @return [Boolean] returns true if policy has been executed
         #
@@ -177,10 +193,10 @@ module Fog
         #
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/POST_executePolicy_v1.0__tenantId__groups__groupId__policies__policyId__execute_Policies.html
         def execute
-      		requires :identity
-      		service.execute_policy(group_id, identity)
+          requires :identity
+          service.execute_policy(group.id, identity)
           true
-      	end
+        end
 
         # Gets the associated webhooks for this policy
         #
@@ -191,16 +207,16 @@ module Fog
         # @raise [Fog::Rackspace::AutoScale:::InternalServerError] - HTTP 500
         # @raise [Fog::Rackspace::AutoScale:::ServiceError]
         def webhooks
-          data = service.list_webhooks(group_id, self.id)
+          requires :identity
 
-          Fog::Rackspace::AutoScale::Webhooks.new({
+          @webhooks ||= Fog::Rackspace::AutoScale::Webhooks.new({
             :service   => service,
-            :policy_id => self.id,
-            :group_id  => group_id
-          }).merge_attributes(data.body)
+            :policy => self,
+            :group  => group
+          })
         end
 
       end
-  	end
+    end
   end
 end

data/lib/fog/rackspace/models/auto_scale/webhook.rb

@@ -5,31 +5,31 @@ module Fog
     class AutoScale
       class Webhook < Fog::Model
 
-      	# @!attribute [r] id
+        # @!attribute [r] id
         # @return [String] The webhook id   
         identity :id
 
-        # @!attribute [r] id
-        # @return [String] The group id (i.e. grand-parent)
-        attribute :group_id
+        # @!attribute [r] group
+        # @return [String] The associated group
+        attribute :group
         
-        # @!attribute [r] id
-        # @return [String] The policy id (i.e. parent)
-        attribute :policy_id
+        # @!attribute [r] policy
+        # @return [String] The associated policy
+        attribute :policy
 
-      	# @!attribute [r] name
+        # @!attribute [r] name
         # @return [String] The webhook name
         attribute :name
-      	
+
         # @!attribute [r] metadata
         # @return [Hash] The metadata
         attribute :metadata
-      	
+
         # @!attribute [r] links
         # @return [Array] The webhook links
         attribute :links
 
-        # Creates webhook
+        # Create webhook
         # * requires attribute: :name
         # 
         # @return [Boolean] returns true if webhook is being created
@@ -41,19 +41,19 @@ module Fog
         #
         # @see Webhooks#create
         # @see 
-        def save
+        def create
           requires :name
 
           options = {}
           options['name'] = name if name
           options['metadata'] = metadata if metadata
 
-          data = service.create_webhook(group_id, policy_id, options)
+          data = service.create_webhook(group.id, policy.id, options)
           merge_attributes(data.body['webhooks'][0])
           true
         end
 
-      	# Updates the webhook
+        # Updates the webhook
         #
         # @return [Boolean] returns true if webhook has started updating
         #
@@ -64,18 +64,31 @@ module Fog
         #
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/PUT_putWebhook_v1.0__tenantId__groups__groupId__policies__policyId__webhooks__webhookId__Webhooks.html
         def update
-      		requires :identity
+          requires :identity
 
-      		options = {
-      			'name' => name,
-      			'metadata' => metadata
-      		}
+          options = {
+            'name' => name,
+            'metadata' => metadata
+          }
 
-      		data = service.update_webhook(group_id, policy_id, identity, options)
-      		merge_attributes(data.body)
-      	end
+          data = service.update_webhook(group.id, policy.id, identity, options)
+          merge_attributes(data.body)
+          true
+        end
+
+        # Saves the webhook
+        # Creates hook if it is new, otherwise it will update it
+        # @return [Boolean] true if policy has saved
+        def save
+          if persisted?
+            update
+          else
+            create
+          end
+          true
+        end
 
-      	# Destroy the webhook
+        # Destroy the webhook
         #
         # @return [Boolean] returns true if webhook has started deleting
         #
@@ -86,10 +99,10 @@ module Fog
         #
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/DELETE_deleteWebhook_v1.0__tenantId__groups__groupId__policies__policyId__webhooks__webhookId__Webhooks.html
         def destroy
-      		requires :identity 
-      		service.delete_webhook(group_id, policy_id, identity)
+          requires :identity
+          service.delete_webhook(group.id, policy.id, identity)
           true
-      	end
+        end
 
         # Retrieves the URL for anonymously executing the policy webhook
         # @return [String] the URL
@@ -100,6 +113,6 @@ module Fog
         end
 
       end
-  	end
+    end
   end
 end

data/lib/fog/rackspace/models/auto_scale/webhooks.rb

@@ -8,8 +8,8 @@ module Fog
 
         model Fog::Rackspace::AutoScale::Webhook
 
-        attr_accessor :group_id
-        attr_accessor :policy_id
+        attr_accessor :group
+        attr_accessor :policy
 
         # Returns list of autoscale webhooks
         #
@@ -20,7 +20,7 @@ module Fog
         # @raise [Fog::Rackspace::AutoScale:::InternalServerError] - HTTP 500
         # @raise [Fog::Rackspace::AutoScale:::ServiceError]
         def all
-          data = service.list_webhooks(group_id, policy_id).body['webhooks']
+          data = service.list_webhooks(group.id, policy.id).body['webhooks']
           load(data)
         end
 
@@ -35,10 +35,8 @@ module Fog
         # @raise [Fog::Rackspace::AutoScale:::ServiceError]
         # 
         # @see http://docs.rackspace.com/cas/api/v1.0/autoscale-devguide/content/GET_getWebhook_v1.0__tenantId__groups__groupId__policies__policyId__webhooks__webhookId__Webhooks.html
-        def get(webhook_id)          
-          data = service.get_webhook(group_id, policy_id, webhook_id).body['webhook']
-          data['group_id'] = group_id
-          data['policy_id'] = policy_id
+        def get(webhook_id)
+          data = service.get_webhook(group.id, policy.id, webhook_id).body['webhook']
           new(data)
         rescue Fog::Rackspace::AutoScale::NotFound
           nil
@@ -53,11 +51,12 @@ module Fog
         # @raise [Fog::Rackspace::AutoScale:::InternalServerError] - HTTP 500
         # @raise [Fog::Rackspace::AutoScale:::ServiceError]
         def create(attributes = {})
-          attributes['group_id'] = group_id
-          attributes['policy_id'] = policy_id
           super(attributes)
         end
 
+        def new(attributes = {})
+          super({:group => group, :policy => policy}.merge(attributes))
+        end
       end
     end
   end

data/lib/fog/rackspace/models/compute_v2/images.rb

@@ -61,7 +61,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Image_Details-d1e4848.html 
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Image_Details-d1e4848.html
         def get(image_id)
           data = service.get_image(image_id).body['image']
           new(data)

data/lib/fog/rackspace/models/compute_v2/metadata.rb

@@ -46,7 +46,7 @@ module Fog
         # Retrieve specific value for key from Metadata.
         # * If key is of type String, this method will return the value of the metadatum
         # * If key is of type Fixnum, this method will return a Fog::Compute::RackspaceV2::Metadatum object (legacy)
-        # @param [#key] key 
+        # @param [#key] key
         # @return [#value] 
         def [](key)
           return super(key) if key.is_a?(Integer)
@@ -58,7 +58,7 @@ module Fog
         # Set value for key.
         # * If key is of type String, this method will set/add the value to Metadata
         # * If key is of type Fixnum, this method will set a Fog::Compute::RackspaceV2::Metadatum object (legacy)
-        # @param [#key] key 
+        # @param [#key] key
         # @return [String] 
         def []=(key, value)
           return super(key,value) if key.is_a?(Integer)          
@@ -84,7 +84,6 @@ module Fog
 
         # Creates new metadata
         def new(attributes = {})
-          requires :parent
           super({ :parent => parent }.merge!(attributes))
         end
 

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -56,7 +56,7 @@ module Fog
         # @return [String] server (extended) status. 
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html#server_status
         attribute :state_ext, :aliases => 'OS-EXT-STS:task_state'
-                
+
         # @!attribute [r] progress
         # @return [Fixnum] The build completion progress, as a percentage. Value is from 0 to 100.
         attribute :progress
@@ -198,17 +198,18 @@ module Fog
         #   * BUILD -> ERROR (on error)
         def create(options)
           requires :name, :image_id, :flavor_id
+          modified_options = Marshal.load(Marshal.dump(options))
 
-          options[:networks] ||= attributes[:networks]
-          options[:disk_config] = disk_config unless disk_config.nil?
-          options[:metadata] = metadata.to_hash unless @metadata.nil?
-          options[:personality] = personality unless personality.nil?
-          options[:keypair] ||= attributes[:keypair]
+          modified_options[:networks] ||= attributes[:networks]
+          modified_options[:disk_config] = disk_config unless disk_config.nil?
+          modified_options[:metadata] = metadata.to_hash unless @metadata.nil?
+          modified_options[:personality] = personality unless personality.nil?
+          modified_options[:keypair] ||= attributes[:keypair]
 
-          if options[:networks]
-            options[:networks].map! { |id| { :uuid => id } }
+          if modified_options[:networks]
+            modified_options[:networks].map! { |id| { :uuid => id } }
           end
-          data = service.create_server(name, image_id, flavor_id, 1, 1, options)
+          data = service.create_server(name, image_id, flavor_id, 1, 1, modified_options)
           merge_attributes(data.body['server'])
           true
         end
@@ -425,7 +426,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.        
+        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Confirm_Resized_Server-d1e3868.html
         # @see #resize
         #

data/lib/fog/rackspace/models/compute_v2/servers.rb

@@ -29,7 +29,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note This method is incompatible with Cloud Servers utlizing RackConnect. RackConnect users 
+        # @note This method is incompatible with Cloud Servers utlizing RackConnect. RackConnect users
         #     should use server personalization to install keys.  Please see Server#personality for more information.
         # @example
         #   service.servers.bootstrap :name => 'bootstrap-server',