ovirt-engine-sdk 4.0.0.alpha13 → 4.0.0.alpha14

data/lib/ovirtsdk4/version.rb

@@ -16,5 +16,5 @@
 
 
 module OvirtSDK4
-  VERSION = '4.0.0.alpha13'
+  VERSION = '4.0.0.alpha14'
 end

data/lib/ovirtsdk4/writers.rb

@@ -31,6 +31,7 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'check_connectivity', object.check_connectivity) unless object.check_connectivity.nil?
       Writer.write_boolean(writer, 'clone', object.clone) unless object.clone.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
+      Writer.write_boolean(writer, 'collapse_snapshots', object.collapse_snapshots) unless object.collapse_snapshots.nil?
       Writer.write_string(writer, 'comment', object.comment) unless object.comment.nil?
       Writer.write_integer(writer, 'connectivity_timeout', object.connectivity_timeout) unless object.connectivity_timeout.nil?
       DataCenterWriter.write_one(object.data_center, writer, 'data_center') unless object.data_center.nil?
@@ -115,7 +116,7 @@ module OvirtSDK4
   class AffinityGroupWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'affinity-group'
+      singular ||= 'affinity_group'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -126,12 +127,13 @@ module OvirtSDK4
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
       Writer.write_boolean(writer, 'positive', object.positive) unless object.positive.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
+      VmWriter.write_many(object.vms, writer, 'vm', 'vms') unless object.vms.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'affinity-group'
-      plural ||= 'affinity-groups'
+      singular ||= 'affinity_group'
+      plural ||= 'affinity_groups'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -148,7 +150,7 @@ module OvirtSDK4
   class AffinityLabelWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'affinity-label'
+      singular ||= 'affinity_label'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -163,8 +165,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'affinity-label'
-      plural ||= 'affinity-labels'
+      singular ||= 'affinity_label'
+      plural ||= 'affinity_labels'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -221,7 +223,7 @@ module OvirtSDK4
   class AgentConfigurationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'agent-configuration'
+      singular ||= 'agent_configuration'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -235,8 +237,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'agent-configuration'
-      plural ||= 'agent-configurations'
+      singular ||= 'agent_configuration'
+      plural ||= 'agent_configurations'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -283,7 +285,7 @@ module OvirtSDK4
   class ApiSummaryWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'api-summary'
+      singular ||= 'api_summary'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -295,8 +297,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'api-summary'
-      plural ||= 'api-summaries'
+      singular ||= 'api_summary'
+      plural ||= 'api_summaries'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -313,7 +315,7 @@ module OvirtSDK4
   class ApiSummaryItemWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'api-summary-item'
+      singular ||= 'api_summary_item'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -323,8 +325,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'api-summary-item'
-      plural ||= 'api-summary-items'
+      singular ||= 'api_summary_item'
+      plural ||= 'api_summary_items'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -372,7 +374,7 @@ module OvirtSDK4
   class AuthorizedKeyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'authorized-key'
+      singular ||= 'authorized_key'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -386,8 +388,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'authorized-key'
-      plural ||= 'authorized-keys'
+      singular ||= 'authorized_key'
+      plural ||= 'authorized_keys'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -463,7 +465,7 @@ module OvirtSDK4
   class BlockStatisticWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'block-statistic'
+      singular ||= 'block_statistic'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -472,8 +474,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'block-statistic'
-      plural ||= 'block-statistics'
+      singular ||= 'block_statistic'
+      plural ||= 'block_statistics'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -582,7 +584,7 @@ module OvirtSDK4
   class BootMenuWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'boot-menu'
+      singular ||= 'boot_menu'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -591,8 +593,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'boot-menu'
-      plural ||= 'boot-menus'
+      singular ||= 'boot_menu'
+      plural ||= 'boot_menus'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -609,7 +611,7 @@ module OvirtSDK4
   class BrickProfileDetailWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'brick-profile-detail'
+      singular ||= 'brick_profile_detail'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -619,8 +621,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'brick-profile-detail'
-      plural ||= 'brick-profile-details'
+      singular ||= 'brick_profile_detail'
+      plural ||= 'brick_profile_details'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -705,7 +707,7 @@ module OvirtSDK4
   class CloudInitWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'cloud-init'
+      singular ||= 'cloud_init'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -720,8 +722,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'cloud-init'
-      plural ||= 'cloud-inits'
+      singular ||= 'cloud_init'
+      plural ||= 'cloud_inits'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -773,9 +775,16 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'tunnel_migration', object.tunnel_migration) unless object.tunnel_migration.nil?
       VersionWriter.write_one(object.version, writer, 'version') unless object.version.nil?
       Writer.write_boolean(writer, 'virt_service', object.virt_service) unless object.virt_service.nil?
+      AffinityGroupWriter.write_many(object.affinity_groups, writer, 'affinity_group', 'affinity_groups') unless object.affinity_groups.nil?
+      CpuProfileWriter.write_many(object.cpu_profiles, writer, 'cpu_profile', 'cpu_profiles') unless object.cpu_profiles.nil?
       DataCenterWriter.write_one(object.data_center, writer, 'data_center') unless object.data_center.nil?
+      GlusterHookWriter.write_many(object.gluster_hooks, writer, 'gluster_hook', 'gluster_hooks') unless object.gluster_hooks.nil?
+      GlusterVolumeWriter.write_many(object.gluster_volumes, writer, 'gluster_volume', 'gluster_volumes') unless object.gluster_volumes.nil?
       MacPoolWriter.write_one(object.mac_pool, writer, 'mac_pool') unless object.mac_pool.nil?
       NetworkWriter.write_one(object.management_network, writer, 'management_network') unless object.management_network.nil?
+      NetworkFilterWriter.write_many(object.network_filters, writer, 'network_filter', 'network_filters') unless object.network_filters.nil?
+      NetworkWriter.write_many(object.networks, writer, 'network', 'networks') unless object.networks.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       writer.write_end
     end
     
@@ -795,6 +804,37 @@ module OvirtSDK4
     
   end
   
+  class ClusterLevelWriter < Writer # :nodoc:
+    
+    def self.write_one(object, writer, singular = nil)
+      singular ||= 'cluster_level'
+      writer.write_start(singular)
+      href = object.href
+      writer.write_attribute('href', href) unless href.nil?
+      writer.write_attribute('id', object.id) unless object.id.nil?
+      Writer.write_string(writer, 'comment', object.comment) unless object.comment.nil?
+      CpuTypeWriter.write_many(object.cpu_types, writer, 'cpu_type', 'cpu_types') unless object.cpu_types.nil?
+      Writer.write_string(writer, 'description', object.description) unless object.description.nil?
+      Writer.write_string(writer, 'name', object.name) unless object.name.nil?
+      writer.write_end
+    end
+    
+    def self.write_many(list, writer, singular = nil, plural = nil)
+      singular ||= 'cluster_level'
+      plural ||= 'cluster_levels'
+      writer.write_start(plural)
+      if list.is_a?(List)
+        href = list.href
+        writer.write_attribute('href', href) unless href.nil?
+      end
+      list.each do |item|
+        write_one(item, writer, singular)
+      end
+      writer.write_end
+    end
+    
+  end
+  
   class ConfigurationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
@@ -916,7 +956,7 @@ module OvirtSDK4
   class CpuProfileWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'cpu-profile'
+      singular ||= 'cpu_profile'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -925,13 +965,14 @@ module OvirtSDK4
       Writer.write_string(writer, 'description', object.description) unless object.description.nil?
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QosWriter.write_one(object.qos, writer, 'qos') unless object.qos.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'cpu-profile'
-      plural ||= 'cpu-profiles'
+      singular ||= 'cpu_profile'
+      plural ||= 'cpu_profiles'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -948,7 +989,7 @@ module OvirtSDK4
   class CpuTopologyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'cpu-topology'
+      singular ||= 'cpu_topology'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -959,8 +1000,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'cpu-topology'
-      plural ||= 'cpu-topologies'
+      singular ||= 'cpu_topology'
+      plural ||= 'cpu_topologies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -977,7 +1018,7 @@ module OvirtSDK4
   class CpuTuneWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'cpu-tune'
+      singular ||= 'cpu_tune'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -986,8 +1027,37 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'cpu-tune'
-      plural ||= 'cpu-tunes'
+      singular ||= 'cpu_tune'
+      plural ||= 'cpu_tunes'
+      writer.write_start(plural)
+      if list.is_a?(List)
+        href = list.href
+        writer.write_attribute('href', href) unless href.nil?
+      end
+      list.each do |item|
+        write_one(item, writer, singular)
+      end
+      writer.write_end
+    end
+    
+  end
+  
+  class CpuTypeWriter < Writer # :nodoc:
+    
+    def self.write_one(object, writer, singular = nil)
+      singular ||= 'cpu_type'
+      writer.write_start(singular)
+      href = object.href
+      writer.write_attribute('href', href) unless href.nil?
+      Writer.write_string(writer, 'architecture', object.architecture) unless object.architecture.nil?
+      Writer.write_integer(writer, 'level', object.level) unless object.level.nil?
+      Writer.write_string(writer, 'name', object.name) unless object.name.nil?
+      writer.write_end
+    end
+    
+    def self.write_many(list, writer, singular = nil, plural = nil)
+      singular ||= 'cpu_type'
+      plural ||= 'cpu_types'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1004,7 +1074,7 @@ module OvirtSDK4
   class CustomPropertyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'custom-property'
+      singular ||= 'custom_property'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1015,8 +1085,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'custom-property'
-      plural ||= 'custom-properties'
+      singular ||= 'custom_property'
+      plural ||= 'custom_properties'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1033,7 +1103,7 @@ module OvirtSDK4
   class DataCenterWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'data-center'
+      singular ||= 'data_center'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1047,12 +1117,20 @@ module OvirtSDK4
       Writer.write_string(writer, 'storage_format', object.storage_format) unless object.storage_format.nil?
       VersionWriter.write_many(object.supported_versions, writer, 'supported_version', 'supported_versions') unless object.supported_versions.nil?
       VersionWriter.write_one(object.version, writer, 'version') unless object.version.nil?
+      ClusterWriter.write_many(object.clusters, writer, 'cluster', 'clusters') unless object.clusters.nil?
+      IscsiBondWriter.write_many(object.iscsi_bonds, writer, 'iscsi_bond', 'iscsi_bonds') unless object.iscsi_bonds.nil?
+      MacPoolWriter.write_one(object.mac_pool, writer, 'mac_pool') unless object.mac_pool.nil?
+      NetworkWriter.write_many(object.networks, writer, 'network', 'networks') unless object.networks.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
+      QosWriter.write_many(object.qoss, writer, 'qos', 'qoss') unless object.qoss.nil?
+      QuotaWriter.write_many(object.quotas, writer, 'quota', 'quotas') unless object.quotas.nil?
+      StorageDomainWriter.write_many(object.storage_domains, writer, 'storage_domain', 'storage_domains') unless object.storage_domains.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'data-center'
-      plural ||= 'data-centers'
+      singular ||= 'data_center'
+      plural ||= 'data_centers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1126,7 +1204,6 @@ module OvirtSDK4
       Writer.write_string(writer, 'sgio', object.sgio) unless object.sgio.nil?
       Writer.write_boolean(writer, 'shareable', object.shareable) unless object.shareable.nil?
       Writer.write_boolean(writer, 'sparse', object.sparse) unless object.sparse.nil?
-      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       Writer.write_string(writer, 'storage_type', object.storage_type) unless object.storage_type.nil?
       Writer.write_boolean(writer, 'uses_scsi_reservation', object.uses_scsi_reservation) unless object.uses_scsi_reservation.nil?
@@ -1134,8 +1211,10 @@ module OvirtSDK4
       DiskProfileWriter.write_one(object.disk_profile, writer, 'disk_profile') unless object.disk_profile.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
       OpenStackVolumeTypeWriter.write_one(object.openstack_volume_type, writer, 'openstack_volume_type') unless object.openstack_volume_type.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QuotaWriter.write_one(object.quota, writer, 'quota') unless object.quota.nil?
       SnapshotWriter.write_one(object.snapshot, writer, 'snapshot') unless object.snapshot.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
       StorageDomainWriter.write_many(object.storage_domains, writer, 'storage_domain', 'storage_domains') unless object.storage_domains.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
@@ -1163,7 +1242,7 @@ module OvirtSDK4
   class DiskAttachmentWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'disk-attachment'
+      singular ||= 'disk_attachment'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1179,8 +1258,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'disk-attachment'
-      plural ||= 'disk-attachments'
+      singular ||= 'disk_attachment'
+      plural ||= 'disk_attachments'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1197,7 +1276,7 @@ module OvirtSDK4
   class DiskProfileWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'disk-profile'
+      singular ||= 'disk_profile'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1205,14 +1284,15 @@ module OvirtSDK4
       Writer.write_string(writer, 'comment', object.comment) unless object.comment.nil?
       Writer.write_string(writer, 'description', object.description) unless object.description.nil?
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QosWriter.write_one(object.qos, writer, 'qos') unless object.qos.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'disk-profile'
-      plural ||= 'disk-profiles'
+      singular ||= 'disk_profile'
+      plural ||= 'disk_profiles'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1229,7 +1309,7 @@ module OvirtSDK4
   class DiskSnapshotWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'disk-snapshot'
+      singular ||= 'disk_snapshot'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1252,7 +1332,6 @@ module OvirtSDK4
       Writer.write_string(writer, 'sgio', object.sgio) unless object.sgio.nil?
       Writer.write_boolean(writer, 'shareable', object.shareable) unless object.shareable.nil?
       Writer.write_boolean(writer, 'sparse', object.sparse) unless object.sparse.nil?
-      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       Writer.write_string(writer, 'storage_type', object.storage_type) unless object.storage_type.nil?
       Writer.write_boolean(writer, 'uses_scsi_reservation', object.uses_scsi_reservation) unless object.uses_scsi_reservation.nil?
@@ -1261,8 +1340,10 @@ module OvirtSDK4
       DiskProfileWriter.write_one(object.disk_profile, writer, 'disk_profile') unless object.disk_profile.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
       OpenStackVolumeTypeWriter.write_one(object.openstack_volume_type, writer, 'openstack_volume_type') unless object.openstack_volume_type.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QuotaWriter.write_one(object.quota, writer, 'quota') unless object.quota.nil?
       SnapshotWriter.write_one(object.snapshot, writer, 'snapshot') unless object.snapshot.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
       StorageDomainWriter.write_many(object.storage_domains, writer, 'storage_domain', 'storage_domains') unless object.storage_domains.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
@@ -1272,8 +1353,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'disk-snapshot'
-      plural ||= 'disk-snapshots'
+      singular ||= 'disk_snapshot'
+      plural ||= 'disk_snapshots'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1367,6 +1448,8 @@ module OvirtSDK4
       Writer.write_string(writer, 'description', object.description) unless object.description.nil?
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
       UserWriter.write_one(object.user, writer, 'user') unless object.user.nil?
+      GroupWriter.write_many(object.groups, writer, 'group', 'groups') unless object.groups.nil?
+      UserWriter.write_many(object.users, writer, 'user', 'users') unless object.users.nil?
       writer.write_end
     end
     
@@ -1389,7 +1472,7 @@ module OvirtSDK4
   class EntityProfileDetailWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'entity-profile-detail'
+      singular ||= 'entity_profile_detail'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1398,8 +1481,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'entity-profile-detail'
-      plural ||= 'entity-profile-details'
+      singular ||= 'entity_profile_detail'
+      plural ||= 'entity_profile_details'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1416,7 +1499,7 @@ module OvirtSDK4
   class ErrorHandlingWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'error-handling'
+      singular ||= 'error_handling'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1425,8 +1508,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'error-handling'
-      plural ||= 'error-handlings'
+      singular ||= 'error_handling'
+      plural ||= 'error_handlings'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1488,7 +1571,7 @@ module OvirtSDK4
   class ExternalComputeResourceWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'external-compute-resource'
+      singular ||= 'external_compute_resource'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1504,8 +1587,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'external-compute-resource'
-      plural ||= 'external-compute-resources'
+      singular ||= 'external_compute_resource'
+      plural ||= 'external_compute_resources'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1522,7 +1605,7 @@ module OvirtSDK4
   class ExternalDiscoveredHostWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'external-discovered-host'
+      singular ||= 'external_discovered_host'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1539,8 +1622,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'external-discovered-host'
-      plural ||= 'external-discovered-hosts'
+      singular ||= 'external_discovered_host'
+      plural ||= 'external_discovered_hosts'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1557,7 +1640,7 @@ module OvirtSDK4
   class ExternalHostWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'external-host'
+      singular ||= 'external_host'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1571,8 +1654,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'external-host'
-      plural ||= 'external-hosts'
+      singular ||= 'external_host'
+      plural ||= 'external_hosts'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1589,7 +1672,7 @@ module OvirtSDK4
   class ExternalHostGroupWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'external-host-group'
+      singular ||= 'external_host_group'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1606,8 +1689,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'external-host-group'
-      plural ||= 'external-host-groups'
+      singular ||= 'external_host_group'
+      plural ||= 'external_host_groups'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1624,7 +1707,7 @@ module OvirtSDK4
   class ExternalHostProviderWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'external-host-provider'
+      singular ||= 'external_host_provider'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1638,12 +1721,17 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'requires_authentication', object.requires_authentication) unless object.requires_authentication.nil?
       Writer.write_string(writer, 'url', object.url) unless object.url.nil?
       Writer.write_string(writer, 'username', object.username) unless object.username.nil?
+      CertificateWriter.write_many(object.certificates, writer, 'certificate', 'certificates') unless object.certificates.nil?
+      ExternalComputeResourceWriter.write_many(object.compute_resources, writer, 'compute_resource', 'compute_resources') unless object.compute_resources.nil?
+      ExternalDiscoveredHostWriter.write_many(object.discovered_hosts, writer, 'discovered_host', 'discovered_hosts') unless object.discovered_hosts.nil?
+      ExternalHostGroupWriter.write_many(object.host_groups, writer, 'host_group', 'host_groups') unless object.host_groups.nil?
+      HostWriter.write_many(object.hosts, writer, 'host', 'hosts') unless object.hosts.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'external-host-provider'
-      plural ||= 'external-host-providers'
+      singular ||= 'external_host_provider'
+      plural ||= 'external_host_providers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1660,7 +1748,7 @@ module OvirtSDK4
   class ExternalProviderWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'external-provider'
