ibm_power_hmc 0.7.0 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 128d1d4297c8885e438de247ccf25a143c856a3cdff5e2894f49c0541b475a6e
-  data.tar.gz: ee5304a78bf10231755750641b3ea5fc11064bea52753db4c8c42456461bbd3f
+  metadata.gz: 90008b33210851e9ac14f556bd7e3b42231f38adcf68b6d5d59eed7e35671678
+  data.tar.gz: 6c85e9814f527680bea78f9c90fcc06a8796c949ac458c41074e01d6f44f7b61
 SHA512:
-  metadata.gz: 7924966345897965a3789b26ef307ae3df5e5dccbdf316e0d59ed665d57a2ceaaf51128f225cd08a2544b6c77d54ae634b5f75d25bfa766c3672480f01fc72da
-  data.tar.gz: '078600454867693aaf410ca0a898eb5464f24b4dd40db56c61caa5145fbc54685f0819f576862f6065649f4a2d46dab2d5f838938b207fc376e563cfc724c56f'
+  metadata.gz: ece63d99cccdf86022d907f75be7fe48871c6cac5fd64b5469fb0470fc4a0fe25e586fff16e2cc8ee65799eae8b315ba81b34879f395a7bb7375ae04edb74d61
+  data.tar.gz: 767ee9bd259139e97bba680a1edd395da73f5f40ab5ec149574c1538fd4964dd081dc1d272feee5395a8bf2aabeb8b8e5d57b410c5250699f6eef6b19f07f8f9

data/lib/ibm_power_hmc/connection.rb

@@ -383,6 +383,16 @@ module IbmPowerHmc
       FeedParser.new(response.body).objects(:PartitionTemplateSummary)
     end
 
+    ##
+    # @!method templates
+    # Retrieve the list of partition templates.
+    # @return [Array<IbmPowerHmc::PartitionTemplate>] The list of partition templates.
+    def templates
+      method_url = "/rest/api/templates/PartitionTemplate?detail=full"
+      response = request(:get, method_url)
+      FeedParser.new(response.body).objects(:PartitionTemplate)
+    end
+
     ##
     # @!method template(template_uuid)
     # Retrieve details for a particular partition template.
@@ -550,8 +560,8 @@ module IbmPowerHmc
         break if response.code != 204 || !wait
       end
       FeedParser.new(response.body).objects(:Event).map do |e|
-        data = e.data.split("/")
-        if data[-2].eql?("UserTask")
+        data = e.data.split("/") unless e.data.nil?
+        if !data.nil? && data.length >= 2 && data[-2].eql?("UserTask")
           e.usertask = usertask(data.last)
         end
         e
@@ -566,7 +576,14 @@ module IbmPowerHmc
     def usertask(uuid)
       method_url = "/rest/api/ui/UserTask/#{uuid}"
       response = request(:get, method_url)
-      JSON.parse(response.body)
+      j = JSON.parse(response.body)
+      if j['status'].eql?("Completed")
+        case j['key']
+        when "TEMPLATE_PARTITION_SAVE", "TEMPLATE_PARTITION_SAVE_AS", "TEMPLATE_PARTITION_CAPTURE"
+          j['template_uuid'] = templates_summary.find { |t| t.name.eql?(j['labelParams'].first) }&.uuid
+        end
+      end
+      j
     end
 
     ##

data/lib/ibm_power_hmc/parser.rb

@@ -74,9 +74,6 @@ module IbmPowerHmc
     end
   end
 
-  private_constant :Parser
-  private_constant :FeedParser
-
   ##
   # HMC generic K2 non-REST object.
   # @abstract
@@ -135,6 +132,15 @@ module IbmPowerHmc
         uuid_from_href(link.attributes["href"], index)
       end.compact
     end
+
+    def collection_of(name, type)
+      objtype = Module.const_get("IbmPowerHmc::#{type}")
+      xml.get_elements("#{name}/#{type}").map do |elem|
+        objtype.new(elem)
+      end
+    rescue
+      []
+    end
   end
 
   ##
@@ -190,12 +196,19 @@ module IbmPowerHmc
     ATTRS = {
       :name => "ManagementConsoleName",
       :build_level => "VersionInfo/BuildLevel",
-      :version => "BaseVersion"
+      :version => "BaseVersion",
+      :ssh_pubkey => "PublicSSHKeyValue"
     }.freeze
 
     def managed_systems_uuids
       uuids_from_links("ManagedSystems")
     end
