ovfparse 0.0.93 → 0.0.95

data/lib/ovfparse/marketplace_repository.rb

@@ -0,0 +1,53 @@
+require 'nokogiri'
+require 'open-uri'
+
+class MarketplaceRepository < VmRepository
+
+  def parse (raw_html) 
+    file_list = Array.new
+    
+    xml = Nokogiri::XML(raw_html) do |config|
+      config.noblanks.strict.noent
+    end
+
+    entries = xml.root.children.select { |element| element.name == 'entry' }
+
+    entries.each { |entry|
+       repository = entry.children.detect { |element| element.name == 'repository' }
+       basepath = repository.children.detect { |element| element.name == 'basepath' }
+       filename = repository.children.detect { |element| element.name == 'filename' }
+
+       file_list.push( {'basepath' => basepath.content, 'filename' => filename.content} )
+    }
+
+    return file_list
+  end
+
+  def fetch
+    #retrieve data from http server
+    raw_html = open(uri)
+    if (raw_html)  
+
+      #parse out package list from index html
+      package_list = parse(raw_html) 
+  
+      #construct package objects based on results
+      return listPackages(package_list)
+    end
+  end
+
+  def listPackages(package_list)
+    packages = Array.new
+    package_list.each { |pkg|
+      fullpath = (pkg['basepath'] + pkg['filename']).to_s
+      package = VmPackage.create(fullpath)
+      package.base_path = pkg['basepath']
+      package.name = pkg['filename']
+
+      packages.push(package)
+    }
+
+    return packages
+  end
+
+end

data/lib/ovfparse/os_id_table.rb

@@ -0,0 +1,261 @@
+#############################################################################################
+# Reverse lookup table for the OVF spec/CIM spec listing of operating system IDs
+# For reference:
+#
+# Go here
+# http://dmtf.org/standards/cim
+#
+# Then pick the latest schema, in this case 2.28, here
+# http://dmtf.org/standards/cim/cim_schema_v2280
+#
+# Then pick the .Zip archive of all Final MOF files., here
+# http://dmtf.org/sites/default/files/cim/cim_schema_v2280/cim_schema_2.28.0Final-MOFs.zip
+#
+# The OS list is in System\CIM_OperatingSystem.mof, line 29.
+#
+# sample usage:
+# require "os_id_table.rb"
+#
+# puts OS_ID_TABLE.value? "HPUX"
+# => true
+# puts OS_ID_TABLE.value? "arduino embedded"
+# => false
+# puts OS_ID_TABLE[55]
+# => NextStep
+#
+# puts OS_ID_TABLE_REV.value? 1
+# => true
+# puts OS_ID_TABLE_REV.value? 250
+# => false
+# puts OS_ID_TABLE_REV["LINUX"]
+# => 36
+# 
+
+OS_ID_TABLE_REV = Hash[
+  "Unknown" => 0,
+  "Other" => 1,
+  "MACOS" => 2,
+  "ATTUNIX" => 3,
+  "DGUX" => 4, 
+  "DECNT" => 5,
+  "Tru64 UNIX" => 6,
+  "OpenVMS" => 7,
+  "HPUX" => 8,
+  "AIX" => 9, 
+  "MVS" => 10,
+  "OS400" => 11,
+  "OS/2" => 12,
+  "JavaVM" => 13,
+  "MSDOS" => 14, 
+  "WIN3x" => 15,
+  "WIN95" => 16,
+  "WIN98" => 17,
+  "WINNT" => 18,
+  "WINCE" => 19, 
+  "NCR3000" => 20,
+  "NetWare" => 21,
+  "OSF" => 22,
+  "DC/OS" => 23, 
+  "Reliant UNIX" => 24,
+  "SCO UnixWare" => 25,
+  "SCO OpenServer" => 26, 
+  "Sequent" => 27,
+  "IRIX" => 28,
+  "Solaris" => 29, 
+  "SunOS" => 30, 
+  "U6000" => 31,
+  "ASERIES" => 32,
+  "HP NonStop OS" => 33,
+  "HP NonStop OSS" => 34, 
+  "BS2000" => 35,
+  "LINUX" => 36,
+  "Lynx" => 37,
+  "XENIX" => 38,
+  "VM" => 39, 
+  "Interactive UNIX" => 40,
+  "BSDUNIX" => 41,
+  "FreeBSD" => 42, 
+  "NetBSD" => 43,
+  "GNU Hurd" => 44,
+  "OS9" => 45,
+  "MACH Kernel" => 46,
+  "Inferno" => 47, 
+  "QNX" => 48,
+  "EPOC" => 49, 
+  "IxWorks" => 50,
+  "VxWorks" => 51, 
+  "MiNT" => 52,
+  "BeOS" => 53,
+  "HP MPE" => 54,
+  "NextStep" => 55,
+  "PalmPilot" => 56, 
+  "Rhapsody" => 57,
+  "Windows 2000" => 58,
+  "Dedicated" => 59, 
+  "OS/390" => 60,
+  "VSE" => 61,
+  "TPF" => 62,
+  "Windows (R) Me" => 63, 
+  "Caldera Open UNIX" => 64,
+  "OpenBSD" => 65,
+  "Not Applicable" => 66, 
+  "Windows XP" => 67,
+  "z/OS" => 68,
+  "Microsoft Windows Server 2003" => 69, 
+  "Microsoft Windows Server 2003 64-Bit" => 70, 
+  "Windows XP 64-Bit" => 71,
+  "Windows XP Embedded" => 72, 
+  "Windows Vista" => 73,
+  "Windows Vista 64-Bit" => 74, 
+  "Windows Embedded for Point of Service" => 75, 
+  "Microsoft Windows Server 2008" => 76, 
+  "Microsoft Windows Server 2008 64-Bit" => 77,
+  "FreeBSD 64-Bit" => 78, 
+  "RedHat Enterprise Linux" => 79, 
+  "RedHat Enterprise Linux 64-Bit" => 80, 
+  "Solaris 64-Bit" => 81,
+  "SUSE" => 82,
+  "SUSE 64-Bit" => 83,
+  "SLES" => 84, 
+  "SLES 64-Bit" => 85,
+  "Novell OES" => 86,
+  "Novell Linux Desktop" => 87, 
+  "Sun Java Desktop System" => 88,
+  "Mandriva" => 89, 
+  "Mandriva 64-Bit" => 90, 
+  "TurboLinux" => 91, 
+  "TurboLinux 64-Bit" => 92, 
+  "Ubuntu" => 93, 
+  "Ubuntu 64-Bit" => 94, 
+  "Debian" => 95, 
+  "Debian 64-Bit" => 96, 
+  "Linux 2.4.x" => 97, 
+  "Linux 2.4.x 64-Bit" => 98, 
+  "Linux 2.6.x" => 99, 
+  "Linux 2.6.x 64-Bit" => 100, 
+  "Linux 64-Bit" => 101, 
+  "Other 64-Bit" => 102, 
+  "Microsoft Windows Server 2008 R2" => 103, 
+  "VMware ESXi" => 104, 
+  "Microsoft Windows 7" => 105, 
+  "CentOS 32-bit" => 106, 
+  "CentOS 64-bit" => 107, 
+  "Oracle Enterprise Linux 32-bit" => 108, 
+  "Oracle Enterprise Linux 64-bit" => 109, 
+  "eComStation 32-bitx" => 110
+]
+
+OS_ID_TABLE = Hash[
+  0 => "Unknown" ,
+  1 => "Other" ,
+  2 => "MACOS" ,
+  3 => "ATTUNIX" ,
+  4 => "DGUX" ,
+  5 => "DECNT" ,
+  6 => "Tru64 UNIX" ,
+  7 => "OpenVMS" ,
+  8 => "HPUX" ,
+  9 => "AIX" ,
+  10 => "MVS" ,
+  11 => "OS400" ,
+  12 => "OS/2" ,
+  13 => "JavaVM" ,
+  14 => "MSDOS" ,
+  15 => "WIN3x" ,
+  16 => "WIN95" ,
+  17 => "WIN98" ,
+  18 => "WINNT" ,
+  19 => "WINCE" ,
+  20 => "NCR3000" ,
+  21 => "NetWare" ,
+  22 => "OSF" ,
+  23 => "DC/OS" ,
+  24 => "Reliant UNIX" ,
+  25 => "SCO UnixWare" ,
+  26 => "SCO OpenServer" ,
+  27 => "Sequent" ,
+  28 => "IRIX" ,
+  29 => "Solaris" ,
+  30 => "SunOS" ,
+  31 => "U6000" ,
+  32 => "ASERIES" ,
+  33 => "HP NonStop OS" ,
+  34 => "HP NonStop OSS" ,
+  35 => "BS2000" ,
+  36 => "LINUX" ,
+  37 => "Lynx" ,
+  38 => "XENIX" ,
+  39 => "VM" ,
+  40 => "Interactive UNIX" ,
+  41 => "BSDUNIX" ,
+  42 => "FreeBSD" ,
+  43 => "NetBSD" ,
+  44 => "GNU Hurd" ,
+  45 => "OS9" ,
+  46 => "MACH Kernel" ,
+  47 => "Inferno" ,
+  48 => "QNX" ,
+  49 => "EPOC" ,
+  50 => "IxWorks" ,
+  51 => "VxWorks" ,
+  52 => "MiNT" ,
+  53 => "BeOS" ,
+  54 => "HP MPE" ,
+  55 => "NextStep" ,
+  56 => "PalmPilot" ,
+  57 => "Rhapsody" ,
+  58 => "Windows 2000" ,
+  59 => "Dedicated" ,
+  60 => "OS/390" ,
+  61 => "VSE" ,
+  62 => "TPF" ,
+  63 => "Windows (R) Me" ,
+  64 => "Caldera Open UNIX" ,
+  65 => "OpenBSD" ,
+  66 => "Not Applicable" ,
+  67 => "Windows XP" ,
+  68 => "z/OS" ,
+  69 => "Microsoft Windows Server 2003" ,
+  70 => "Microsoft Windows Server 2003 64-Bit" ,
+  71 => "Windows XP 64-Bit" ,
+  72 => "Windows XP Embedded" ,
+  73 => "Windows Vista" ,
+  74 => "Windows Vista 64-Bit" ,
+  75 => "Windows Embedded for Point of Service" ,
+  76 => "Microsoft Windows Server 2008" ,
+  77 => "Microsoft Windows Server 2008 64-Bit" ,
+  78 => "FreeBSD 64-Bit" ,
+  79 => "RedHat Enterprise Linux" ,
+  80 => "RedHat Enterprise Linux 64-Bit" ,
+  81 => "Solaris 64-Bit" ,
+  82 => "SUSE" ,
+  83 => "SUSE 64-Bit" ,
+  84 => "SLES" ,
+  85 => "SLES 64-Bit" ,
+  86 => "Novell OES" ,
+  87 => "Novell Linux Desktop" ,
+  88 => "Sun Java Desktop System" ,
+  89 => "Mandriva" ,
+  90 => "Mandriva 64-Bit" ,
+  91 => "TurboLinux" ,
+  92 => "TurboLinux 64-Bit" ,
+  93 => "Ubuntu" ,
+  94 => "Ubuntu 64-Bit" ,
+  95 => "Debian" ,
+  96 => "Debian 64-Bit" ,
+  97 => "Linux 2.4.x" ,
+  98 => "Linux 2.4.x 64-Bit" ,
+  99 => "Linux 2.6.x" ,
+  100 => "Linux 2.6.x 64-Bit" ,
+  101 => "Linux 64-Bit" ,
+  102 => "Other 64-Bit" ,
+  103 => "Microsoft Windows Server 2008 R2" ,
+  104 => "VMware ESXi" ,
+  105 => "Microsoft Windows 7" ,
+  106 => "CentOS 32-bit" ,
+  107 => "CentOS 64-bit" ,
+  108 => "Oracle Enterprise Linux 32-bit" ,
+  109 => "Oracle Enterprise Linux 64-bit" ,
+  110 => "eComStation 32-bitx" 
+]
+

data/lib/ovfparse/vmpackage.rb

@@ -1,5 +1,8 @@
+require 'open-uri'
+
 class VmPackage 
   @url
+  @base_path
   @name
   @version
   @protocol
@@ -10,19 +13,25 @@ class VmPackage
   OVA = 0
   OVF = 1
   ISO = 2
+
+  @references
+  @diskSection
+  @networkSection
+  @virtualSystem
   
   @type = nil
- 
+
+  DEBUG_MODE = false
 
   # List of attributes in an OVF product that we will extract / set
   PRODUCT_ATTRIBUTES = [ {'full_name' => 'ovf:instance', 'node_ref' => 'instance', 'attribute_ref' => 'instance'},
                          {'full_name' => 'ovf:class', 'node_ref' => 'class', 'attribute_ref' => 'product_class'} ]
 
   # List of elements in an OVF product that we will extract / set
-  PRODUCT_ELEMENTS = [ {'full_name' => 'ovf:Info', 'node_ref' => 'Info', 'element_ref' => 'description', 'required' => false},
-                       {'full_name' => 'ovf:Product', 'node_ref' => 'Product', 'element_ref' => 'name', 'required' => false},
-                       {'full_name' => 'ovf:Vendor', 'node_ref' => 'Vendor', 'element_ref' => 'vendor', 'required' => false},
-                       {'full_name' => 'ovf:Version', 'node_ref' => 'Version', 'element_ref' => 'version', 'required' => false} ]
+  PRODUCT_ELEMENTS = [ {'full_name' => 'Info', 'node_ref' => 'Info', 'element_ref' => 'description', 'required' => false},
+                       {'full_name' => 'Product', 'node_ref' => 'Product', 'element_ref' => 'name', 'required' => false},
+                       {'full_name' => 'Vendor', 'node_ref' => 'Vendor', 'element_ref' => 'vendor', 'required' => false},
+                       {'full_name' => 'Version', 'node_ref' => 'Version', 'element_ref' => 'version', 'required' => false} ]
 
   # List of attributes in an OVF property that we will extract / set
   PROPERTY_ATTRIBUTES = [ {'full_name' => 'ovf:value', 'node_ref' => 'value', 'attribute_ref' => 'value'},
@@ -35,15 +44,15 @@ class VmPackage
                           {'full_name' => 'cops:uuid', 'node_ref' => 'uuid', 'attribute_ref' => 'uuid'} ] # @todo refactor to cops extension module
 
   # List of elements in an OVF property that we will extract / set