+      singular ||= 'external_provider'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1678,8 +1766,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'external-provider'
-      plural ||= 'external-providers'
+      singular ||= 'external_provider'
+      plural ||= 'external_providers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1724,7 +1812,7 @@ module OvirtSDK4
   class FencingPolicyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'fencing-policy'
+      singular ||= 'fencing_policy'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1735,8 +1823,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'fencing-policy'
-      plural ||= 'fencing-policies'
+      singular ||= 'fencing_policy'
+      plural ||= 'fencing_policies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1853,7 +1941,7 @@ module OvirtSDK4
   class FopStatisticWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'fop-statistic'
+      singular ||= 'fop_statistic'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1863,8 +1951,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'fop-statistic'
-      plural ||= 'fop-statistics'
+      singular ||= 'fop_statistic'
+      plural ||= 'fop_statistics'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1881,7 +1969,7 @@ module OvirtSDK4
   class GlusterBrickWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-brick'
+      singular ||= 'gluster_brick'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1901,6 +1989,7 @@ module OvirtSDK4
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       GlusterVolumeWriter.write_one(object.gluster_volume, writer, 'gluster_volume') unless object.gluster_volume.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
       VmWriter.write_one(object.vm, writer, 'vm') unless object.vm.nil?
       VmWriter.write_many(object.vms, writer, 'vm', 'vms') unless object.vms.nil?
@@ -1908,8 +1997,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-brick'
-      plural ||= 'gluster-bricks'
+      singular ||= 'gluster_brick'
+      plural ||= 'gluster_bricks'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1926,7 +2015,7 @@ module OvirtSDK4
   class GlusterBrickAdvancedDetailsWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-brick-advanced-details'
+      singular ||= 'gluster_brick_advanced_details'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1949,8 +2038,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-brick-advanced-details'
-      plural ||= 'gluster-brick-advanced-detailss'
+      singular ||= 'gluster_brick_advanced_details'
+      plural ||= 'gluster_brick_advanced_detailss'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1967,7 +2056,7 @@ module OvirtSDK4
   class GlusterBrickMemoryInfoWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-brick-memory-info'
+      singular ||= 'gluster_brick_memory_info'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -1976,8 +2065,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-brick-memory-info'
-      plural ||= 'gluster-brick-memory-infos'
+      singular ||= 'gluster_brick_memory_info'
+      plural ||= 'gluster_brick_memory_infos'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -1994,7 +2083,7 @@ module OvirtSDK4
   class GlusterClientWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-client'
+      singular ||= 'gluster_client'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2006,8 +2095,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-client'
-      plural ||= 'gluster-clients'
+      singular ||= 'gluster_client'
+      plural ||= 'gluster_clients'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2024,7 +2113,7 @@ module OvirtSDK4
   class GlusterHookWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-hook'
+      singular ||= 'gluster_hook'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2046,8 +2135,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-hook'
-      plural ||= 'gluster-hooks'
+      singular ||= 'gluster_hook'
+      plural ||= 'gluster_hooks'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2064,7 +2153,7 @@ module OvirtSDK4
   class GlusterMemoryPoolWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-memory-pool'
+      singular ||= 'gluster_memory_pool'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2084,8 +2173,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-memory-pool'
-      plural ||= 'gluster-memory-pools'
+      singular ||= 'gluster_memory_pool'
+      plural ||= 'gluster_memory_pools'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2102,7 +2191,7 @@ module OvirtSDK4
   class GlusterServerHookWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-server-hook'
+      singular ||= 'gluster_server_hook'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2118,8 +2207,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-server-hook'
-      plural ||= 'gluster-server-hooks'
+      singular ||= 'gluster_server_hook'
+      plural ||= 'gluster_server_hooks'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2136,7 +2225,7 @@ module OvirtSDK4
   class GlusterVolumeWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-volume'
+      singular ||= 'gluster_volume'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2160,12 +2249,13 @@ module OvirtSDK4
       Writer.write_string(writer, 'volume_type', object.volume_type) unless object.volume_type.nil?
       GlusterBrickWriter.write_many(object.bricks, writer, 'brick', 'bricks') unless object.bricks.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-volume'
-      plural ||= 'gluster-volumes'
+      singular ||= 'gluster_volume'
+      plural ||= 'gluster_volumes'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2182,7 +2272,7 @@ module OvirtSDK4
   class GlusterVolumeProfileDetailsWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'gluster-volume-profile-details'
+      singular ||= 'gluster_volume_profile_details'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2196,8 +2286,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'gluster-volume-profile-details'
-      plural ||= 'gluster-volume-profile-detailss'
+      singular ||= 'gluster_volume_profile_details'
+      plural ||= 'gluster_volume_profile_detailss'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2214,7 +2304,7 @@ module OvirtSDK4
   class GracePeriodWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'grace-period'
+      singular ||= 'grace_period'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2223,8 +2313,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'grace-period'
-      plural ||= 'grace-periods'
+      singular ||= 'grace_period'
+      plural ||= 'grace_periods'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2241,7 +2331,7 @@ module OvirtSDK4
   class GraphicsConsoleWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'graphics-console'
+      singular ||= 'graphics_console'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2260,8 +2350,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'graphics-console'
-      plural ||= 'graphics-consoles'
+      singular ||= 'graphics_console'
+      plural ||= 'graphics_consoles'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2289,7 +2379,9 @@ module OvirtSDK4
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
       Writer.write_string(writer, 'namespace', object.namespace) unless object.namespace.nil?
       DomainWriter.write_one(object.domain, writer, 'domain') unless object.domain.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       RoleWriter.write_many(object.roles, writer, 'role', 'roles') unless object.roles.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
       writer.write_end
     end
     
@@ -2312,7 +2404,7 @@ module OvirtSDK4
   class GuestOperatingSystemWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'guest-operating-system'
+      singular ||= 'guest_operating_system'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2326,8 +2418,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'guest-operating-system'
-      plural ||= 'guest-operating-systems'
+      singular ||= 'guest_operating_system'
+      plural ||= 'guest_operating_systems'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2344,7 +2436,7 @@ module OvirtSDK4
   class HardwareInformationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'hardware-information'
+      singular ||= 'hardware_information'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2365,8 +2457,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'hardware-information'
-      plural ||= 'hardware-informations'
+      singular ||= 'hardware_information'
+      plural ||= 'hardware_informations'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2383,7 +2475,7 @@ module OvirtSDK4
   class HighAvailabilityWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'high-availability'
+      singular ||= 'high_availability'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2393,8 +2485,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'high-availability'
-      plural ||= 'high-availabilities'
+      singular ||= 'high_availability'
+      plural ||= 'high_availabilities'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2461,7 +2553,6 @@ module OvirtSDK4
       HardwareInformationWriter.write_one(object.hardware_information, writer, 'hardware_information') unless object.hardware_information.nil?
       HostedEngineWriter.write_one(object.hosted_engine, writer, 'hosted_engine') unless object.hosted_engine.nil?
       IscsiDetailsWriter.write_one(object.iscsi, writer, 'iscsi') unless object.iscsi.nil?
-      KatelloErratumWriter.write_many(object.katello_errata, writer, 'katello_erratum', 'katello_errata') unless object.katello_errata.nil?
       Writer.write_string(writer, 'kdump_status', object.kdump_status) unless object.kdump_status.nil?
       KsmWriter.write_one(object.ksm, writer, 'ksm') unless object.ksm.nil?
       VersionWriter.write_one(object.libvirt_version, writer, 'libvirt_version') unless object.libvirt_version.nil?
@@ -2478,7 +2569,6 @@ module OvirtSDK4
       SeLinuxWriter.write_one(object.se_linux, writer, 'se_linux') unless object.se_linux.nil?
       SpmWriter.write_one(object.spm, writer, 'spm') unless object.spm.nil?
       SshWriter.write_one(object.ssh, writer, 'ssh') unless object.ssh.nil?
-      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       Writer.write_string(writer, 'status_detail', object.status_detail) unless object.status_detail.nil?
       VmSummaryWriter.write_one(object.summary, writer, 'summary') unless object.summary.nil?
@@ -2486,10 +2576,22 @@ module OvirtSDK4
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       Writer.write_boolean(writer, 'update_available', object.update_available) unless object.update_available.nil?
       VersionWriter.write_one(object.version, writer, 'version') unless object.version.nil?
+      AffinityLabelWriter.write_many(object.affinity_labels, writer, 'affinity_label', 'affinity_labels') unless object.affinity_labels.nil?
+      AgentWriter.write_many(object.agents, writer, 'agent', 'agents') unless object.agents.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
+      DeviceWriter.write_many(object.devices, writer, 'device', 'devices') unless object.devices.nil?
       ExternalHostProviderWriter.write_one(object.external_host_provider, writer, 'external_host_provider') unless object.external_host_provider.nil?
       HookWriter.write_many(object.hooks, writer, 'hook', 'hooks') unless object.hooks.nil?
+      KatelloErratumWriter.write_many(object.katello_errata, writer, 'katello_erratum', 'katello_errata') unless object.katello_errata.nil?
+      NetworkAttachmentWriter.write_many(object.network_attachments, writer, 'network_attachment', 'network_attachments') unless object.network_attachments.nil?
+      NicWriter.write_many(object.nics, writer, 'nic', 'nics') unless object.nics.nil?
+      NumaNodeWriter.write_many(object.numa_nodes, writer, 'host_numa_node', 'host_numa_nodes') unless object.numa_nodes.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       StorageConnectionExtensionWriter.write_many(object.storage_connection_extensions, writer, 'storage_connection_extension', 'storage_connection_extensions') unless object.storage_connection_extensions.nil?
+      HostStorageWriter.write_many(object.storages, writer, 'storage', 'storages') unless object.storages.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
+      UnmanagedNetworkWriter.write_many(object.unmanaged_networks, writer, 'unmanaged_network', 'unmanaged_networks') unless object.unmanaged_networks.nil?
       writer.write_end
     end
     
@@ -2512,7 +2614,7 @@ module OvirtSDK4
   class HostDeviceWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'host-device'
+      singular ||= 'host_device'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2534,8 +2636,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'host-device'
-      plural ||= 'host-devices'
+      singular ||= 'host_device'
+      plural ||= 'host_devices'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2552,7 +2654,7 @@ module OvirtSDK4
   class HostDevicePassthroughWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'host-device-passthrough'
+      singular ||= 'host_device_passthrough'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2561,8 +2663,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'host-device-passthrough'
-      plural ||= 'host-device-passthroughs'
+      singular ||= 'host_device_passthrough'
+      plural ||= 'host_device_passthroughs'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2579,7 +2681,7 @@ module OvirtSDK4
   class HostNicWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'host-nic'
+      singular ||= 'host_nic'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2614,8 +2716,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'host-nic'
-      plural ||= 'host-nics'
+      singular ||= 'host_nic'
+      plural ||= 'host_nics'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2632,7 +2734,7 @@ module OvirtSDK4
   class HostNicVirtualFunctionsConfigurationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'host-nic-virtual-functions-configuration'
+      singular ||= 'host_nic_virtual_functions_configuration'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2643,8 +2745,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'host-nic-virtual-functions-configuration'
-      plural ||= 'host-nic-virtual-functions-configurations'
+      singular ||= 'host_nic_virtual_functions_configuration'
+      plural ||= 'host_nic_virtual_functions_configurations'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2661,7 +2763,7 @@ module OvirtSDK4
   class HostStorageWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'host-storage'
+      singular ||= 'host_storage'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2690,8 +2792,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'host-storage'
-      plural ||= 'host-storages'
+      singular ||= 'host_storage'
+      plural ||= 'host_storages'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2708,7 +2810,7 @@ module OvirtSDK4
   class HostedEngineWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'hosted-engine'
+      singular ||= 'hosted_engine'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2721,8 +2823,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'hosted-engine'
-      plural ||= 'hosted-engines'
+      singular ||= 'hosted_engine'
+      plural ||= 'hosted_engines'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -2879,7 +2981,7 @@ module OvirtSDK4
   class InstanceTypeWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'instance-type'
+      singular ||= 'instance_type'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -2924,15 +3026,22 @@ module OvirtSDK4
       TemplateVersionWriter.write_one(object.version, writer, 'version') unless object.version.nil?
       VirtioScsiWriter.write_one(object.virtio_scsi, writer, 'virtio_scsi') unless object.virtio_scsi.nil?
       VmWriter.write_one(object.vm, writer, 'vm') unless object.vm.nil?
+      CdromWriter.write_many(object.cdroms, writer, 'cdrom', 'cdroms') unless object.cdroms.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
       CpuProfileWriter.write_one(object.cpu_profile, writer, 'cpu_profile') unless object.cpu_profile.nil?
+      DiskWriter.write_many(object.disks, writer, 'disk', 'disks') unless object.disks.nil?
+      GraphicsConsoleWriter.write_many(object.graphics_consoles, writer, 'graphics_console', 'graphics_consoles') unless object.graphics_consoles.nil?
+      NicWriter.write_many(object.nics, writer, 'nic', 'nics') unless object.nics.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
+      WatchdogWriter.write_many(object.watchdogs, writer, 'watchdog', 'watchdogs') unless object.watchdogs.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'instance-type'
-      plural ||= 'instance-types'
+      singular ||= 'instance_type'
+      plural ||= 'instance_types'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3006,7 +3115,7 @@ module OvirtSDK4
   class IpAddressAssignmentWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'ip-address-assignment'
+      singular ||= 'ip_address_assignment'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3016,8 +3125,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'ip-address-assignment'
-      plural ||= 'ip-address-assignments'
+      singular ||= 'ip_address_assignment'
+      plural ||= 'ip_address_assignments'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3034,7 +3143,7 @@ module OvirtSDK4
   class IscsiBondWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'iscsi-bond'
+      singular ||= 'iscsi_bond'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3049,8 +3158,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'iscsi-bond'
-      plural ||= 'iscsi-bonds'
+      singular ||= 'iscsi_bond'
+      plural ||= 'iscsi_bonds'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3067,7 +3176,7 @@ module OvirtSDK4
   class IscsiDetailsWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'iscsi-details'
+      singular ||= 'iscsi_details'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3092,8 +3201,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'iscsi-details'
-      plural ||= 'iscsi-detailss'
+      singular ||= 'iscsi_details'
+      plural ||= 'iscsi_detailss'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3125,6 +3234,7 @@ module OvirtSDK4
       Writer.write_date(writer, 'start_time', object.start_time) unless object.start_time.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       UserWriter.write_one(object.owner, writer, 'owner') unless object.owner.nil?
+      StepWriter.write_many(object.steps, writer, 'step', 'steps') unless object.steps.nil?
       writer.write_end
     end
     
@@ -3147,7 +3257,7 @@ module OvirtSDK4
   class KatelloErratumWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'katello-erratum'
+      singular ||= 'katello_erratum'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3168,8 +3278,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'katello-erratum'
-      plural ||= 'katello-errata'
+      singular ||= 'katello_erratum'
+      plural ||= 'katello_errata'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3241,7 +3351,7 @@ module OvirtSDK4
   class LogicalUnitWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'logical-unit'
+      singular ||= 'logical_unit'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3266,8 +3376,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'logical-unit'
-      plural ||= 'logical-units'
+      singular ||= 'logical_unit'
+      plural ||= 'logical_units'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3311,7 +3421,7 @@ module OvirtSDK4
   class MacPoolWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'mac-pool'
+      singular ||= 'mac_pool'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3326,8 +3436,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'mac-pool'
-      plural ||= 'mac-pools'
+      singular ||= 'mac_pool'
+      plural ||= 'mac_pools'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3344,7 +3454,7 @@ module OvirtSDK4
   class MemoryOverCommitWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'memory-over-commit'
+      singular ||= 'memory_over_commit'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3353,8 +3463,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'memory-over-commit'
-      plural ||= 'memory-over-commits'
+      singular ||= 'memory_over_commit'
+      plural ||= 'memory_over_commits'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3371,7 +3481,7 @@ module OvirtSDK4
   class MemoryPolicyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'memory-policy'
+      singular ||= 'memory_policy'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3383,8 +3493,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'memory-policy'
-      plural ||= 'memory-policies'
+      singular ||= 'memory_policy'
+      plural ||= 'memory_policies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3428,7 +3538,7 @@ module OvirtSDK4
   class MigrationBandwidthWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'migration-bandwidth'
+      singular ||= 'migration_bandwidth'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3438,8 +3548,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'migration-bandwidth'
-      plural ||= 'migration-bandwidths'
+      singular ||= 'migration_bandwidth'
+      plural ||= 'migration_bandwidths'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3456,7 +3566,7 @@ module OvirtSDK4
   class MigrationOptionsWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'migration-options'
+      singular ||= 'migration_options'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3468,8 +3578,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'migration-options'
-      plural ||= 'migration-optionss'
+      singular ||= 'migration_options'
+      plural ||= 'migration_optionss'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3486,7 +3596,7 @@ module OvirtSDK4
   class MigrationPolicyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'migration-policy'
+      singular ||= 'migration_policy'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3498,8 +3608,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'migration-policy'
-      plural ||= 'migration-policies'
+      singular ||= 'migration_policy'
+      plural ||= 'migration_policies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3527,7 +3637,6 @@ module OvirtSDK4
       IpWriter.write_one(object.ip, writer, 'ip') unless object.ip.nil?
       Writer.write_integer(writer, 'mtu', object.mtu) unless object.mtu.nil?
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
-      NetworkLabelWriter.write_many(object.network_labels, writer, 'network_label', 'network_labels') unless object.network_labels.nil?
       Writer.write_boolean(writer, 'profile_required', object.profile_required) unless object.profile_required.nil?
       Writer.write_boolean(writer, 'required', object.required) unless object.required.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
@@ -3542,7 +3651,10 @@ module OvirtSDK4
       VlanWriter.write_one(object.vlan, writer, 'vlan') unless object.vlan.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
       DataCenterWriter.write_one(object.data_center, writer, 'data_center') unless object.data_center.nil?
+      NetworkLabelWriter.write_many(object.network_labels, writer, 'network_label', 'network_labels') unless object.network_labels.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QosWriter.write_one(object.qos, writer, 'qos') unless object.qos.nil?
+      VnicProfileWriter.write_many(object.vnic_profiles, writer, 'vnic_profile', 'vnic_profiles') unless object.vnic_profiles.nil?
       writer.write_end
     end
     
