ovfparse 0.0.97 → 0.6.7

data/lib/ovfparse/vmpackage.rb

@@ -176,13 +176,10 @@ class VmPackage
   end
 
   def checkschema(schema)
-puts "Starting schema parse"
-    xsd = Nokogiri::XML::Schema(File.open(schema))
-puts "Done with schema parse"
     response = ""
 
     isValid = true    
-    xsd.validate(@xml).each do |error|
+    schema.validate(@xml).each do |error|
       response << error.message + "\n"
       isValid = false
     end
@@ -300,8 +297,22 @@ puts "Done with schema parse"
     }
   end
 
+  def removeNetworksFromVirtualHardwareSection
+     vhs = getChildByName(virtualSystem, 'VirtualHardwareSection') || virtualSystem.add_child(xml.create_element('VirtualHardwareSection', {}))
+     items = getChildrenByName(vhs, 'Item')
+     items.each { |item|
+        id = getChildByName(item, 'ResourceType')
+        if(id.content == '10')
+           item.unlink
+        end
+     }
+  end
+
   def setVmNetworks(networks)
+     removeNetworksFromVirtualHardwareSection
+
      networkNodes = getChildrenByName(networkSection, 'Network')
+     vhs = getChildByName(virtualSystem, 'VirtualHardwareSection')
 
      networkNodes.each { |node|
         updated_network = networks.detect { |network| network.location == node['name'] }
@@ -318,6 +329,19 @@ puts "Done with schema parse"
         end
      }
 
+     # Find the highest instance ID
+     maxID = 0
+     items = getChildrenByName(vhs, 'Item')
+     items.each { |item|
+        itemID = getChildByName(item, 'InstanceID').content.to_i
+        if(itemID > maxID)
+           maxID = itemID
+        end
+     }
+
+     rasdNamespace = xml.root.namespace_definitions.detect{ |ns| ns.prefix == 'rasd' }
+     netCount = 0
+
      networks.each { |network|
         if( (networkNodes.detect { |node| network.location == node['name'] }).nil?)
            networkNode = networkSection.add_child(xml.create_element('Network', {'ovf:name' => network.location}))
@@ -325,12 +349,107 @@ puts "Done with schema parse"
               networkNode.add_child(xml.create_element('Description', network.notes))
            end
         end
+
+        maxID += 1
+        newNetwork = vhs.add_child(xml.create_element('Item', {}))
+        newNetwork.add_child(xml.create_element('AutomaticAllocation', "true")).namespace = rasdNamespace
+        newNetwork.add_child(xml.create_element('Connection', network.location)).namespace = rasdNamespace
+        newNetwork.add_child(xml.create_element('ElementName', "ethernet" + netCount.to_s)).namespace = rasdNamespace
+        newNetwork.add_child(xml.create_element('InstanceID', maxID.to_s)).namespace = rasdNamespace
+        newNetwork.add_child(xml.create_element('ResourceSubType', "E1000")).namespace = rasdNamespace
+        newNetwork.add_child(xml.create_element('ResourceType', "10")).namespace = rasdNamespace
+        netCount += 1
+     }
+  end
+
+  def removeDisksFromVirtualHardwareSection
+     vhs = getChildByName(virtualSystem, 'VirtualHardwareSection') || virtualSystem.add_child(xml.create_element('VirtualHardwareSection', {}))
+     items = getChildrenByName(vhs, 'Item')
+     items.each { |item|
+        id = getChildByName(item, 'ResourceType')
+        if(id.content == '17')
+           item.unlink
+        end
+     }
+  end
+
+  def getOpenChannelOnIDEController(controller, items)
+     currentAddress = getChildByName(controller, 'InstanceID').content
+     controllerChildren = items.select{ |item| 
+        parentNode = getChildByName(item, 'Parent')
+        unless(parentNode.nil?)
+           parentNode.content == currentAddress
+        end
      }
+     childAddresses = Array.new
+     controllerChildren.each{ |child|
+        childAddresses.push(getChildByName(child, 'AddressOnParent').content)
+     }
+     if(childAddresses.length == 0 || (childAddresses.length == 1 && childAddresses[0] == '1'))
+        return '0'
+     elsif(childAddresses.length == 1)
+        return '1'
+     else
+        return false
+     end
+  end
+
+  def buildNewIDEController(vhs, rasdNamespace, newID, newAddress)
+     new_controller = vhs.add_child(xml.create_element('Item', {}))
+     new_controller.add_child(xml.create_element('Address', newAddress)).namespace = rasdNamespace
+     new_controller.add_child(xml.create_element('Description', "IDE Controller " + newAddress)).namespace = rasdNamespace
+     new_controller.add_child(xml.create_element('ElementName', "IDEController" + newAddress)).namespace = rasdNamespace
+     new_controller.add_child(xml.create_element('InstanceID', newID)).namespace = rasdNamespace
+     new_controller.add_child(xml.create_element('ResourceType', "5")).namespace = rasdNamespace
+  end
+
+  def getFirstOpenIDEAddress(vhs, rasdNamespace, maxID)
+     items = getChildrenByName(vhs, 'Item')
+     ide_controllers = items.select{ |item| getChildByName(item, 'ResourceType').content == '5' }
+
+     if(ide_controllers.length == 0)
+        buildNewIDEController(vhs, rasdNamespace, maxID, '0')
+        return [maxID, '0']
+
+     elsif(ide_controllers.length == 1)
+        controller = ide_controllers[0]
+        controllerAddress = getChildByName(controller, 'Address').content
+        open_address = getOpenChannelOnIDEController(controller, items)
+        if(open_address == '0' || open_address == '1')
+           return [getChildByName(controller, 'InstanceID').content, open_address]
+        elsif(!open_address && controllerAddress == '0')
+           buildNewIDEController(vhs, rasdNamespace, maxID, '1')
+           return [maxID, '0']
+        else
+           buildNewIDEController(vhs, rasdNamespace, maxID, '0')
+           return [maxID, '0']
+        end
+
+     else
+        controller = ide_controllers[0]
+        controllerAddress = getChildByName(controller, 'Address').content
+        open_address = getOpenChannelOnIDEController(controller, items)
+        if(open_address == '0' || open_address == '1')
+           return [getChildByName(controller, 'InstanceID').content, open_address]
+        else
+           controller = ide_controllers[1]
+           controllerAddress = getChildByName(controller, 'Address').content
+           open_address = getOpenChannelOnIDEController(controller, items)
+           if(open_address == '0' || open_address == '1')
+              return [getChildByName(controller, 'InstanceID').content, open_address]
+           else
+              return false
+           end
+        end
+     end
   end
 
   def setVmDisks(disks)
+     removeDisksFromVirtualHardwareSection
+
      fileNodes = getChildrenByName(references, 'File')
      diskNodes = getChildrenByName(diskSection, 'Disk')
+     vhs = getChildByName(virtualSystem, 'VirtualHardwareSection')
 
      icons = Array.new
      getChildrenByName(getChildByName(virtualSystem, 'ProductSection'), 'Icon').each { |node|
@@ -350,18 +469,50 @@ puts "Done with schema parse"
            end
         else
            file_node['ovf:id'] = updated_disk.name + '_disk'
+           old_disk_node = old_disk_node || diskSection.add_child(xml.create_element('Disk', {}))
            old_disk_node['ovf:fileRef'] = updated_disk.name + '_disk'
            old_disk_node['ovf:capacity'] = updated_disk.size.to_s
            old_disk_node['ovf:diskId'] = updated_disk.name
+           old_disk_node['ovf:capacityAllocationUnits'] = "byte * 2^30"
+           old_disk_node['ovf:format'] = "http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" 
         end
      }
 