+
+    def ssh_authkeys
+      xml.get_elements("AuthorizedKeysValue/AuthorizedKey").map do |elem|
+        elem.text&.strip
+      end.compact
+    end
   end
 
   # Managed System information
@@ -232,9 +245,7 @@ module IbmPowerHmc
     end
 
     def io_adapters
-      xml.get_elements("AssociatedSystemIOConfiguration/IOSlots/IOSlot/RelatedIOAdapter/IOAdapter").map do |elem|
-        IOAdapter.new(elem)
-      end
+      collection_of("AssociatedSystemIOConfiguration/IOSlots/IOSlot/RelatedIOAdapter", "IOAdapter")
     end
 
     def vswitches_uuids
@@ -266,7 +277,8 @@ module IbmPowerHmc
       :state => "PartitionState",
       :type => "PartitionType",
       :memory => "PartitionMemoryConfiguration/CurrentMemory",
-      :dedicated => "PartitionProcessorConfiguration/HasDedicatedProcessors",
+      :dedicated => "PartitionProcessorConfiguration/CurrentHasDedicatedProcessors",
+      :sharing_mode => "PartitionProcessorConfiguration/CurrentSharingMode",
       :rmc_state => "ResourceMonitoringControlState",
       :rmc_ipaddr => "ResourceMonitoringIPAddress",
       :os => "OperatingSystemVersion",
@@ -277,8 +289,8 @@ module IbmPowerHmc
     }.freeze
 
     def sys_uuid
-      sys_href = singleton("AssociatedManagedSystem", "href")
-      uuid_from_href(sys_href)
+      href = singleton("AssociatedManagedSystem", "href")
+      uuid_from_href(href) unless href.nil?
     end
 
     def net_adap_uuids
@@ -286,9 +298,7 @@ module IbmPowerHmc
     end
 
     def lhea_ports
-      xml.get_elements("HostEthernetAdapterLogicalPorts/HostEthernetAdapterLogicalPort").map do |elem|
-        HostEthernetAdapterLogicalPort.new(elem)
-      end
+      collection_of("HostEthernetAdapterLogicalPorts", "HostEthernetAdapterLogicalPort")
     end
 
     def sriov_elp_uuids
@@ -321,9 +331,7 @@ module IbmPowerHmc
   # VIOS information
   class VirtualIOServer < BasePartition
     def pvs
-      xml.get_elements("PhysicalVolumes/PhysicalVolume").map do |elem|
-        PhysicalVolume.new(elem)
-      end
+      collection_of("PhysicalVolumes", "PhysicalVolume")
     end
 
     def rep
@@ -332,15 +340,11 @@ module IbmPowerHmc
     end
 
     def vscsi_mappings
-      xml.get_elements("VirtualSCSIMappings/VirtualSCSIMapping").map do |elem|
-        VirtualSCSIMapping.new(elem)
-      end
+      collection_of("VirtualSCSIMappings", "VirtualSCSIMapping")
     end
 
     def vfc_mappings
-      xml.get_elements("VirtualFibreChannelMappings/VirtualFibreChannelMapping").map do |elem|
-        VirtualFibreChannelMapping.new(elem)
-      end
+      collection_of("VirtualFibreChannelMappings", "VirtualFibreChannelMapping")
     end
   end
 
@@ -390,9 +394,7 @@ module IbmPowerHmc
     }.freeze
 
     def vopts
-      xml.get_elements("OpticalMedia/VirtualOpticalMedia").map do |elem|
-        VirtualOpticalMedia.new(elem)
-      end
+      collection_of("OpticalMedia", "VirtualOpticalMedia")
     end
   end
 
@@ -424,7 +426,7 @@ module IbmPowerHmc
 
     def vswitch_uuid
       href = singleton("AssociatedSwitch", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
 
     def lpars_uuids
@@ -511,7 +513,7 @@ module IbmPowerHmc
   class VirtualSCSIMapping < AbstractNonRest
     def lpar_uuid
       href = singleton("AssociatedLogicalPartition", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
 
     def client
@@ -562,7 +564,7 @@ module IbmPowerHmc
 
     def vios_uuid
       href = singleton("ConnectingPartition", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
   end
 
@@ -606,7 +608,7 @@ module IbmPowerHmc
   class VirtualFibreChannelMapping < AbstractNonRest
     def lpar_uuid
       href = singleton("AssociatedLogicalPartition", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
 
     def client
@@ -636,16 +638,14 @@ module IbmPowerHmc
 
     def lpar_uuid
       href = singleton("ConnectingPartition", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
   end
 
   # VFC client information
   class VirtualFibreChannelClientAdapter < VirtualFibreChannelAdapter
     def nport_loggedin
-      xml.get_elements("NportLoggedInStatus/VirtualFibreChannelNPortLoginStatus").map do |elem|
-        VirtualFibreChannelNPortLoginStatus.new(elem)
-      end
+      collection_of("NportLoggedInStatus", "VirtualFibreChannelNPortLoginStatus")
     end
 
     def server
@@ -699,9 +699,7 @@ module IbmPowerHmc
     }.freeze
 
     def pvs
-      xml.get_elements("PhysicalVolumes/PhysicalVolume").map do |elem|
-        PhysicalVolume.new(elem)
-      end
+      collection_of("PhysicalVolumes", "PhysicalVolume")
     end
   end
 
@@ -713,15 +711,17 @@ module IbmPowerHmc
       :tier_capable => "ClusterCapabilities/IsTierCapable"
     }.freeze
 
+    def repopvs
+      collection_of("RepositoryDisk", "PhysicalVolume")
+    end
+
     def ssp_uuid
       href = singleton("ClusterSharedStoragePool", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
 
     def nodes
-      xml.get_elements("Node/Node").map do |elem|
-        Node.new(elem)
-      end
+      collection_of("Node", "Node")
     end
   end
 
@@ -736,13 +736,14 @@ module IbmPowerHmc
 
     def vios_uuid
       href = singleton("VirtualIOServer", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
   end
 
   # SSP information
   class SharedStoragePool < AbstractRest
     ATTRS = {
+      :id => "SharedStoragePoolID",
       :name => "StoragePoolName",
       :udid => "UniqueDeviceID",
       :capacity => "Capacity",
@@ -754,13 +755,11 @@ module IbmPowerHmc
 
     def cluster_uuid
       href = singleton("AssociatedCluster", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
 
     def pvs
-      xml.get_elements("PhysicalVolumes/PhysicalVolume").map do |elem|
-        PhysicalVolume.new(elem)
-      end
+      collection_of("PhysicalVolumes", "PhysicalVolume")
     end
 
     def tiers_uuids
@@ -768,9 +767,7 @@ module IbmPowerHmc
     end
 
     def lus
-      xml.get_elements("LogicalUnits/LogicalUnit").map do |elem|
-        LogicalUnit.new(elem)
-      end
+      collection_of("LogicalUnits", "LogicalUnit")
     end
   end
 
@@ -788,7 +785,7 @@ module IbmPowerHmc
 
     def ssp_uuid
       href = singleton("AssociatedSharedStoragePool", "href")
-      uuid_from_href(href)
+      uuid_from_href(href) unless href.nil?
     end
 
     def lus_uuids
@@ -816,10 +813,15 @@ module IbmPowerHmc
 
   class PartitionTemplate < AbstractRest
     ATTRS = {
-      :name        => "partitionTemplateName",
-      :description => "description",
-      :os          => "logicalPartitionConfig/osVersion",
-      :memory      => "logicalPartitionConfig/memoryConfiguration/currMemory"
+      :name         => "partitionTemplateName",
+      :description  => "description",
+      :os           => "logicalPartitionConfig/osVersion",
+      :memory       => "logicalPartitionConfig/memoryConfiguration/currMemory",
+      :dedicated    => "logicalPartitionConfig/processorConfiguration/hasDedicatedProcessors",
+      :sharing_mode => "logicalPartitionConfig/processorConfiguration/sharingMode",
+      :vprocs       => "logicalPartitionConfig/processorConfiguration/sharedProcessorConfiguration/desiredVirtualProcessors",
+      :proc_units   => "logicalPartitionConfig/processorConfiguration/sharedProcessorConfiguration/desiredProcessingUnits",
+      :procs        => "logicalPartitionConfig/processorConfiguration/dedicatedProcessorConfiguration/desiredProcessors"
     }.freeze
   end
 

data/lib/ibm_power_hmc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IbmPowerHmc
-  VERSION = "0.7.0"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_power_hmc
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.3
 platform: ruby
 authors:
 - IBM Power
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client