Signed-off-by: Luke Kanies <[email protected]>
---
Local-branch: refactor/master/8233-refactor_parameter_management
lib/puppet/type.rb | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 6a7f193..96face2 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -278,10 +278,6 @@ class Type
parameters.find_all { |p| p.property? }
end
- def self.validattr?(name)
- valid_parameter?(name)
- end
-
# does the name reflect a valid property?
def self.validproperty?(name)
p = parameter(name) and p.property?
@@ -494,7 +490,7 @@ class Type
# value, but you can also specifically return 'is' and 'should'
# values using 'object.is(:property)' or 'object.should(:property)'.
def [](name)
- fail("Invalid parameter #{name}(#{name.inspect})") unless
self.class.validattr?(name)
+ fail("Invalid parameter #{name}(#{name.inspect})") unless
self.class.valid_parameter?(name)
if name == :name && nv = name_var
name = nv
@@ -513,7 +509,7 @@ class Type
# access to always be symbols, not strings. This sets the 'should'
# value on properties, and otherwise just sets the appropriate parameter.
def []=(name,value)
- fail("Invalid parameter #{name}") unless self.class.validattr?(name)
+ fail("Invalid parameter #{name}") unless self.class.valid_parameter?(name)
if name == :name && nv = name_var
name = nv
@@ -786,7 +782,7 @@ class Type
# Provide the name, so we know we'll always refer to a real thing
result[:name] = self[:name] unless self[:name] == title
- if ensure_prop = property(:ensure) or (self.class.validattr?(:ensure) and
ensure_prop = newattr(:ensure))
+ if ensure_prop = property(:ensure) or
(self.class.valid_parameter?(:ensure) and ensure_prop = newattr(:ensure))
result[:ensure] = ensure_state = ensure_prop.retrieve
else
ensure_state = nil
@@ -989,7 +985,7 @@ class Type
list = Array(list).collect {|p| p.to_sym}
unless list == [:all]
list.each do |param|
- next if @resource.class.validattr?(param)
+ next if @resource.class.valid_parameter?(param)
fail "Cannot audit #{param}: not a valid attribute for #{resource}"
end
end
--
1.7.3.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
