omf_sfa 0.2.3 → 0.2.4

data/examples/brite2rspec.rb

@@ -0,0 +1,60 @@
+
+require 'omf_base/lobject'
+OMF::Base::Loggable.init_log 'brite2rspec'
+
+require 'omf-sfa/util/brite_parser'
+require 'omf-sfa/resource'
+include OMF::SFA::Resource
+
+GURN.default_domain = "urn:publicid:IDN+acme.org"
+
+unless file_name = ARGV[0]
+  puts "Missing BRITE file name - #{ARGV}"
+  exit -1
+end
+
+OMF::SFA::Resource::OResource.init()
+
+node_services = []
+node_services << ExecuteService.create(command: "sudo sh /local/postboot_script.sh", shell: "sh")
+node_services << InstallService.create(install_path: "/local", url: "http://emmy9.casa.umass.edu/InstaGENI_Images/install-script.tar.gz")
+
+di = DiskImage.create(url: "urn:publicid:IDN+utah.geniracks.net+image+emulab-ops:OPENVZ-STD")
+sliver_type = SliverType.create(name: 'emulab-openvz', disk_image: di)
+
+parser = OMF::SFA::Util::BriteParser.new()
+# opts; [:id, :i], [:x, :f], [:y, :f], [:type]
+parser.on_new_node do |opts|
+  name = "n#{opts[:id]}"
+  node = Node.create(name: name, urn: 'foo_urn', sliver_type: sliver_type, exclusive: false)
+  node_services.each {|s| node.services << s }
+  node
+end
+
+network_cnt = 0
+# opts: [:id, :i], [:from, :i], [:to, :i], [:length, :f], [:delay, :f], [:bw, :f], [:type], [:direction]
+parser.on_new_edge do |opts, from, to|
+  name = "l#{opts[:id]}"
+  link = Link.create(name: name)
+
+  # Create a new subnet for each link
+  ip_nw = "10.#{network_cnt / 256}.#{network_cnt % 256}"
+  network_cnt += 1
+
+  f_ip = Ip.create(address: "#{ip_nw}.1", netmask: "255.255.255.0", ip_type: "ipv4")
+  f_name = "#{from.name}:if#{from.interfaces.length}"
+  from.interfaces << f_if = Interface.create(name: f_name, ip: f_ip)
+
+  t_ip = Ip.create(address: "#{ip_nw}.2", netmask: "255.255.255.0", ip_type: "ipv4")
+  t_name = "#{to.name}:if#{to.interfaces.length}"
+  to.interfaces << t_if = Interface.create(name: t_name, ip: t_ip)
+
+  link.interfaces << f_if << t_if
+  link.capacity = opts[:bw]
+  #link.latency = opts[:delay]
+  link
+end
+
+# Write RSPEC to stdout
+parser.parse_file(file_name)
+puts parser.to_rspec

data/examples/waxman_10.brite

