lib/infoblox/resource.rb in infoblox-0.2.19 vs lib/infoblox/resource.rb in infoblox-0.3.0

@@ -54,11 +54,12 @@
     def self.remote_post_attrs
       @remote_post_attrs ||= []
     end
 
     def self._return_fields
-      self.remote_attrs.join(",")
+      remove = Infoblox.wapi_version < '1.2' ? :extattrs : :extensible_attributes
+      (self.remote_attrs - [remove]).join(",")
     end
 
     def self.default_params
       {:_return_fields => self._return_fields}
     end
@@ -96,11 +97,11 @@
         new(item.merge({:connection => connection}))
       end
     end
 
     def self.resource_uri
-      BASE_PATH + self.wapi_object
+      Infoblox.base_path + self.wapi_object
     end
 
     ##
     # A hash that maps Infoblox WAPI object identifiers to subclasses of Resource.
     # Used by the Search resource for mapping response objects.
@@ -133,10 +134,10 @@
       self._ref = unquote(connection.put(resource_uri, remote_attribute_hash(write = true)).body)
       true
     end
 
     def resource_uri
-      self._ref.nil? ? self.class.resource_uri : (BASE_PATH + self._ref)
+      self._ref.nil? ? self.class.resource_uri : (Infoblox.base_path + self._ref)
     end
     
     def remote_attribute_hash(write=false, post=false)
       {}.tap do |hsh|
         self.class.remote_attrs.each do |k|