-  PROPERTY_ELEMENTS = [ {'full_name' => 'ovf:Label', 'node_ref' => 'Label', 'element_ref' => 'name', 'required' => false},
-                        {'full_name' => 'ovf:Description', 'node_ref' => 'Description', 'element_ref' => 'description', 'required' => false},
-                        {'full_name' => 'cops:Example', 'node_ref' => 'cops:Example', 'element_ref' => 'example', 'required' => true}, # @todo refactor to cops extension module
-                        {'full_name' => 'cops:NoneType', 'node_ref' => 'cops:NoneType', 'element_ref' => 'nonetype', 'required' => true} ] # @todo refactor to cops extension module
+  PROPERTY_ELEMENTS = [ {'full_name' => 'Label', 'node_ref' => 'Label', 'element_ref' => 'name', 'required' => false},
+                        {'full_name' => 'Description', 'node_ref' => 'Description', 'element_ref' => 'description', 'required' => false},
+                        {'full_name' => 'Example', 'node_ref' => 'cops:Example', 'element_ref' => 'example', 'required' => true}, # @todo refactor to cops extension module
+                        {'full_name' => 'NoneType', 'node_ref' => 'cops:NoneType', 'element_ref' => 'nonetype', 'required' => true} ] # @todo refactor to cops extension module
   
   OVF_NAMESPACE = {'ovf' => 'http://schemas.dmtf.org/ovf/envelope/1'}
 
 