@@ -0,0 +1,37 @@
+Topology: ( 10 Nodes, 20 Edges )
+Model (1 - RTWaxman):  10 1000 100 2  2  0.15000000596046448 0.20000000298023224 1 1 10.0 1024.0 
+
+Nodes: ( 10 )
+0	46	77	3	3	-1	RT_NODE
+1	102	39	5	5	-1	RT_NODE
+2	257	24	5	5	-1	RT_NODE
+3	388	1	5	5	-1	RT_NODE
+4	404	86	3	3	-1	RT_NODE
+5	405	16	5	5	-1	RT_NODE
+6	543	41	6	6	-1	RT_NODE
+7	685	59	3	3	-1	RT_NODE
+8	767	32	3	3	-1	RT_NODE
+9	733	1	2	2	-1	RT_NODE
+
+
+Edges: ( 20 )
+0	2	0	217.55459085020476	0.7256840025315272	10.0	-1	-1	E_RT	U
+1	2	1	155.72411502397438	0.5194397352850497	10.0	-1	-1	E_RT	U
+2	3	2	133.00375934536586	0.44365278643989725	10.0	-1	-1	E_RT	U
+3	3	1	288.51343122981297	0.9623772164068684	10.0	-1	-1	E_RT	U
+4	4	2	159.5399636454766	0.5321680362134947	10.0	-1	-1	E_RT	U
+5	4	1	305.6354037084055	1.019489968985162	10.0	-1	-1	E_RT	U
+6	5	2	148.21605850919124	0.4943955545045474	10.0	-1	-1	E_RT	U
+7	5	4	70.00714249274856	0.23351869143001774	10.0	-1	-1	E_RT	U
+8	6	5	140.24621207005913	0.46781100834117423	10.0	-1	-1	E_RT	U
+9	6	3	160.0781059358212	0.5339630856751614	10.0	-1	-1	E_RT	U
+10	7	3	302.61031046545656	1.009399344080419	10.0	-1	-1	E_RT	U
+11	7	6	143.13629868066312	0.47745129959427834	10.0	-1	-1	E_RT	U
+12	8	7	86.33075929238663	0.28796841611134405	10.0	-1	-1	E_RT	U
+13	8	6	224.1807306616695	0.747786425840204	10.0	-1	-1	E_RT	U
+14	9	3	345.0	1.1507961284336246	10.0	-1	-1	E_RT	U
+15	9	8	46.010868281309364	0.1534757364753631	10.0	-1	-1	E_RT	U
+16	0	5	364.1455752854894	1.2146588934051483	10.0	-1	-1	E_RT	U
+17	0	6	498.30211719397704	1.6621569485713248	10.0	-1	-1	E_RT	U
+18	1	5	303.87168344549644	1.013606831448363	10.0	-1	-1	E_RT	U
+19	1	6	441.0045351240733	1.4710327873694318	10.0	-1	-1	E_RT	U

data/lib/omf-sfa/resource.rb

@@ -18,3 +18,6 @@ require 'omf-sfa/resource/component_lease'
 require 'omf-sfa/resource/link'
 require 'omf-sfa/resource/interface'
 require 'omf-sfa/resource/node'
+require 'omf-sfa/resource/execute_service'
+require 'omf-sfa/resource/install_service'
+require 'omf-sfa/resource/disk_image'

data/lib/omf-sfa/resource/abstract_service.rb

@@ -0,0 +1,14 @@
+
+require 'omf-sfa/resource/oresource'
+
+module OMF::SFA::Resource
+
+  # This class represents a service attached to a resource
+  #
+  class AbstractService < OMF::SFA::Resource::OResource
+    extend OMF::SFA::Resource::Base::ClassMethods
+    include OMF::SFA::Resource::Base::InstanceMethods
+
+  end
+end
+

data/lib/omf-sfa/resource/disk_image.rb

@@ -0,0 +1,23 @@
+
+require 'omf-sfa/resource/oresource'
+
+module OMF::SFA::Resource
+
+  # This class represents a disk image to be used for a particular node.
+  #
+  # <disk_image name="urn:publicid:IDN+instageni.gpolab.bbn.com+image+emulab-net//GIMIomf"/>
+  # <disk_image version="de35e71b31771870bcdfcccb4dee11657ba145b8" name="http://emmy9.casa.umass.edu/Disk_Images/ExoGENI/exogeni-umass-ovs-1.0.2.xml"/>
+  #
+  class DiskImage < OResource
+    oproperty :url, String, required: true
+    oproperty :version, String, required: false
+
+    extend OMF::SFA::Resource::Base::ClassMethods
+    include OMF::SFA::Resource::Base::InstanceMethods
+
+    sfa_class 'disk_image'
+    sfa :name, prop_name: :url, attribute: true
+    sfa :version, attribute: true
+  end
+end
+

data/lib/omf-sfa/resource/execute_service.rb

@@ -0,0 +1,20 @@
+
+require 'omf-sfa/resource/oresource'
+
+module OMF::SFA::Resource
+
+  # This class represents a service which executes a
+  # program as part of the boot process.
+  #
+  # <execute command="sudo sh /local/postboot_script.sh" shell="sh"/>
+  #
+  class ExecuteService < AbstractService
+    oproperty :command, String, required: true
+    oproperty :shell, String, default: 'sh'
+
+    sfa_class 'execute'
+    sfa :command, :attribute => true
+    sfa :shell, :attribute => true
+  end
+end
+

data/lib/omf-sfa/resource/gurn.rb

@@ -5,7 +5,7 @@ module OMF::SFA::Resource
 #
   class GURN #< OMF::Base::MObject
 
-    @@def_domain = 'omf:nitos'
+    @@def_domain = "urn:publicid:IDN+acme.org"
     @@name2obj = {}
 
     # Create a GURN
@@ -18,6 +18,9 @@ module OMF::SFA::Resource
     #
     def self.create(name, opts = {})
       return name if name.kind_of? self
+      unless name
+        raise "No name given"
+      end
       #puts "GUID: #{name}###{opts}"
 
       obj = @@name2obj[name]

data/lib/omf-sfa/resource/install_service.rb

@@ -0,0 +1,20 @@
+
+require 'omf-sfa/resource/oresource'
+
+module OMF::SFA::Resource
+
+  # This class represents a service which installs a
+  # program as part of the boot process.
+  #
+  # <install install_path="/local" url="http://emmy9.casa.umass.edu/InstaGENI_Images/install-script.tar.gz"/>
+  #
+  class InstallService < AbstractService
+    oproperty :url, String, required: true # Location of file to install
+    oproperty :install_path, String, default: '/usr/local'
+
+    sfa_class 'install'
+    sfa :url, :attribute => true
+    sfa :install_path, :attribute => true
+  end
+end
+

data/lib/omf-sfa/resource/interface.rb

@@ -33,10 +33,12 @@ module OMF::SFA::Resource
     end
 
     def to_sfa_ref_xml(res_el, obj2id, opts)
+      #puts "IF_OPTS #{opts}"
       if obj2id.key?(self)
         el = res_el.add_child(Nokogiri::XML::Element.new('interface_ref', res_el.document))
-        el.set_attribute('component_id', self.component_id.to_s)
-        el.set_attribute('id_ref', self.uuid.to_s)
+        el.set_attribute('component_id', self.component_id.to_s) unless opts[:type] == :request
+        #el.set_attribute('id_ref', self.uuid.to_s)
+        el.set_attribute('client_id', self.component_name)
       else
         self.to_sfa_xml(res_el, obj2id, opts)
       end

data/lib/omf-sfa/resource/link.rb

@@ -5,24 +5,47 @@ require 'omf-sfa/resource/channel'
 
 module OMF::SFA::Resource
 
-      # <link component_id="urn:publicid:IDN+emulab.net+link+link-pc102%3Aeth2-internet%3Aborder" component_name="link-pc102:eth2-internet:border">
-        # <component_manager name="urn:publicid:IDN+emulab.net+authority+cm"/>
-          # <interface_ref component_id="urn:publicid:IDN+emulab.net+interface+pc102:eth2"/>
-          # <interface_ref component_id="urn:publicid:IDN+emulab.net+interface+internet:border"/>
-        # <property capacity="100000" dest_id="urn:publicid:IDN+emulab.net+interface+internet:border" latency="0" packet_loss="0" source_id="urn:publicid:IDN+emulab.net+interface+pc102:eth2"/>
-        # <property capacity="100000" dest_id="urn:publicid:IDN+emulab.net+interface+pc102:eth2" latency="0" packet_loss="0" source_id="urn:publicid:IDN+emulab.net+interface+internet:border"/>
-          # <link_type name="ipv4"/>
-      # </link>
-
+  # <link component_id="urn:publicid:IDN+emulab.net+link+link-pc102%3Aeth2-internet%3Aborder" component_name="link-pc102:eth2-internet:border">
+    # <component_manager name="urn:publicid:IDN+emulab.net+authority+cm"/>
+      # <interface_ref component_id="urn:publicid:IDN+emulab.net+interface+pc102:eth2"/>
+      # <interface_ref component_id="urn:publicid:IDN+emulab.net+interface+internet:border"/>
+    # <property capacity="100000" dest_id="urn:publicid:IDN+emulab.net+interface+internet:border" latency="0" packet_loss="0" source_id="urn:publicid:IDN+emulab.net+interface+pc102:eth2"/>
+    # <property capacity="100000" dest_id="urn:publicid:IDN+emulab.net+interface+pc102:eth2" latency="0" packet_loss="0" source_id="urn:publicid:IDN+emulab.net+interface+internet:border"/>
+      # <link_type name="ipv4"/>
+  # </link>
   class Link < Channel
 
     oproperty :link_type, String
