ibm_power_hmc 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3d62a8c9463bde2ffbcfc08f9005924913a5567506cf6ae2e73fae8863a2bd
-  data.tar.gz: acc60a5a70fff620d64085ffc36a6e2aa79fc582f5644be4b6d1ef1e1484af95
+  metadata.gz: fa2829db70216f23c73d2d06e8daebdbc2be4f3bde1f8f17d2659961288caa19
+  data.tar.gz: cb7a7cabacbf9efffe013715af8b0e4c5cc4fdf6b941cd0ef42cc8d19861fea5
 SHA512:
-  metadata.gz: 628151a41e5e7492b42dfea5a510f3030bcc48ffa8d97121e43d6b4a3ba612586bb511f8f4a46aa3644e5acfa6fbc217f04bda179c99d2e9aa23cf6c4d6bf5c9
-  data.tar.gz: f6fea07e19239510bded7d89f7091fbf3f5398c2e2c4ac135c1ef32e75369c4a23666241f0faa7e09c3595ac0f81667539913b30679bf8568bd556008071f041
+  metadata.gz: 390b00cf4dd7f4fd83ef4c8619d25274f3b708fe5bdc075eef77b8bd7f199875b2003cbc203ecdf3adbee4518a8905bd59003bd238a7c81033504e0763971943
+  data.tar.gz: 7fee8e0a80ce4b266b27469706e00dd8804a5f706a272301751680bc660bf04d6398583c8268a0b8e28176da6e4f96c161b22f4d71813c4b1b101c6c5872fa5a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.24.0
+* Add schema methods to modify VSCSI and VFC mappings
+* Add schema definition for IOSlot
+* Add schema definition for IORDevice
 ## v0.23.0
 * Enhance schema definition for physical fibre channel adapters
 ## v0.22.0

data/lib/ibm_power_hmc/schema/uom.rb

@@ -94,10 +94,15 @@ module IbmPowerHmc
       uuids_from_links("AssociatedVirtualIOServers")
     end
 
+    # Deprecated: use io_slots.io_adapter
     def io_adapters
       collection_of("AssociatedSystemIOConfiguration/IOSlots/IOSlot/RelatedIOAdapter", "IOAdapter")
     end
 
+    def io_slots
+      collection_of("AssociatedSystemIOConfiguration/IOSlots", "IOSlot")
+    end
+
     def vswitches_uuids
       uuids_from_links("AssociatedSystemIOConfiguration/AssociatedSystemVirtualNetwork/VirtualSwitches")
     end
@@ -107,6 +112,73 @@ module IbmPowerHmc
     end
   end
 