-  attr_accessor :url, :name, :version, :state, :protocol, :size, :xml
+  attr_accessor :url, :base_path, :name, :version, :state, :protocol, :size, :xml, :references, :diskSection, :networkSection, :virtualSystem
 
 
   def initialize 
@@ -63,6 +72,10 @@ class VmPackage
   end
 
   def initialize(uri)
+    if (URI::HTTP==uri.class) then
+      uri = uri.to_s 
+    end
+
     (@protocol, @url) = uri.split(":", 2) unless !uri
     @url.sub!(/^\/{0,2}/, '')
     @protocol.downcase
@@ -75,7 +88,6 @@ class VmPackage
     @url.sub!(/^\/{0,2}/, '')
     @protocol.downcase
     @url.downcase
-
     if @protocol=='ftp'
       FtpVmPackage.new(uri)
     elsif @protocol=='http'
@@ -105,13 +117,52 @@ class VmPackage
 
   def fetch
   end
+
+
+  # Caches all of the base elements inside Envelope for fast access
+  def loadElementRefs
+     children = @xml.root.children
+
+     @references = children[0]
+     if(@references.name != 'References')
+        @references = getChildByName(xml.root, 'References')
+     end
+
+     @diskSection = children[1]
+     if(@diskSection.name != 'DiskSection')
+        @diskSection = getChildByName(xml.root, 'DiskSection')
+     end
+
+     @networkSection = children[2]
+     if(@networkSection.name != 'NetworkSection')
+        @networkSection = getChildByName(xml.root, 'NetworkSection')
+     end
+
+     @virtualSystem = children[3]
+     if(@virtualSystem.name != 'VirtualSystem')
+        @virtualSystem = getChildByName(xml.root, 'VirtualSystem')
+     end
+
+  end
   
+  # Returns the first child node of the passed node whose name matches the passed name.
+  def getChildByName(node, childName)
+     return node.children.detect{ |element| element.name == childName}
+  end
+
+  # Returns every child node of the passed node whose name matches the passed name.
+  def getChildrenByName(node, childName)
+     return node.children.select{ |element| element.name == childName}
+  end
+
   def referenced_file(element) 
     @xml.xpath("//ovf:References/ovf:File[@ovf:id='#{element['fileRef']}']", OVF_NAMESPACE).first
   end
      
   def method_missing(method)
-    puts "WARNING: NoSuchMethod Error: " + method.to_s + " ...trying XPath query \n"
+    if DEBUG_MODE
+      puts "WARNING: NoSuchMethod Error: " + method.to_s + " ...trying XPath query \n"
+    end 
   
     # try with namespace
     data = @xml.xpath("//ovf:" + method.to_s)
@@ -139,7 +190,7 @@ class VmPackage
   end
 
   def checkschema(schema)
-    xsd = Nokogiri::XML::Schema(File.read(schema))
+    xsd = Nokogiri::XML::Schema(schema)
     response = ""
 
     isValid = true    
@@ -152,18 +203,23 @@ class VmPackage
   end
 
   def getVmName
-    return xml.xpath('ovf:Envelope/ovf:VirtualSystem')[0]['id']
+    return virtualSystem['id']
   end
 
   def getVmDescription
-    descNode = xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:Info')[0]
+    descNode = getChildByName(virtualSystem, 'Info')
     return descNode.nil? ? '' : descNode.content
   end
 
   def getVmOS_ID
-    return xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:OperatingSystemSection')[0]['id']
+    return getChildByName(virtualSystem, 'OperatingSystemSection')['id']
   end
 
+  def getVmOS
+    return OS_ID_TABLE[getVmOS_ID.to_i]
+  end 
+
+
   # note this is not part of the OVF spec. Specific users could overwrite this method to 
   # store/retrieve patch level in the description field, for example.
   def getVmPatchLevel