-    #has 2, :interfaces
+    oproperty :capacity, Integer # kbps
+    oproperty :latency, Integer # ms
+    oproperty :packet_loss, Float # 0 .. 1
 
     sfa_class 'link'
     sfa :link_type, :content_attribute => :name
+    sfa :property # sets capacity, latency and packet_loss
     #sfa :properties, LinkProperty, :inline => true, :has_many => true
 
+    #Override xml serialization of 'property'
+    def _to_sfa_xml_property(res_el, pdef, obj2id, opts)
+      capacity = self.capacity
+      latency = self.latency
+      packet_loss = self.packet_loss
+      if capacity || latency || packet_loss
+        source, dest = self.interfaces.to_a
+        _to_sfa_xml_one_way_property(res_el, source, dest, capacity, latency, packet_loss)
+        _to_sfa_xml_one_way_property(res_el, dest, source, capacity, latency, packet_loss)
+      end
+    end
+
+    def _to_sfa_xml_one_way_property(res_el, source, dest, capacity, latency, packet_loss)
+      # <property source_id="n7:if1" dest_id="n6:if2" capacity="10" latency="20" packet_loss="0.3"/>
+      el = res_el.add_child(Nokogiri::XML::Element.new('property', res_el.document))
+      el.set_attribute('source_id', source.client_id)
+      el.set_attribute('dest_id_id', dest.client_id)
+      el.set_attribute('capacity', capacity.to_i) if capacity
+      el.set_attribute('latency', latency.to_i) if latency
+      el.set_attribute('packet_loss', packet_loss) if packet_loss
+    end
   end
 
 end # OMF::SFA::Resource

data/lib/omf-sfa/resource/node.rb

@@ -1,6 +1,8 @@
 
 require 'omf-sfa/resource/ocomponent'
 require 'omf-sfa/resource/interface'
+require 'omf-sfa/resource/abstract_service'
+require 'omf-sfa/resource/sliver_type'
 
 module OMF::SFA::Resource
 
@@ -9,18 +11,21 @@ module OMF::SFA::Resource
 
     oproperty :hardware_type, String, :required => false
     oproperty :available, Boolean, :default => true
-    #oproperty :sliver_type, String, :required => false
+    oproperty :sliver_type, SliverType, :required => false # Is this required?
     oproperty :interfaces, :interface, :functional => false
     oproperty :exclusive, Boolean, :default => true
+    oproperty :services, OMF::SFA::Resource::AbstractService, functional: false
 
     #belongs_to :sliver
 
     sfa_class 'node'
     sfa :hardware_type, :inline => true, :has_many => true
-    sfa :available, :attr_value => 'now'  # <available now="true">
+    sfa :available, attr_value: 'now', in_request: false  # <available now="true">
     #sfa :sliver_type, :attr_value => 'name'
+    sfa :sliver_type
     sfa :interfaces, :inline => true, :has_many => true
     sfa :exclusive, :attribute => true
+    sfa :services, :has_many => true
 
 
     # Override xml serialization of 'interface'

data/lib/omf-sfa/resource/ocomponent.rb

@@ -41,13 +41,13 @@ module OMF::SFA::Resource
 
     #sfa_add_namespace :ol, 'http://nitlab.inf.uth.gr/schema/sfa/rspec/1'
 
-    sfa :component_id, :attribute => true, :prop_name => :component_gurn # "urn:publicid:IDN+plc:cornell+node+planetlab3-dsl.cs.cornell.edu"
+    sfa :component_id, attribute: true, prop_name: :component_gurn, in_request: false
 
     sfa :client_id, :attribute => true, :prop_name => :name
     alias_method :client_id, :name
 
-    sfa :component_manager_id, :attribute => true, :prop_name => :component_manager_gurn # "urn:publicid:IDN+plc+authority+am"
-    sfa :component_name, :attribute => true # "plane
+    sfa :component_manager_id, attribute: true, prop_name: :component_manager_gurn, in_request: false
+    sfa :component_name, attribute: true, in_request: false
     sfa :leases, :inline => true, :has_many => true
 
     sfa :exo_sliver__geni_sliver_info

data/lib/omf-sfa/resource/oproperty.rb

@@ -47,57 +47,6 @@ module OMF::SFA::Resource
 
     belongs_to :o_resource
 
-    # module ArrayProxy
-      # def << (val)
-        # if @on_set_block
-          # val = @on_set_block.call(val)
-          # return if val.nil?
-        # end
-        # @oproperty << val
-        # @on_modified_block.call(val, true) if @on_add_block
-        # super
-      # end
-#
-      # def clear()
-        # _remove { super }
-      # end
-#
-      # def delete(obj)
-        # _remove { super }
-      # end
-#
-      # def delete_at(index)
-        # _remove { super }
-      # end
-#
-      # def delete_if(&block)
-        # _remove { super }
-      # end
-#
-      # # Callback to support 'reverse' operation
-      # def on_modified(&block)
-        # @on_modified_block = block
-      # end
-#
-      # def on_set(&block)
-        # @on_set_block = block
-      # end
-#
-      # private
-      # def _remove(&block)
-        # old = self.dup
-        # r = block.call()
-        # removed = old - self
-        # unless removed.empty?
-          # if @on_remove_block
-            # removed.each {|it| @on_modified_block.call(it, false) }
-          # end
-          # @oproperty.value = self
-        # end
-        # r
-      # end
-    # end
-
     def self.prop_all(query, opts = {}, resource_class = nil)
       i = 0
       where = query.map do |pn, v|
@@ -208,7 +157,10 @@ module OMF::SFA::Resource
       when 's'
         val = attribute_get(:s_value)
       when 'r'
-        uuid = attribute_get(:s_value)
+        uuid_s = attribute_get(:s_value)
+        uuid = UUIDTools::UUID.parse(uuid_s)
+        #puts "RRRR >> #{uuid}"
+        #puts "OOOO >> #{OResource.all.to_a}"
         val = OResource.first(uuid: uuid)
       when 't'
         val = Time.at(attribute_get(:n_value))
@@ -225,7 +177,7 @@ module OMF::SFA::Resource
         val = JSON.load(js)[0]
         #puts "VALUE: #{js.inspect}-#{val.inspect}-#{val.class}"
         if val.kind_of? Array
-          val.tap {|v| v.extend(ArrayProxy).instance_variable_set(:@oproperty, self) }
+          #val.tap {|v| v.extend(OPropertyArray).instance_variable_set(:@oproperty, self) }
         end
       else
         throw "Unknown property type '#{type}'"
@@ -307,8 +259,20 @@ module OMF::SFA::Resource
       end
     end
 
+    def [](index)
+      if p = OProperty.all(name: @name, o_resource: @resource).all[index]
+        p.value
+      else
+        nil
+      end
+    end
+
+    def length
+      OProperty.count(name: @name, o_resource: @resource)
+    end
+
     def empty?
-      OProperty.count(name: @name, o_resource: @resource) == 0
+      self.length == 0
     end
 
     # Callback to support 'reverse' operation

data/lib/omf-sfa/resource/oresource.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'dm-core'
 require 'dm-types'
 require 'dm-validations'
+require 'dm-aggregates'
+
 require 'omf_base/lobject'
 require 'set'
 require 'active_support/inflector'
@@ -66,6 +68,20 @@ module OMF::SFA::Resource
 
     #belongs_to :account, :model => 'OAccount', :child_key  => [ :account_id ], :required => false
 