+  # I/O Slot information
+  class IOSlot < AbstractNonRest
+    ATTRS = {
+      :description => "Description",
+      :lpar_id => "PartitionID",
+      :lpar_name => "PartitionName",
+      :lpar_type => "PartitionType",
+      :pci_class => "PCIClass",
+      :pci_dev => "PCIDeviceID",
+      :pci_subsys_dev => "PCISubsystemDeviceID",
+      :pci_man => "PCIManufacturerID",
+      :pci_rev => "PCIRevisionID",
+      :pci_vendor => "PCIVendorID",
+      :pci_subsys_vendor => "PCISubsystemVendorID",
+      :dr_name => "SlotDynamicReconfigurationConnectorName",
+      :physloc => "SlotPhysicalLocationCode",
+      :sriov_capable_dev => "SRIOVCapableDevice",
+      :sriov_capable => "SRIOVCapableSlot",
+      :vpd_model => "VitalProductDataModel",
+      :vpd_serial => "VitalProductDataSerialNumber",
+      :vpd_stale => "VitalProductDataStale",
+      :vpd_type => "VitalProductDataType"
+    }.freeze
+
+    def io_adapter
+      elem = xml.elements["RelatedIOAdapter/*[1]"]
+      Module.const_get("IbmPowerHmc::#{elem.name}").new(elem) unless elem.nil?
+    rescue NameError
+      nil
+    end
+
+    def features
+      xml.get_elements("FeatureCodes").map do |elem|
+        elem.text&.strip
+      end.compact
+    end
+
+    def ior_devices
+      collection_of("IORDevices", "IORDevice")
+    end
+  end
+
+  # I/O Device information
+  class IORDevice < AbstractNonRest
+    ATTRS = {
+      :parent => "ParentName",
+      :pci_dev => "PCIDeviceId",
+      :pci_vendor => "PCIVendorId",
+      :pci_subsys_dev => "PCISubsystemDeviceId",
+      :pci_subsys_vendor => "PCISubsystemVendorId",
+      :pci_rev => "PCIRevisionId",
+      :pci_class => "PCIClassCode",
+      :type => "DeviceType",
+      :serial => "SerialNumber",
+      :fru_number => "FruNumber",
+      :part_number => "PartNumber",
+      :ccin => "CCIN",
+      :size => "Size",
+      :location => "LocationCode",
+      :ucode_version => "MicroCodeVersion",
+      :wwpn => "WWPN",
+      :wwnn => "WWNN",
+      :macaddr => "MacAddressValue",
+      :description => "Description"
+    }.freeze
+  end
+
   # I/O Adapter information
   class IOAdapter < AbstractNonRest
     ATTRS = {
@@ -124,11 +196,29 @@ module IbmPowerHmc
 
   # FC adapter information
   class PhysicalFibreChannelAdapter < IOAdapter
-    def slots
+    def ports
       collection_of("PhysicalFibreChannelPorts", "PhysicalFibreChannelPort")
     end
   end
 
+  # FC port information
+  class PhysicalFibreChannelPort < AbstractNonRest
+    ATTRS = {
+      :location => "LocationCode",
+      :name => "PortName",
+      :udid => "UniqueDeviceID",
+      :wwpn => "WWPN",
+      :wwnn => "WWNN",
+      :avail_ports => "AvailablePorts",
+      :total_ports => "TotalPorts",
+      :label => "Label"
+    }.freeze
+
+    def pvs
+      collection_of("PhysicalVolumes", "PhysicalVolume")
+    end
+  end
+
   # Common class for LPAR and VIOS
   class BasePartition < AbstractRest
     ATTRS = {
@@ -193,10 +283,17 @@ module IbmPowerHmc
       end.compact
     end
 
+    # Deprecated: use io_slots.io_adapter
     def io_adapters
       collection_of("PartitionIOConfiguration/ProfileIOSlots/ProfileIOSlot/AssociatedIOSlot/RelatedIOAdapter", "*[1]")
     end
 
+    def io_slots
+      xml.get_elements("PartitionIOConfiguration/ProfileIOSlots/ProfileIOSlot/AssociatedIOSlot").map do |elem|
+        IOSlot.new(elem)
+      end.compact
+    end
+
     def shared_processor_pool_uuid
       href = singleton("ProcessorPool", "href")
       uuid_from_href(href) unless href.nil?
@@ -260,10 +357,39 @@ module IbmPowerHmc
       collection_of("VirtualSCSIMappings", "VirtualSCSIMapping")
     end
 
+    # Remove VSCSI mapping (vhostX) from XML
+    def vscsi_mapping_delete!(location)
+      vscsi_mappings.each do |mapping|
+        mapping.xml.parent.delete(mapping.xml) if mapping.server&.location == location
+      end
+    end
+
+    # Remove VSCSI target (vtscsiX) from XML
+    def vscsi_mapping_unmap!(target)
+      mapping = vscsi_mappings.find { |m| m.device&.target == target }
+      mapping.xml.parent.delete(mapping.xml) unless mapping.nil?
+    end
+
     def vfc_mappings
       collection_of("VirtualFibreChannelMappings", "VirtualFibreChannelMapping")
     end
 
+    # Remove VFC mapping (vfchostX) from XML
+    def vfc_mapping_delete!(location)
+      mapping = vfc_mappings.find { |m| m.server&.location == location }
+      mapping.xml.parent.delete(mapping.xml) unless mapping.nil?
+    end
+
+    # Remove FC adapter mapping (fcsX) from XML
+    def vfc_mapping_unmap!(location)
+      mapping = vfc_mappings.find { |m| m.port && m.server&.location == location }
+      return if mapping.nil?
+
+      mapping.port.xml.parent.delete(mapping.port.xml)
+      mapping.server.map_port = nil
+      mapping.server.xml.delete(mapping.server.port.xml) unless mapping.server.port.nil?
+    end
+
     def seas
       collection_of("SharedEthernetAdapters", "SharedEthernetAdapter")
     end
@@ -759,24 +885,6 @@ module IbmPowerHmc
     end
   end
 
-  # FC port information
-  class PhysicalFibreChannelPort < AbstractNonRest
-    ATTRS = {
-      :location => "LocationCode",
-      :name => "PortName",
-      :udid => "UniqueDeviceID",
-      :wwpn => "WWPN",
-      :wwnn => "WWNN",
-      :avail_ports => "AvailablePorts",
-      :total_ports => "TotalPorts",
-      :label => "Label"
-    }.freeze
-
-    def pvs
-      collection_of("PhysicalVolumes", "PhysicalVolume")
-    end
-  end
-
   # Cluster information
   class Cluster < AbstractRest
     ATTRS = {

data/lib/ibm_power_hmc/version.rb

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

metadata

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