occi-core 4.2.9 → 4.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 048de127a2481ac6c0fffea83b1c94f6823e8204
-  data.tar.gz: a3428c76af76ab77a58d8835ab9843c651c5ea1e
+  metadata.gz: 24ac48413195e65ec6847bb7d4c3ebad5a13e910
+  data.tar.gz: 039a79688fea638a32f959e5faa7dbba6e71938a
 SHA512:
-  metadata.gz: cc0813f8ebfbacbabd56be0c9dd01fc30ed29c21c966c53c2b534e3d5b6436e8693337d3a1d5421a5e91bf8311ea0d03e00f559c73d36196fa1cd485a2b49b05
-  data.tar.gz: 4ccef9118f96d9e260f42a7b3101e719b2d9498d88236893eb63f3f09f5f64d4a8111609e8dc71f54e918464fc313d620fecb345eaf04065eb625b3dcabeebfc
+  metadata.gz: aa4eeb03ceadf69c476ace568a61d1517b166043a3e0104a0451b569a91f16882a258144ae48254a2ca2d9e7c4c0ec62be9a1c5b9cc9cf62b6fcebd92ecc92f8
+  data.tar.gz: f601b3b6bde0c77b61da0c2d7c817761060d2556ff4b716d6f787ae9c5f80e25a2b31e3ca4039ac2c698efb10333f37f2aece544b4c5c04878d9d5d7af5ba29c

data/README.md

@@ -14,14 +14,10 @@ Requirements
 * RubyGems have to be installed
 * Rake has to be installed (e.g., `gem install rake`)
 
-### Dependencies
-* `libxslt1-dev` or `libxslt-devel`
-* `libxml2-dev`or `libxml2-devel`
-
 ### Examples
 #### For distros based on Debian:
 ~~~
-apt-get install ruby rubygems ruby-dev libxslt1-dev libxml2-dev
+apt-get install ruby rubygems ruby-dev
 ~~~
 ~~~
 ruby -v
@@ -31,7 +27,7 @@ ruby -v
 
 #### For distros based on RHEL:
 ~~~
-yum install libxml2-devel libxslt-devel ruby-devel openssl-devel gcc gcc-c++ ruby rubygems
+yum install ruby-devel openssl-devel gcc gcc-c++ ruby rubygems
 ~~~
 ~~~
 ruby -v
@@ -132,30 +128,6 @@ OCCI messages can be parsed to an OCCI collection for example like
     body = %Q|Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind"|
     collection=Occi::Parser.parse(media_type, body)
 
-### Parsing OVF / OVA files
-
-Parsing of OVF/OVA files is partly supported and will be improved in future versions.
-
-The example in [DMTF DSP 2021](http://www.dmtf.org/sites/default/files/standards/documents/DSP2021_1.0.0.tar) is
-bundled with rOCCI and can be parsed to an OCCI collection with
-
-    require 'open-uri'
-    ova=open 'https://raw.github.com/gwdg/rOCCI/master/spec/occi/test.ova'
-    collection=Occi::Parser.ova(ova.read)
-
-Currently only the following entries of OVF files are parsed
-
-* File in References
-* Disk in the DiskSection
-* Network in the NetworkSection
-* In the VirutalSystemSection:
-    * Info
-    * in the VirtualHardwareSection the items regarding
-        * Processor
-        * Memory
-        * Ethernet Adapter
-        * Parallel port
-
 ### Using the OCCI model
 
 The occi-core gem includes all OCCI Core classes necessary to handly arbitrary OCCI objects.

data/lib/occi/parser.rb

@@ -86,12 +86,6 @@ module Occi
           collection = parse_body_plain(body, category, entity_type)
         when 'application/occi+json', 'application/json'
           collection = Occi::Parser::Json.collection body
-        when 'application/occi+xml', 'application/xml'
-          collection = Occi::Parser::Xml.collection body
-        when 'application/ovf', 'application/ovf+xml'
-          collection = Occi::Parser::Ovf.collection body
-        when 'application/ova'
-          collection = Occi::Parser::Ova.collection body
         else
           raise Occi::Errors::ParserTypeError, "Content type #{media_type} not supported"
         end

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.2.9" unless defined?(::Occi::VERSION)
+  VERSION = "4.2.10" unless defined?(::Occi::VERSION)
 end

data/lib/occi-core.rb

@@ -10,7 +10,6 @@ require 'active_support/notifications'
 
 require 'logger'
 require 'uuidtools'
-require 'nokogiri'
 require 'rubygems/package'
 require 'zlib'
 require 'tempfile'

data/occi-core.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json'
   gem.add_dependency 'hashie'
   gem.add_dependency 'uuidtools', '>=2.1.3'
-  gem.add_dependency 'nokogiri', '~>1.6.0'
   gem.add_dependency 'activesupport', '~>4.0.0'
   gem.add_dependency 'settingslogic'
 

data/spec/occi/parser_spec.rb

@@ -86,48 +86,6 @@ module Occi
         end
       end
 
-      it "parses an OVF file" do
-        media_type = 'application/ovf+xml'
-        body = File.read('spec/occi/parser/ovf_samples/test.ovf')
-        collection = Occi::Parser.parse(media_type, body)
-
-        collection.resources.each { |res| res.id="noid" } #Equalize auto-generated IDs
-
-        expected = Marshal.load(File.open("spec/occi/parser/ovf_samples/test.dump", "rb"))
-        expect(collection).to eql expected
-      end
-
-      it 'copes with faulty OVF' #do
-#        expect{ Occi::Parser.parse('application/ovf', "{This is not an OVF}")}.to raise_error(Occi::Errors::ParserInputError)
-#      end
-
-      it "parses an OVA container" do
-        media_type = 'application/ova'
-        body = File.read('spec/occi/parser/ova_samples/test.ova')
-        collection = Occi::Parser.parse(media_type, body)
-
-        collection.resources.each { |res| res.id="noid" } #Equalize auto-generated IDs
-
-        expected = Marshal.load(File.open("spec/occi/parser/ova_samples/test.dump", "rb"))
-        expect(collection).to eql expected
-      end
-
-      it 'copes with faulty OVA' do
-        expect{ Occi::Parser.parse('application/ova', "{This is not an OVA}")}.to raise_error(Occi::Errors::ParserInputError)
-      end
-
-  #    ZS 11 Oct 2013: XML format not yet properly specified
-  #    it "parses a XML file" do
-  #      media_type = 'application/xml'
-  #      body = File.read('spec/occi/parser/xml_samples/test.xml')
-  #      collection = Occi::Parser.parse(media_type, body)
-  #      
-  #    end
-
-      it 'copes with faulty XML' do
-        expect{ collection = Occi::Parser.parse('application/xml', "{This is not a XML}") }.to raise_error(Occi::Errors::ParserInputError)
-      end
-
       it 'copes with non-existent MIME-type' do
         expect{ collection = Occi::Parser.parse('application/notexist', 'X-OCCI-Location: http://example.com:8090/a/b/vm1"') }.to raise_error(Occi::Errors::ParserTypeError)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.2.9
+  version: 4.2.10
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -54,20 +54,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -173,11 +159,8 @@ files:
 - lib/occi/model.rb
 - lib/occi/parser.rb
 - lib/occi/parser/json.rb
-- lib/occi/parser/ova.rb
-- lib/occi/parser/ovf.rb
 - lib/occi/parser/text.rb
 - lib/occi/parser/text/constants.rb
-- lib/occi/parser/xml.rb
 - lib/occi/settings.rb
 - lib/occi/version.rb
 - occi-core.gemspec
@@ -207,10 +190,6 @@ files:
 - spec/occi/log_spec.rb
 - spec/occi/model_spec.rb
 - spec/occi/parser/json_samples/test.json
-- spec/occi/parser/ova_samples/test.dump
-- spec/occi/parser/ova_samples/test.ova
-- spec/occi/parser/ovf_samples/test.dump
-- spec/occi/parser/ovf_samples/test.ovf
 - spec/occi/parser/text_samples/occi_categories.dump
 - spec/occi/parser/text_samples/occi_categories.text
 - spec/occi/parser/text_samples/occi_compute_rocci_server.dump
@@ -240,7 +219,6 @@ files:
 - spec/occi/parser/text_samples/occi_storage_rocci_server.resource.dump
 - spec/occi/parser/text_samples/occi_storage_rocci_server.text
 - spec/occi/parser/text_spec.rb
-- spec/occi/parser/xml_samples/test.xml
 - spec/occi/parser_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gwdg/rOCCI-core

data/lib/occi/parser/ova.rb

@@ -1,41 +0,0 @@
-module Occi
-  module Parser
-    module Ova
-
-      # @param [String] string
-      # @return [Occi::Collection]
-      def self.collection(string)
-        Occi::Log.debug "[#{self}] Parsing ova format"
-        tar = Gem::Package::TarReader.new(StringIO.new(string))
-        ovf = mf = cert = nil
-        files = {}
-
-        tar.each do |entry|
-          tempfile = Tempfile.new(entry.full_name)
-          tempfile.write(entry.read)
-          tempfile.close
-          files[entry.full_name] = tempfile.path
-
-          ovf = tempfile.path if entry.full_name.end_with? '.ovf'
-          mf = tempfile.path if entry.full_name.end_with? '.mf'
-          cert = tempfile.path if entry.full_name.end_with? '.cert'
-        end
-
-        Occi::Log.debug "[#{self}] In ova found: #{ovf} #{mf} #{cert}"
-        raise Occi::Errors::ParserInputError, 'No ovf file found' unless ovf
-
-        File.read(mf).each_line do |line|
-          line = line.scan(/SHA1\(([^\)]*)\)= (.*)/).flatten
-          name = line.first
-          sha1 = line.last
-
-          Occi::Log.debug "[#{self}] SHA1 hash #{Digest::SHA1.hexdigest(files[name])}"
-          raise Occi::Errors::ParserInputError, "SHA1 mismatch for file #{name}" unless Digest::SHA1.hexdigest(File.read(files[name])) == sha1
-        end if mf
-
-        Occi::Parser::Ovf.collection(File.read(ovf), files)
-      end
-
-    end
-  end
-end

data/lib/occi/parser/ovf.rb

@@ -1,211 +0,0 @@
-module Occi
-  module Parser
-    module Ovf
-
-      # Declaring Class constants for OVF XML namespaces (defined in OVF specification ver.1.1)
-      OVF ="http://schemas.dmtf.org/ovf/envelope/1"
-      RASD ="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-      VSSD ="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-      OVFENV="http://schemas.dmtf.org/ovf/environment/1"
-      CIM ="http://schemas.dmtf.org/wbem/wscim/1/common"
-
-      class << self
-
-        # @param [String] string
-        # @param [Hash] files key value pairs of file names and paths to the file
-        def collection(string, files={})
-          collection = Occi::Collection.new
-          doc = Nokogiri::XML(string)
-
-          references = parse_references(doc, files)
-          parse_storage(doc, references, collection)
-          parse_network(doc, collection)
-          parse_compute(doc, references, collection)
-
-          collection
-        end
-
-        def parse_references(doc, files)
-          references = {}
-
-          doc.xpath('envelope:Envelope/envelope:References/envelope:File', 'envelope' => "#{OVF}").each do |file|
-            href = URI.parse(file.attributes['href'].to_s)
-            references[file.attributes['id'].to_s] = if href.relative?
-              files[href.to_s] ? "file://#{files[href.to_s]}" : "file://#{href.to_s}"
-            else
-              href.to_s
-            end
-          end
-
-          references
-        end
-
-        def parse_storage(doc, references, collection)
-          doc.xpath('envelope:Envelope/envelope:DiskSection/envelope:Disk', 'envelope' => "#{OVF}").each do |disk|
-            storage = Occi::Infrastructure::Storage.new
-
-            if disk.attributes['fileRef']
-              parse_storage_disk_file(disk, storage, references)
-            else
-              parse_storage_disk_alloc(disk, storage, references)
-            end
-
-            collection.resources << storage
-          end
-
-          collection
-        end
-
-        def parse_storage_disk_file(disk, storage, references)
-          storagelink = Occi::Infrastructure::Storagelink.new
-          storagelink.title = disk.attributes['fileRef'].to_s
-          storagelink.target = references[disk.attributes['fileRef'].to_s]
-
-          storage.title = disk.attributes['diskId'].to_s
-          storage.links << storagelink
-
-          storage
-        end
-
-        def parse_storage_disk_alloc(disk, storage)
-          #OCCI accepts storage size in GB
-          #OVF ver 1.1: The capacity of a virtual disk shall be specified by the ovf:capacity attribute with an xs:long integer
-          #value. The default unit odf allocation shall be bytes. The optional string attribute
-          #ovf:capacityAllocationUnits may be used to specify a particular unit of allocation.
-          alloc_units = disk.attributes['capacityAllocationUnits'].to_s
-
-          if alloc_units.empty?
-            # The capacity is defined in bytes, convert to GB and pass it to OCCI
-            capacity = disk.attributes['capacity'].to_s.to_i
-          else
-            alloc_unit_bytes = alloc_units_bytes(alloc_units)
-            capacity = calculate_capacity_bytes(disk.attributes['capacity'].to_s, alloc_unit_bytes)
-          end
-
-          capacity_gb = calculate_capacity_gb(capacity)
-          storage.size = capacity_gb.to_s if capacity_gb
-          storage.title = disk.attributes['diskId'].to_s if disk.attributes['diskId']
-
-          storage
-        end
-
-        def parse_network(doc, collection)
-          doc.xpath('envelope:Envelope/envelope:NetworkSection/envelope:Network', 'envelope' => "#{OVF}").each do |nw|
-            network = Occi::Infrastructure::Network.new
-            network.title = nw.attributes['name'].to_s
-            collection.resources << network
-          end
-
-          collection
-        end
-
-        def parse_compute(doc, references, collection)
-          # Iteration through all the virtual hardware sections,and a sub-iteration on each Item defined in the Virtual Hardware section
-          doc.xpath('envelope:Envelope/envelope:VirtualSystem', 'envelope' => "#{OVF}").each do |virtsys|
-            compute = Occi::Infrastructure::Compute.new
-
-            doc.xpath('envelope:Envelope/envelope:VirtualSystem/envelope:VirtualHardwareSection', 'envelope' => "#{OVF}").each do |virthwsec|
-              compute.summary = virthwsec.xpath("item:Info/text()", 'item' => "#{RASD}").to_s
-              parse_compute_resources(collection, compute, virthwsec)
-            end
-
-            collection.resources << compute
-          end
-
-          collection
-        end
-
-        def parse_compute_resources(collection, compute, virthwsec)
-          virthwsec.xpath('envelope:Item', 'envelope' => "#{OVF}").each do |resource_alloc|
-            resType = resource_alloc.xpath("item:ResourceType/text()", 'item' => "#{RASD}")
-
-            case resType.to_s
-            when "4" then
-              # 4 is the ResourceType for memory in the CIM_ResourceAllocationSettingData
-              parse_compute_memory(resource_alloc, compute)
-            when "3" then
-              # 3 is the ResourceType for processor in the CIM_ResourceAllocationSettingData
-              compute.cores = resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{RASD}").to_s.to_i
-            when "10" then
-              # extract the network
-              parse_compute_network(resource_alloc, compute, collection)
-            when "17" then
-              # extract the mountpoint
-              parse_compute_storage(resource_alloc, compute, collection)
-            end
-
-            ##Add the cpu architecture
-            #system_sec = virthwsec.xpath('envelope:System', 'envelope' => "#{OVF}")
-            #compute.architecture = system_sec.xpath('vssd_:VirtualSystemType/text()', 'vssd_' => "#{VSSD}")
-          end
-
-          compute
-        end
-
-        def parse_compute_memory(resource_alloc, compute)
-          alloc_units = resource_alloc.xpath("item:AllocationUnits/text()", 'item' => "#{RASD}").to_s
-
-          alloc_unit_bytes = alloc_units_bytes(alloc_units)
-          capacity = calculate_capacity_bytes(resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{RASD}").to_s, alloc_unit_bytes)
-          capacity_gb = calculate_capacity_gb(capacity)
-
-          compute.memory = capacity_gb
-          # compute.attributes.occi!.compute!.memory = resource_alloc.xpath("item:VirtualQuantity/text()", 'item' => "#{RASD}").to_s.to_i
-
-          compute
-        end
-
-        def parse_compute_network(resource_alloc, compute, collection)
-          id = resource_alloc.xpath("item:Connection/text()", 'item' => "#{RASD}").to_s
-          network = collection.resources.select { |resource| resource.title == id }.first
-          raise Occi::Errors::ParserInputError, "Network with id #{id} not found" unless network
-
-          networkinterface = compute.networkinterface(network)
-          networkinterface.title = resource_alloc.xpath("item:ElementName/text()", 'item' => "#{RASD}").to_s
-
-          compute
-        end
-
-        def parse_compute_storage(resource_alloc, compute, collection)
-          host_resource = resource_alloc.xpath("item:HostResource/text()", 'item' => "#{RASD}").to_s
-
-          if host_resource.start_with? 'ovf:/disk/'
-            id = host_resource.gsub('ovf:/disk/', '')
-            storage = collection.resources.select { |resource| resource.title == id }.first
-            raise Occi::Errors::ParserInputError, "Disk with id #{id} not found" unless storage
-          elsif host_resource.start_with? 'ovf:/file/'
-            raise Occi::Errors::ParserInputError, 'OVF files are not supported!'
-            #id = host_resource.gsub('ovf:/file/', '')
-            #storagelink.attributes.occi!.core!.target = references[id]
-          end
-
-          storagelink = compute.storagelink(storage)
-          storagelink.title = resource_alloc.xpath("item:ElementName/text()", 'item' => "#{RASD}").to_s
-
-          compute
-        end
-
-        def calculate_capacity_bytes(capacity, alloc_units_bytes)
-          total_capacity_bytes = alloc_units_bytes * capacity.to_i
-          total_capacity_bytes
-        end
-
-        def calculate_capacity_gb(capacity)
-          capacity_gb = capacity.to_f/(2**30)
-          capacity_gb
-        end
-
-        def alloc_units_bytes(alloc_units)
-          units = alloc_units.split('*')
-          #check units[1] is nil??
-          units[1].strip!
-          alloc_vars = units[1].split('^')
-          alloc_units_bytes = (alloc_vars[0].to_i**alloc_vars[1].to_i)
-          alloc_units_bytes
-        end
-
-      end
-
-    end
-  end
-end

data/lib/occi/parser/xml.rb

@@ -1,20 +0,0 @@
-module Occi
-  module Parser
-    module Xml
-      # @param [String] string
-      # @return [Occi::Collection]
-      def self.collection(string)
-
-        begin
-          parsed_xml = Nokogiri::XML(string) { |config| config.strict.nonet }
-        rescue Nokogiri::XML::SyntaxError => perr
-          Occi::Log.error "[#{self}] Failed to parse XML input: #{perr.message}"
-          raise Occi::Errors::ParserInputError, perr.message
-        end
-
-        hash = Hashie::Mash.new(Hash.from_xml(parsed_xml))
-        Occi::Collection.new(hash)
-      end
-    end
-  end
-end

data/spec/occi/parser/ovf_samples/test.ovf

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-    xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-    xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-    xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-    xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 ../dsp8023.xsd">
-        
-    <!-- This example reference a local schema file, to validate against online schema use:
-    xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.0.0.xsd"
-    -->
-    
-    <!-- References to all external files -->
-    <References>
-        <File ovf:id="lamp" ovf:href="http://example.com/lamp.vmdk" ovf:size="180114671"/>
-    </References>
-    <!-- Describes meta-information about all virtual disks in the package  -->
-    <DiskSection>
-        <Info>List of the virtual disks used in the package</Info>
-        <Disk ovf:diskId="lamp" ovf:fileRef="lamp" ovf:capacity="4294967296"
-            ovf:populatedSize="1924967692"
-            ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"/>
-    </DiskSection>
-    <!-- Describes all networks used in the package -->
-    <NetworkSection>
-        <Info>Logical networks used in the package</Info>
-        <Network ovf:name="VM Network">
-            <Description>The network that the LAMP Service will be available
-            on</Description>
-        </Network>
-    </NetworkSection>
-    <VirtualSystem ovf:id="MyLampService">
-        <Info>Single-VM Virtual appliance with LAMP stack</Info>
-       <Name>LAMP Virtual Appliance</Name>
-        <!-- Overall information about the product -->
-        <ProductSection>
-            <Info>Product information for the service</Info>
-            <Product>Lamp Service</Product>
-            <Version>1.0</Version>
-            <FullVersion>1.0.0</FullVersion>
-        </ProductSection>
-        <!-- Linux component configuration parameters -->
-        <ProductSection ovf:class="org.linuxdist.x">
-            <Info>Product customization for the installed Linux system</Info>
-            <Product>Linux Distribution X</Product>
-            <Version>2.6.3</Version>
-            <Property ovf:key="hostname" ovf:type="string">
-                <Description>Specifies the hostname for the appliance</Description>
-            </Property>
-            <Property ovf:key="ip" ovf:type="string">
-                <Description>Specifies the IP address for the appliance</Description>
-            </Property>
-            <Property ovf:key="subnet" ovf:type="string">
-                <Description> Specifies the subnet to use on the deployed network
-                </Description>
-            </Property>
-            <Property ovf:key="gateway" ovf:type="string">
-                <Description> Specifies the gateway on the deployed network
-                </Description>
-            </Property>
-            <Property ovf:key="dns" ovf:type="string">
-                <Description> A comma separated list of DNS servers on the deployed
-                    network </Description>
-            </Property>
-            <Property ovf:key="netCoreRmemMaxMB" ovf:type="uint16" ovf:value="16"
-                ovf:userConfigurable="true">
-                <Description> Specify TCP read max buffer size in mega bytes. Default is
-                    16. </Description>
-            </Property>
-            <Property ovf:key="netCoreWmemMaxMB" ovf:type="uint16" ovf:value="16"
-                ovf:userConfigurable="true">
-                <Description> Specify TCP write max buffer size in mega bytes. Default is
-                    16. </Description>
-            </Property>
-        </ProductSection>
-        <!-- Apache  component configuration parameters -->
-        <ProductSection ovf:class="org.apache.httpd">
-            <Info>Product customization for the installed Apache Web Server</Info>
-            <Product>Apache Distribution Y</Product>
-            <Version>2.6.6</Version>
-            <Property ovf:key="httpPort" ovf:type="uint16" ovf:value="80"
-                ovf:userConfigurable="true">
-                <Description>Port number for HTTP requests</Description>
-            </Property>
-            <Property ovf:key="httpsPort" ovf:type="uint16" ovf:value="443"
-                ovf:userConfigurable="true">
-                <Description>Port number for HTTPS requests</Description>
-            </Property>
-            <Property ovf:key="startThreads" ovf:type="uint16" ovf:value="50"
-                ovf:userConfigurable="true">
-                <Description>Number of threads created on startup. </Description>
-            </Property>
-            <Property ovf:key="minSpareThreads" ovf:type="uint16" ovf:value="15"
-                ovf:userConfigurable="true">
-                <Description> Minimum number of idle threads to handle request spikes.
-                </Description>
-            </Property>
-            <Property ovf:key="maxSpareThreads" ovf:type="uint16" ovf:value="30"
-                ovf:userConfigurable="true">
-                <Description>Maximum number of idle threads </Description>
-            </Property>
-            <Property ovf:key="maxClients" ovf:type="uint16" ovf:value="256"
-                ovf:userConfigurable="true">
-                <Description>Limit the number of simultaneous requests that will be
-                    served. </Description>
-            </Property>
-        </ProductSection>
-        <!-- MySQL  component configuration parameters -->
-        <ProductSection ovf:class="org.mysql.db">
-            <Info>Product customization for the installed MySql Database Server</Info>
-            <Product>MySQL Distribution Z</Product>
-            <Version>5.0</Version>
-            <Property ovf:key="queryCacheSizeMB" ovf:type="uint16" ovf:value="32"
-                ovf:userConfigurable="true">
-                <Description>Buffer to cache repeated queries for faster access (in
-                MB)</Description>
-            </Property>
-            <Property ovf:key="maxConnections" ovf:type="uint16" ovf:value="500"
-                ovf:userConfigurable="true">
-                <Description>The number of concurrent connections that can be
-                served</Description>
-            </Property>
-            <Property ovf:key="waitTimeout" ovf:type="uint16" ovf:value="100"
-                ovf:userConfigurable="true">
-                <Description>Number of seconds to wait before timing out a connection
-                </Description>
-            </Property>
-        </ProductSection>
-        <!-- PHP component configuration parameters -->
-        <ProductSection ovf:class="net.php">
-            <Info>Product customization for the installed PHP component</Info>
-            <Product>PHP Distribution U</Product>
-            <Version>5.0</Version>
-            <Property ovf:key="sessionTimeout" ovf:type="uint16" ovf:value="5"
-                ovf:userConfigurable="true">
-                <Description> How many minutes a session has to be idle before it is
-                    timed out </Description>
-            </Property>
-            <Property ovf:key="concurrentSessions" ovf:type="uint16" ovf:value="500"
-                ovf:userConfigurable="true">
-                <Description> The number of concurrent sessions that can be served
-                </Description>
-            </Property>
-            <Property ovf:key="memoryLimit" ovf:type="uint16" ovf:value="32"
-                ovf:userConfigurable="true">
-                <Description> How much memory in megabytes a script can consume before
-                    being killed </Description>
-            </Property>
-        </ProductSection>
-        <OperatingSystemSection ovf:id="36">
-            <Info>Guest Operating System</Info>
-            <Description>Linux 2.6.x</Description>
-        </OperatingSystemSection>
-        <VirtualHardwareSection>
-            <Info>Virtual Hardware Requirements: 256MB, 1 CPU, 1 disk, 1 NIC</Info>
-            <System>
-                <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-                <vssd:InstanceID>0</vssd:InstanceID>
-                <vssd:VirtualSystemType>vmx-04</vssd:VirtualSystemType>
-            </System>
-            <Item>
-                <rasd:Description>Number of virtual CPUs</rasd:Description>
-                <rasd:ElementName>1 virtual CPU</rasd:ElementName>
-                <rasd:InstanceID>1</rasd:InstanceID>
-                <rasd:ResourceType>3</rasd:ResourceType>
-                <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-            </Item>
-            <Item>
-                <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-                <rasd:Description>Memory Size</rasd:Description>
-                <rasd:ElementName>256 MB of memory</rasd:ElementName>
-                <rasd:InstanceID>2</rasd:InstanceID>
-                <rasd:ResourceType>4</rasd:ResourceType>
-                <rasd:VirtualQuantity>256</rasd:VirtualQuantity>
-            </Item>
-            <Item>
-                <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
-                <rasd:Connection>VM Network</rasd:Connection>
-                <rasd:ElementName>Ethernet adapter on "VM Network"</rasd:ElementName>
-                <rasd:InstanceID>3</rasd:InstanceID>
-                <rasd:ResourceType>10</rasd:ResourceType>
-            </Item>
-            <Item>
-                <rasd:ElementName>SCSI Controller 0 - LSI Logic</rasd:ElementName>
-                <rasd:InstanceID>4</rasd:InstanceID>
-                <rasd:ResourceSubType>LsiLogic</rasd:ResourceSubType>
-                <rasd:ResourceType>6</rasd:ResourceType>
-            </Item>
-            <Item>
-                <rasd:ElementName>Harddisk 1</rasd:ElementName>
-                <rasd:HostResource>ovf:/disk/lamp</rasd:HostResource>
-                <rasd:InstanceID>5</rasd:InstanceID>
-                <rasd:Parent>4</rasd:Parent>
-                <rasd:ResourceType>17</rasd:ResourceType>
-            </Item>
-        </VirtualHardwareSection>
-    </VirtualSystem>
-</Envelope>

data/spec/occi/parser/xml_samples/test.xml

@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<occi:extension xmlns:occi="http://schemas.ogf.org/occi"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                scheme="http://schemas.ogf.org/occi/infrastructure" name="infrastructure" >
-  <!--
-      Compute Resource
-  -->
-  <occi:kind term="compute" title="Compute Resource" >
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en" >Information processing resources.</xsd:documentation>
-    </xsd:annotation>
-    <occi:related scheme="http://schemas.ogf.org/occi/core" term="resource" />
-    <occi:attribute name="occi.compute.architecture" mutable="true" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >CPU architecture of the instance</xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="x86" />
-          <xsd:enumeration name="x64" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-    <occi:attribute name="occi.compute.cores" type="xsd:integer" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Number of CPU cores assigned to the instance</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.compute.hostname" type="xsd:string" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Fully qualified DNS hostname for the instance</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.compute.speed" type="xsd:float" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >CPU clock frequency (speed) in gigahertz</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.compute.memory" type="xsd:float" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Maximum RAM in gigabytes allocated to the instance</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.compute.state" mutable="false" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Current state of the instance</xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="active" />
-          <xsd:enumeration name="inactive" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-    <occi:action scheme="./compute/action" term="start" />
-    <occi:action scheme="./compute/action" term="stop" >
-      <occi:attribute name="method" >
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string" >
-            <xsd:enumeration name="graceful" />
-            <xsd:enumeration name="acpioff" />
-            <xsd:enumeration name="poweroff" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </occi:attribute>
-    </occi:action>
-    <occi:action scheme="./compute/action" term="restart" >
-      <occi:attribute name="method" >
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string" >
-            <xsd:enumeration name="graceful" />
-            <xsd:enumeration name="warm" />
-            <xsd:enumeration name="cold" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </occi:attribute>
-    </occi:action>
-    <occi:action scheme="./compute/action" term="suspend" >
-      <occi:attribute name="method" >
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string" >
-            <xsd:enumeration name="hibernate" />
-            <xsd:enumeration name="suspend" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </occi:attribute>
-    </occi:action>
-  </occi:kind>
-  <!--
-      Storage Resource
-  -->
-  <occi:kind term="storage" title="Storage Resource" >
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en" >Information recording resources.</xsd:documentation>
-    </xsd:annotation>
-    <occi:related scheme="http://schemas.ogf.org/occi/core" term="resource" /> 
-    <occi:attribute name="occi.storage.size" type="xsd:float" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Storage size in gigabytes of the instance.</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.storage.state" mutable="false" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Current status of the instance</xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="online" />
-          <xsd:enumeration name="offline" />
-          <xsd:enumeration name="backup" />
-          <xsd:enumeration name="snapshot" />
-          <xsd:enumeration name="resize" />
-          <xsd:enumeration name="degraded" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-    <occi:action scheme="./storage/action" term="online" />
-    <occi:action scheme="./storage/action" term="offline" />
-    <occi:action scheme="./storage/action" term="backup" />
-    <occi:action scheme="./storage/action" term="snapshot" />
-    <occi:action scheme="./storage/action" term="resize" >
-      <occi:attribute name="size" type="xsd:float" >
-        <xsd:annotation>
-          <xsd:documentation xml:lang="en" >gigabytes</xsd:documentation>
-        </xsd:annotation>
-      </occi:attribute>
-    </occi:action>
-  </occi:kind>
-  <!--
-      StorageLink Link
-  -->
-  <occi:kind term="storagelink" title="StorageLink Link" >
-    <occi:related scheme="http://schemas.ogf.org/occi/core" term="link" /> 
-    <occi:attribute name="occi.storagelink.deviceid" use="required" type="xsd:string" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Device identifier as defined by the OCCI service provider.
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.storagelink.mountpoint" type="xsd:string" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Point to where the storage is mounted in the guest OS.
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.storagelink.state" use="required" mutable="false" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Current status of the instance.
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="active" />
-          <xsd:enumeration name="inactive" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-  </occi:kind>
-  <!--
-      Network
-  -->
-  <occi:kind term="network" title="Network Resource" >
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en" >
-        Interconnection resoruce and represents a L2 networking
-        resource. This is complimented by the IPNetwork Mixin.
-      </xsd:documentation>
-    </xsd:annotation>
-    <occi:related scheme="http://schemas.ogf.org/occi/core" term="resource" />
-    <occi:attribute name="occi.network.vlan" mutable="true" >
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:integer" >
-          <xsd:minInclusive value="0" />
-          <xsd:maxInclusive value="4095" />
-        </xsd:restriction>
-      </xsd:simpleType>
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >802.1q VLAN identifier (e.g 343)</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.network.label" mutable="true" type="xsd:string" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Tag based VLANs (e.g. external-dmz)</xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.network.state" mutable="false" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Current state of the instance</xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="active" />
-          <xsd:enumeration name="inactive" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-    <occi:action scheme="./network/action" term="up" />
-    <occi:action scheme="./network/action" term="down" />
-  </occi:kind>
-  <!--
-      NetworkInterface Link
-  -->
-  <occi:kind term="networkinterface" title="NetworkInterface Link" >
-    <occi:related scheme="http://schemas.ogf.org/occi/core" term="link" />
-    <occi:attribute name="occi.networkinterface.interface" mutable="false" type="xsd:string" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Identifier that relates the link to the link's device
-          interface.
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.networkinterface.mac" type="occi:mac802" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          MAC address associated with the link's device interface.
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.networkinterface.state" mutable="false" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >Current status of the instance.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="active" />
-          <xsd:enumeration name="inactive" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-  </occi:kind>
-  <!--
-      IP Networking Mixin
-  -->
-  <occi:mixin term="ipnetwork" title="IP Networking Mixin" scheme="./network" >
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en" >
-        IPNetworking Mixin is defined in order to support L3/L4 capabilities
-      </xsd:documentation>
-    </xsd:annotation>
-    <occi:attribute name="occi.network.address" type="occi:cidr" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Internet Protocol (IP) network address (e.g. 192.168.0.1/24, fc00::/7)
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.network.gateway" type="occi:ip" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Internet Protocol (IP) network address (e.g. 192.168.0.1, fc00::/7)
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.network.allocation" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Address allocation mechanism, 'dynamic' e.g. uses the
-          dynamic host configuration protocol, 'static' e.g. uses
-          user supplied static network configurations.
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="dynamic" />
-          <xsd:enumeration name="static" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-  </occi:mixin>
-  <!--
-      IP NetworkInterface Mixin
-  -->
-  <occi:mixin term="ipnetworkinterface" title="IP Network Interface Mixin" scheme="./networkinterface" >
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en" >
-        IPNetworkInterface mixin is described in order for
-        NetworkInterface to support L3/L4 capabilities (e.g. IP, TCP
-        etc.).
-      </xsd:documentation>
-    </xsd:annotation>
-    <occi:attribute name="occi.networkinterface.address" type="occi:cidr" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Internet Procotol (IP) network address (e.g. 192.168.0.1/24,
-          fc00::/7) of the link.
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.networkinterface.gateway"  type="occi:ip">
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Internet Protocol (IP) network address (e.g. 192.168.0.1/24, fc00::/7)
-        </xsd:documentation>
-      </xsd:annotation>
-    </occi:attribute>
-    <occi:attribute name="occi.networkinterface.allocation" use="required" >
-      <xsd:annotation>
-        <xsd:documentation xml:lang="en" >
-          Address mechanism, 'dynamic' e.g. uses the
-          dynamic host configuration protocol, 'static' e.g. uses
-          user supplied static network configurations.
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string" >
-          <xsd:enumeration name="dynamic" />
-          <xsd:enumeration name="static" />
-        </xsd:restriction>
-      </xsd:simpleType>
-    </occi:attribute>
-  </occi:mixin>
-  <!--
-      OS template
-  -->
-  <occi:mixin term="os_tpl" title="OS Template" />
-  <!--
-      Resource template
-  -->
-  <occi:mixin term="resource_tpl" title="Resoruce template" />
-  <!-- 
-       Attribute Types 
-  -->
-  <xsd:simpleType name="ip">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-        The datatype denoting a string corresponding to a IPv4 or IPv6 address.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="(((([1-9]?\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}([1-9]?\d|1\d{2}|2[0-4]\d|25[0-5]))|((([\da-fA-F]{1,4})|(\:))\:){7}(([\da-fA-F]{1,4})|(\:))))"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="cidr" >
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-        The datatype denoting a string corresponding to a CIDR block.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="(((([1-9]?\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}([1-9]?\d|1\d{2}|2[0-4]\d|25[0-5])\/(\d|[1-2]\d|3[0-2]))|((([\da-fA-F]{0,4})|(\:))\:){7}(([\da-fA-F]{0,4})|(\:)))\/([1-9]?\d|1[01]\d|12[0-8])))"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="mac802" >
-    <xsd:restriction base="xsd:string" >
-      <xsd:pattern value="[\da-fA-F]{2}(\:[\da-fA-F]){5}" />
-    </xsd:restriction>
-  </xsd:simpleType>
-</occi:extension>