ovfparse 0.9.1 → 0.9.2

data/lib/ovfparse/vmcollection.rb

@@ -100,51 +100,24 @@ class VmCollection
       return [isValid, response]
    end
 
-   def getVmName
-      return virtualSystem['id'] || ''
+   def getCollectionName
+      return virtualSystemCollection['id'] || ''
    end
 
-   def getVmDescription
-      # ???
+   def getCollectionDescription
+      descNode = getChildByName(virtualSystemCollection, 'Info')
+      return descNode.nil? ? '' : descNode.content
    end
 
-   def getVmDisks
-      disks = Array.new
-      filenames = Hash.new
-      getChildrenByName(references, 'File').each { |node|
-         filenames[node['id']] = node['href']
-      }
-
-      getChildrenByName(diskSection, 'Disk').each { |node|
-         capacity = node['capacity']
-         units = node['capacityAllocationUnits']
-         if(units == "byte * 2^40")
-            capacity = (capacity.to_i * 1099511627776).to_s
-         elsif(units == "byte * 2^30")
-            capacity = (capacity.to_i * 1073741824).to_s
-         elsif(units == "byte * 2^20")
-            capacity = (capacity.to_i * 1048576).to_s
-         elsif(units == "byte * 2^10")
-            capacity = (capacity.to_i * 1024).to_s
-         end
-         thin_size = node['populatedSize']
-         disks.push({ 'name' => node['diskId'], 'location' => filenames[node['fileRef']], 'size' => capacity, 'thin_size' => (thin_size || "-1") })
-      }
-
-      return disks
-   end
-
-   def getVmNetworks
-      networks = Array.new
-      getChildrenByName(networkSection, 'Network').each { |node|
-         descriptionNode = getChildByName(node, 'Description')
-         text = descriptionNode.nil? ? '' : descriptionNode.text
-         networks.push({'location' => node['name'], 'notes' => text })
-      }
-      return networks
+   def setCollectionName(newValue)
+      virtualSystem['ovf:id'] = newValue
+      nameNode = getChildByName(virtualSystemCollection, 'Name') ||
+         getChildByName(virtualSystemCollection, 'Info').add_next_sibling(xml.create_element('Name', {}))
+      nameNode.content = newValue
    end
 
-   def getVirtualSystems
+   def setCollectionDescription(newValue)
+      getChildByName(virtualSystemCollection, 'Info').content = newValue
    end
 
    def self.constructFromVmPackages(packages)
@@ -304,7 +277,7 @@ class VmCollection
             xml.NetworkSection{
                xml.Info "List of logical networks"
             }
-            xml.VirtualSystemCollection('ovf:id' => "vm_collection"){
+            xml.VirtualSystemCollection('id' => "vm_collection"){
                xml.Info "A collection of virtual machines"
             }
          }
@@ -313,6 +286,7 @@ class VmCollection
          xml.doc.children[0].add_previous_sibling(node)
       end
 
+      builder.doc.root.children[3].attribute("id").namespace = builder.doc.root.namespace_definitions.detect{ |ns| ns.prefix == "ovf"}
       newPackage = NewVmCollection.new
       newPackage.xml = builder.doc
       newPackage.loadElementRefs
@@ -351,6 +325,7 @@ class VmCollection
          }
 
          new_package.virtualSystem.children.unlink
+         new_package.virtualSystem['ovf:id'] = virtualSystem['id']
          new_package.virtualSystem.add_child(virtualSystem.clone.children)
          new_package.virtualSystem.children.each{ |child|
             child.namespace = new_package.virtualSystem.namespace

data/lib/ovfparse/vmpackage.rb

@@ -302,7 +302,6 @@ class VmPackage
     getChildByName(virtualSystem, 'OperatingSystemSection')['ovf:id'] = newValue.to_s
   end
 
-
   def setVmCPUs(newValue)
     setVirtualQuantity(3, newValue)
   end
@@ -622,10 +621,10 @@ class VmPackage
           xml.NetworkSection{
              xml.Info "List of logical networks"
           }
-          xml.VirtualSystem('ovf:id' => "vm"){
+          xml.VirtualSystem('id' => "vm"){
              xml.Info "A virtual machine"
              xml.Name "New Virtual Machine"
-             xml.OperatingSystemSection('ovf:id' => "94"){
+             xml.OperatingSystemSection('id' => "94"){
                  xml.Info "The kind of guest operating system"
              }
              xml.VirtualHardwareSection{
@@ -659,15 +658,20 @@ class VmPackage
       xml.doc.children[0].add_previous_sibling(node)
     end
 
+    builder.doc.root.children[3].attribute("id").namespace = builder.doc.root.namespace_definitions.detect{ |ns| ns.prefix == "ovf"}
+    builder.doc.root.children[3].children[2].attribute("id").namespace = builder.doc.root.namespace_definitions.detect{ |ns| ns.prefix == "ovf"}
+      
     newPackage = NewVmPackage.new
     newPackage.xml = builder.doc
     newPackage.loadElementRefs
     return newPackage
   end
 
-  def write_xml(file)
-    xml.write_xml_to(file)
-  end
+   def writeXML(filename)
+      file = File.new(filename, "w")
+      file.puts(xml.to_s)
+      file.close
+   end
 
   # @todo make this a general purpose signing util
   def sign(signature)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ovfparse
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Jim Barkley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 -04:00
+date: 2011-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency