lib/ohai/plugins/aix/cpu.rb in ohai-6.24.2 vs lib/ohai/plugins/aix/cpu.rb in ohai-7.0.0.rc.0

@@ -15,35 +15,39 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 
-provides "cpu"
+Ohai.plugin(:CPU) do
+  provides "cpu"
 
-cpu Mash.new
+  collect_data(:aix) do
+    cpu Mash.new
 
-# IBM is the only maker of CPUs for AIX systems.
-cpu[:vendor_id] = "IBM"
-# At least one CPU will be available, but we'll wait to increment this later.
-cpu[:available] = 0
-cpu[:total] = 0
+    # IBM is the only maker of CPUs for AIX systems.
+    cpu[:vendor_id] = "IBM"
+    # At least one CPU will be available, but we'll wait to increment this later.
+    cpu[:available] = 0
+    cpu[:total] = 0
 
-cpudevs = from("lsdev -Cc processor").lines
-cpudevs.each do |c|
-	cpu[:total] += 1
-  name, status, location = c.split
-  cpu[name] = Mash.new
-  cpu[name][:status] = status
-	cpu[name][:location] = location
-  if status =~ /Available/
+    cpudevs = shell_out("lsdev -Cc processor").stdout.lines
+    cpudevs.each do |c|
+      cpu[:total] += 1
+      name, status, location = c.split
+      cpu[name] = Mash.new
+      cpu[name][:status] = status
+      cpu[name][:location] = location
+      if status =~ /Available/
   	cpu[:available] += 1
-  	lsattr = from("lsattr -El #{name}").lines
+  	lsattr = shell_out("lsattr -El #{name}").stdout.lines
   	lsattr.each do |attribute|
-  		attrib, value = attribute.split
-  		cpu[name][attrib] = value
+          attrib, value = attribute.split
+          cpu[name][attrib] = value
   	end
+      end
+    end
+
+    # Every AIX system has proc0.
+    cpu[:model] = cpu[:proc0][:type]
+    cpu[:mhz] = cpu[:proc0][:frequency].to_i / 1024
   end
 end
-
-# Every AIX system has proc0.
-cpu[:model] = cpu[:proc0][:type]
-cpu[:mhz] = cpu[:proc0][:frequency].to_i / 1024