+    def self.init(persistence_url = 'sqlite::memory:')
+      DataMapper::Logger.new($stdout, :info) # :note
+
+      DataMapper.setup(:default, persistence_url)
+      DataMapper::Model.raise_on_save_failure = true
+
+      DataMapper.finalize
+      #DataMapper.auto_upgrade!
+      require  'dm-migrations'
+      DataMapper.auto_migrate!
+
+      self
+    end
+
     def self.href_resolver(&block)
       @@href_resolvers[self] = block
     end
@@ -73,6 +89,10 @@ module OMF::SFA::Resource
     def self.oproperty(name, type, opts = {})
       name = name.to_s
 
+      if self.properties.find {|p| p.name.to_s == name }
+        raise "Can't define an oproperty '#{name}' as it is already used as a base property."
+      end
+
       # should check if +name+ is already used
       op = @@oprops[self] ||= {}
       opts[:__type__] = type
@@ -241,7 +261,7 @@ module OMF::SFA::Resource
 
 
     def oproperty_get(pname)
-      #puts "OPROPERTY_GET: pname:'#{pname}'"
+      #puts "OPROPERTY_GET: pname:'#{pname}':#{pname.class}"
       pname = pname.to_sym
       return self.name if pname == :name
 
@@ -251,7 +271,7 @@ module OMF::SFA::Resource
     alias_method :[], :oproperty_get
 
     def oproperty_set(pname, value, type = nil)
-      #puts "OPROPERTY_SET pname:'#{pname}', value:'#{value.class}'-#{type}, self:'#{self.inspect}'"
+      #puts "OPROPERTY_SET pname:'#{pname}', value:'#{value.class}'::#{type}, self:'#{self.inspect}'"
       pname = pname.to_sym
       if pname == :name
         self.name = value
@@ -260,6 +280,7 @@ module OMF::SFA::Resource
         #puts ">>>>>" + @@oprops[self.class][pname.to_s].to_s
         prop = self.oproperties.first_or_create(:name => pname)
         prop.value = value
+        #puts ">> #{prop.inspect}"
       end
       value
     end

data/lib/omf-sfa/resource/sfa_base.rb

@@ -30,6 +30,7 @@ module OMF::SFA
         @@sfa_namespace2prefix = {}
         @@sfa_classes = {}
         @@sfa_name2class = {}
+        @@sfa_suppress_id = {}
 
         #
         # @opts
@@ -65,6 +66,14 @@ module OMF::SFA
           end
         end
 
+        def sfa_suppress_id
+          @@sfa_suppress_id[self] = true
+        end
+
+        def sfa_suppress_id?
+          @@sfa_suppress_id[self] == true
+        end
+
         # Define a SFA property
         #
         # @param [Symbol] name name of resource in RSpec
@@ -85,29 +94,34 @@ module OMF::SFA
         # opts:
         #   :valid_for - valid [sec] from now
         #
-        def sfa_advertisement_xml(resources, opts = {})
+        def to_rspec(resources, type, opts = {})
           doc = Nokogiri::XML::Document.new
           #<rspec expires="2011-09-13T09:07:09Z" generated="2011-09-13T09:07:09Z" type="advertisement" xmlns="http://www.geni.net/resources/rspec/3" xmlns:ol="http://nitlab.inf.uth.gr/schema/sfa/rspec/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/ad.xsd http://nitlab.inf.uth.gr/schema/sfa/rspec/1 http://nitlab.inf.uth.gr/schema/sfa/rspec/1/ad-reservation.xsd">
           root = doc.add_child(Nokogiri::XML::Element.new('rspec', doc))
-          root.add_namespace(nil, SFA_NAMESPACE_URI)
-          root.add_namespace('xsi', "http://www.w3.org/2001/XMLSchema-instance")
 
-          opts[:type] = 'advertisement' unless opts[:type]
-          if opts[:type] == 'manifest'
+          root.set_attribute('type', type)
+          now = Time.now
+          root.set_attribute('generated', now.iso8601)
+
+          case opts[:type] = type = type.to_sym
+          when :manifest
             schema = 'manifest.xsd'