@@ -3565,7 +3677,7 @@ module OvirtSDK4
   class NetworkAttachmentWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'network-attachment'
+      singular ||= 'network_attachment'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3585,8 +3697,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'network-attachment'
-      plural ||= 'network-attachments'
+      singular ||= 'network_attachment'
+      plural ||= 'network_attachments'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3603,7 +3715,7 @@ module OvirtSDK4
   class NetworkConfigurationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'network-configuration'
+      singular ||= 'network_configuration'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3613,8 +3725,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'network-configuration'
-      plural ||= 'network-configurations'
+      singular ||= 'network_configuration'
+      plural ||= 'network_configurations'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3631,7 +3743,7 @@ module OvirtSDK4
   class NetworkFilterWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'network-filter'
+      singular ||= 'network_filter'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3644,8 +3756,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'network-filter'
-      plural ||= 'network-filters'
+      singular ||= 'network_filter'
+      plural ||= 'network_filters'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3662,7 +3774,7 @@ module OvirtSDK4
   class NetworkLabelWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'network-label'
+      singular ||= 'network_label'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3676,8 +3788,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'network-label'
-      plural ||= 'network-labels'
+      singular ||= 'network_label'
+      plural ||= 'network_labels'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3694,7 +3806,7 @@ module OvirtSDK4
   class NfsProfileDetailWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'nfs-profile-detail'
+      singular ||= 'nfs_profile_detail'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3704,8 +3816,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'nfs-profile-detail'
-      plural ||= 'nfs-profile-details'
+      singular ||= 'nfs_profile_detail'
+      plural ||= 'nfs_profile_details'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3736,11 +3848,15 @@ module OvirtSDK4
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
       Writer.write_boolean(writer, 'on_boot', object.on_boot) unless object.on_boot.nil?
       Writer.write_boolean(writer, 'plugged', object.plugged) unless object.plugged.nil?
-      ReportedDeviceWriter.write_many(object.reported_devices, writer, 'reported_device', 'reported_devices') unless object.reported_devices.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
       NetworkWriter.write_one(object.network, writer, 'network') unless object.network.nil?
+      NetworkAttachmentWriter.write_many(object.network_attachments, writer, 'network_attachment', 'network_attachments') unless object.network_attachments.nil?
+      NetworkLabelWriter.write_many(object.network_labels, writer, 'network_label', 'network_labels') unless object.network_labels.nil?
+      ReportedDeviceWriter.write_many(object.reported_devices, writer, 'reported_device', 'reported_devices') unless object.reported_devices.nil?
       StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
+      NetworkLabelWriter.write_many(object.virtual_function_allowed_labels, writer, 'virtual_function_allowed_label', 'virtual_function_allowed_labels') unless object.virtual_function_allowed_labels.nil?
+      NetworkWriter.write_many(object.virtual_function_allowed_networks, writer, 'virtual_function_allowed_network', 'virtual_function_allowed_networks') unless object.virtual_function_allowed_networks.nil?
       VmWriter.write_one(object.vm, writer, 'vm') unless object.vm.nil?
       VmWriter.write_many(object.vms, writer, 'vm', 'vms') unless object.vms.nil?
       VnicProfileWriter.write_one(object.vnic_profile, writer, 'vnic_profile') unless object.vnic_profile.nil?
@@ -3766,7 +3882,7 @@ module OvirtSDK4
   class NicConfigurationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'nic-configuration'
+      singular ||= 'nic_configuration'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3778,8 +3894,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'nic-configuration'
-      plural ||= 'nic-configurations'
+      singular ||= 'nic_configuration'
+      plural ||= 'nic_configurations'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3796,7 +3912,7 @@ module OvirtSDK4
   class NumaNodeWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'numa-node'
+      singular ||= 'numa_node'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3814,8 +3930,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'numa-node'
-      plural ||= 'numa-nodes'
+      singular ||= 'numa_node'
+      plural ||= 'numa_nodes'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3832,7 +3948,7 @@ module OvirtSDK4
   class NumaNodePinWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'numa-node-pin'
+      singular ||= 'numa_node_pin'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3843,8 +3959,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'numa-node-pin'
-      plural ||= 'numa-node-pins'
+      singular ||= 'numa_node_pin'
+      plural ||= 'numa_node_pins'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3861,7 +3977,7 @@ module OvirtSDK4
   class OpenStackImageWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-image'
+      singular ||= 'open_stack_image'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3874,8 +3990,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-image'
-      plural ||= 'open-stack-images'
+      singular ||= 'open_stack_image'
+      plural ||= 'open_stack_images'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3892,7 +4008,7 @@ module OvirtSDK4
   class OpenStackImageProviderWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-image-provider'
+      singular ||= 'open_stack_image_provider'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3907,12 +4023,14 @@ module OvirtSDK4
       Writer.write_string(writer, 'tenant_name', object.tenant_name) unless object.tenant_name.nil?
       Writer.write_string(writer, 'url', object.url) unless object.url.nil?
       Writer.write_string(writer, 'username', object.username) unless object.username.nil?
+      CertificateWriter.write_many(object.certificates, writer, 'certificate', 'certificates') unless object.certificates.nil?
+      OpenStackImageWriter.write_many(object.images, writer, 'image', 'images') unless object.images.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-image-provider'
-      plural ||= 'open-stack-image-providers'
+      singular ||= 'open_stack_image_provider'
+      plural ||= 'open_stack_image_providers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3929,7 +4047,7 @@ module OvirtSDK4
   class OpenStackNetworkWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-network'
+      singular ||= 'open_stack_network'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3942,8 +4060,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-network'
-      plural ||= 'open-stack-networks'
+      singular ||= 'open_stack_network'
+      plural ||= 'open_stack_networks'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -3960,7 +4078,7 @@ module OvirtSDK4
   class OpenStackNetworkProviderWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-network-provider'
+      singular ||= 'open_stack_network_provider'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -3979,12 +4097,15 @@ module OvirtSDK4
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       Writer.write_string(writer, 'url', object.url) unless object.url.nil?
       Writer.write_string(writer, 'username', object.username) unless object.username.nil?
+      CertificateWriter.write_many(object.certificates, writer, 'certificate', 'certificates') unless object.certificates.nil?
+      OpenStackNetworkWriter.write_many(object.networks, writer, 'network', 'networks') unless object.networks.nil?
+      OpenStackSubnetWriter.write_many(object.subnets, writer, 'subnet', 'subnets') unless object.subnets.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-network-provider'
-      plural ||= 'open-stack-network-providers'
+      singular ||= 'open_stack_network_provider'
+      plural ||= 'open_stack_network_providers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4001,7 +4122,7 @@ module OvirtSDK4
   class OpenStackProviderWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-provider'
+      singular ||= 'open_stack_provider'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4020,8 +4141,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-provider'
-      plural ||= 'open-stack-providers'
+      singular ||= 'open_stack_provider'
+      plural ||= 'open_stack_providers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4038,7 +4159,7 @@ module OvirtSDK4
   class OpenStackSubnetWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-subnet'
+      singular ||= 'open_stack_subnet'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4061,8 +4182,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-subnet'
-      plural ||= 'open-stack-subnets'
+      singular ||= 'open_stack_subnet'
+      plural ||= 'open_stack_subnets'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4079,7 +4200,7 @@ module OvirtSDK4
   class OpenStackVolumeProviderWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-volume-provider'
+      singular ||= 'open_stack_volume_provider'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4094,13 +4215,16 @@ module OvirtSDK4
       Writer.write_string(writer, 'tenant_name', object.tenant_name) unless object.tenant_name.nil?
       Writer.write_string(writer, 'url', object.url) unless object.url.nil?
       Writer.write_string(writer, 'username', object.username) unless object.username.nil?
+      OpenstackVolumeAuthenticationKeyWriter.write_many(object.authentication_keys, writer, 'authentication_key', 'authentication_keys') unless object.authentication_keys.nil?
+      CertificateWriter.write_many(object.certificates, writer, 'certificate', 'certificates') unless object.certificates.nil?
       DataCenterWriter.write_one(object.data_center, writer, 'data_center') unless object.data_center.nil?
+      OpenStackVolumeTypeWriter.write_many(object.volume_types, writer, 'volume_type', 'volume_types') unless object.volume_types.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-volume-provider'
-      plural ||= 'open-stack-volume-providers'
+      singular ||= 'open_stack_volume_provider'
+      plural ||= 'open_stack_volume_providers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4117,7 +4241,7 @@ module OvirtSDK4
   class OpenStackVolumeTypeWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'open-stack-volume-type'
+      singular ||= 'open_stack_volume_type'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4131,8 +4255,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'open-stack-volume-type'
-      plural ||= 'open-stack-volume-types'
+      singular ||= 'open_stack_volume_type'
+      plural ||= 'open_stack_volume_types'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4149,7 +4273,7 @@ module OvirtSDK4
   class OpenstackVolumeAuthenticationKeyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'openstack-volume-authentication-key'
+      singular ||= 'openstack_volume_authentication_key'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4166,8 +4290,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'openstack-volume-authentication-key'
-      plural ||= 'openstack-volume-authentication-keys'
+      singular ||= 'openstack_volume_authentication_key'
+      plural ||= 'openstack_volume_authentication_keys'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4184,22 +4308,24 @@ module OvirtSDK4
   class OperatingSystemWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'operating-system'