+     # Find the highest instance ID
+     maxID = 0
+     items = getChildrenByName(vhs, 'Item')
+     items.each { |item|
+        itemID = getChildByName(item, 'InstanceID').content.to_i
+        if(itemID > maxID)
+           maxID = itemID
+        end
+     }
+
+     rasdNamespace = xml.root.namespace_definitions.detect{ |ns| ns.prefix == 'rasd' }
+
      disks.each { |disk|
         if( (fileNodes.detect { |node| disk.location == node['href'] }).nil?)
            diskSection.add_child(xml.create_element('Disk', {'ovf:capacity' => disk.size.to_s, 'ovf:capacityAllocationUnits' => "byte * 2^30", 'ovf:diskId' => disk.name, 'ovf:fileRef' => disk.name + '_disk', 'ovf:format' => "http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" }))
            references.add_child(xml.create_element('File', {'ovf:href' => disk.location, 'ovf:id' => disk.name + '_disk'}))
         end
+
+        maxID += 1
+        address = getFirstOpenIDEAddress(vhs, rasdNamespace, maxID)
+        if(!address)
+           # PANIC BECAUSE THIS IS BAD MAN, NO AVAILABLE IDE SLOTS
+           raise "No IDE slots available"
+        else
+           maxID += 1
+           newDisk = vhs.add_child(xml.create_element('Item', {}))
+           newDisk.add_child(xml.create_element('AddressOnParent', address[1])).namespace = rasdNamespace
+           newDisk.add_child(xml.create_element('ElementName', disk.name)).namespace = rasdNamespace
+           newDisk.add_child(xml.create_element('HostResource', "ovf:/disk/" + disk.name)).namespace = rasdNamespace
+           newDisk.add_child(xml.create_element('InstanceID', maxID.to_s)).namespace = rasdNamespace
+           newDisk.add_child(xml.create_element('Parent', address[0])).namespace = rasdNamespace
+           newDisk.add_child(xml.create_element('ResourceType', "17")).namespace = rasdNamespace
+        end
      }
+
   end
 
   def setVmAttributes(attributes)
@@ -406,7 +557,7 @@ puts "Done with schema parse"
   def setElements(updated_element, parent_node, element_list)
      element_list.each { |element_details|
         updated_value = updated_element[element_details['element_ref']]
-        element_node = parent_node.xpath(element_details['full_name'])[0]
+        element_node = getChildByName(parent_node, element_details['full_name'])
         #if((updated_value == '' || updated_value.nil?) && !element_node.nil?)
         #   element_node.unlink
         #elsif(updated_value != '' && !updated_value.nil?)
@@ -571,3 +722,4 @@ end
 
 class Vc4VmPackage < VmPackage
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ovfparse
 version: !ruby/object:Gem::Version 
-  hash: 221
+  hash: 9
   prerelease: 
   segments: 
   - 0
-  - 0
-  - 97
-  version: 0.0.97
+  - 6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Jim Barkley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -04:00
+date: 2011-06-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,20 +43,20 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/ovfparse/http_vmrepository.rb
-- lib/ovfparse/vc_repository.rb
-- lib/ovfparse/os_id_table.rb
-- lib/ovfparse/file_vmrepository.rb
+- lib/ovfparse/vc4_vmrepository.rb
+- lib/ovfparse/ftp_vmrepository.rb
 - lib/ovfparse/marketplace_repository.rb
+- lib/ovfparse/vc_repository.rb
+- lib/ovfparse/https_vmrepository.rb
 - lib/ovfparse/vmrepository.rb
+- lib/ovfparse/esx_repository.rb
 - lib/ovfparse/vmpackage.rb
+- lib/ovfparse/http_vmrepository.rb
 - lib/ovfparse/esx4_vmrepository.rb
-- lib/ovfparse/vc4_vmrepository.rb
-- lib/ovfparse/https_vmrepository.rb
-- lib/ovfparse/ftp_vmrepository.rb
-- lib/ovfparse/esx_repository.rb
-- lib/test.rb
+- lib/ovfparse/file_vmrepository.rb
+- lib/ovfparse/os_id_table.rb
 - lib/ovfparse.rb
+- lib/test.rb
 - README
 has_rdoc: true
 homepage: http://github.com/ruby-ovf/ovfparse
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Retrieves and parses files in the Open Virtualization Format