@@ -186,11 +242,11 @@ class VmPackage
   def getVmDisks
     disks = Array.new
     filenames = Hash.new
-    xml.xpath('ovf:Envelope/ovf:References/ovf:File').each { |node|
+    getChildrenByName(references, 'File').each { |node|
       filenames[node['id']] = node['href']
     }
 
-    xml.xpath('ovf:Envelope/ovf:DiskSection/ovf:Disk').each { |node|
+    getChildrenByName(diskSection, 'Disk').each { |node|
       disks.push({ 'name' => node['diskId'], 'location' => filenames[node['fileRef']], 'size' => node['capacity'] })
     }
 
@@ -199,8 +255,8 @@ class VmPackage
 
   def getVmNetworks
     networks = Array.new
-    xml.xpath('ovf:Envelope/ovf:NetworkSection/ovf:Network').each { |node|
-      descriptionNode = node.xpath('ovf:Description')[0]
+    getChildrenByName(networkSection, 'Network').each { |node|
+      descriptionNode = getChildByName(node, 'Description')
       text = descriptionNode.nil? ? '' : descriptionNode.text
       networks.push({'location' => node['name'], 'notes' => text })
     }
@@ -217,25 +273,25 @@ class VmPackage
   end
 
   def getVirtualQuantity(resource)
-    xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item').each { |node|
+    getChildrenByName(getChildByName(virtualSystem, 'VirtualHardwareSection'), 'Item').each{ |node|
       resourceType = node.xpath('rasd:ResourceType')[0].text
       resourceType == resource.to_s ? (return node.xpath('rasd:VirtualQuantity')[0].text) : next
     }
   end
 
   def setVmName(newValue)
-    xml.xpath('ovf:Envelope/ovf:VirtualSystem')[0]['ovf:id'] = newValue
-    nameNode = xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:Name')[0] ||
-       xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:Info')[0].add_next_sibling(xml.create_element('Name', {}))
+    virtualSystem['ovf:id'] = newValue
+    nameNode = getChildByName(virtualSystem, 'Name') ||
+       getChildByName(virtualSystem, 'Info').add_next_sibling(xml.create_element('Name', {}))
     nameNode.content = newValue
   end
 
   def setVmDescription(newValue)
-    xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:Info')[0].content = newValue
+    getChildByName(virtualSystem, 'Info').content = newValue
   end
 
   def setVmOS_ID(newValue)
-    xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:OperatingSystemSection')[0]['ovf:id'] = newValue.to_s
+    getChildByName(virtualSystem, 'OperatingSystemSection')['ovf:id'] = newValue.to_s
   end
 
 
@@ -248,22 +304,21 @@ class VmPackage
   end
 
   def setVirtualQuantity(resource, newValue)
-    xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item').each { |node|
+    getChildrenByName(getChildByName(virtualSystem, 'VirtualHardwareSection'), 'Item').each { |node|
       resourceType = node.xpath('rasd:ResourceType')[0].text
       resourceType == resource.to_s ? (node.xpath('rasd:VirtualQuantity')[0].content = newValue) : next
     }
   end
 
   def setVmNetworks(networks)
-     networkSection = xml.xpath('ovf:Envelope/ovf:NetworkSection')[0]
-     networkNodes = networkSection.xpath('ovf:Network')
-    
+     networkNodes = getChildrenByName(networkSection, 'Network')
+
      networkNodes.each { |node|
         updated_network = networks.detect { |network| network.location == node['name'] }
         if(updated_network.nil?)
            node.unlink
         else
-           descriptionNode = node.xpath('ovf:Description')[0]
+           descriptionNode = getChildByName(node, 'Description')
            if((updated_network.notes == '' || updated_network.notes.nil?) && !descriptionNode.nil?)
               descriptionNode.unlink
            elsif(updated_network.notes != '' && !updated_network.notes.nil?)
@@ -284,14 +339,11 @@ class VmPackage
   end
 
   def setVmDisks(disks)
-     fileSection = xml.xpath('ovf:Envelope/ovf:References')[0]
-     fileNodes = fileSection.xpath('ovf:File')
-
-     diskSection = xml.xpath('ovf:Envelope/ovf:DiskSection')[0]
-     diskNodes = diskSection.xpath('ovf:Disk')
+     fileNodes = getChildrenByName(references, 'File')
+     diskNodes = getChildrenByName(diskSection, 'Disk')
 
      icons = Array.new
-     xml.xpath('ovf:Envelope/ovf:VirtualSystem/ovf:ProductSection/ovf:Icon').each { |node|
+     getChildrenByName(getChildByName(virtualSystem, 'ProductSection'), 'Icon').each { |node|
         icons.push(node['fileRef'])
      }
 
@@ -317,7 +369,7 @@ class VmPackage
      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" }))
-           fileSection.add_child(xml.create_element('File', {'ovf:href' => disk.location, 'ovf:id' => disk.name + '_disk'}))
+           references.add_child(xml.create_element('File', {'ovf:href' => disk.location, 'ovf:id' => disk.name + '_disk'}))
         end
      }
   end
@@ -344,17 +396,17 @@ class VmPackage
   end
 
   def setProductIcon(new_icon, productNode)
-     iconNode = productNode.xpath('ovf:Icon')[0]
+     iconNode = getChildByName(productNode, 'Icon')
      if((new_icon == '' || new_icon.nil?) && !iconNode.nil?)
-        (xml.xpath('ovf:Envelope/ovf:References/ovf:File').detect { |fileNode| fileNode['id'] == iconNode['fileRef']}).unlink
+        getChildrenByName(references, 'File').detect { |fileNode| fileNode['id'] == iconNode['fileRef']}.unlink
         iconNode.unlink
      elsif(new_icon != '' && !new_icon.nil?)
         if(iconNode.nil?)
            productNode.add_child(xml.create_element('Icon', {'ovf:fileRef' => productNode['class'] + '_icon'}))
-           xml.xpath('ovf:Envelope/ovf:References')[0].add_child(xml.create_element('File', {'ovf:id' => productNode['class'] + '_icon', 'ovf:href' => new_icon}))
+           references.add_child(xml.create_element('File', {'ovf:id' => productNode['class'] + '_icon', 'ovf:href' => new_icon}))
         else
            productNode.add_child(iconNode)
-           (xml.xpath('ovf:Envelope/ovf:References/ovf:File').detect { |fileNode| fileNode['id'] == iconNode['fileRef']})['ovf:href'] = new_icon
+           getChildrenByName(references, 'File').detect { |fileNode| fileNode['id'] == iconNode['fileRef']}['ovf:href'] = new_icon
         end
      end
   end
@@ -430,7 +482,11 @@ class VmPackage
       node = Nokogiri::XML::Comment.new(xml.doc, ' skeleton framework constructed by OVFparse ')
       xml.doc.children[0].add_previous_sibling(node)
     end
-    return builder.to_xml
+
+    newPackage = NewVmPackage.new
+    newPackage.xml = builder.doc
+    newPackage.loadElementRefs
+    return newPackage
   end
 
   def write_xml(file)
@@ -452,19 +508,12 @@ end
 class HttpVmPackage < VmPackage
   def fetch 
     url = URI.parse(URI.escape(self.uri))
-    Net::HTTP.start(url.host) { |http|
-      resp = http.get(url.path)
-      open(@name, "wb") { |file|
-        file.write(resp.body)
-      }
-    }
-
-    @xml = Nokogiri::XML(File.open(@name)) do |config|
-      config.strict.noent
-      config.strict
+    
+    @xml = Nokogiri::XML(open(url)) do |config|
+      config.noblanks.strict.noent
     end
 
-    File.unlink(@name)   
+    loadElementRefs
   end
 end
 
@@ -486,6 +535,7 @@ class HttpsVmPackage < VmPackage
     end
   
     File.unlink(@name)   
+    loadElementRefs
   end
 
 
@@ -505,6 +555,7 @@ class FtpVmPackage < VmPackage
     end
   
     File.unlink(@name)   
+    loadElementRefs
   end 
 end
 
@@ -513,6 +564,12 @@ class FileVmPackage < VmPackage
     @xml = Nokogiri::XML(File.open(self.url)) do |config|
       config.noblanks.strict.noent
     end
+    loadElementRefs
+  end
+end
+
+class NewVmPackage < VmPackage
+  def initialize
   end
 end
 

data/lib/ovfparse/vmrepository.rb

@@ -19,13 +19,15 @@ def initialize(uri)
     @url.downcase
 end 
 
-  def self.create uri
+  def self.create(uri, managed)
     (@protocol, @url) = uri.split(":", 2) unless !uri
     @url.sub!(/^\/{0,2}/, '')
     @protocol.downcase
     @url.downcase
 
-    if @protocol=='ftp'
+    if(managed)
+      MarketplaceRepository.new(uri)
+    elsif @protocol=='ftp'
       FtpVmRepository.new(uri) 
     elsif @protocol=='http'
       HttpVmRepository.new(uri) 
@@ -69,8 +71,10 @@ end
     packages = Array.new
     package_list.each { |p|
       package = VmPackage.create(self.uri + "/" + p)
+      package.base_path = self.uri + "/"
       package.name = p
-      package.state = VmPackage::UNKNOWN
+# @todo remove this, or fix it. Supposed to be handled with a COPS mix-in
+#      package.state = VmPackage::UNKNOWN
       packages.push(package)
     }
 

data/lib/ovfparse.rb

@@ -8,9 +8,11 @@ path = File.expand_path(File.dirname(__FILE__))
 
 require path + '/ovfparse/vmrepository'
 require path + '/ovfparse/vmpackage'
+require path + '/ovfparse/os_id_table'
 require path + '/ovfparse/esx4_vmrepository'
 require path + '/ovfparse/file_vmrepository'
 require path + '/ovfparse/ftp_vmrepository'
 require path + '/ovfparse/http_vmrepository'
 require path + '/ovfparse/https_vmrepository'
 require path + '/ovfparse/vc4_vmrepository'
+require path + '/ovfparse/marketplace_repository'

data/lib/test.rb

@@ -40,7 +40,7 @@ puts "\n\n****************************\n"
 # 
 # package = VmPackage.create("file://ambrosia/public/vmlib/someOVF.ovf")
 # package = VmPackage.create("http://cops-af-lib.mitre.org//Base OS Package (jeos)-Ubuntu-20090917.ovf")
-# package.get 
+# package.fetch 
 # puts package.xml
 # puts package.ProductSection
 # 
@@ -52,7 +52,7 @@ puts "\n\n****************************\n"
 # puts "uri: " + vmRepo.uri + "\n"
 # packages = vmRepo.fetch
 # ovfTest = packages[1]
-# ovfTest.get 
+# ovfTest.fetch 
 # puts ovfTest.xml
 # 
 # uri = "ftp://localhost/repo"
@@ -63,7 +63,7 @@ puts "\n\n****************************\n"
 # puts "uri: " + vmRepo.uri + "\n"
 # packages = vmRepo.fetch
 # ovfTest = packages[1]
-# ovfTest.get 
+# ovfTest.fetch 
 
 
 #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ovfparse
 version: !ruby/object:Gem::Version 
-  hash: 165
+  hash: 161
   prerelease: 
   segments: 
   - 0
   - 0
-  - 93
-  version: 0.0.93
+  - 95
+  version: 0.0.95
 platform: ruby
 authors: 
 - Jim Barkley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -04:00
+date: 2011-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,8 @@ files:
 - lib/ovfparse/ftp_vmrepository.rb
 - lib/ovfparse/http_vmrepository.rb
 - lib/ovfparse/https_vmrepository.rb
+- lib/ovfparse/marketplace_repository.rb
+- lib/ovfparse/os_id_table.rb
 - lib/ovfparse/vc4_vmrepository.rb
 - lib/ovfparse/vc_repository.rb
 - lib/ovfparse/vmpackage.rb