+      singular ||= 'operating_system'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
       BootWriter.write_one(object.boot, writer, 'boot') unless object.boot.nil?
       Writer.write_string(writer, 'cmdline', object.cmdline) unless object.cmdline.nil?
+      Writer.write_string(writer, 'custom_kernel_cmdline', object.custom_kernel_cmdline) unless object.custom_kernel_cmdline.nil?
       Writer.write_string(writer, 'initrd', object.initrd) unless object.initrd.nil?
       Writer.write_string(writer, 'kernel', object.kernel) unless object.kernel.nil?
+      Writer.write_string(writer, 'reported_kernel_cmdline', object.reported_kernel_cmdline) unless object.reported_kernel_cmdline.nil?
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       VersionWriter.write_one(object.version, writer, 'version') unless object.version.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'operating-system'
-      plural ||= 'operating-systems'
+      singular ||= 'operating_system'
+      plural ||= 'operating_systems'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4216,7 +4342,7 @@ module OvirtSDK4
   class OperatingSystemInfoWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'operating-system-info'
+      singular ||= 'operating_system_info'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4230,8 +4356,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'operating-system-info'
-      plural ||= 'operating-system-infos'
+      singular ||= 'operating_system_info'
+      plural ||= 'operating_system_infos'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4406,7 +4532,7 @@ module OvirtSDK4
   class PmProxyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'pm-proxy'
+      singular ||= 'pm_proxy'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4415,8 +4541,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'pm-proxy'
-      plural ||= 'pm-proxies'
+      singular ||= 'pm_proxy'
+      plural ||= 'pm_proxies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4433,7 +4559,7 @@ module OvirtSDK4
   class PortMirroringWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'port-mirroring'
+      singular ||= 'port_mirroring'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4441,8 +4567,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'port-mirroring'
-      plural ||= 'port-mirrorings'
+      singular ||= 'port_mirroring'
+      plural ||= 'port_mirrorings'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4459,7 +4585,7 @@ module OvirtSDK4
   class PowerManagementWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'power-management'
+      singular ||= 'power_management'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4478,8 +4604,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'power-management'
-      plural ||= 'power-managements'
+      singular ||= 'power_management'
+      plural ||= 'power_managements'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4526,7 +4652,7 @@ module OvirtSDK4
   class ProductInfoWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'product-info'
+      singular ||= 'product_info'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4537,8 +4663,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'product-info'
-      plural ||= 'product-infos'
+      singular ||= 'product_info'
+      plural ||= 'product_infos'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4555,7 +4681,7 @@ module OvirtSDK4
   class ProfileDetailWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'profile-detail'
+      singular ||= 'profile_detail'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4568,8 +4694,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'profile-detail'
-      plural ||= 'profile-details'
+      singular ||= 'profile_detail'
+      plural ||= 'profile_details'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4614,7 +4740,7 @@ module OvirtSDK4
   class ProxyTicketWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'proxy-ticket'
+      singular ||= 'proxy_ticket'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4623,8 +4749,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'proxy-ticket'
-      plural ||= 'proxy-tickets'
+      singular ||= 'proxy_ticket'
+      plural ||= 'proxy_tickets'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4705,6 +4831,9 @@ module OvirtSDK4
       Writer.write_integer(writer, 'storage_soft_limit_pct', object.storage_soft_limit_pct) unless object.storage_soft_limit_pct.nil?
       UserWriter.write_many(object.users, writer, 'user', 'users') unless object.users.nil?
       VmWriter.write_many(object.vms, writer, 'vm', 'vms') unless object.vms.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
+      QuotaClusterLimitWriter.write_many(object.quota_cluster_limits, writer, 'quota_cluster_limit', 'quota_cluster_limits') unless object.quota_cluster_limits.nil?
+      QuotaStorageLimitWriter.write_many(object.quota_storage_limits, writer, 'quota_storage_limit', 'quota_storage_limits') unless object.quota_storage_limits.nil?
       writer.write_end
     end
     
@@ -4727,7 +4856,7 @@ module OvirtSDK4
   class QuotaClusterLimitWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'quota-cluster-limit'
+      singular ||= 'quota_cluster_limit'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4745,8 +4874,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'quota-cluster-limit'
-      plural ||= 'quota-cluster-limits'
+      singular ||= 'quota_cluster_limit'
+      plural ||= 'quota_cluster_limits'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4763,7 +4892,7 @@ module OvirtSDK4
   class QuotaStorageLimitWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'quota-storage-limit'
+      singular ||= 'quota_storage_limit'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4779,8 +4908,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'quota-storage-limit'
-      plural ||= 'quota-storage-limits'
+      singular ||= 'quota_storage_limit'
+      plural ||= 'quota_storage_limits'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4853,7 +4982,7 @@ module OvirtSDK4
   class ReportedConfigurationWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'reported-configuration'
+      singular ||= 'reported_configuration'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4865,8 +4994,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'reported-configuration'
-      plural ||= 'reported-configurations'
+      singular ||= 'reported_configuration'
+      plural ||= 'reported_configurations'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4883,7 +5012,7 @@ module OvirtSDK4
   class ReportedDeviceWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'reported-device'
+      singular ||= 'reported_device'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4899,8 +5028,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'reported-device'
-      plural ||= 'reported-devices'
+      singular ||= 'reported_device'
+      plural ||= 'reported_devices'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4917,7 +5046,7 @@ module OvirtSDK4
   class RngDeviceWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'rng-device'
+      singular ||= 'rng_device'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4927,8 +5056,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'rng-device'
-      plural ||= 'rng-devices'
+      singular ||= 'rng_device'
+      plural ||= 'rng_devices'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -4979,7 +5108,7 @@ module OvirtSDK4
   class SchedulingPolicyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'scheduling-policy'
+      singular ||= 'scheduling_policy'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -4990,12 +5119,15 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'locked', object.locked) unless object.locked.nil?
       Writer.write_string(writer, 'name', object.name) unless object.name.nil?
       PropertyWriter.write_many(object.properties, writer, 'property', 'properties') unless object.properties.nil?
+      BalanceWriter.write_many(object.balances, writer, 'balance', 'balances') unless object.balances.nil?
+      FilterWriter.write_many(object.filters, writer, 'filter', 'filters') unless object.filters.nil?
+      WeightWriter.write_many(object.weight, writer, 'weight', 'weight') unless object.weight.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'scheduling-policy'
-      plural ||= 'scheduling-policies'
+      singular ||= 'scheduling_policy'
+      plural ||= 'scheduling_policies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5012,7 +5144,7 @@ module OvirtSDK4
   class SchedulingPolicyUnitWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'scheduling-policy-unit'
+      singular ||= 'scheduling_policy_unit'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5028,8 +5160,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'scheduling-policy-unit'
-      plural ||= 'scheduling-policy-units'
+      singular ||= 'scheduling_policy_unit'
+      plural ||= 'scheduling_policy_units'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5046,7 +5178,7 @@ module OvirtSDK4
   class SeLinuxWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'se-linux'
+      singular ||= 'se_linux'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5055,8 +5187,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'se-linux'
-      plural ||= 'se-linuxs'
+      singular ||= 'se_linux'
+      plural ||= 'se_linuxs'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5073,7 +5205,7 @@ module OvirtSDK4
   class SerialNumberWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'serial-number'
+      singular ||= 'serial_number'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5083,8 +5215,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'serial-number'
-      plural ||= 'serial-numbers'
+      singular ||= 'serial_number'
+      plural ||= 'serial_numbers'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5136,7 +5268,7 @@ module OvirtSDK4
   class SkipIfConnectivityBrokenWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'skip-if-connectivity-broken'
+      singular ||= 'skip_if_connectivity_broken'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5146,8 +5278,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'skip-if-connectivity-broken'
-      plural ||= 'skip-if-connectivity-brokens'
+      singular ||= 'skip_if_connectivity_broken'
+      plural ||= 'skip_if_connectivity_brokens'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5164,7 +5296,7 @@ module OvirtSDK4
   class SkipIfSdActiveWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'skip-if-sd-active'
+      singular ||= 'skip_if_sd_active'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5173,8 +5305,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'skip-if-sd-active'
-      plural ||= 'skip-if-sd-actives'
+      singular ||= 'skip_if_sd_active'
+      plural ||= 'skip_if_sd_actives'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5241,33 +5373,40 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'start_paused', object.start_paused) unless object.start_paused.nil?
       Writer.write_date(writer, 'start_time', object.start_time) unless object.start_time.nil?
       Writer.write_boolean(writer, 'stateless', object.stateless) unless object.stateless.nil?
-      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       Writer.write_string(writer, 'status_detail', object.status_detail) unless object.status_detail.nil?
       Writer.write_string(writer, 'stop_reason', object.stop_reason) unless object.stop_reason.nil?
       Writer.write_date(writer, 'stop_time', object.stop_time) unless object.stop_time.nil?
-      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
       TimeZoneWriter.write_one(object.time_zone, writer, 'time_zone') unless object.time_zone.nil?
       Writer.write_boolean(writer, 'tunnel_migration', object.tunnel_migration) unless object.tunnel_migration.nil?
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       UsbWriter.write_one(object.usb, writer, 'usb') unless object.usb.nil?
       Writer.write_boolean(writer, 'use_latest_template_version', object.use_latest_template_version) unless object.use_latest_template_version.nil?
       VirtioScsiWriter.write_one(object.virtio_scsi, writer, 'virtio_scsi') unless object.virtio_scsi.nil?
+      AffinityLabelWriter.write_many(object.affinity_labels, writer, 'affinity_label', 'affinity_labels') unless object.affinity_labels.nil?
+      ApplicationWriter.write_many(object.applications, writer, 'application', 'applications') unless object.applications.nil?
       CdromWriter.write_many(object.cdroms, writer, 'cdrom', 'cdroms') unless object.cdroms.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
       CpuProfileWriter.write_one(object.cpu_profile, writer, 'cpu_profile') unless object.cpu_profile.nil?
+      DiskAttachmentWriter.write_many(object.disk_attachments, writer, 'disk_attachment', 'disk_attachments') unless object.disk_attachments.nil?
       DiskWriter.write_many(object.disks, writer, 'disk', 'disks') unless object.disks.nil?
       ExternalHostProviderWriter.write_one(object.external_host_provider, writer, 'external_host_provider') unless object.external_host_provider.nil?
       FloppyWriter.write_many(object.floppies, writer, 'floppy', 'floppies') unless object.floppies.nil?
+      GraphicsConsoleWriter.write_many(object.graphics_consoles, writer, 'graphics_console', 'graphics_consoles') unless object.graphics_consoles.nil?
       HostWriter.write_one(object.host, writer, 'host') unless object.host.nil?
+      HostDeviceWriter.write_many(object.host_devices, writer, 'host_device', 'host_devices') unless object.host_devices.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
       KatelloErratumWriter.write_many(object.katello_errata, writer, 'katello_erratum', 'katello_errata') unless object.katello_errata.nil?
       NicWriter.write_many(object.nics, writer, 'nic', 'nics') unless object.nics.nil?
+      NumaNodeWriter.write_many(object.numa_nodes, writer, 'host_numa_node', 'host_numa_nodes') unless object.numa_nodes.nil?
       PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QuotaWriter.write_one(object.quota, writer, 'quota') unless object.quota.nil?
       ReportedDeviceWriter.write_many(object.reported_devices, writer, 'reported_device', 'reported_devices') unless object.reported_devices.nil?
+      SessionWriter.write_many(object.sessions, writer, 'session', 'sessions') unless object.sessions.nil?
       SnapshotWriter.write_many(object.snapshots, writer, 'snapshot', 'snapshots') unless object.snapshots.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
       VmWriter.write_one(object.vm, writer, 'vm') unless object.vm.nil?
       VmPoolWriter.write_one(object.vm_pool, writer, 'vm_pool') unless object.vm_pool.nil?
@@ -5294,7 +5433,7 @@ module OvirtSDK4
   class SpecialObjectsWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'special-objects'
+      singular ||= 'special_objects'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5304,8 +5443,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'special-objects'
-      plural ||= 'special-objectss'
+      singular ||= 'special_objects'
+      plural ||= 'special_objectss'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5384,7 +5523,7 @@ module OvirtSDK4
   class SshPublicKeyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'ssh-public-key'
+      singular ||= 'ssh_public_key'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5398,8 +5537,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'ssh-public-key'
-      plural ||= 'ssh-public-keys'
+      singular ||= 'ssh_public_key'
+      plural ||= 'ssh_public_keys'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5503,6 +5642,7 @@ module OvirtSDK4
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       JobWriter.write_one(object.job, writer, 'job') unless object.job.nil?
       StepWriter.write_one(object.parent_step, writer, 'parent_step') unless object.parent_step.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       writer.write_end
     end
     
@@ -5525,7 +5665,7 @@ module OvirtSDK4
   class StorageConnectionWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'storage-connection'
+      singular ||= 'storage_connection'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5551,8 +5691,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'storage-connection'
-      plural ||= 'storage-connections'
+      singular ||= 'storage_connection'
+      plural ||= 'storage_connections'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5569,7 +5709,7 @@ module OvirtSDK4
   class StorageConnectionExtensionWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'storage-connection-extension'
+      singular ||= 'storage_connection_extension'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5585,8 +5725,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'storage-connection-extension'
-      plural ||= 'storage-connection-extensions'
+      singular ||= 'storage_connection_extension'
+      plural ||= 'storage_connection_extensions'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5603,7 +5743,7 @@ module OvirtSDK4
   class StorageDomainWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'storage-domain'
+      singular ||= 'storage_domain'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5626,13 +5766,22 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'wipe_after_delete', object.wipe_after_delete) unless object.wipe_after_delete.nil?
       DataCenterWriter.write_one(object.data_center, writer, 'data_center') unless object.data_center.nil?
       DataCenterWriter.write_many(object.data_centers, writer, 'data_center', 'data_centers') unless object.data_centers.nil?
+      DiskProfileWriter.write_many(object.disk_profiles, writer, 'disk_profile', 'disk_profiles') unless object.disk_profiles.nil?
+      DiskSnapshotWriter.write_many(object.disk_snapshots, writer, 'disk_snapshot', 'disk_snapshots') unless object.disk_snapshots.nil?
+      DiskWriter.write_many(object.disks, writer, 'disk', 'disks') unless object.disks.nil?
+      FileWriter.write_many(object.files, writer, 'file', 'files') unless object.files.nil?
       HostWriter.write_one(object.host, writer, 'host') unless object.host.nil?
+      ImageWriter.write_many(object.images, writer, 'image', 'images') unless object.images.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
+      StorageConnectionWriter.write_many(object.storage_connections, writer, 'storage_connection', 'storage_connections') unless object.storage_connections.nil?
+      TemplateWriter.write_many(object.templates, writer, 'template', 'templates') unless object.templates.nil?
+      VmWriter.write_many(object.vms, writer, 'vm', 'vms') unless object.vms.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'storage-domain'
-      plural ||= 'storage-domains'
+      singular ||= 'storage_domain'
+      plural ||= 'storage_domains'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5730,9 +5879,16 @@ module OvirtSDK4
       TemplateVersionWriter.write_one(object.version, writer, 'version') unless object.version.nil?
       VirtioScsiWriter.write_one(object.virtio_scsi, writer, 'virtio_scsi') unless object.virtio_scsi.nil?
       VmWriter.write_one(object.vm, writer, 'vm') unless object.vm.nil?
+      CdromWriter.write_many(object.cdroms, writer, 'cdrom', 'cdroms') unless object.cdroms.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
       CpuProfileWriter.write_one(object.cpu_profile, writer, 'cpu_profile') unless object.cpu_profile.nil?
+      DiskWriter.write_many(object.disks, writer, 'disk', 'disks') unless object.disks.nil?
+      GraphicsConsoleWriter.write_many(object.graphics_consoles, writer, 'graphics_console', 'graphics_consoles') unless object.graphics_consoles.nil?
+      NicWriter.write_many(object.nics, writer, 'nic', 'nics') unless object.nics.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
+      WatchdogWriter.write_many(object.watchdogs, writer, 'watchdog', 'watchdogs') unless object.watchdogs.nil?
       writer.write_end
     end
     
@@ -5755,7 +5911,7 @@ module OvirtSDK4
   class TemplateVersionWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'template-version'
+      singular ||= 'template_version'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5766,8 +5922,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'template-version'
-      plural ||= 'template-versions'
+      singular ||= 'template_version'
+      plural ||= 'template_versions'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5812,7 +5968,7 @@ module OvirtSDK4
   class TimeZoneWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'time-zone'
+      singular ||= 'time_zone'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5822,8 +5978,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'time-zone'
-      plural ||= 'time-zones'
+      singular ||= 'time_zone'
+      plural ||= 'time_zones'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5840,7 +5996,7 @@ module OvirtSDK4
   class TransparentHugePagesWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'transparent-huge-pages'
+      singular ||= 'transparent_huge_pages'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5849,8 +6005,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'transparent-huge-pages'
-      plural ||= 'transparent-huge-pagess'
+      singular ||= 'transparent_huge_pages'
+      plural ||= 'transparent_huge_pagess'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5867,7 +6023,7 @@ module OvirtSDK4
   class UnmanagedNetworkWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'unmanaged-network'
+      singular ||= 'unmanaged_network'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -5881,8 +6037,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'unmanaged-network'
-      plural ||= 'unmanaged-networks'
+      singular ||= 'unmanaged_network'
+      plural ||= 'unmanaged_networks'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -5946,7 +6102,10 @@ module OvirtSDK4
       Writer.write_string(writer, 'user_name', object.user_name) unless object.user_name.nil?
       DomainWriter.write_one(object.domain, writer, 'domain') unless object.domain.nil?
       GroupWriter.write_many(object.groups, writer, 'group', 'groups') unless object.groups.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       RoleWriter.write_many(object.roles, writer, 'role', 'roles') unless object.roles.nil?
+      SshPublicKeyWriter.write_many(object.ssh_public_keys, writer, 'ssh_public_key', 'ssh_public_keys') unless object.ssh_public_keys.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
       writer.write_end
     end
     
@@ -5997,7 +6156,7 @@ module OvirtSDK4
   class VcpuPinWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vcpu-pin'
+      singular ||= 'vcpu_pin'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6007,8 +6166,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vcpu-pin'
-      plural ||= 'vcpu-pins'
+      singular ||= 'vcpu_pin'
+      plural ||= 'vcpu_pins'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6090,7 +6249,7 @@ module OvirtSDK4
   class VirtioScsiWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'virtio-scsi'
+      singular ||= 'virtio_scsi'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6099,8 +6258,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'virtio-scsi'
-      plural ||= 'virtio-scsis'
+      singular ||= 'virtio_scsi'
+      plural ||= 'virtio_scsis'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6117,7 +6276,7 @@ module OvirtSDK4
   class VirtualNumaNodeWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'virtual-numa-node'
+      singular ||= 'virtual_numa_node'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6137,8 +6296,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'virtual-numa-node'
-      plural ||= 'virtual-numa-nodes'
+      singular ||= 'virtual_numa_node'
+      plural ||= 'virtual_numa_nodes'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6228,33 +6387,40 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'start_paused', object.start_paused) unless object.start_paused.nil?
       Writer.write_date(writer, 'start_time', object.start_time) unless object.start_time.nil?
       Writer.write_boolean(writer, 'stateless', object.stateless) unless object.stateless.nil?
-      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       Writer.write_string(writer, 'status', object.status) unless object.status.nil?
       Writer.write_string(writer, 'status_detail', object.status_detail) unless object.status_detail.nil?
       Writer.write_string(writer, 'stop_reason', object.stop_reason) unless object.stop_reason.nil?
       Writer.write_date(writer, 'stop_time', object.stop_time) unless object.stop_time.nil?
-      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
       TimeZoneWriter.write_one(object.time_zone, writer, 'time_zone') unless object.time_zone.nil?
       Writer.write_boolean(writer, 'tunnel_migration', object.tunnel_migration) unless object.tunnel_migration.nil?
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       UsbWriter.write_one(object.usb, writer, 'usb') unless object.usb.nil?
       Writer.write_boolean(writer, 'use_latest_template_version', object.use_latest_template_version) unless object.use_latest_template_version.nil?
       VirtioScsiWriter.write_one(object.virtio_scsi, writer, 'virtio_scsi') unless object.virtio_scsi.nil?
+      AffinityLabelWriter.write_many(object.affinity_labels, writer, 'affinity_label', 'affinity_labels') unless object.affinity_labels.nil?
+      ApplicationWriter.write_many(object.applications, writer, 'application', 'applications') unless object.applications.nil?
       CdromWriter.write_many(object.cdroms, writer, 'cdrom', 'cdroms') unless object.cdroms.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
       CpuProfileWriter.write_one(object.cpu_profile, writer, 'cpu_profile') unless object.cpu_profile.nil?
+      DiskAttachmentWriter.write_many(object.disk_attachments, writer, 'disk_attachment', 'disk_attachments') unless object.disk_attachments.nil?
       DiskWriter.write_many(object.disks, writer, 'disk', 'disks') unless object.disks.nil?
       ExternalHostProviderWriter.write_one(object.external_host_provider, writer, 'external_host_provider') unless object.external_host_provider.nil?
       FloppyWriter.write_many(object.floppies, writer, 'floppy', 'floppies') unless object.floppies.nil?
+      GraphicsConsoleWriter.write_many(object.graphics_consoles, writer, 'graphics_console', 'graphics_consoles') unless object.graphics_consoles.nil?
       HostWriter.write_one(object.host, writer, 'host') unless object.host.nil?
+      HostDeviceWriter.write_many(object.host_devices, writer, 'host_device', 'host_devices') unless object.host_devices.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
       KatelloErratumWriter.write_many(object.katello_errata, writer, 'katello_erratum', 'katello_errata') unless object.katello_errata.nil?
       NicWriter.write_many(object.nics, writer, 'nic', 'nics') unless object.nics.nil?
+      NumaNodeWriter.write_many(object.numa_nodes, writer, 'host_numa_node', 'host_numa_nodes') unless object.numa_nodes.nil?
       PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QuotaWriter.write_one(object.quota, writer, 'quota') unless object.quota.nil?
       ReportedDeviceWriter.write_many(object.reported_devices, writer, 'reported_device', 'reported_devices') unless object.reported_devices.nil?
+      SessionWriter.write_many(object.sessions, writer, 'session', 'sessions') unless object.sessions.nil?
       SnapshotWriter.write_many(object.snapshots, writer, 'snapshot', 'snapshots') unless object.snapshots.nil?
+      StatisticWriter.write_many(object.statistics, writer, 'statistic', 'statistics') unless object.statistics.nil?
       StorageDomainWriter.write_one(object.storage_domain, writer, 'storage_domain') unless object.storage_domain.nil?
+      TagWriter.write_many(object.tags, writer, 'tag', 'tags') unless object.tags.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
       VmPoolWriter.write_one(object.vm_pool, writer, 'vm_pool') unless object.vm_pool.nil?
       WatchdogWriter.write_many(object.watchdogs, writer, 'watchdog', 'watchdogs') unless object.watchdogs.nil?
@@ -6280,7 +6446,7 @@ module OvirtSDK4
   class VmBaseWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vm-base'
+      singular ||= 'vm_base'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6329,8 +6495,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vm-base'
-      plural ||= 'vm-bases'
+      singular ||= 'vm_base'
+      plural ||= 'vm_bases'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6347,7 +6513,7 @@ module OvirtSDK4
   class VmPlacementPolicyWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vm-placement-policy'
+      singular ||= 'vm_placement_policy'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6357,8 +6523,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vm-placement-policy'
-      plural ||= 'vm-placement-policies'
+      singular ||= 'vm_placement_policy'
+      plural ||= 'vm_placement_policies'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6375,7 +6541,7 @@ module OvirtSDK4
   class VmPoolWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vm-pool'
+      singular ||= 'vm_pool'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6389,18 +6555,20 @@ module OvirtSDK4
       RngDeviceWriter.write_one(object.rng_device, writer, 'rng_device') unless object.rng_device.nil?
       Writer.write_integer(writer, 'size', object.size) unless object.size.nil?
       Writer.write_boolean(writer, 'soundcard_enabled', object.soundcard_enabled) unless object.soundcard_enabled.nil?
+      Writer.write_boolean(writer, 'stateful', object.stateful) unless object.stateful.nil?
       Writer.write_string(writer, 'type', object.type) unless object.type.nil?
       Writer.write_boolean(writer, 'use_latest_template_version', object.use_latest_template_version) unless object.use_latest_template_version.nil?
       ClusterWriter.write_one(object.cluster, writer, 'cluster') unless object.cluster.nil?
       InstanceTypeWriter.write_one(object.instance_type, writer, 'instance_type') unless object.instance_type.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       TemplateWriter.write_one(object.template, writer, 'template') unless object.template.nil?
       VmWriter.write_one(object.vm, writer, 'vm') unless object.vm.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vm-pool'
-      plural ||= 'vm-pools'
+      singular ||= 'vm_pool'
+      plural ||= 'vm_pools'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6417,7 +6585,7 @@ module OvirtSDK4
   class VmSummaryWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vm-summary'
+      singular ||= 'vm_summary'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6428,8 +6596,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vm-summary'
-      plural ||= 'vm-summaries'
+      singular ||= 'vm_summary'
+      plural ||= 'vm_summaries'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6446,7 +6614,7 @@ module OvirtSDK4
   class VnicPassThroughWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vnic-pass-through'
+      singular ||= 'vnic_pass_through'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6455,8 +6623,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vnic-pass-through'
-      plural ||= 'vnic-pass-throughs'
+      singular ||= 'vnic_pass_through'
+      plural ||= 'vnic_pass_throughs'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6473,7 +6641,7 @@ module OvirtSDK4
   class VnicProfileWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'vnic-profile'
+      singular ||= 'vnic_profile'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6486,13 +6654,14 @@ module OvirtSDK4
       Writer.write_boolean(writer, 'port_mirroring', object.port_mirroring) unless object.port_mirroring.nil?
       NetworkWriter.write_one(object.network, writer, 'network') unless object.network.nil?
       NetworkFilterWriter.write_one(object.network_filter, writer, 'network_filter') unless object.network_filter.nil?
+      PermissionWriter.write_many(object.permissions, writer, 'permission', 'permissions') unless object.permissions.nil?
       QosWriter.write_one(object.qos, writer, 'qos') unless object.qos.nil?
       writer.write_end
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'vnic-profile'
-      plural ||= 'vnic-profiles'
+      singular ||= 'vnic_profile'
+      plural ||= 'vnic_profiles'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href
@@ -6509,7 +6678,7 @@ module OvirtSDK4
   class VolumeGroupWriter < Writer # :nodoc:
     
     def self.write_one(object, writer, singular = nil)
-      singular ||= 'volume-group'
+      singular ||= 'volume_group'
       writer.write_start(singular)
       href = object.href
       writer.write_attribute('href', href) unless href.nil?
@@ -6520,8 +6689,8 @@ module OvirtSDK4
     end
     
     def self.write_many(list, writer, singular = nil, plural = nil)
-      singular ||= 'volume-group'
-      plural ||= 'volume-groups'
+      singular ||= 'volume_group'
+      plural ||= 'volume_groups'
       writer.write_start(plural)
       if list.is_a?(List)
         href = list.href