lib/fog/rackspace/monitoring.rb in fog-maestrodev-1.14.0.20130806165225 vs lib/fog/rackspace/monitoring.rb in fog-maestrodev-1.15.0.20130829165835

@@ -75,10 +75,14 @@
 
       request      :evaluate_alarm_example
 
 
       class Mock < Fog::Rackspace::Service
+
+        def initialize(options={})
+        end
+
         def request(params)
           Fog::Mock.not_implemented
         end
       end
 
@@ -110,25 +114,29 @@
 
         def endpoint_uri(service_endpoint_url=nil)
           @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_monitoring_url)
         end
 
+        def request_id_header
+         "X-Response-Id"
+        end
+
         private
 
         def request(params, parse_json = true, &block)
           super(params, parse_json, &block)
           rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
+            raise BadRequest.slurp(error, self)
           rescue Excon::Errors::Conflict => error
-            raise Conflict.slurp error
+            raise Conflict.slurp(error, self)
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp(error, region)
+            raise NotFound.slurp(error, self)
           rescue Excon::Errors::ServiceUnavailable => error
-            raise ServiceUnavailable.slurp error
+            raise ServiceUnavailable.slurp(error, self)
           rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
+            raise InternalServerError.slurp(error, self)
           rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
+            raise ServiceError.slurp(error, self)
         end
 
         def authenticate
           options = {
             :rackspace_api_key => @rackspace_api_key,