-          else
+          when :advertisement
             schema = 'ad.xsd'
+            root.set_attribute('expires', (now + (opts[:valid_for] || 600)).iso8601)
+          when :request
+            schema = 'request.xsd'
+          else
+            raise "Unnown Rspec type '#{type}'"
           end
-          root['xsi:schemaLocation'] = "#{SFA_NAMESPACE_URI} #{SFA_NAMESPACE_URI}/#{schema} #{@@sfa_namespaces[:ol]} #{@@sfa_namespaces[:ol]}/ad-reservation.xsd"
+
+          root.add_namespace(nil, SFA_NAMESPACE_URI)
+          root.add_namespace('xsi', "http://www.w3.org/2001/XMLSchema-instance")
+          #root['xsi:schemaLocation'] = "#{SFA_NAMESPACE_URI} #{SFA_NAMESPACE_URI}/#{schema} #{@@sfa_namespaces[:ol]} #{@@sfa_namespaces[:ol]}/ad-reservation.xsd"
           @@sfa_namespaces.each do |prefix, opts|
             root.add_namespace(prefix.to_s, opts[:urn])
           end
 
-          root.set_attribute('type', opts[:type])
-          now = Time.now
-          root.set_attribute('generated', now.iso8601)
-          root.set_attribute('expires', (now + (opts[:valid_for] || 600)).iso8601)
-
           #root = doc.create_element('rspec', doc)
           #doc.add_child root
           obj2id = {}
@@ -443,28 +457,41 @@ module OMF::SFA
             self.class.sfa_add_namespaces_to_document(parent)
           end
           defs = self.class.sfa_defs()
-          if (id = obj2id[self])
+          if (!(opts[:suppress_id] || self.class.sfa_suppress_id?) && id = obj2id[self])
             new_element.set_attribute('idref', id)
             return parent
           end
 
           id = sfa_id()
           obj2id[self] = id
-          new_element.set_attribute('id', id) #if detail_level > 0
+          unless opts[:suppress_id] || self.class.sfa_suppress_id?
+            new_element.set_attribute('id', id) #if detail_level > 0
+          end
           #if href = self.href(opts)
           #  new_element.set_attribute('omf:href', href)
           #end
           level = opts[:level] ? opts[:level] : 0
           opts[:level] = level + 1
+          sfa_type = opts[:type]
+          is_request = sfa_type == :request
           defs.keys.sort.each do |key|
             next if key.start_with?('_')
             pdef = defs[key]
+            #puts ">>>> PDEF(#{key}): #{pdef}"
             if (ilevel = pdef[:include_level])
               #next if level > ilevel
             end
-            #puts ">>>> #{k} <#{self}> #{pdef.inspect}"
-            value = send(key.to_sym)
-            #puts "#{k} <#{v}> #{pdef.inspect}"
+            next if is_request && pdef[:in_request] == false
+
+            if respond_to?(m = "_to_sfa_xml_#{key}".to_sym)
+              send(m, new_element, pdef, obj2id, opts)
+              next
+            end
+            pname = (pdef[:prop_name] || key).to_sym
+            #puts ">>>> #{pname} <#{self}> #{pdef.inspect}"
+            next unless respond_to? pname
+            value = send(pname)
+            #puts "#{key} <#{value} - #{value.class}> #{pdef.inspect}"
             if value.nil?
               value = pdef[:default]
             end
@@ -473,7 +500,7 @@ module OMF::SFA
               if value.is_a?(Time)
                 value = value.xmlschema # xs:dateTime
               end
-                _to_sfa_property_xml(key, value, new_element, pdef, obj2id, opts)
+              _to_sfa_property_xml(key, value, new_element, pdef, obj2id, opts)
               #end
             end
           end
@@ -483,6 +510,11 @@ module OMF::SFA
 
         def _to_sfa_property_xml(pname, value, res_el, pdef, obj2id, opts)
           pname = self.class._sfa_add_ns(pname, pdef)
