ucslib 0.1.2 → 0.1.4

data/lib/ucslib/inventory.rb

@@ -48,6 +48,7 @@ class UCSInventory
           xml.classId("value" => "orgOrg")
           xml.classId("value" => "fabricVlan")
           xml.classId("value" => "vnicEther")
+          xml.classId("value" => "vnicFc")
           xml.classId("value" => "fabricVsan")
           xml.classId("value" => "vmAdaptor")
           xml.classId("value" => "vmCont")

data/lib/ucslib/provision.rb

@@ -514,8 +514,8 @@ class UCSProvision
           xml.configConfMos('cookie' => "#{@cookie}", 'inHierarchical' => 'true'){
             xml.inConfigs{
               xml.pair('key' => "org-root/org-#{org}/fw-host-pack-#{host_firmware_pkg_name}"){
-                xml.firmwareComputeHostPack('descr' => "#{host_firmware_pkg_description}", 'dn' => "org-root/org-#{org}/fw-host-pack-#{host_firmware_pkg_name}",
-                                           'ignoreCompCheck' => 'yes', 'mode' => 'staged', 'name' => "#{host_firmware_pkg_name}", 'stageSize' => '0',
+                xml.firmwareComputeHostPack('bladeBundleVersion' => "", 'descr' => "#{host_firmware_pkg_description}", 'dn' => "org-root/org-#{org}/fw-host-pack-#{host_firmware_pkg_name}",
+                                           'ignoreCompCheck' => 'yes', 'mode' => 'staged', 'policyOwner' =>"local", 'rackBundleVersion' => "",'name' => "#{host_firmware_pkg_name}", 'stageSize' => '0',
                                            'status' => 'created', 'updateTrigger' => 'immediate'){
                                              xml.firmwarePackItem('hwModel' => "#{hardware_model}", 'hwVendor' => "#{hardware_vendor}",
                                                                   'rn' => "pack-image-#{hardware_vendor}|#{hardware_model}|#{hardware_type}",
@@ -532,8 +532,8 @@ class UCSProvision
           xml.configConfMos('cookie' => "#{@cookie}", 'inHierarchical' => 'false'){
             xml.inConfigs{
               xml.pair('key' => "org-root/org-#{org}/fw-host-pack-#{host_firmware_pkg_name}"){
-                xml.firmwareComputeHostPack('descr' => "#{host_firmware_pkg_description}", 'dn' => "org-root/org-#{org}/fw-host-pack-#{host_firmware_pkg_name}",
-                                            'ignoreCompCheck' => 'yes', 'mode' => 'staged', 'stageSize' => '0', 'updateTrigger' => 'immediate'){
+                xml.firmwareComputeHostPack('bladeBundleVersion' => "", 'descr' => "#{host_firmware_pkg_description}", 'dn' => "org-root/org-#{org}/fw-host-pack-#{host_firmware_pkg_name}",
+                                            'ignoreCompCheck' => 'yes', 'mode' => 'staged', 'policyOwner' =>"local", 'rackBundleVersion' => "",'stageSize' => '0', 'updateTrigger' => 'immediate'){
                                              xml.firmwarePackItem('hwModel' => "#{hardware_model}", 'hwVendor' => "#{hardware_vendor}",
                                                                   'rn' => "pack-image-#{hardware_vendor}|#{hardware_model}|#{hardware_type}",
                                                                   'type' => "#{hardware_type}", 'version' => "#{firmware_version}")

data/lib/ucslib/stats.rb

@@ -1,4 +1,6 @@
 class UCSStats
+    STATNAMES = %w(adaptorEthPortStats adaptorEthPortErrStats adaptorEthPortMcastStats adaptorVnicStats computeMbPowerStats computeMbTempStats computePCIeFatalStats computePCIeFatalCompletionStats computePCIeFatalProtocolStats computePCIeFatalReceiveStats equipmentChassisStats equipmentFanStats equipmentFanModuleStats equipmentIOCardStats equipmentNetworkElementFanStats equipmentPsuStats equipmentPsuInputStats etherErrStats etherLossStats etherPauseStats etherRxStats etherTxStats fcStats fcErrStats memoryArrayEnvStats memoryErrorStats memoryUnitEnvStats processorEnvStats processorErrorStats swEnvStats swSystemStats)
+
     def fetch(tokenjson)
         cookie 	 = "#{JSON.parse(tokenjson)['cookie']}"
         ip       = "#{JSON.parse(tokenjson)['ip']}"
@@ -60,6 +62,29 @@ class UCSStats
         return Nokogiri::XML(ucs_response_multi_class)
     end
 
+    # Translate stats XML into a hash.
+    #
+    # If statname is supplied, only include that stat.  Otherwise, include
+    # all stats.
+    #
+    # Hash looks like hash[statname][dn][attribute] = value
+    def get_hash(xml,statname=:all)
+        statnames = STATNAMES if statname == :all
+
+        h = Hash.new{|k,v| k[v] = Hash.new}
+        statnames.each do |statname|
+            xml.xpath("configResolveClasses/outConfigs/#{statname}").each do |stat|
+                dn = stat.attributes['dn'].value
+                h[statname][dn] = Hash.new
+                stat.attributes.each do |attr,value|
+                    next if attr == 'dn'
+                    h[statname][dn][attr] = value.value
+                end
+            end
+        end
+        return h
+    end
+
     def show_sample(xml,statname,all=false)
         list = xml.xpath("configResolveClasses/outConfigs/#{statname}")
         list = [list.first] unless all

data/lib/ucslib/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Ucslib
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucslib
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri