19622736 IPADM properties are failing on multiple settings.
authorDavid Miner <dave.miner@oracle.com>
Thu, 18 Sep 2014 18:52:39 -0400
changeset 2109 ed516b43cefc
parent 2108 6145b31310ca
child 2110 6983cfc62f1d
19622736 IPADM properties are failing on multiple settings.
components/ruby/puppet/files/solaris/lib/puppet/provider/address_properties/solaris.rb
components/ruby/puppet/files/solaris/lib/puppet/provider/interface_properties/solaris.rb
components/ruby/puppet/files/solaris/lib/puppet/provider/protocol_properties/solaris.rb
--- a/components/ruby/puppet/files/solaris/lib/puppet/provider/address_properties/solaris.rb	Tue Sep 23 22:10:27 2014 -0700
+++ b/components/ruby/puppet/files/solaris/lib/puppet/provider/address_properties/solaris.rb	Thu Sep 18 18:52:39 2014 -0400
@@ -73,15 +73,9 @@
     end
 
     def properties=(value)
-        ipadm("set-addrprop", add_properties(value), @resource[:name])
-    end
-
-    def add_properties(props)
-        a = []
-        props.each do |key, value|
-            a << "#{key}=#{value}"
+        value.each do |key, value|
+            ipadm("set-addrprop", "-p", "#{key}=#{value}", @resource[:name])
         end
-        properties = Array["-p", a.join(",")]
     end
 
     def exists?
@@ -107,7 +101,9 @@
     end
 
     def create
-        ipadm("set-addrprop", add_properties(@addrprops), @resource[:address])
+        @addrprops.each do |key, value|
+            ipadm("set-addrprop", "-p", "#{key}=#{value}", @resource[:address])
+        end
     end
 
     def exec_cmd(*cmd)
--- a/components/ruby/puppet/files/solaris/lib/puppet/provider/interface_properties/solaris.rb	Tue Sep 23 22:10:27 2014 -0700
+++ b/components/ruby/puppet/files/solaris/lib/puppet/provider/interface_properties/solaris.rb	Thu Sep 18 18:52:39 2014 -0400
@@ -73,15 +73,9 @@
     end
 
     def properties=(value)
-        ipadm("set-ifprop", add_properties(value), @resource[:name])
-    end
-
-    def add_properties(props)
-        a = []
-        props.each do |key, value|
-            a << "#{key}=#{value}"
+        value.each do |key, value|
+            ipadm("set-ifprop", "-p", "#{key}=#{value}", @resource[:name])
         end
-        properties = Array["-p", a.join(",")]
     end
 
     def exists?
@@ -111,7 +105,9 @@
 
     def create
         name, proto = @resource[:interface].split("/")
-        ipadm("set-ifprop", "-m", proto, add_properties(@ifprops), name)
+        @ifprops.each do |key, value|
+            ipadm("set-ifprop", "-m", proto, "-p", "#{key}=#{value}", name)
+        end
     end
 
     def exec_cmd(*cmd)
--- a/components/ruby/puppet/files/solaris/lib/puppet/provider/protocol_properties/solaris.rb	Tue Sep 23 22:10:27 2014 -0700
+++ b/components/ruby/puppet/files/solaris/lib/puppet/provider/protocol_properties/solaris.rb	Thu Sep 18 18:52:39 2014 -0400
@@ -73,17 +73,11 @@
     end
 
     def properties=(value)
-        ipadm("set-prop", "-p", add_properties(value), @resource[:name])
+        value.each do |key, value|
+            ipadm("set-prop", "-p", "#{key}=#{value}", @resource[:name])
+        end
     end
 
-    def add_properties(props)
-        a = []
-        props.each do |key, value|
-            a << "#{key}=#{value}"
-        end
-        properties = Array["-p", a.join(",")]
-    end
-    
     def exists?
         if @resource[:properties] == nil
             return :false
@@ -107,7 +101,9 @@
     end
 
     def create
-        ipadm("set-prop", add_properties(@protoprops), @resource[:name])
+        @protoprops.each do |key, value|
+            ipadm("set-prop", "-p", "#{key}=#{value}", @resource[:name])
+        end
     end
 
     def exec_cmd(*cmd)