+          if value.respond_to?(:to_sfa_xml)
+            value.to_sfa_xml(res_el, obj2id, opts)
+            return
+          end
+
           if pdef[:attribute]
             res_el.set_attribute(pname, value.to_s)
           elsif aname = pdef[:attr_value]
@@ -494,7 +526,8 @@ module OMF::SFA
             else
               cel = res_el.add_child(Nokogiri::XML::Element.new(pname, res_el.document))
             end
-            if !value.kind_of?(String) && value.kind_of?(Enumerable)
+            #puts ">>> _to_sfa_property_xml(#{pname}): class: #{value.class} string? #{value.kind_of?(String)} enumerable: #{value.kind_of?(Enumerable)} "
+            if !value.kind_of?(String) && (value.kind_of?(Enumerable) || value.is_a?(OMF::SFA::Resource::OPropertyArray))
               value.each do |v|
                 if v.respond_to?(:to_sfa_xml)
                   v.to_sfa_xml(cel, obj2id, opts)

data/lib/omf-sfa/resource/sliver_type.rb

@@ -0,0 +1,25 @@
+
+require 'omf-sfa/resource/oresource'
+require 'omf-sfa/resource/disk_image'
+
+module OMF::SFA::Resource
+
+  # This class represents a disk image to be used for a particular node.
+  #
+  #  <sliver_type name="emulab-openvz">
+  #    <disk_image name="urn:publicid:IDN+instageni.gpolab.bbn.com+image+emulab-net//GIMIomf"/>
+  #  </sliver_type>
+  #
+  class SliverType < OResource
+    oproperty :disk_image, DiskImage, required: false
+
+    extend OMF::SFA::Resource::Base::ClassMethods
+    include OMF::SFA::Resource::Base::InstanceMethods
+
+    sfa_class 'sliver_type'
+    sfa_suppress_id
+    sfa :name, :attribute => true
+    sfa :disk_image
+  end
+end
+

data/lib/omf-sfa/version.rb

@@ -1,4 +1,4 @@
 module OMF; module SFA
   #VERSION = "6.0.0.pre.1"
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_sfa
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -393,8 +393,10 @@ files:
 - Rakefile
 - bin/parse_rspec.rb
 - etc/omf-sfa/omf-sfa-am.yaml
+- examples/brite2rspec.rb
 - examples/exogeni5nodemanifest.rspec
 - examples/instageni5nodemanifest.rspec
+- examples/waxman_10.brite
 - lib/omf-sfa/am.rb
 - lib/omf-sfa/am/am-rest/REST_API.md
 - lib/omf-sfa/am/am-rest/account_handler.rb
@@ -426,13 +428,17 @@ files:
 - lib/omf-sfa/model/ontology.rb
 - lib/omf-sfa/resource.rb
 - lib/omf-sfa/resource/README.md
+- lib/omf-sfa/resource/abstract_service.rb
 - lib/omf-sfa/resource/channel.rb
 - lib/omf-sfa/resource/comp_group.rb
 - lib/omf-sfa/resource/component_lease.rb
 - lib/omf-sfa/resource/constants.rb
+- lib/omf-sfa/resource/disk_image.rb
+- lib/omf-sfa/resource/execute_service.rb
 - lib/omf-sfa/resource/group_component.rb
 - lib/omf-sfa/resource/group_membership.rb
 - lib/omf-sfa/resource/gurn.rb
+- lib/omf-sfa/resource/install_service.rb
 - lib/omf-sfa/resource/interface.rb
 - lib/omf-sfa/resource/ip.rb
 - lib/omf-sfa/resource/link.rb
@@ -447,6 +453,7 @@ files:
 - lib/omf-sfa/resource/project.rb
 - lib/omf-sfa/resource/project_membership.rb
 - lib/omf-sfa/resource/sfa_base.rb
+- lib/omf-sfa/resource/sliver_type.rb
 - lib/omf-sfa/resource/user.rb
 - lib/omf-sfa/util/create_sample_testbed.rb
 - lib/omf-sfa/util/load_from_sfa_xml.rb